Matt Nash
|
bf2dcdb733
|
Issue #1369 add geosolutions project to cots feature
Change-Id: I62dd15c2f0d2ee017fcb3ad9483399b688c508f3
Former-commit-id: 6949c1f105 [formerly 1d56d879fb] [formerly 6949c1f105 [formerly 1d56d879fb] [formerly ab07a92d48 [formerly 01033bfd4b1b298095697267be60d978aa5c14a5]]]
Former-commit-id: ab07a92d48
Former-commit-id: 210da024a4 [formerly d24fab93dd]
Former-commit-id: 349ba67388
|
2012-12-13 09:40:49 -06:00 |
|
Dustin Johnson
|
b4a13190ad
|
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: efd3d3735a [formerly 064ef82d1e] [formerly efd3d3735a [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]
Former-commit-id: 1dbeb22893
Former-commit-id: 2d1e886cf3 [formerly 4222b24d09]
Former-commit-id: 6613c51d3b
|
2012-11-08 09:57:16 -06:00 |
|
Max Schenkelberg
|
2345861756
|
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: f069f34a96 [formerly 2f90120248] [formerly f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]]
Former-commit-id: ca4177dd08
Former-commit-id: 5a5bd522a1 [formerly 747ab974e9]
Former-commit-id: 50625b0453
|
2012-11-07 10:44:42 -06:00 |
|
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
|
673749c4b9
|
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: d26119c383 [formerly b2656df2f8] [formerly d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]]
Former-commit-id: 24fc32ee14
Former-commit-id: 781265a6a8 [formerly 5949c8b09c]
Former-commit-id: e1a106fdbb
|
2012-10-26 14:00:55 -05:00 |
|
Nate Jensen
|
065bd9facf
|
Issue #716 remove dead plugin from features
Change-Id: I8fdce7496e3fc9123a48300f1c72c182eb811a0f
Former-commit-id: e58404bcb5 [formerly bcedcc51fa] [formerly e58404bcb5 [formerly bcedcc51fa] [formerly 7046ba996a [formerly f5784196a7d39d642357a3fb11ad34dc3fcd4b70]]]
Former-commit-id: 7046ba996a
Former-commit-id: 95bbc6a2d4 [formerly 63c5c4dc33]
Former-commit-id: c558b07925
|
2012-06-29 13:19:47 -05:00 |
|
Nate Jensen
|
c39f1c2a1d
|
Issue #716 fix feature location of smack and remove dead dir
Change-Id: I93ae13842f8e484f0d6243573f30d70b37a99702
Former-commit-id: eb2c21c15d [formerly 315594cab4] [formerly eb2c21c15d [formerly 315594cab4] [formerly 24b40c3392 [formerly eabc44141aa681503d6076ebf779536ff27e62f2]]]
Former-commit-id: 24b40c3392
Former-commit-id: 11f01325e5 [formerly d125185d28]
Former-commit-id: bd58025a99
|
2012-06-28 17:57:17 -05:00 |
|
Bryan Kowal
|
b69b1e9509
|
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: fa84e5df3e [formerly 207bbd3087] [formerly fa84e5df3e [formerly 207bbd3087] [formerly 25addabe64 [formerly 048ea55e064e0581cf32ca286c67f611ee4e0c3b]]]
Former-commit-id: 25addabe64
Former-commit-id: 21a02e1510 [formerly 94e4af6d47]
Former-commit-id: 85507d67dd
|
2012-06-19 15:03:57 -05:00 |
|
Steve Harris
|
1d2ad9224a
|
Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java
Former-commit-id: 572e1bb476 [formerly 27bc369818] [formerly 572e1bb476 [formerly 27bc369818] [formerly 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 9c9e01dbda [formerly 63ea8599d7]
Former-commit-id: 7978d3b640
|
2012-05-09 13:14:00 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Bryan Kowal
|
07e4ddc1b9
|
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: b1a5abc6b3 [formerly 6ddeef48fa] [formerly b1a5abc6b3 [formerly 6ddeef48fa] [formerly ce99417a2a [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]
Former-commit-id: ce99417a2a
Former-commit-id: 541fe8fbbb [formerly 10a291afa1]
Former-commit-id: 47c7cba3f5
|
2012-04-10 16:42:36 -05: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 |
|