7 commits

Author	SHA1	Message	Date
Dustin Johnson	7843e33544	Issue #1302 Fixes for data delivery merge with development branch. ... Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753 Former-commit-id: 8d5c86f31e [formerly 2f28e19bf6] [formerly 8d5c86f31e [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]] Former-commit-id: a8f9c4f90a Former-commit-id: 7b4967b5bb [formerly 7f994472ae] Former-commit-id: e0c68bde6d	2012-11-01 16:31:14 -05:00
Dustin Johnson	931d94d1de	Issue #1302 Merge branch '5-Data_Delivery' into development ... Conflicts: edexOsgi/build.edex/deploy-common/external-rules.xml edexOsgi/build.edex/deploy-common/plugin-methods.xml edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java edexOsgi/build.edex/build.xml edexOsgi/build.edex/esb/conf/modes.xml edexOsgi/com.raytheon.edex.feature.uframe/feature.xml edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0 Former-commit-id: 8e69107b5a [formerly 98d7beae50] [formerly 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]] Former-commit-id: 31d7d09c10 Former-commit-id: e7a0f96a9a [formerly bcf575966b] Former-commit-id: 4d9c945388	2012-11-01 13:36:06 -05:00
Brad Gonzales	78fbf32245	Issue #1274 Added Token control for java code and scripts started by RFC Crons. ... Added tokens for app control to the Apps_Defaults configuration file. Added AppsDefaults token checks to the cron java code and scripts. Updated Executor.start() to load system properties from properties files in a conf resources properties directory and also to load site specific properties from a conf resources properties site directory. Amend: Removed tabs in MainMethod.java. Updates from peer review. Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute(). Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc Former-commit-id: 75e77feb58 [formerly 68a3a98547] [formerly 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]] Former-commit-id: 44e9238fa9 Former-commit-id: 7807eca270 [formerly 253c19ae05] Former-commit-id: 6fae286ad2	2012-10-31 21:20:40 -05:00
Bryan Kowal	c497827083	Issue #1134 - edex will now use the same jep library that CAVE does ... Former-commit-id: 3c63f21cfc [formerly ec89c440fe] [formerly 3c63f21cfc [formerly ec89c440fe] [formerly 04b574f56e [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]] Former-commit-id: 04b574f56e Former-commit-id: 8a04029498 [formerly 84f7083b81] Former-commit-id: 6f159f35de	2012-09-07 10:28:51 -05:00
Bryan Kowal	5b4c392e7f	Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development ... Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]] Former-commit-id: f92eb59a73 Former-commit-id: 8d64fdba2c [formerly 580172b47c] Former-commit-id: 212afcceea	2012-07-10 16:57:16 -05:00
Bryan Kowal	66028f4fe2	Issue #708 - it is now possible to build edex rpms in the new baseline repository. ... Former-commit-id: 11a1c4f35f [formerly 973ceff9a7] [formerly 11a1c4f35f [formerly 973ceff9a7] [formerly f79134499e [formerly 0932e1173258d916a6a1caae5c943903d830c2af]]] Former-commit-id: f79134499e Former-commit-id: 872a3a5f60 [formerly 1acbc16759] Former-commit-id: 720c2063f0	2012-06-20 11:22:58 -05:00
Bryan Kowal	eca1d3d525	Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository. ... Former-commit-id: 5e80c45a03 [formerly dcc5675564] [formerly 5e80c45a03 [formerly dcc5675564] [formerly c0aaac4a07 [formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]] Former-commit-id: c0aaac4a07 Former-commit-id: a9c2cf4fae [formerly c608fc959c] Former-commit-id: 720a152a45	2012-06-14 11:35:15 -05:00