Commit graph

15 commits

Author SHA1 Message Date
Max Schenkelberg
1610826d2e Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]
Former-commit-id: 50825200a1
2013-07-15 14:26:15 -05:00
Nate Jensen
a1f314948f Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]
Former-commit-id: 3f3e0a788d
2013-05-29 14:49:43 -05:00
Nate Jensen
cb4b66d37a Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]
Former-commit-id: 36bc35b5c8
2013-05-29 09:20:53 -05:00
Nate Jensen
49b20e5d20 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]
Former-commit-id: 1fd2f8965f
2013-05-23 11:20:40 -05:00
Nate Jensen
91c8b9ac1d Issue #1989 use camel's built-in DirectVm component
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]
Former-commit-id: d7b8e04bb7
2013-05-23 10:06:28 -05:00
Roger Ferrel
4dbb053d65 Issue #1496 Changes to allow multiple query jobs. (Reduced long queries from 30 to 5 seconds.)
Changes to use fewer synchronized blocks.

Change-Id: I854a5ff9d34be63e46d26f3d78953bc3b8cc796a

Former-commit-id: 7a7f86bfe6 [formerly 7adb742310b662763315fc721d6d6f326b8ba160]
Former-commit-id: fbcc5fb9a0
2013-01-30 13:11:56 -06:00
Roger Ferrel
58e3bbbe97 Issue #1496 Changes to move what may be long queries off the UI thread.
Changed based on comments in patch set 2.

Change-Id: I867f716aac39562f9b8bfaddf187bc80cb5a71ce

Former-commit-id: ff09ee32ab [formerly e54cc8fa001f3c6584bc40a74f461d7021ef77bb]
Former-commit-id: 470abe2495
2013-01-23 14:08:46 -06:00
Bryan Kowal
fd8be91fed Issue #708 - ensure that spring and other resources are packaged in the edex jars created by the pde build. Updated the edex pde build to handle foss dependencies correctly.
Former-commit-id: 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]
Former-commit-id: 25e20ad89c
2012-06-19 13:15:53 -05:00
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: 37793c86b1 [formerly a435e6464a78345b5036e3060430375dc53e4faf]
Former-commit-id: d325d496f5
2012-06-11 15:24:03 -05:00
Steve Harris
676ea3192f 12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
2012-06-08 13:39:48 -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: 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 31b3e87ffa
2012-05-09 13:19:47 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
2012-04-18 15:18:16 -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: e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]
Former-commit-id: 2ed20e107d
2012-04-04 18:29:13 -05:00
Matt Nash
1faae42484 Moving 12.1.1 into ss_sync
Former-commit-id: 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]
Former-commit-id: c83e5ff474
2012-01-19 11:53:12 -06:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
2012-01-06 08:55:05 -06:00