Commit graph

10 commits

Author SHA1 Message Date
Dustin Johnson
8e69107b5a 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: 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 98d7beae50
2012-11-01 13:36:06 -05:00
Brad Gonzales
d26119c383 Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]
Former-commit-id: b2656df2f8
2012-10-26 14:00:55 -05:00
Steve Harris
98171b5de9 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
11f96dbedd 12.7.1-8 baseline
Former-commit-id: c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: 16bf591a33
2012-07-19 16:20:40 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Nate Jensen
fae8fd5a6d Issue #181 fixing edex feature and component deploys
Change-Id: Id7bad29c6914b13b3a6f47452f772999b696f48d

Former-commit-id: 1dabb12dce [formerly 0c82def5c753aab240848aac8dc906a161461ac3]
Former-commit-id: 8e3730adbf
2012-01-24 12:15:01 -06:00
root
a02aeb236c Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 9f19e3f712
2012-01-06 08:55:05 -06:00