Steve Harris
|
80108c0af9
|
Merge branch 'ss_sync' (OB12.3.1) into 9-Wes2Bridge
Conflicts:
edexOsgi/build.edex/esb/data/utility/edex_static/base/python/ObsRequest.py
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
Former-commit-id: 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly 6a1f2160bd [formerly c90ce9d54e] [formerly ed26e06df2] [formerly fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]]]
Former-commit-id: fee53dea94
Former-commit-id: a4eb467a34 [formerly 51bb9ebb46] [formerly 530c02831155693cd7d1ae3b27691f3302b2bbe3 [formerly dcdd7f0648]]
Former-commit-id: 59dcab34a58796d3cbce15bcb83c58e6507ec39d [formerly 58cb18d860]
Former-commit-id: f51d290333
|
2012-04-10 12:50:03 -05:00 |
|
Bryan Kowal
|
d484d46519
|
Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.
Former-commit-id: 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]]
Former-commit-id: 839d7c886f
Former-commit-id: 438e88cc58 [formerly ab70749ea4] [formerly 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9]]
Former-commit-id: 8311d4eb699b277f616ec522a0769d665dba89b5 [formerly adaa011b1f]
Former-commit-id: 6f9a0e45cb
|
2012-04-09 09:32:45 -05:00 |
|
Bryan Kowal
|
ad3d889f82
|
Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances.
Former-commit-id: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f24e7a4d31 [formerly edb7431d0a] [formerly f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]]
Former-commit-id: 1f75c4defef522fcbd2e5b5755b3202c6dd96d6d [formerly 3db4653b1e]
Former-commit-id: faefa46212
|
2012-04-04 18:29:13 -05:00 |
|
Steve Harris
|
9340618732
|
12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
|
2012-03-30 08:38:33 -05:00 |
|
Steve Harris
|
85d3d96d4c
|
Merge branch 'ss_sync' into 9-Wes2Bridge
Conflicts:
.gitignore
ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
deleted h5 files
using ss_sync version of java files
Former-commit-id: 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly 6d01784115 [formerly 24059a5b4e] [formerly 9b67525e95] [formerly e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]]]
Former-commit-id: e5b56c99ab
Former-commit-id: 2dbdc945bf [formerly 73a337bc31] [formerly 6a444fc4fae979713c005a8d9737369a6bcbce84 [formerly 40d7357165]]
Former-commit-id: 9ad2c540c010a2b27f18bb9c98356065c7663bd2 [formerly 21f12bae82]
Former-commit-id: f8ae79c35c
|
2012-02-27 15:58:49 -06:00 |
|
Steve Harris
|
43ff909553
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
|
2012-02-23 10:06:18 -06:00 |
|
Steve Harris
|
3a4af24369
|
Merging SS OB12.2.1 into ss_sync
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
|
2012-02-22 11:14:43 -06:00 |
|
David Gillingham
|
4349cccf11
|
Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20: Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly a10e6766d8 [formerly 535821e5b8] [formerly bb1ac9959b] [formerly 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]]]
Former-commit-id: 061966f243
Former-commit-id: 9a17298fb6 [formerly 3e42bc7d2d] [formerly 4931a468f096c3bd0bb7f0820c5d10d1c1c224aa [formerly 9f416558fa]]
Former-commit-id: 0be14ae8d9ccc5883f09318f7a66b2bf2cf6b629 [formerly 5a44726c19]
Former-commit-id: 8efd012653
|
2012-02-13 16:09:36 -06:00 |
|
Ben Steffensmeier
|
dc6c9bb96e
|
Issue #211 change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a
Former-commit-id: 9f0a74d808 [formerly 44debb13a3] [formerly 0d9fa5ea6c] [formerly 9f0a74d808 [formerly 44debb13a3] [formerly 0d9fa5ea6c] [formerly 83fbf80c98 [formerly 0d9fa5ea6c [formerly 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0]]]]
Former-commit-id: 83fbf80c98
Former-commit-id: dfd37b6bf8 [formerly d9a74d7a76] [formerly 6fc44fe46f98238613a95f5b004d4bad4c1c8b65 [formerly 3d3f73118b]]
Former-commit-id: 54533aa0aaa921aca2ce10344908c3fa2a651e4f [formerly b9d633b902]
Former-commit-id: 102decb6a6
|
2012-02-01 17:39:14 -06:00 |
|
Nate Jensen
|
d29b557612
|
Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e
Former-commit-id: 0dea704a93 [formerly e61ff490b1] [formerly 1b32446288] [formerly 0dea704a93 [formerly e61ff490b1] [formerly 1b32446288] [formerly f3ba2258df [formerly 1b32446288 [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]]]
Former-commit-id: f3ba2258df
Former-commit-id: 2dec5b706e [formerly 6bdb96c7ca] [formerly f80cae6694c70fd33d6dc36a7beadcfa8acd394a [formerly 50e735ce0c]]
Former-commit-id: e772b70631c0034dfafc04e1149bb6b652b31cae [formerly 81e6aa8183]
Former-commit-id: 90fdbcfea8
|
2012-01-31 09:45:27 -06:00 |
|
David Gillingham
|
531c37f6fb
|
Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly 91ecb60c1f [formerly b31f40ec9d] [formerly 845e6c19af] [formerly b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]]]
Former-commit-id: b056e18757
Former-commit-id: f2b58b2f16 [formerly ea7a55ad8d] [formerly 589441ef8a8b0e931380208ea6dea9adff2ba461 [formerly 87b15de88b]]
Former-commit-id: 2dfb07d58a5928ce4fb055932bcc4ae63a274440 [formerly d85d78f180]
Former-commit-id: e8d336e205
|
2012-01-26 17:38:43 -06:00 |
|
Dave Hladky
|
92cce91d94
|
Issue #15 Wes2Bridge time settings
Former-commit-id: bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly bf2470f405 [formerly 66fbee3e04] [formerly 594412a5b5] [formerly b03b324ead [formerly 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]]]
Former-commit-id: b03b324ead
Former-commit-id: 36d48978af [formerly 4e8acfaba3] [formerly 2479f0c7510c79fa38a277d7f43ba5ff441b9d5a [formerly 2d53cfbe41]]
Former-commit-id: 89a6fd5528f6dc78ffeaa8483a1da240cdbab071 [formerly 8553b8a654]
Former-commit-id: 1061ccbc4c
|
2012-01-25 10:53:51 -06:00 |
|
Nate Jensen
|
a2bcb9d289
|
Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly daa0663af0 [formerly 6366bc35cb] [formerly fe52a35f7a] [formerly 33756de9c8 [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]]]
Former-commit-id: 33756de9c8
Former-commit-id: bf2e1850f3 [formerly 7301ad5c66] [formerly 2cdd1911db9699c1da43ed376abd9ca94f036c25 [formerly 3b7a082f41]]
Former-commit-id: 378c9f2dfbf1104a0ce3d7135ab45d92a28d77a0 [formerly ef5349fb63]
Former-commit-id: 532df5ba35
|
2012-01-24 09:59:50 -06:00 |
|
Matt Nash
|
515196cb86
|
Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
|
2012-01-19 11:53:12 -06:00 |
|
root
|
7dbd17a5aa
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
|
2012-01-06 08:55:05 -06:00 |
|