15 commits

Author	SHA1	Message	Date
Max Schenkelberg	d1881ffa51	Issue #2142 Got log4j out of edex. ... Amend: Removed deleted files from build.properties Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa Former-commit-id: 94fa6f0e30 [formerly 63421a4819] [formerly 50825200a1 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]] Former-commit-id: 50825200a1 Former-commit-id: 1610826d2e	2013-07-15 14:26:15 -05:00
Nate Jensen	b025262dc1	Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh ... Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3 Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]] Former-commit-id: 3f3e0a788d Former-commit-id: a1f314948f	2013-05-29 14:49:43 -05:00
Nate Jensen	452858b86f	Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables ... Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c Former-commit-id: 808ab352c5 [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]] Former-commit-id: 36bc35b5c8 Former-commit-id: cb4b66d37a	2013-05-29 09:20:53 -05:00
Nate Jensen	a84a6fe6ae	Issue #1989 remove activemq references from spring xml, fix deprecated javadoc ... Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61 Former-commit-id: b7cecb931e [formerly 1978133177] [formerly 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]] Former-commit-id: 1fd2f8965f Former-commit-id: 49b20e5d20	2013-05-23 11:20:40 -05:00
Nate Jensen	dac803ca07	Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages ... Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158 Former-commit-id: 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]] Former-commit-id: 6f1684b85c Former-commit-id: 22c23492c4	2013-05-14 16:16:13 -05:00
Max Schenkelberg	41706c42f2	Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database. ... Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79 Former-commit-id: c8a5f1a007 [formerly 0f1112fb3e] [formerly 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]] Former-commit-id: 38bba3705f Former-commit-id: 6ebc058df4	2013-02-27 12:26:32 -06:00
Bryan Kowal	b2a0a7c148	Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper ... - disabled the startup of the admin web application in the jetty container - removed configuration and libraries specific to the tanuki java service wrapper - updated the rpm build and developer deployment - added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log... Former-commit-id: 519ce2c0fb [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]] Former-commit-id: 803397c7c7 Former-commit-id: 450e8e7a4c	2013-02-21 13:55:28 -06:00
Richard Peter	8141fe33fc	Issue #1189: Remove camel http header copy overhead ... Change-Id: I00dcf2d41972359b36c7485425f61cb6fc74759a Former-commit-id: 59b12a2eaa [formerly bc28c38ef4] [formerly 85c2977c00 [formerly 4818be92cdeb4bc9a4064f59d2c4a773aca5f1aa]] Former-commit-id: 85c2977c00 Former-commit-id: 210a8734f5	2012-09-19 10:04:30 -05:00
Bryan Kowal	5db24885ba	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: cb16805e7e [formerly 95a5887b06] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]] Former-commit-id: 25e20ad89c Former-commit-id: fd8be91fed	2012-06-19 13:15:53 -05:00
Steve Harris	53d2822329	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: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]] Former-commit-id: 31b3e87ffa Former-commit-id: 98447412f8	2012-05-09 13:19:47 -05:00
Steve Harris	a2a6a18fae	12.4.1-4 baseline ... Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]] Former-commit-id: 2a216f333c Former-commit-id: a4e519f3cd	2012-04-18 15:18:16 -05:00
Bryan Kowal	ab70749ea4	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: f49aadd9c8 [formerly 1afa927c33] [formerly 839d7c886f [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]] Former-commit-id: 839d7c886f Former-commit-id: 24148c19a9	2012-04-09 09:32:45 -05:00
Bryan Kowal	edb7431d0a	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: 3e039dc79f [formerly e792b2a16f] [formerly 2ed20e107d [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]] Former-commit-id: 2ed20e107d Former-commit-id: 5f4d6f600a	2012-04-04 18:29:13 -05:00
Matt Nash	82300ccdcf	Moving 12.1.1 into ss_sync ... Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]] Former-commit-id: c83e5ff474 Former-commit-id: 1faae42484	2012-01-19 11:53:12 -06:00
root	8e80217e59	Initial revision of AWIPS2 11.9.0-7p5 ... Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]] Former-commit-id: 06a8b51d6d Former-commit-id: 3360eb6c5f	2012-01-06 08:55:05 -06:00