Commit graph

17 commits

Author SHA1 Message Date
Brian Clements
d0ddbc8abe Omaha #3583 productsrv no longer uses serialization util for JAXB
Change-Id: Ifad0e3cc6c875e66e695f7f812b038105ec64b18

Former-commit-id: bd15ca2b1d [formerly 1d06a876d7] [formerly b984f9e3ed] [formerly bd15ca2b1d [formerly 1d06a876d7] [formerly b984f9e3ed] [formerly 8bf3b0372b [formerly b984f9e3ed [formerly e3dbeb01aa3235db1f6e72a41bdbcd456a60f37f]]]]
Former-commit-id: 8bf3b0372b
Former-commit-id: 5b8382aebf [formerly 6e8af95e7b] [formerly 702777b10d447aaeb6977c9cf45d39693ba8c8cf [formerly d0a741a083]]
Former-commit-id: 07e3b4bf8f70aaca64c0ab9dbea1f2e1d81bd87f [formerly 86442d1b24]
Former-commit-id: b21ad76754
2014-09-12 15:22:48 -05:00
Nate Jensen
805ff08819 Issue #2984 remove uEngineWeb, move gfe svc backup files to viz.gfe
plugin

Change-Id: I8fcd61af003366405b4b40661bb7e471bf03c64a

Former-commit-id: 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly 33fb2c2e0d [formerly 40d1fda798] [formerly f086bb0c9b] [formerly ceec3d48f0 [formerly f086bb0c9b [formerly e2feed87185e15d9e681ca0155b03d1d9ff29e25]]]]
Former-commit-id: ceec3d48f0
Former-commit-id: 134f34c4df [formerly dfe50ee038] [formerly d97211d5385681fec6abca63498e85889f803dd8 [formerly 715932091e]]
Former-commit-id: 3e07e40b8dcad3da2eb07fe1e1fd1960476568c1 [formerly 1e5433c9c3]
Former-commit-id: c8c25d9224
2014-04-14 14:28:11 -05:00
Max Schenkelberg
ad32bbd91d 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 cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
2013-07-15 14:26:15 -05:00
Nate Jensen
88f9c45cf0 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 04d6f6654d [formerly 927da5cffb] [formerly 99b4a21414] [formerly 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: 3a41ae85b4 [formerly b025262dc1] [formerly d0138025d23b33df24fb8ba7acc2f8deacce3bcc [formerly a1f314948f]]
Former-commit-id: 080efd3540895c64fe9887513267aae9011cea8d [formerly 4eb941dacb]
Former-commit-id: e4bbe70d57
2013-05-29 14:49:43 -05:00
Nate Jensen
8777604fdd 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 cf705759bd [formerly 808ab352c5] [formerly 82d6c03669] [formerly 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]]]
Former-commit-id: 36bc35b5c8
Former-commit-id: 768a7dad60 [formerly 452858b86f] [formerly db577cfe4bfa8cdfe3ef347e55233cf887e454bd [formerly cb4b66d37a]]
Former-commit-id: 4de98fe7068aa6e779321f9fb2a37687751247da [formerly 74081dd140]
Former-commit-id: f9d85ac8a9
2013-05-29 09:20:53 -05:00
Nate Jensen
de2f575c94 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly e8ebe1a123 [formerly b7cecb931e] [formerly 1978133177] [formerly 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: 3b56918970 [formerly a84a6fe6ae] [formerly f442aa5cc9b841acd44c25b957b4ae48afadd47f [formerly 49b20e5d20]]
Former-commit-id: 897e2914605390b57d9f2b46e9b29f5c116a73d9 [formerly 9689640192]
Former-commit-id: eaaf8d1b8a
2013-05-23 11:20:40 -05:00
Nate Jensen
6b9fa8445b 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 c5e226e268 [formerly 1fcbeb41c9] [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]]]
Former-commit-id: 6f1684b85c
Former-commit-id: 575b6335c3 [formerly dac803ca07] [formerly 1baaa254282ed154b97e2ddd86e72bbfaeb0e555 [formerly 22c23492c4]]
Former-commit-id: ab22f7f711aa7fbda2856f8ecf6ccf6a6defb61d [formerly 925339b84c]
Former-commit-id: 0080d492e2
2013-05-14 16:16:13 -05:00
Max Schenkelberg
81dad90e5f 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 2fd6f3ed4e [formerly c8a5f1a007] [formerly 0f1112fb3e] [formerly 38bba3705f [formerly 0f1112fb3e [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]]]]
Former-commit-id: 38bba3705f
Former-commit-id: bde1619d1c [formerly 41706c42f2] [formerly 71ee9b4fe7ff08b057d3d7bee4f424a8213cdcca [formerly 6ebc058df4]]
Former-commit-id: abc90031c64b3efb5931ffb8669c4138a0d5dd1e [formerly 22a18ffe01]
Former-commit-id: 727602f011
2013-02-27 12:26:32 -06:00
Bryan Kowal
55b55a1255 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 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6a47017449 [formerly b2a0a7c148] [formerly 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]]
Former-commit-id: 302b1a5ae96498f9e93f50ccd303b89ce6085fa5 [formerly 2a21f2624b]
Former-commit-id: b88a24574b
2013-02-21 13:55:28 -06:00
Richard Peter
f0513d81b4 Issue #1189: Remove camel http header copy overhead
Change-Id: I00dcf2d41972359b36c7485425f61cb6fc74759a

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