Commit graph

11 commits

Author SHA1 Message Date
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
69e4af9ce2 Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 449e4a2182 [formerly 9137f334b5] [formerly 449e4a2182 [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]]
Former-commit-id: 20a5fe3577
Former-commit-id: 4ffe05d37e [formerly 2ffcd5d684]
Former-commit-id: 49343a7e3c
2012-11-01 11:02:48 -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
93967d22c2 Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6

Former-commit-id: 67035fa0b8 [formerly 327ffa9439] [formerly 67035fa0b8 [formerly 327ffa9439] [formerly cd40d9accf [formerly dca54e56436ace397c6163b03ac4edb480336404]]]
Former-commit-id: cd40d9accf
Former-commit-id: 6ac43a3c0c [formerly 107831f23d]
Former-commit-id: e0c0b5928f
2012-07-28 08:52:36 -05:00
Bryan Kowal
50d469075a Issue #876 - ensure that the edex pde build also searches the current working directory for features and plugins (temporarily).
Former-commit-id: 6fe6e64f38 [formerly 5058c32c34] [formerly 6fe6e64f38 [formerly 5058c32c34] [formerly 31f2db8719 [formerly 62f98b83bf1c050700ac8eb4bf339cde5e55226e]]]
Former-commit-id: 31f2db8719
Former-commit-id: 43f3d40a8e [formerly 5619099acd]
Former-commit-id: 8378fadbc2
2012-07-11 16:28:28 -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
96e82f60e5 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 cb16805e7e [formerly 95a5887b06] [formerly 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]]
Former-commit-id: 25e20ad89c
Former-commit-id: 5db24885ba [formerly fd8be91fed]
Former-commit-id: f390151c0b
2012-06-19 13:15:53 -05:00
Bryan Kowal
19f8cca72c Issue #708 - support deploying from a separate work assignment repository - initial implementation.
Former-commit-id: 24627d52f2 [formerly 1c8b752063] [formerly 24627d52f2 [formerly 1c8b752063] [formerly 14c912f215 [formerly 0feb8374a85d09d8712f4bc421b5a24acb8d27c2]]]
Former-commit-id: 14c912f215
Former-commit-id: 4a631c01ee [formerly c1b57d1de1]
Former-commit-id: b730eced02
2012-06-14 12:43:34 -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
Matt Nash
bcc32c10bc Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]
Former-commit-id: c83e5ff474
Former-commit-id: 82300ccdcf [formerly 1faae42484]
Former-commit-id: 21d2361f00
2012-01-19 11:53:12 -06:00
root
e2ecdcfe33 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 8e80217e59 [formerly 3360eb6c5f]
Former-commit-id: 377dcd10b9
2012-01-06 08:55:05 -06:00