Commit graph

106 commits

Author SHA1 Message Date
Benjamin Phillippe
4675bed4c2 Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]
Former-commit-id: b10b1150be
2013-03-25 15:15:38 -05:00
Richard Peter
c7dd6365d2 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: 3239c176fa [formerly a1839a82cf0ef4460fd260cbbc3cc5ea0f0e5155]
Former-commit-id: 7b8931ed16
2013-03-25 14:45:06 -05:00
Steve Harris
be96282207 13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
2013-03-25 13:27:13 -05:00
Dustin Johnson
6fc42b0791 Issue #1815 Move DD phase3 code to 5-Data_Delivery
Change-Id: Ie2b2887c8238e8d2b495e6bdc3ef31499646e425

Former-commit-id: 04cbd3a24e [formerly 126661592c42e16a07451868b87a33cff2a89cd1]
Former-commit-id: 8956d1ac17
2013-03-22 10:04:21 -05:00
Richard Peter
ead48007cb 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: 4c3fcf3b67 [formerly c83b019bdfed59b6e3ec599f8a7a3b899c2f59a4]
Former-commit-id: 9fdeb37a48
2013-03-21 18:21:53 -05:00
Steve Harris
310474ae9b 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: cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]
Former-commit-id: 36df63be5c
2013-03-20 13:45:11 -05:00
Ben Steffensmeier
0d9119a1c7 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]
Former-commit-id: 2b6aa86371
2013-03-20 13:05:54 -05:00
Bryan Kowal
db02ab18ed 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: 5e86ef080e [formerly 98188e57e4ced9665827b1c2a2f74960c46f03dd]
Former-commit-id: 729bc9c4bb
2013-03-13 14:44:05 -05:00
Bryan Kowal
29e157d94e Issue #1739 - remove reference to non-existent junit version
Change-Id: If4f8825df05442173cbc537cdedb519dd382cf78

Former-commit-id: 44215e65e9 [formerly f4249d163f057560504b5cbc3745b7ae4b36f28c]
Former-commit-id: 5138fe5537
2013-03-01 10:26:25 -06:00
Max Schenkelberg
c8a5f1a007 Issue #1638 Removed dependency of pointdata in edex.common and uf.common.spatial in uf.edex.database.
Change-Id: I87419a6d70e1a4c58e985fffa54d1fd19471bc79

Former-commit-id: 38bba3705f [formerly bd68a2e47f8c54d6e06e19ce3e29259c07926b8a]
Former-commit-id: 0f1112fb3e
2013-02-27 12:26:32 -06:00
Steve Harris
0a4564eb97 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]
Former-commit-id: 67f090638f
2013-02-25 15:58:48 -06:00
Steve Harris
64744fdb19 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: 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]
Former-commit-id: a0573644c4
2013-02-21 15:41:39 -06:00
Bryan Kowal
519ce2c0fb 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: 803397c7c7 [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]
Former-commit-id: a8fb04f41c
2013-02-21 13:55:28 -06:00
Steve Harris
8ae397085e 13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
2013-02-20 16:19:40 -06:00
Ron Anderson
dc7c9edb87 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]
Former-commit-id: a2a89fb4e7
2013-02-15 09:03:41 -06:00
Dustin Johnson
651c6d55c1 Issue #1543 Clean up test files after changing to Spring transactions
Change-Id: I83199fd60f0e84c4b6e7b9b400d9f7cafbc2c680

Former-commit-id: 19fd95d2c8 [formerly e7e146c79b11d33ad6755acdeb11f58fa789b4c6]
Former-commit-id: 4bcd75c091
2013-02-12 11:59:45 -06:00
Dustin Johnson
0d548bd66f 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: ef32853dc1 [formerly bb9ab0ceb479a8c6a727b9764433edb70eec31f1]
Former-commit-id: 8307af022c
2013-02-11 14:21:57 -06:00
Steve Harris
d66ad2f77b 13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: d0752de66c
2013-02-07 16:00:39 -06:00
Dustin Johnson
efe1bcc4b5 Issue #1543 Add ability to save/read dods files back to net.dods
Change-Id: Icca189f4c3716d4045798d88a6e6ce7d27d46fcf

Former-commit-id: febe492056 [formerly d93464273e905ecbb834d7aeaccf477b42e495a3]
Former-commit-id: cd381cb819
2013-02-05 14:07:30 -06:00
Steve Harris
33bc5fd816 13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
2013-01-23 11:18:44 -05:00
Dustin Johnson
3ec05a5a9c 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: 15c2c55ff9 [formerly 464b46dd4f4af60dbeb917f65c18c876d712e4ad]
Former-commit-id: 557de162b0
2013-01-22 11:45:18 -06:00
Dustin Johnson
3ebe0cf1ca Issue #1441 Break net.dods dependency on AWIPS code
Change-Id: I13289bff3f3ea80317a858f8a32cc280b1ac0480

Former-commit-id: c00f5f394a [formerly 010eabebb27f6a2571ffb2a09e1715cb84c57ce9]
Former-commit-id: ddcc816bba
2013-01-10 12:06:39 -06:00
Richard Peter
d0a6ba23e5 Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]
Former-commit-id: 029ebaa63a
2013-01-09 17:55:05 -06:00
Bryan Kowal
ab8b346489 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: d6b4cb65f4 [formerly b535a90fb25287945485c10b3c85749c11285171]
Former-commit-id: c8a43edd9e
2013-01-07 12:16:01 -06:00
Steve Harris
efd3392abe 13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
2013-01-06 14:55:11 -06:00
Steve Harris
51208e5515 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
2013-01-06 14:32:24 -06:00
Ron Anderson
3e4aeeab8b Issue #1395 Updated SetOpacityDialog. Added source jars for geoapi. Removed legacy shapefile import menu item.
Change-Id: I495db377f77485fd9bd896f02dba9c640b9ad3b1

