Commit graph

15 commits

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

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]
Former-commit-id: 50825200a1
Former-commit-id: 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]
Former-commit-id: d1881ffa51
2013-07-15 14:26:15 -05:00
Nate Jensen
3a41ae85b4 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

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

Former-commit-id: cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]
Former-commit-id: 452858b86f
2013-05-29 09:20:53 -05:00
Nate Jensen
3b56918970 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]
Former-commit-id: a84a6fe6ae
2013-05-23 11:20:40 -05:00
Nate Jensen
575b6335c3 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]
Former-commit-id: dac803ca07
2013-05-14 16:16:13 -05:00
Max Schenkelberg
bde1619d1c Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79

Former-commit-id: 2fd6f3ed4e [formerly c8a5f1a007] [formerly 0f1112fb3e] [formerly 38bba3705f [formerly 0f1112fb3e [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]
Former-commit-id: 38bba3705f
Former-commit-id: 71ee9b4fe7ff08b057d3d7bee4f424a8213cdcca [formerly 6ebc058df4]
Former-commit-id: 41706c42f2
2013-02-27 12:26:32 -06:00
Bryan Kowal
6a47017449 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: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]
Former-commit-id: b2a0a7c148
2013-02-21 13:55:28 -06:00
Richard Peter
6f8f5690b0 Issue #1189: Remove camel http header copy overhead
Change-Id: I00dcf2d41972359b36c7485425f61cb6fc74759a

Former-commit-id: dc724d0b01 [formerly 59b12a2eaa] [formerly bc28c38ef4] [formerly 85c2977c00 [formerly bc28c38ef4 [formerly 4818be92cdeb4bc9a4064f59d2c4a773aca5f1aa]]]
Former-commit-id: 85c2977c00
Former-commit-id: 1bc903727f196bf47440f4f26981da59cdf7f9d9 [formerly 210a8734f5]
Former-commit-id: 8141fe33fc
2012-09-19 10:04:30 -05:00
Bryan Kowal
181cd0b024 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: d25012ee75 [formerly cb16805e7e] [formerly 95a5887b06] [formerly 25e20ad89c [formerly 95a5887b06 [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: f43b37604ae27b981a3dbd819486fddea450376c [formerly fd8be91fed]
Former-commit-id: 5db24885ba
2012-06-19 13:15:53 -05:00
Steve Harris
fe7ac96625 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: fc70139990 [formerly d7f7c26582] [formerly 092efd6072] [formerly 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 606a1f5f70c4344a8a6b5b7da1c351cf7707cda2 [formerly 98447412f8]
Former-commit-id: 53d2822329
2012-05-09 13:19:47 -05:00
Steve Harris
98d8b3f188 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]
Former-commit-id: a2a6a18fae
2012-04-18 15:18:16 -05:00
Bryan Kowal
438e88cc58 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: 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]
Former-commit-id: 839d7c886f
Former-commit-id: 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9]
Former-commit-id: ab70749ea4
2012-04-09 09:32:45 -05:00
Bryan Kowal
f24e7a4d31 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: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]
Former-commit-id: edb7431d0a
2012-04-04 18:29:13 -05:00
Matt Nash
fa4cd88c90 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 21d2361f00 [formerly 1faae42484]
Former-commit-id: 82300ccdcf
2012-01-19 11:53:12 -06:00
root
9bb8decbcf Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 377dcd10b9 [formerly 3360eb6c5f]
Former-commit-id: 8e80217e59
2012-01-06 08:55:05 -06:00