Matt Nash
dc7355a3e4
Issue #1369 fix geotiff import in CAVE
...
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50
Former-commit-id: fc4d7daab4
[formerly fc4d7daab4
[formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]]
Former-commit-id: 10d399aafe
Former-commit-id: c9372636d9
2012-12-06 12:02:11 -06:00
Nate Jensen
e76a412fb4
Merge "Issue #1325 add missing sourcepath for jts" into development
...
Former-commit-id: 19d74235d9
[formerly 19d74235d9
[formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]]
Former-commit-id: c4e1d26056
Former-commit-id: 84e98e2364
2012-11-15 11:02:35 -06:00
Ron Anderson
c55588f57c
Issue #1325 add missing sourcepath for jts
...
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653
Former-commit-id: 94ec6eaeaf
[formerly 94ec6eaeaf
[formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]]
Former-commit-id: 457d55ecdf
Former-commit-id: 1157e5a55e
2012-11-15 11:00:02 -06:00
Dustin Johnson
3129d3bd3a
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 7d9e7567bd
[formerly 7d9e7567bd
[formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]]
Former-commit-id: 7c59f9ea41
Former-commit-id: c0c60c2488
2012-11-14 12:19:10 -06:00
Ron Anderson
dc6b83dccc
Issue #1325 Update geotools source path entries per code review.
...
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: 8a5a2dc532
[formerly 8a5a2dc532
[formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]]
Former-commit-id: 795dfdc9dd
Former-commit-id: bad09a9c0d
2012-11-13 12:06:54 -06:00
Ron Anderson
80a6ade49c
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: f709ab812a
[formerly f709ab812a
[formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]]
Former-commit-id: 303994ff1b
Former-commit-id: 7bf1316e8c
2012-11-12 15:02:08 -06:00
Dustin Johnson
1317e0b3ef
Issue #1302 Restore jdom.jar, delete net.jcip/.project
...
Amend:
Also change the manifest and .classpath for ohd common
Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b
Former-commit-id: 595c421e47
[formerly 595c421e47
[formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 2b6e98954e
Former-commit-id: 0806be04dd
2012-11-08 14:47:17 -06:00
Dustin Johnson
6613c51d3b
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: 064ef82d1e
[formerly 064ef82d1e
[formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 1dbeb22893
Former-commit-id: 4222b24d09
2012-11-08 09:57:16 -06:00
Max Schenkelberg
50625b0453
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: 2f90120248
[formerly 2f90120248
[formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
2012-11-07 10:44:42 -06:00
Dustin Johnson
e0c68bde6d
Issue #1302 Fixes for data delivery merge with development branch.
...
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: 2f28e19bf6
[formerly 2f28e19bf6
[formerly 87641d4b41b10f66e12c8d839548b8012e900438]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7f994472ae
2012-11-01 16:31:14 -05:00
Dustin Johnson
4d9c945388
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: 98d7beae50
[formerly 98d7beae50
[formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
2012-11-01 13:36:06 -05:00
Steve Harris
560f0d9cc3
12.11.1-4 baseline
...
Former-commit-id: d3497e47eb
[formerly d3497e47eb
[formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Steven Harris
a544be6d83
12.11.1-1 baseline
...
Former-commit-id: 618aa3f316
[formerly 618aa3f316
[formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
2012-09-27 15:57:45 -05:00
Steve Harris
faadb51529
12.10.1-3 baseline
...
Former-commit-id: 21f430062b
[formerly 21f430062b
[formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
2012-09-11 16:00:38 -05:00
Steve Harris
5bb474d33c
12.9.1-10 baseline
...
Former-commit-id: 3adc50a783
[formerly 3adc50a783
[formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: cb9b80f3a0
Former-commit-id: dc08c5a71a
2012-08-30 14:28:27 -05:00
Steve Harris
9b5c2094ed
12.9.1-5 baseline
...
Former-commit-id: 61f269f54c
[formerly 61f269f54c
[formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00
Steve Harris
d5fa61041b
12.6.1-9 baseline
...
Former-commit-id: 2c0ff851ca
[formerly 2c0ff851ca
[formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 27afa60345
Former-commit-id: 4f7bb90bb0
2012-07-10 07:53:49 -05:00
Steve Harris
9054c5ab6c
12.5.1-15 baseline
...
Former-commit-id: b13cbb7e00
[formerly b13cbb7e00
[formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 676ea3192f
2012-06-08 13:39:48 -05:00
Steve Harris
e5543a0e86
12.4.1-10 baseline
...
Former-commit-id: 9f8cb727a5
[formerly 9f8cb727a5
[formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
2012-05-01 18:06:13 -05:00
Steve Harris
8cd5974f4c
12.4.1-4 baseline
...
Former-commit-id: 67a5a68300
[formerly 67a5a68300
[formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 2a216f333c
Former-commit-id: a4e519f3cd
2012-04-18 15:18:16 -05:00
Steve Harris
1328771113
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: f9baa1c98c
[formerly f9baa1c98c
[formerly 2059372e90437312cf12f06de6c84d0824fb586c]]
Former-commit-id: 46e1499e43
Former-commit-id: 096ba6eb30
2012-02-23 13:16:35 -06:00
Steve Harris
32fa2a28c5
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: c502603907
[formerly c502603907
[formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]]
Former-commit-id: ecb38ba165
Former-commit-id: a9b900821a
2012-02-23 12:45:50 -06:00
Steve Harris
ae9c52b012
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: d0bbbfefcc
[formerly d0bbbfefcc
[formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]
Former-commit-id: 7a10ca9766
Former-commit-id: 3d511fe719
2012-02-23 10:06:18 -06:00
Roger Ferrel
0d2ef82d19
Issue #181
...
Changes from January ncep_cave
Former-commit-id: 7427aeaf29
[formerly 7427aeaf29
[formerly 6a878c3c5f400c53d39d7920c0619362aaafb946]]
Former-commit-id: fa42f2dc60
Former-commit-id: 376f6868b6
2012-01-26 09:26:07 -06:00
Bryan Kowal
a5a50ccfe0
Issue #24 - merging jep changes into git thinclient branch.
...
Former-commit-id: 5039d66b12
[formerly 5039d66b12
[formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 90c33ef882
2012-01-23 13:25:11 -06:00
Bryan Kowal
3bcecdfe66
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
...
Former-commit-id: 2142afe3f1
[formerly 2142afe3f1
[formerly 296d2915b17f0086d93e200d4780663bff34edbb]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 2a7b92ec91
2012-01-20 11:37:38 -06:00
Matt Nash
21d2361f00
Moving 12.1.1 into ss_sync
...
Former-commit-id: 66be3bec40
[formerly 66be3bec40
[formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
2012-01-19 11:53:12 -06:00
root
377dcd10b9
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 9f19e3f712
[formerly 9f19e3f712
[formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
2012-01-06 08:55:05 -06:00