Ben Steffensmeier
0d765a2fcf
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: ed544fc17c2b6aa863712b6aa863710d9119a1c7
2013-03-20 13:05:54 -05:00
Steve Harris
90b0bab156
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 6ec9e7303567f090638f67f090638f0a4564eb97
2013-02-25 15:58:48 -06:00
Steve Harris
abdc733151
Merge branch 'development' into omaha_13.3.1
...
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 2641d578e2a0573644c4a0573644c464744fdb19
2013-02-21 15:41:39 -06:00
Bryan Kowal
0d4a63efe4
Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
...
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...
Former-commit-id: 803397c7c7a8fb04f41ca8fb04f41c519ce2c0fb
2013-02-21 13:55:28 -06:00
Steve Harris
e0406d3183
13.3.1-1 baseline
...
Former-commit-id: d2a654625f71e899002171e89900218ae397085e
2013-02-20 16:19:40 -06:00
Ron Anderson
9156b9ffe8
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 7c0a5d74bfa2a89fb4e7a2a89fb4e7dc7c9edb87
2013-02-15 09:03:41 -06:00
Dustin Johnson
4f5d6bc65c
Issue #1543 Clean up test files after changing to Spring transactions
...
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680
Former-commit-id: 19fd95d2c84bcd75c0914bcd75c091651c6d55c1
2013-02-12 11:59:45 -06:00
Dustin Johnson
c79c031f62
Issue #1543 Add testing of current OpenDAP type retrievals.
...
- Add test for current behavior of SBN-like retrievals.
- Change session management to use a factory implementation.
- Add service locator strategy to find jaxbables.
- Tests cleanup.
- Add mock versions of OpenDAP service classes to test more OpenDAP retrieval functionality.
Amend:
Peer review comments.
Change to use Spring transactions.
Change-Id: Ifce73361a5d864c54fdd493240c40d5ae66ef366
Former-commit-id: ef32853dc18307af022c8307af022c0d548bd66f
2013-02-11 14:21:57 -06:00
Steve Harris
52f48669f6
13.2.1-6 baseline
...
Former-commit-id: a46e33f06ed0752de66cd0752de66cd66ad2f77b
2013-02-07 16:00:39 -06:00
Dustin Johnson
23449a73bf
Issue #1543 Add ability to save/read dods files back to net.dods
...
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf
Former-commit-id: febe492056cd381cb819cd381cb819efe1bcc4b5
2013-02-05 14:07:30 -06:00
Steve Harris
a4fa438a41
13.2.1-2 baseline
...
Former-commit-id: 328c6dccad83e9157df783e9157df733bc5fd816
2013-01-23 11:18:44 -05:00
Dustin Johnson
40ef4c5947
Issue #1441 Create new datadelivery services plugin
...
Add GroupDefinition service.
Update subscriptions to not have a group name when their group is deleted.
Amend:
Rebase to HEAD of 13.2.1.
Change-Id: I817ca1912f76ccf347907ddb12e3f6fd8de7e5aa
Former-commit-id: 15c2c55ff9557de162b0557de162b03ec05a5a9c
2013-01-22 11:45:18 -06:00
Dustin Johnson
3c2ace6854
Issue #1441 Break net.dods dependency on AWIPS code
...
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480
Former-commit-id: c00f5f394addcc816bbaddcc816bba3ebe0cf1ca
2013-01-10 12:06:39 -06:00
Richard Peter
95f0508c29
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 328be6ac2b029ebaa63a029ebaa63ad0a6ba23e5
2013-01-09 17:55:05 -06:00
Bryan Kowal
199e202979
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: d6b4cb65f4c8a43edd9ec8a43edd9eab8b346489
2013-01-07 12:16:01 -06:00
Steve Harris
1d4d25b49b
13.1.2-6 baseline
...
Former-commit-id: 59969775ad8e5f9e0e6c8e5f9e0e6cefd3392abe
2013-01-06 14:55:11 -06:00
Steve Harris
e8f4a2f031
13.1.2-2 baseline
...
Former-commit-id: 4ba416aeb3c0c1d56f3ac0c1d56f3a51208e5515
2013-01-06 14:32:24 -06:00
Ron Anderson
e5c1e61664
Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
...
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1
Former-commit-id: 639b5abbd9753fa0487b753fa0487b3e4aeeab8b
2012-12-13 15:25:24 -06:00
Ron Anderson
3b29368389
Issue #1393 Add additional jars to org.geotools
...
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f
Former-commit-id: 7cd3b46dfd95696f639695696f639630c396680c
2012-12-06 14:17:35 -06:00
Matt Nash
b591c681fb
Issue #1369 fix geotiff import in CAVE
...
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50
Former-commit-id: 10d399aafefc4d7daab4fc4d7daab4cb9cd97d1f
2012-12-06 12:02:11 -06:00
Nate Jensen
1e1049386d
Merge "Issue #1325 add missing sourcepath for jts" into development
...
Former-commit-id: c4e1d2605619d74235d919d74235d9397c71cb00
2012-11-15 11:02:35 -06:00
Ron Anderson
f3ee84c21e
Issue #1325 add missing sourcepath for jts
...
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653
Former-commit-id: 457d55ecdf94ec6eaeaf94ec6eaeaf0984f201b2
2012-11-15 11:00:02 -06:00
Dustin Johnson
f1cfa9a60d
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: 7c59f9ea417d9e7567bd7d9e7567bdafd9a767ea
2012-11-14 12:19:10 -06:00
Ron Anderson
dbc5a5bb97
Issue #1325 Update geotools source path entries per code review.
...
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: 795dfdc9dd8a5a2dc5328a5a2dc5321bb7258935
2012-11-13 12:06:54 -06:00
Ron Anderson
e7cd1f9def
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: 303994ff1bf709ab812af709ab812a7aaf4db2dc
2012-11-12 15:02:08 -06:00
Dustin Johnson
19c2e301b8
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: 2b6e98954e595c421e47595c421e47db4d728eb7
2012-11-08 14:47:17 -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: 1dbeb22893064ef82d1e064ef82d1eefd3d3735a
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: ca4177dd082f901202482f90120248f069f34a96
2012-11-07 10:44:42 -06:00
Dustin Johnson
a03d79bbf0
Issue #1302 Fixes for data delivery merge with development branch.
...
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: a8f9c4f90a2f28e19bf62f28e19bf68d5c86f31e
2012-11-01 16:31:14 -05: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: 31d7d09c1098d7beae5098d7beae508e69107b5a
2012-11-01 13:36:06 -05:00
Steve Harris
6e44abdba1
12.11.1-4 baseline
...
Former-commit-id: 6958b861f0d3497e47ebd3497e47eb98171b5de9
2012-10-16 13:27:07 -05:00
Steven Harris
ffe3641057
12.11.1-1 baseline
...
Former-commit-id: feec28f274618aa3f316618aa3f3160e86bfd1d3
2012-09-27 15:57:45 -05:00
Steve Harris
0403e7d0a9
12.10.1-3 baseline
...
Former-commit-id: 969e7e6dfd21f430062b21f430062bde1639aea2
2012-09-11 16:00:38 -05:00
Steve Harris
264d870cbf
12.9.1-10 baseline
...
Former-commit-id: cb9b80f3a03adc50a7833adc50a783bdb45cdfae
2012-08-30 14:28:27 -05:00
Steve Harris
77cbd6c1e5
12.9.1-5 baseline
...
Former-commit-id: f2fac3942861f269f54c61f269f54ca1d931fd44
2012-08-21 15:27:03 -05:00
Steve Harris
32fdf6ed3b
12.6.1-9 baseline
...
Former-commit-id: 27afa603452c0ff851ca2c0ff851ca7c064b6868
2012-07-10 07:53:49 -05:00
Steve Harris
2f10c7a1e4
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5b13cbb7e00b13cbb7e008552902906
2012-06-08 13:39:48 -05:00
Steve Harris
7fa9dbd5fb
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a59f8cb727a54bfbdad17d
2012-05-01 18:06:13 -05:00
Steve Harris
4767b0e069
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a6830067a5a68300750b7543dd
2012-04-18 15:18:16 -05:00
Steve Harris
55b44a00db
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: 46e1499e43f9baa1c98cf9baa1c98c608a0c17a0
2012-02-23 13:16:35 -06:00
Steve Harris
2f8260ccbc
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: ecb38ba165c502603907c50260390707ac42866c
2012-02-23 12:45:50 -06:00
Steve Harris
5a96582f16
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: 7a10ca9766d0bbbfefccd0bbbfefcc92084b3f20
2012-02-23 10:06:18 -06:00
Roger Ferrel
aa10b2f656
Issue #181
...
Changes from January ncep_cave
Former-commit-id: fa42f2dc607427aeaf297427aeaf29ae0981ac0f
2012-01-26 09:26:07 -06:00
Bryan Kowal
c1d930b119
Issue #24 - merging jep changes into git thinclient branch.
...
Former-commit-id: cf4d56d0a05039d66b125039d66b12be0b6a87eb
2012-01-23 13:25:11 -06:00
Bryan Kowal
28957b7118
Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
...
Former-commit-id: 2b5ee4b9402142afe3f12142afe3f1971bf802ac
2012-01-20 11:37:38 -06:00
Matt Nash
d8da2252c3
Moving 12.1.1 into ss_sync
...
Former-commit-id: c83e5ff47466be3bec4066be3bec40580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 06a8b51d6d9f19e3f7129f19e3f712a02aeb236c
2012-01-06 08:55:05 -06:00
