Commit graph

485 commits

Author SHA1 Message Date
Steve Harris
b36c69cc67 12.5.1-2 baseline
Former-commit-id: ff847bf86803a485212f08a098be13bc3d83b0b8
2012-05-03 19:17:13 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
2012-05-01 18:06:13 -05:00
Steve Harris
01457fbbde 12.4.1-10 baseline
Former-commit-id: 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a
2012-04-24 15:38:29 -05:00
Steve Harris
cca73b3c62 12.4.1-7 baseline
Former-commit-id: 3524730cc38b5420e7529b5a75d62313695e64d6
2012-04-24 15:24:39 -05:00
Steve Harris
2a216f333c 12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
2012-04-18 15:18:16 -05:00
Steve Harris
fee53dea94 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: 3bd9b3a16b0105822983302efa5dd2834aaf5a5f
2012-04-10 12:50:03 -05:00
Bryan Kowal
839d7c886f 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: f11953c494fac20b2ad53b41069cfcb24281eb4a
2012-04-09 09:32:45 -05:00
Bryan Kowal
2ed20e107d 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: 6b206773eff05abf20ecc87b27e96c47b67ba600
2012-04-04 18:29:13 -05:00
Steve Harris
22bd792cd9 12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
2012-03-30 08:38:33 -05:00
Steve Harris
54a1d9cdbc Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 296cc5a5a6bcc45cd92198a045a88620d7d18653
2012-03-29 10:01:55 -05:00
Bryan Kowal
66e05f4c96 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: eaa45d7123c43590be3d58fdf845708ade2dbb51
2012-03-12 11:43:34 -05:00
Bryan Kowal
00759729a4 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: 47f1f6baaafd98cca0da5812a0870156766e83c7
2012-03-05 14:36:56 -06:00
Steve Harris
e5b56c99ab 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: fb9d0adece5806382d0aa5c7c3e7c41f89594143
2012-02-27 15:58:49 -06:00
Steve Harris
7a10ca9766 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: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
2012-02-23 10:06:18 -06:00
Steve Harris
54be9660f1 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 60f30af0c9e3203e2ff623d420165201dff41601
2012-02-22 11:14:43 -06:00
Steve Harris
9995d22e25 Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: a04c1c31c89566279953d2a270df8d652a3a82ff
2012-02-22 10:12:49 -06:00
Steve Harris
496cc6a06b 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: 85082f273a85a3967d54d4a489b6ea973d0688be
2012-02-20 16:38:06 -06:00
Steve Harris
cc66c8be24 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: a998a29e2f756ffc583eac04a884dcf9aae585e8
2012-02-20 12:43:38 -06:00
Bryan Kowal
682c10767d Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: be16819b50761daa75717bc901f73c66a7ad1af5
2012-02-17 12:17:14 -06:00
Steve Harris
1707b98721 Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: f3bac368dacad47036f9823243379fe6ed1d4869
2012-02-15 14:34:47 -06:00
David Gillingham
061966f243 Issue #20: Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Issue #20: Address peer review comments from previous commit.

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: 47750dfd5e387238f409ead55549cbb24f5afbe1
2012-02-13 16:09:36 -06:00
Ben Steffensmeier
83fbf80c98 Issue #211 change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a

Former-commit-id: 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0
2012-02-01 17:39:14 -06:00
Nate Jensen
f3ba2258df Issue #181 disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9
2012-01-31 09:45:27 -06:00
Nate Jensen
50c6816fa9 Issue #181 fix ncep edex rpms
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: 17f8151b148ad8d645c81760bfa4820dc421490a
2012-01-30 15:56:50 -06:00
Greg Armendariz
c34ed58ff5 Merge "Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts." into 9-Wes2Bridge
Former-commit-id: 42fa4a177e61322ee5808111323546a0e9438bdc
2012-01-27 08:54:21 -06:00
David Gillingham
b056e18757 Issue #20: Merge all changes from previous SVN repo to GIT.
Former-commit-id: 926a2a6a5af5b3514c29097deb0fc24b093643a2
2012-01-26 17:38:43 -06:00
Bryan Kowal
71d08b6916 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: b309c8b3d2726da589a057d31d2ae7592b82eb19
2012-01-26 17:38:17 -06:00
Bryan Kowal
f4f398089b Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: fc677d37985950823d3815054da39791d17c84ed
2012-01-26 17:33:36 -06:00
Bryan Kowal
bdf268a621 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: 23e05be1b40d5bd0cc969bd2c01ba4420fa7c644
2012-01-26 17:26:07 -06:00
Dave Hladky
b03b324ead Issue #15 Wes2Bridge time settings
Former-commit-id: 61cb464263b06c01f4ea0b7270628f03e9e48d5a
2012-01-25 10:53:51 -06:00
Nate Jensen
33756de9c8 Issue #181 integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: 3aa13bd49e23ef963127f7efbc91054c06808f1c
2012-01-24 09:59:50 -06:00
Nate Jensen
a015cc136b Issue #181 integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: 71d87e07ef1d5ce2509fddce9170870a5950ba7b
2012-01-24 09:49:27 -06:00
Bryan Kowal
2b5ee4b940 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 296d2915b17f0086d93e200d4780663bff34edbb
2012-01-20 11:37:38 -06:00
Matt Nash
c83e5ff474 Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
2012-01-19 11:53:12 -06:00
root
06a8b51d6d Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
2012-01-06 08:55:05 -06:00