Dustin Johnson
|
1dbeb22893
|
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: c04f7dca6f980ab7f3d77825312ddc34ba3b188d
|
2012-11-08 09:57:16 -06:00 |
|
Max Schenkelberg
|
ca4177dd08
|
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: a9c7374d162296c170f7c1b80e1fb2978b854cfd
|
2012-11-07 10:44:42 -06:00 |
|
Dustin Johnson
|
a8f9c4f90a
|
Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: 87641d4b41b10f66e12c8d839548b8012e900438
|
2012-11-01 16:31:14 -05:00 |
|
Dustin Johnson
|
31d7d09c10
|
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: 89583d97c8823818f87dc1a234078d85ba7bea4a
|
2012-11-01 13:36:06 -05:00 |
|
Steve Harris
|
6958b861f0
|
12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
|
2012-10-16 13:27:07 -05:00 |
|
Steven Harris
|
feec28f274
|
12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
969e7e6dfd
|
12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
cb9b80f3a0
|
12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
27afa60345
|
12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
3904c4ccf5
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Steve Harris
|
8485b90ff8
|
12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
|
2012-05-01 18:06:13 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|
Steve Harris
|
46e1499e43
|
Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 2059372e90437312cf12f06de6c84d0824fb586c
|
2012-02-23 13:16:35 -06:00 |
|
Steve Harris
|
ecb38ba165
|
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: cccea1aa13ad987a8c1f2b06c2dfcaa77967544d
|
2012-02-23 12:45:50 -06:00 |
|
Steve Harris
|
7a10ca9766
|
Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java
deleted 'H5U; PlotResource2.java was not edited
Former-commit-id: 5528a1374781f3a4d55702ae1f0c34efcf1e3865
|
2012-02-23 10:06:18 -06:00 |
|
Roger Ferrel
|
fa42f2dc60
|
Issue #181
Changes from January ncep_cave
Former-commit-id: 6a878c3c5f400c53d39d7920c0619362aaafb946
|
2012-01-26 09:26:07 -06:00 |
|
Bryan Kowal
|
cf4d56d0a0
|
Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac
|
2012-01-23 13:25:11 -06:00 |
|
Bryan Kowal
|
2b5ee4b940
|
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 296d2915b17f0086d93e200d4780663bff34edbb
|
2012-01-20 11:37:38 -06:00 |
|
Matt Nash
|
c83e5ff474
|
Moving 12.1.1 into ss_sync
Former-commit-id: 2a9569942c48542cf708b6c0b9189146fd954c11
|
2012-01-19 11:53:12 -06:00 |
|
root
|
06a8b51d6d
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f
|
2012-01-06 08:55:05 -06:00 |
|