xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
561 commits 31 branches 40 tags 3.8 GiB
Commit graph

20 commits

Author SHA1 Message Date
Steve Harris
d325d496f5 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: a435e6464a78345b5036e3060430375dc53e4faf
 2012-06-11 15:24:03 -05:00
Steve Harris
3904c4ccf5 12.5.1-15 baseline 
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
 2012-06-08 13:39:48 -05:00
Steve Harris
31b3e87ffa 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: f98354aae305ad227eaf3b36e4393b8aefc80f02
 2012-05-09 13:19:47 -05:00
Steve Harris
8485b90ff8 12.4.1-10 baseline 
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
 2012-05-01 18:06:13 -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
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
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
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
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
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