Dustin Johnson
e7a0f96a9a
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 31d7d09c10
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Brad Gonzales
7807eca270
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 44e9238fa9
[formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]
Former-commit-id: 44e9238fa9
Former-commit-id: 253c19ae05
2012-10-31 21:20:40 -05:00
Bryan Kowal
8a04029498
Issue #1134 - edex will now use the same jep library that CAVE does
...
Former-commit-id: 3c63f21cfc
[formerly ec89c440fe
] [formerly 04b574f56e
[formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]
Former-commit-id: 04b574f56e
Former-commit-id: 84f7083b81
2012-09-07 10:28:51 -05:00
Bryan Kowal
14c20083b0
Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
...
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36
Former-commit-id: dd1acbe70a
[formerly c6b2d65308
] [formerly 5ca4a66fdc
[formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: f295ee11ea
2012-08-02 10:33:55 -05:00
Bryan Kowal
a9c2cf4fae
Issue #708 - build and developer deployment changes required for transitioning to the AWIPS II Common Baseline Repository.
...
Former-commit-id: 5e80c45a03
[formerly dcc5675564
] [formerly c0aaac4a07
[formerly 3fb013680e1c49b1e0921ad57d59104c5ec2cbfc]]
Former-commit-id: c0aaac4a07
Former-commit-id: c608fc959c
2012-06-14 11:35:15 -05:00