Commit graph

12 commits

Author SHA1 Message Date
Nate Jensen
c5e226e268 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 08b9ce4c62
Former-commit-id: 1fcbeb41c9
2013-05-14 16:16:13 -05:00
Dustin Johnson
34b969552f Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 04cbd3a24e [formerly 8956d1ac17 [formerly 126661592c42e16a07451868b87a33cff2a89cd1]]
Former-commit-id: 8956d1ac17
Former-commit-id: 6fc42b0791
2013-03-22 10:04:21 -05:00
Nate Jensen
84ea117d75 Issue #1638 fix build
Change-Id: I2c96c708c30050befc6f87fca41fb306da7ecc5e

Former-commit-id: 1cbc7bbfdc [formerly 192fe9a724 [formerly fe7a28034739ec871528f041cfa7a488e5c71378]]
Former-commit-id: 192fe9a724
Former-commit-id: 975d044ba6
2013-03-13 08:50:26 -05:00
Max Schenkelberg
d0b7850775 Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects
Amend: Accepted ticket for work, again!  Ensured uframe product project was not deleted

Change-Id: Iaa7754f25d74d893f84a7f82df605fb906e1e719

Former-commit-id: e0ba97d547 [formerly 4ed4ef8d71 [formerly 615fa06253cc5226ddbedbb7835f3f03cf4cbb5b]]
Former-commit-id: 4ed4ef8d71
Former-commit-id: 2611980ca4
2013-02-27 11:50:38 -06:00
Ron Anderson
9156b9ffe8 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 7c0a5d74bf [formerly a2a89fb4e7 [formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: a2a89fb4e7
Former-commit-id: dc7c9edb87
2013-02-15 09:03:41 -06:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
2012-11-08 09:57:16 -06:00
Max Schenkelberg
94e64c9b0d Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: ca4177dd08 [formerly 2f90120248 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: 2f90120248
Former-commit-id: f069f34a96
2012-11-07 10:44:42 -06:00
Dustin Johnson
7d0e4a6e75 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 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
2012-11-01 13:36:06 -05:00
Nate Jensen
7e34a3e6ab Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f

Former-commit-id: 7046ba996a [formerly bcedcc51fa [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]
Former-commit-id: bcedcc51fa
Former-commit-id: e58404bcb5
2012-06-29 13:19:47 -05:00
Bryan Kowal
a6814ec7fb Issue #708 - fix cave dependency issue when building due to ecf. The baseline p2-build.xml script will no longer attempt to build the collaboration feature.
Former-commit-id: 25addabe64 [formerly 207bbd3087 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]
Former-commit-id: 207bbd3087
Former-commit-id: fa84e5df3e
2012-06-19 15:03:57 -05:00
Bryan Kowal
db3f60b23a Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
Former-commit-id: ce99417a2a [formerly 6ddeef48fa [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]
Former-commit-id: 6ddeef48fa
Former-commit-id: b1a5abc6b3
2012-04-10 16:42:36 -05:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00