Commit graph

292 commits

Author SHA1 Message Date
Steve Harris
244755b393 12.5.1-15 baseline
Former-commit-id: cee20d8656 [formerly d5c238de07 [formerly 1c128372ef9f478f1b807e8d0f23207d095bfc65]]
Former-commit-id: d5c238de07
Former-commit-id: 0ca936807e
2012-06-11 16:02:30 -05:00
Steve Harris
975053c3dc 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: d325d496f5 [formerly 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]]
Former-commit-id: 37793c86b1
Former-commit-id: c7024992a3
2012-06-11 15:24:03 -05:00
Steve Harris
2f10c7a1e4 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
2012-06-08 13:39:48 -05:00
Steve Harris
45773fbee0 12.5.1-9 baseline
Former-commit-id: 1f542697cb [formerly 8f3c9ebfb7 [formerly 25a4d3ed99c4be73a118b92c230c6365b65b56eb]]
Former-commit-id: 8f3c9ebfb7
Former-commit-id: b8de76b45e
2012-05-21 17:48:55 -05:00
Steve Harris
ba6d779949 12.5.1-6 baseline
Former-commit-id: fa87dc6cf1 [formerly 24474489f9 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]]
Former-commit-id: 24474489f9
Former-commit-id: df80148db6
2012-05-16 16:41:22 -05:00
Richard Peter
7a5aea8ee4 Issue : Update grib/gfe thread/memory usage for grib notification route
Change-Id: Ifa295f02c6e465bc151268c47fc71bfc67646e36

Former-commit-id: 150d16b24e [formerly e431671ff2 [formerly a4450314db26948d531ecf80ec1455895cdb81ac]]
Former-commit-id: e431671ff2
Former-commit-id: 7b14c9499a
2012-05-11 10:06:04 -05:00
Steve Harris
fc70139990 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: 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 092efd6072
Former-commit-id: d7f7c26582
2012-05-09 13:19:47 -05:00
Steve Harris
c1bc408f84 12.5.1-2 baseline
Former-commit-id: b36c69cc67 [formerly 84d191e7b6 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]]
Former-commit-id: 84d191e7b6
Former-commit-id: ac708c050d
2012-05-03 19:17:13 -05:00
Steve Harris
7fa9dbd5fb 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
2012-05-01 18:06:13 -05:00
Steve Harris
931087306f 12.4.1-10 baseline
Former-commit-id: 01457fbbde [formerly 704b75e1a1 [formerly 5bd6393d7577e5625c6c85b7fe5e7beb9f8c477a]]
Former-commit-id: 704b75e1a1
Former-commit-id: 418489e726
2012-04-24 15:38:29 -05:00
Steve Harris
98c92073b5 12.4.1-7 baseline
Former-commit-id: cca73b3c62 [formerly 90ae4bbb36 [formerly 3524730cc38b5420e7529b5a75d62313695e64d6]]
Former-commit-id: 90ae4bbb36
Former-commit-id: 6d585942fe
2012-04-24 15:24:39 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Steve Harris
6a1f2160bd 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: fee53dea94 [formerly ed26e06df2 [formerly 3bd9b3a16b0105822983302efa5dd2834aaf5a5f]]
Former-commit-id: ed26e06df2
Former-commit-id: c90ce9d54e
2012-04-10 12:50:03 -05:00
Bryan Kowal
476ad5de1f Issue - 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: 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]
Former-commit-id: 1afa927c33
Former-commit-id: f49aadd9c8
2012-04-09 09:32:45 -05:00
Bryan Kowal
5f9463bc57 Issue - 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: 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]
Former-commit-id: e792b2a16f
Former-commit-id: 3e039dc79f
2012-04-04 18:29:13 -05:00
Steve Harris
760ead2047 12.3.1-10 baseline
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
2012-03-30 08:38:33 -05:00
Steve Harris
770ccb1520 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]
Former-commit-id: 132d68acc6
Former-commit-id: 94e6323c0a
2012-03-29 10:01:55 -05:00
Bryan Kowal
08451e8a63 Issue - 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: 66e05f4c96 [formerly 58bfa62981 [formerly eaa45d7123c43590be3d58fdf845708ade2dbb51]]
Former-commit-id: 58bfa62981
Former-commit-id: eab9c845bb
2012-03-12 11:43:34 -05:00
Bryan Kowal
3bd189df23 Issue - 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: 00759729a4 [formerly bea56356fd [formerly 47f1f6baaafd98cca0da5812a0870156766e83c7]]
Former-commit-id: bea56356fd
Former-commit-id: ed81095573
2012-03-05 14:36:56 -06:00
Steve Harris
6d01784115 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: e5b56c99ab [formerly 9b67525e95 [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: 9b67525e95
Former-commit-id: 24059a5b4e
2012-02-27 15:58:49 -06:00
Steve Harris
5a96582f16 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: 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: d0bbbfefcc
Former-commit-id: 92084b3f20
2012-02-23 10:06:18 -06:00
Steve Harris
829d2791e9 Merging SS OB12.2.1 into ss_sync
Former-commit-id: 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: c8aae98741
Former-commit-id: 8da36046de
2012-02-22 11:14:43 -06:00
Steve Harris
a811ac888f Merge branch 14-NCEP into 'ss_sync'
Former-commit-id: 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]
Former-commit-id: 94c2ea985b
Former-commit-id: 85075e6107
2012-02-22 10:12:49 -06:00
Steve Harris
121ec88a98 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: 496cc6a06b [formerly b89ebc5e01 [formerly 85082f273a85a3967d54d4a489b6ea973d0688be]]
Former-commit-id: b89ebc5e01
Former-commit-id: ec0f1aebfc
2012-02-20 16:38:06 -06:00
Steve Harris
d129eab241 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client
Former-commit-id: cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]
Former-commit-id: 4b76d22f77
Former-commit-id: c268da57bc
2012-02-20 12:43:38 -06:00
Bryan Kowal
eda0f92b17 Issue - fix deploy-install and the edex-cots rpm specification in test_sync.
Former-commit-id: 682c10767d [formerly 10a0ca252d [formerly be16819b50761daa75717bc901f73c66a7ad1af5]]
Former-commit-id: 10a0ca252d
Former-commit-id: 5754f9dfd8
2012-02-17 12:17:14 -06:00
Steve Harris
c4ced8af2d Merge commit 'awips2_OB12.1.1_Omaha' into 14-NCEP
Former-commit-id: 1707b98721 [formerly 7356d655da [formerly f3bac368dacad47036f9823243379fe6ed1d4869]]
Former-commit-id: 7356d655da
Former-commit-id: 6aed9311a8
2012-02-15 14:34:47 -06:00
David Gillingham
a10e6766d8 Issue : Committing refactored archiver capability
Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Issue : Address peer review comments from previous commit.

