Richard Peter
25263a5042
Merge "Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client Merge local virtualHosts.xml back in with SLC change" into development
...
Former-commit-id: a43becec4fc7dd6365d27b8931ed163239c176fa7b8931ed163239c176fa911a371329516bb024bb
2013-03-25 14:45:06 -05:00
Steve Harris
bb30a41300
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0be962822070be473728aaaac0b51e50be473728aaaac0b51e5bc439aee4ff80f98cee2
2013-03-25 13:27:13 -05:00
Dustin Johnson
0dcc67bc55
Issue #1815 Move DD phase3 code to 5-Data_Delivery
...
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425
Former-commit-id: 34b969552f6fc42b07918956d1ac1704cbd3a24e8956d1ac1704cbd3a24e1b1bd69b8953291f7130
2013-03-22 10:04:21 -05:00
Richard Peter
fced329e1c
Issue #1814 : Baseline qpid 0.18 configuration and 0.18 java client
...
Merge local virtualHosts.xml back in with SLC change
Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b
Former-commit-id: d6a8b05c22ead48007cb9fdeb37a484c3fcf3b679fdeb37a484c3fcf3b67704bc86cf54b386ccd1c
2013-03-21 18:21:53 -05:00
Steve Harris
96ba08115a
Merge branch 'omaha_13.3.1' into development
...
Conflicts (auto resolved):
cave/com.raytheon.uf.viz.cots.feature/feature.xml
edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml
Former-commit-id: 8db22baf07310474ae9b36df63be5ccb5ea76f9836df63be5ccb5ea76f98104e6e79e8d00dc0d174
2013-03-20 13:45:11 -05:00
Ben Steffensmeier
4b0e7e77d3
Issue #1804 Switch bzip2 cots package to jbzip2.
...
Former-commit-id: 0d765a2fcf0d9119a1c72b6aa86371ed544fc17c2b6aa86371ed544fc17c646b61f653b201d9dee2
2013-03-20 13:05:54 -05:00
Bryan Kowal
0b6a31d7ca
Issue #1663 - PostgreSQL Upgrade
...
- we are now building PostgreSQL 9.2.3 and psql 9.2.3 from source
- we are building pgadmin3 1.16.1 from source
- we can build both a 32-bit and 64-bit version of PostgreSQL, psql, and pgadmin3
- the following extensions are also built with PostgreSQL:
* geos 3.3.7
* postgis 2.0.2
* proj 4.8.0
* gdal 1.9.2
- database creation scripts and configuration have been updated for compatibility
- removed remaining references to prefixed psql and postgresql rpms
- removed unused sql scripts from the baseline
- we are now using modified versions of the PostgreSQL 9.2.3 postgresql.conf file
- updated the postgresql jdbc drivers
Change-Id: Ibe61cfcb2540cd4d8b9fae492688109d8bd715d8
Former-commit-id: 9e678feaf8db02ab18ed729bc9c4bb5e86ef080e729bc9c4bb5e86ef080e58e035a024f6139755a5
2013-03-13 14:44:05 -05:00
Bryan Kowal
ac84ac231a
Issue #1739 - remove reference to non-existent junit version
...
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78
Former-commit-id: ed498a3b5329e157d94e5138fe553744215e65e95138fe553744215e65e9a2e3556f7e0be2bc1f80
2013-03-01 10:26:25 -06:00
Max Schenkelberg
bde1619d1c
Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
...
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79
Former-commit-id: 2fd6f3ed4ec8a5f1a0070f1112fb3e38bba3705f0f1112fb3e38bba3705f6ebc058df441706c42f2
2013-02-27 12:26:32 -06:00
Steve Harris
f30d1cdf87
Merge branch 'development' into omaha_13.3.1
...
Former-commit-id: 90b0bab1560a4564eb9767f090638f6ec9e7303567f090638f6ec9e730350051276ad1e46625f8f2
2013-02-25 15:58:48 -06:00
Steve Harris
7e48d3e684
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: abdc73315164744fdb19a0573644c42641d578e2a0573644c42641d578e233dd2589f14f155a183a
2013-02-21 15:41:39 -06:00
Bryan Kowal
6a47017449
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: 0d4a63efe4519ce2c0fba8fb04f41c803397c7c7a8fb04f41c803397c7c7450e8e7a4cb2a0a7c148
2013-02-21 13:55:28 -06:00
Steve Harris
db712e1fcf
13.3.1-1 baseline
...
Former-commit-id: e0406d31838ae397085e71e8990021d2a654625f71e8990021d2a654625f46d28be4a4e4435815c9
2013-02-20 16:19:40 -06:00
Ron Anderson
12f2ac0171
Issue #1608 Fixed group deletes in H5pyDataStore.py
...
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a
Former-commit-id: 9156b9ffe8dc7c9edb87a2a89fb4e77c0a5d74bfa2a89fb4e77c0a5d74bfe952a4f179d69d628450
2013-02-15 09:03:41 -06:00
Dustin Johnson
ad99747ea8
Issue #1543 Clean up test files after changing to Spring transactions
...
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680
Former-commit-id: 4f5d6bc65c651c6d55c14bcd75c09119fd95d2c84bcd75c09119fd95d2c8b4367903b04a10957512
2013-02-12 11:59:45 -06:00
Dustin Johnson
ae6a451422
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: c79c031f620d548bd66f8307af022cef32853dc18307af022cef32853dc1e504a474f973a5667256
2013-02-11 14:21:57 -06:00
Steve Harris
5027d2365b
13.2.1-6 baseline
...
Former-commit-id: 52f48669f6d66ad2f77bd0752de66ca46e33f06ed0752de66ca46e33f06e30d38334ccbbe92e6824
2013-02-07 16:00:39 -06:00
Dustin Johnson
7ad9070600
Issue #1543 Add ability to save/read dods files back to net.dods
...
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf
Former-commit-id: 23449a73bfefe1bcc4b5cd381cb819febe492056cd381cb819febe492056fffbb32775c81cb3d60b
2013-02-05 14:07:30 -06:00
Steve Harris
ce726fadc7
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccad47cc08ac79d9be4dce21
2013-01-23 11:18:44 -05:00
Dustin Johnson
02604beac9
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: 40ef4c59473ec05a5a9c557de162b015c2c55ff9557de162b015c2c55ff9a3c99f86bb756080321e
2013-01-22 11:45:18 -06:00
Dustin Johnson
773a3303da
Issue #1441 Break net.dods dependency on AWIPS code
...
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480
Former-commit-id: 3c2ace68543ebe0cf1caddcc816bbac00f5f394addcc816bbac00f5f394ac29d2e2e7159a209e77d
2013-01-10 12:06:39 -06:00
Richard Peter
177a54d19a
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b6a5a0d7d0980bf1d7a28
2013-01-09 17:55:05 -06:00
Bryan Kowal
0e985cf0f3
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: 199e202979ab8b346489c8a43edd9ed6b4cb65f4c8a43edd9ed6b4cb65f4146c43a6066d7f57c62a
2013-01-07 12:16:01 -06:00
Steve Harris
fe763963e9
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775addbcae57f5782a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb3941337c553cd4185ef5c
2013-01-06 14:32:24 -06:00
Ron Anderson
3ef1648013
Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
...
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1
Former-commit-id: e5c1e616643e4aeeab8b753fa0487b639b5abbd9753fa0487b639b5abbd9995f28220a8b81f0bfb4
2012-12-13 15:25:24 -06:00
Ron Anderson
8ac9be23c6
Issue #1393 Add additional jars to org.geotools
...
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f
Former-commit-id: 3b2936838930c396680c95696f63967cd3b46dfd95696f63967cd3b46dfda96fa1714287f3e0f015
2012-12-06 14:17:35 -06:00
Matt Nash
d5654048bd
Issue #1369 fix geotiff import in CAVE
...
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50
Former-commit-id: b591c681fbcb9cd97d1ffc4d7daab410d399aafefc4d7daab410d399aafec9372636d901dc19b06d
2012-12-06 12:02:11 -06:00
Nate Jensen
4475544f1a
Merge "Issue #1325 add missing sourcepath for jts" into development
...
Former-commit-id: 1e1049386d397c71cb0019d74235d9c4e1d2605619d74235d9c4e1d2605684e98e236472a741c6a3
2012-11-15 11:02:35 -06:00
Ron Anderson
f45b7720e1
Issue #1325 add missing sourcepath for jts
...
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653
Former-commit-id: f3ee84c21e0984f201b294ec6eaeaf457d55ecdf94ec6eaeaf457d55ecdf1157e5a55e9d832ad8be
2012-11-15 11:00:02 -06:00
Dustin Johnson
21dc859b85
Issue #1322 Common baseline changes to support BandwidthManager
...
Amend:
Revert EDEXLocalizationAdapter and duplicate getPath() in test version.
Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8
Former-commit-id: f1cfa9a60dafd9a767ea7d9e7567bd7c59f9ea417d9e7567bd7c59f9ea41c0c60c24885d410ff934
2012-11-14 12:19:10 -06:00
Ron Anderson
88e7d313c4
Issue #1325 Update geotools source path entries per code review.
...
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0
Former-commit-id: dbc5a5bb971bb72589358a5a2dc532795dfdc9dd8a5a2dc532795dfdc9ddbad09a9c0dd6a33fb39f
2012-11-13 12:06:54 -06:00
Ron Anderson
366df432bc
Issue #1325 Update GeoTools for WA4.7
...
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94
Former-commit-id: e7cd1f9def7aaf4db2dcf709ab812a303994ff1bf709ab812a303994ff1b7bf1316e8c3ae270a65d
2012-11-12 15:02:08 -06:00
Dustin Johnson
272761ae41
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: 19c2e301b8db4d728eb7595c421e472b6e98954e595c421e472b6e98954e0806be04ddeac5bc8197
2012-11-08 14:47:17 -06:00
Dustin Johnson
cd5faf58bf
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: acd4cf94d8efd3d3735a064ef82d1e1dbeb22893064ef82d1e1dbeb228934222b24d092d1e886cf3
2012-11-08 09:57:16 -06:00
Max Schenkelberg
f9e6347863
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: 94e64c9b0df069f34a962f90120248ca4177dd082f90120248ca4177dd08747ab974e95a5bd522a1
2012-11-07 10:44:42 -06:00
Dustin Johnson
feb6c540b8
Issue #1302 Fixes for data delivery merge with development branch.
...
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753
Former-commit-id: a03d79bbf08d5c86f31e2f28e19bf6a8f9c4f90a2f28e19bf6a8f9c4f90a7f994472ae7b4967b5bb
2012-11-01 16:31:14 -05:00
Dustin Johnson
fe8a2a3b09
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: 7d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10bcf575966be7a0f96a9a
2012-11-01 13:36:06 -05:00
Steve Harris
c9b563338a
12.11.1-4 baseline
...
Former-commit-id: 6e44abdba198171b5de9d3497e47eb6958b861f0d3497e47eb6958b861f0cbbdb231ce2c82d9cb07
2012-10-16 13:27:07 -05:00
Steven Harris
9c67bbab77
12.11.1-1 baseline
...
Former-commit-id: ffe36410570e86bfd1d3618aa3f316feec28f274618aa3f316feec28f2748843ffd022f5e63d5f93
2012-09-27 15:57:45 -05:00
Steve Harris
64699fa90b
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9de1639aea221f430062b969e7e6dfd21f430062b969e7e6dfd438d139fddf376a4b4db
2012-09-11 16:00:38 -05:00
Steve Harris
c704490769
12.9.1-10 baseline
...
Former-commit-id: 264d870cbfbdb45cdfae3adc50a783cb9b80f3a03adc50a783cb9b80f3a0dc08c5a71af43a5af47f
2012-08-30 14:28:27 -05:00
Steve Harris
d9faed979f
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac3942872824561cb7fb0b17bd5
2012-08-21 15:27:03 -05:00
Steve Harris
e528bb0df2
12.6.1-9 baseline
...
Former-commit-id: 32fdf6ed3b7c064b68682c0ff851ca27afa603452c0ff851ca27afa603454f7bb90bb0dc50bc8443
2012-07-10 07:53:49 -05:00
Steve Harris
1f521a70b3
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf5676ea3192f97c4db937e
2012-06-08 13:39:48 -05:00
Steve Harris
40aa780b3d
12.4.1-10 baseline
...
Former-commit-id: 7fa9dbd5fb4bfbdad17d9f8cb727a58485b90ff89f8cb727a58485b90ff8a28d70b5c533a67cdd82
2012-05-01 18:06:13 -05:00
Steve Harris
98d8b3f188
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333ca4e519f3cda2a6a18fae
2012-04-18 15:18:16 -05:00
Steve Harris
1fa3e31716
Merge branch 'ss_sync' into 4-Thin_Client
...
Former-commit-id: 55b44a00db608a0c17a0f9baa1c98c46e1499e43f9baa1c98c46e1499e43096ba6eb3063764220c4
2012-02-23 13:16:35 -06:00
Steve Harris
9397ca10a8
removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
...
Former-commit-id: 2f8260ccbc07ac42866cc502603907ecb38ba165c502603907ecb38ba165a9b900821ad83100c3df
2012-02-23 12:45:50 -06:00
Steve Harris
2d02f819be
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: 5a96582f1692084b3f20d0bbbfefcc7a10ca9766d0bbbfefcc7a10ca97663d511fe71992b7072b82
2012-02-23 10:06:18 -06:00
