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
|
4ffe05d37e
|
Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41
Former-commit-id: 449e4a2182 [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]
Former-commit-id: 20a5fe3577
Former-commit-id: 2ffcd5d684
|
2012-11-01 11:02:48 -05:00 |
|
Bryan Kowal
|
8d64fdba2c
|
Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development
Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: f92eb59a73
Former-commit-id: 580172b47c
|
2012-07-10 16:57:16 -05:00 |
|
Bryan Kowal
|
5db24885ba
|
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 25e20ad89c [formerly 1afabfa6e3621f0cfda1084e95c0e5a91a313812]]
Former-commit-id: 25e20ad89c
Former-commit-id: fd8be91fed
|
2012-06-19 13:15:53 -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 |
|
Matt Nash
|
82300ccdcf
|
Moving 12.1.1 into ss_sync
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
|
2012-01-19 11:53:12 -06:00 |
|
root
|
8e80217e59
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
|
2012-01-06 08:55:05 -06:00 |
|