Former-commit-id: 639b5abbd9 [formerly a7657cf6b42a3d7a0f5fd64468820d1547ad1e9d]
Former-commit-id: 753fa0487b
2012-12-13 15:25:24 -06:00
Ron Anderson
30c396680c Issue #1393 Add additional jars to org.geotools
Change-Id: I10aaef928d2eb7333d3d65c3871b633d5760e14f

Former-commit-id: 7cd3b46dfd [formerly 910af88ea60686f094bb3de17f5412cb9656111f]
Former-commit-id: 95696f6396
2012-12-06 14:17:35 -06:00
Matt Nash
cb9cd97d1f Issue #1369 fix geotiff import in CAVE
Change-Id: Iccc051478064e5746c80be5cf8edad7eb8e89f50

Former-commit-id: 10d399aafe [formerly ab5775f5187c2b0a2180dfeebc32774c3a1adb16]
Former-commit-id: fc4d7daab4
2012-12-06 12:02:11 -06:00
Nate Jensen
397c71cb00 Merge "Issue #1325 add missing sourcepath for jts" into development
Former-commit-id: c4e1d26056 [formerly ecff6dc0484b6dc65e2c043be4a2b6a7fbb3a503]
Former-commit-id: 19d74235d9
2012-11-15 11:02:35 -06:00
Ron Anderson
0984f201b2 Issue #1325 add missing sourcepath for jts
Change-Id: I776bcb3cbb2accd0cf6c41b2a91c12102b9a9653

Former-commit-id: 457d55ecdf [formerly bf8dd91d2e2cb79548cc852c82446cb914e63991]
Former-commit-id: 94ec6eaeaf
2012-11-15 11:00:02 -06:00
Dustin Johnson
afd9a767ea Issue #1322 Common baseline changes to support BandwidthManager
Amend:
  Revert EDEXLocalizationAdapter and duplicate getPath() in test version.

Change-Id: I72205aadeba1f894ee49cb4d146519df10d941f8

Former-commit-id: 7c59f9ea41 [formerly 07aeec469a83ce07286bc27ea3e6bda41909be8d]
Former-commit-id: 7d9e7567bd
2012-11-14 12:19:10 -06:00
Ron Anderson
1bb7258935 Issue #1325 Update geotools source path entries per code review.
Change-Id: Ib9a682df979cd1b20510880b594f5c2e496094b0

Former-commit-id: 795dfdc9dd [formerly fc0837f4b3219eaa7ae4a99dee6db1da9a80c3ba]
Former-commit-id: 8a5a2dc532
2012-11-13 12:06:54 -06:00
Ron Anderson
7aaf4db2dc Issue #1325 Update GeoTools for WA4.7
Change-Id: Ic4a5b2ba0e6567d39c7faf19ed4a5d5b5445fb94

Former-commit-id: 303994ff1b [formerly 5700f31e4620e1f7b819386aa8762927ec94c2d7]
Former-commit-id: f709ab812a
2012-11-12 15:02:08 -06:00
Dustin Johnson
db4d728eb7 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: 2b6e98954e [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]
Former-commit-id: 595c421e47
2012-11-08 14:47:17 -06:00
Dustin Johnson
efd3d3735a 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: 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 064ef82d1e
2012-11-08 09:57:16 -06:00
Max Schenkelberg
f069f34a96 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: ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]
Former-commit-id: 2f90120248
2012-11-07 10:44:42 -06:00
Dustin Johnson
8d5c86f31e Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]
Former-commit-id: 2f28e19bf6
2012-11-01 16:31:14 -05:00
Dustin Johnson
8e69107b5a 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: 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 98d7beae50
2012-11-01 13:36:06 -05:00
Steve Harris
98171b5de9 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
2012-10-16 13:27:07 -05:00
Steven Harris
0e86bfd1d3 12.11.1-1 baseline
Former-commit-id: feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: 618aa3f316
2012-09-27 15:57:45 -05:00
Steve Harris
de1639aea2 12.10.1-3 baseline
Former-commit-id: 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 21f430062b
2012-09-11 16:00:38 -05:00
Steve Harris
bdb45cdfae 12.9.1-10 baseline
Former-commit-id: cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: 3adc50a783
2012-08-30 14:28:27 -05:00
Steve Harris
a1d931fd44 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: 61f269f54c
2012-08-21 15:27:03 -05:00
Steve Harris
7c064b6868 12.6.1-9 baseline
Former-commit-id: 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 2c0ff851ca
2012-07-10 07:53:49 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Steve Harris
4bfbdad17d 12.4.1-10 baseline
Former-commit-id: 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 9f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
750b7543dd 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 67a5a68300
2012-04-18 15:18:16 -05:00
Steve Harris
608a0c17a0 Merge branch 'ss_sync' into 4-Thin_Client
Former-commit-id: 46e1499e43 [formerly 2059372e90437312cf12f06de6c84d0824fb586c]
Former-commit-id: f9baa1c98c
2012-02-23 13:16:35 -06:00
Steve Harris
07ac42866c removed .gitignore.orig & cots/uframe-eclipse. Added *.orig files to .gitignore
Former-commit-id: ecb38ba165 [formerly cccea1aa13ad987a8c1f2b06c2dfcaa77967544d]
Former-commit-id: c502603907
2012-02-23 12:45:50 -06:00