Steve Harris
cf3c768213
Merge branch 'ss_sync' (OB12.5.1-15) into 9-Wes2Bridge
...
Conflicts:
cots/org.jboss.cache/.project
edexOsgi/build.edex/esb/conf/spring/project.properties
edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/bufr/BUFRSection1.java
edexOsgi/com.raytheon.uf.edex.decodertools/src/com/raytheon/uf/edex/decodertools/time/TimeTools.java
javaUtilities/com.raytheon.wes2bridge.utility.product/.project
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ssha/src/gov/noaa/nws/ncep/common/dataplugin/ssha/SshaRecord.java
ncep/gov.noaa.nws.ncep.common.staticdata/.project
Former-commit-id: 37793c86b1d325d496f5
2012-06-11 15:24:03 -05:00
Steve Harris
676ea3192f
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e003904c4ccf5
2012-06-08 13:39:48 -05:00
Richard Peter
33c7d4cb87
Issue #502 : Update grib/gfe thread/memory usage for grib notification route
...
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36
Former-commit-id: e431671ff2150d16b24e
2012-05-11 10:06:04 -05:00
Steve Harris
98447412f8
Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java
All of these were 'self-resolved' when kdiff3 invoked
Former-commit-id: 092efd607231b3e87ffa
2012-05-09 13:19:47 -05:00
Steve Harris
a28d70b5c5
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a58485b90ff8
2012-05-01 18:06:13 -05:00
Steve Harris
a4e519f3cd
12.4.1-4 baseline
...
Former-commit-id: 67a5a683002a216f333c
2012-04-18 15:18:16 -05:00
Steve Harris
dcdd7f0648
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: ed26e06df2fee53dea94
2012-04-10 12:50:03 -05:00
Bryan Kowal
24148c19a9
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: 1afa927c33839d7c886f
2012-04-09 09:32:45 -05:00
Bryan Kowal
5f4d6f600a
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: e792b2a16f2ed20e107d
2012-04-04 18:29:13 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Steve Harris
4b853c56c6
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
...
Former-commit-id: 132d68acc654a1d9cdbc
2012-03-29 10:01:55 -05:00
Bryan Kowal
3b97383354
Issue #419 - a -Dgit={true|false} switch will be used to determine if deploy-install will deploy from a single directory source tree or a multiple directory source tree. Removed tmp files that should not be baselined.
...
Former-commit-id: 58bfa6298166e05f4c96
2012-03-12 11:43:34 -05:00
Bryan Kowal
1fda54a89b
Issue #20 - additional new svn changes that have not been merged yet:
...
http://lightning.omaha.us.ray.com/redmine/projects/interim-svn-repository/repository/diff/trunk/edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java?rev=48&rev_to=1
Former-commit-id: bea56356fd00759729a4
2012-03-05 14:36:56 -06:00
Steve Harris
40d7357165
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: 9b67525e95e5b56c99ab
2012-02-27 15:58:49 -06:00
Steve Harris
3d511fe719
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: d0bbbfefcc7a10ca9766
2012-02-23 10:06:18 -06:00
Steve Harris
4450cf8963
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: c8aae9874154be9660f1
2012-02-22 11:14:43 -06:00
Steve Harris
aaead73ec5
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: 94c2ea985b9995d22e25
2012-02-22 10:12:49 -06:00
Steve Harris
4a93298877
Merge branch 'ss_sync' (OB12.1.2) into 9-Wes2Bridge
...
Conflicts:
.gitignore
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/IVcModuleArgument.java
deltaScripts/.pydevproject
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/ServerSpecificPersistablePluginDataObject.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IDataArchiver.java
edexOsgi/com.raytheon.uf.edex.maintenance/src/com/raytheon/uf/edex/maintenance/archive/IPluginArchiver.java
Former-commit-id: b89ebc5e01496cc6a06b
2012-02-20 16:38:06 -06:00
Steve Harris
54b5b6baef
Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
...
Former-commit-id: 4b76d22f77cc66c8be24
2012-02-20 12:43:38 -06:00
Bryan Kowal
2ba23624b4
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: 10a0ca252d682c10767d
2012-02-17 12:17:14 -06:00
Steve Harris
db1e3b1215
Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
...
Former-commit-id: 7356d655da1707b98721
2012-02-15 14:34:47 -06:00
David Gillingham
9f416558fa
Issue #20 : Committing refactored archiver capability
...
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Issue #20 : Address peer review comments from previous commit.
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf
Former-commit-id: bb1ac9959b061966f243
2012-02-13 16:09:36 -06:00
Ben Steffensmeier
3d3f73118b
Issue #211 change point requests to correctly return null responses when there are no matching pdos.
...
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a
Former-commit-id: 0d9fa5ea6c83fbf80c98
2012-02-01 17:39:14 -06:00
Nate Jensen
50e735ce0c
Issue #181 disable nctext-ingest
...
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e
Former-commit-id: 1b32446288f3ba2258df
2012-01-31 09:45:27 -06:00
Nate Jensen
ab7f9e5a56
Issue #181 fix ncep edex rpms
...
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf
Former-commit-id: 0301af999e50c6816fa9
2012-01-30 15:56:50 -06:00
Greg Armendariz
3c983de477
Merge "Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts." into 9-Wes2Bridge
...
Former-commit-id: 906dad4b76c34ed58ff5
2012-01-27 08:54:21 -06:00
David Gillingham
87b15de88b
Issue #20 : Merge all changes from previous SVN repo to GIT.
...
Former-commit-id: 845e6c19afb056e18757
2012-01-26 17:38:43 -06:00
Bryan Kowal
1f254d0e0f
Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
...
Former-commit-id: f0b31d25f671d08b6916
2012-01-26 17:38:17 -06:00
Bryan Kowal
6969c9b7ed
Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
...
Former-commit-id: fac21248adf4f398089b
2012-01-26 17:33:36 -06:00
Bryan Kowal
2f2b824273
Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
...
Former-commit-id: c690ba1e13bdf268a621
2012-01-26 17:26:07 -06:00
Dave Hladky
2d53cfbe41
Issue #15 Wes2Bridge time settings
...
Former-commit-id: 594412a5b5b03b324ead
2012-01-25 10:53:51 -06:00
Nate Jensen
3b7a082f41
Issue #181 integrating ncep edex code
...
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3
Former-commit-id: fe52a35f7a33756de9c8
2012-01-24 09:59:50 -06:00
Nate Jensen
e951995736
Issue #181 integrating ncep edex code
...
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf
Former-commit-id: f96e6a822ba015cc136b
2012-01-24 09:49:27 -06:00
Bryan Kowal
2a7b92ec91
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
...
Former-commit-id: 2142afe3f12b5ee4b940
2012-01-20 11:37:38 -06:00
Matt Nash
1faae42484
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f71206a8b51d6d
2012-01-06 08:55:05 -06:00