Change-Id: Ifc07621d2ad7b315a8d8391ae6ae6608516ba3bf

Former-commit-id: 061966f243 [formerly bb1ac9959b [formerly 47750dfd5e387238f409ead55549cbb24f5afbe1]]
Former-commit-id: bb1ac9959b
Former-commit-id: 535821e5b8
2012-02-13 16:09:36 -06:00
Ben Steffensmeier
9f0a74d808 Issue change point requests to correctly return null responses when there are no matching pdos.
Change-Id: I88e6ba5734aa55af76c3b417eea9336eef7bf08a

Former-commit-id: 83fbf80c98 [formerly 0d9fa5ea6c [formerly 2cd24c7e679b4f7002664d2588dd8bc54c7cebd0]]
Former-commit-id: 0d9fa5ea6c
Former-commit-id: 44debb13a3
2012-02-01 17:39:14 -06:00
Nate Jensen
0dea704a93 Issue disable nctext-ingest
Change-Id: Ib376d7ebf435947898d5c84e8e31b83737760e3e

Former-commit-id: f3ba2258df [formerly 1b32446288 [formerly a54d4b8e55c23411c0cb61eae8f57e8279c9f8e9]]
Former-commit-id: 1b32446288
Former-commit-id: e61ff490b1
2012-01-31 09:45:27 -06:00
Nate Jensen
e831de315f Issue fix ncep edex rpms
Change-Id: Iaf7778d9b32e8136f74caf4ed37892149e8392cf

Former-commit-id: 50c6816fa9 [formerly 0301af999e [formerly 17f8151b148ad8d645c81760bfa4820dc421490a]]
Former-commit-id: 0301af999e
Former-commit-id: 769731f21b
2012-01-30 15:56:50 -06:00
Greg Armendariz
f922263831 Merge "Issue - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts." into 9-Wes2Bridge
Former-commit-id: c34ed58ff5 [formerly 906dad4b76 [formerly 42fa4a177e61322ee5808111323546a0e9438bdc]]
Former-commit-id: 906dad4b76
Former-commit-id: 324694d954
2012-01-27 08:54:21 -06:00
David Gillingham
91ecb60c1f Issue : Merge all changes from previous SVN repo to GIT.
Former-commit-id: b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: 845e6c19af
Former-commit-id: b31f40ec9d
2012-01-26 17:38:43 -06:00
Bryan Kowal
da5e9f5bba Issue - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: 71d08b6916 [formerly f0b31d25f6 [formerly b309c8b3d2726da589a057d31d2ae7592b82eb19]]
Former-commit-id: f0b31d25f6
Former-commit-id: c8dde3b1f6
2012-01-26 17:38:17 -06:00
Bryan Kowal
a4cc5a6ba9 Issue - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: f4f398089b [formerly fac21248ad [formerly fc677d37985950823d3815054da39791d17c84ed]]
Former-commit-id: fac21248ad
Former-commit-id: d042d202e4
2012-01-26 17:33:36 -06:00
Bryan Kowal
4f1c75af04 Issue - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: bdf268a621 [formerly c690ba1e13 [formerly 23e05be1b40d5bd0cc969bd2c01ba4420fa7c644]]
Former-commit-id: c690ba1e13
Former-commit-id: e314799f44
2012-01-26 17:26:07 -06:00
Dave Hladky
bf2470f405 Issue Wes2Bridge time settings
Former-commit-id: b03b324ead [formerly 594412a5b5 [formerly 61cb464263b06c01f4ea0b7270628f03e9e48d5a]]
Former-commit-id: 594412a5b5
Former-commit-id: 66fbee3e04
2012-01-25 10:53:51 -06:00
Nate Jensen
daa0663af0 Issue integrating ncep edex code
Change-Id: Iaf11559e4cdb4f846d02283c5d2038474c0118e3

Former-commit-id: 33756de9c8 [formerly fe52a35f7a [formerly 3aa13bd49e23ef963127f7efbc91054c06808f1c]]
Former-commit-id: fe52a35f7a
Former-commit-id: 6366bc35cb
2012-01-24 09:59:50 -06:00
Nate Jensen
adb8188f98 Issue integrating ncep edex code
Change-Id: I7f3fd64d1e21d5a82b29b404bb90a62bfa6f79bf

Former-commit-id: a015cc136b [formerly f96e6a822b [formerly 71d87e07ef1d5ce2509fddce9170870a5950ba7b]]
Former-commit-id: f96e6a822b
Former-commit-id: 873469f771
2012-01-24 09:49:27 -06:00
Bryan Kowal
28957b7118 Issue - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]
Former-commit-id: 2142afe3f1
Former-commit-id: 971bf802ac
2012-01-20 11:37:38 -06:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00