Richard Peter
0fa3bf800d
Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
...
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
rpms/build/i386/build.sh
Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24
Former-commit-id: 37645245e5744eb64856
2013-06-24 18:36:15 -05:00
Nate Jensen
8a76694b9f
Merge "Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests" into development
...
Former-commit-id: 69eec45f13b1bd29e784
2013-06-24 09:10:01 -05:00
Steve Harris
d8176d4a4c
13.5.1-3 baseline
...
Former-commit-id: 72d22a30c963803c1424
2013-06-24 09:29:43 -04:00
Matt Nash
0fe30ac2fb
Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests
...
Change-Id: I8ede8f8149be84e58d10d30066e08d3c80d543e5
Former-commit-id: 99e919492154a114d789
2013-06-20 06:59:05 -05:00
Nate Jensen
c0f95eb55a
Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml
...
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6
Former-commit-id: c4283b033681fc4fa753
2013-06-19 10:16:06 -05:00
Dustin Johnson
1e7c85a592
Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
...
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576
Former-commit-id: 314331c9a46f8246262b
2013-06-19 08:56:43 -05:00
Dustin Johnson
d6bedc07ce
Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
...
Former-commit-id: 2e1d54e6868d139f3325
2013-06-18 13:55:51 -05:00
Dave Hladky
da1ea1f213
Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed
...
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8
Former-commit-id: 6ea9d25f9f235484e91d
2013-06-18 13:40:02 -05:00
Dustin Johnson
b9d8e444b3
Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
...
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7
Former-commit-id: 7ee918a5489bc7c854ab
2013-06-18 12:34:25 -05:00
Bryan Kowal
da49d311e9
Issue #2100 - export EDEX_BITS earlier
...
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420
Former-commit-id: 9b1596dc0c0e01520e11
2013-06-17 15:57:18 -05:00
Steve Harris
12248cade1
Merge branch 'omaha_13.5.1' into development
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/PointSubsetManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/SubsetManagerDlg.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
Former-commit-id: 532d41787b43316cbff9
2013-06-17 15:29:01 -05:00
Steve Harris
41748175b6
Merge branch 'master_13.5.1' into omaha_13.5.1
...
Conflicts (self-resolved with kdiff3):
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
Former-commit-id: 40359c27c397631f9c62
2013-06-17 15:25:32 -05:00
Steve Harris
bc60b22f00
13.5.1-2 baseline
...
Former-commit-id: 3386330894adb779323d
2013-06-17 15:01:22 -04:00
Dave Hladky
d1cd0938a6
Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763 , #2062 for 13.6.1
...
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a
Former-commit-id: 752f7106bce48e4eeb69
2013-06-14 12:29:08 -05:00
Dave Hladky
292a7a49dc
Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763 , #2062 for 13.6.1
...
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03
Former-commit-id: 5512104d86776bbbba21
2013-06-13 22:13:49 -05:00
Nate Jensen
f55b3cbdbe
Issue #2102 improve error handling on thrift or http errors
...
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b
Former-commit-id: 0f6d897ff3c2faa0e3bf
2013-06-13 11:39:30 -05:00
Dustin Johnson
fd61a1e056
Issue #2090 Create Data Provider Agent feature
...
Amend: Remove dataplugins feature from dataprovideragent
Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901
Former-commit-id: 45600f3d55e33cd9d00d
2013-06-12 15:41:32 -05:00
Nate Jensen
dae8945d1a
Issue #1989 fix wrapper.conf
...
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce
Former-commit-id: 08eb034abc30f9bba5c4
2013-06-12 14:05:15 -05:00
Steve Harris
6384018950
13.5.1-1 baseline
...
Former-commit-id: fe872355a7998961612c
2013-06-10 15:17:17 -04:00
Greg Armendariz
e220ed1ae4
Merge "Issue #1927 - remove obsolete files" into development
...
Former-commit-id: afed5f12a0367d9850b3
2013-06-06 16:49:05 -05:00
Bryan Kowal
6aecf2370f
Issue #1927 - remove obsolete files
...
Former-commit-id: 49623103606d642232dd
2013-06-06 16:35:04 -05:00
David Gillingham
2c0af328b6
Issue #2023 : Pure python client implementation of Data Access Framework.
...
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427
Former-commit-id: 4bdf7178bdae3e7a64b0
2013-06-06 13:47:31 -05:00
Bryan Kowal
3427534c29
Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
...
Former-commit-id: 2abb257d354b5c653363
2013-06-04 18:25:58 -05:00
Dustin Johnson
b4bc2ca947
Issue #2038 Fix ability to get shared subscriptions by id
...
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19
Former-commit-id: 05bd3e113dfc807288a7
2013-05-31 09:29:44 -05:00
Dustin Johnson
54045d6b9b
Merge "Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS" into development
...
Former-commit-id: e4ecae9e7ec01ea33d5b
2013-05-30 17:11:19 -05:00
Dave Hladky
c292bf1b55
Issue #2049 Sister ticket to #753 , WFS retrieval impl for MADIS
...
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7
Former-commit-id: 83dae4fe011608d407d1
2013-05-30 17:04:16 -05:00
Nate Jensen
10dd7ea61f
Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
...
Former-commit-id: e4578ca7ba4aa3657d1a
2013-05-30 14:50:39 -05:00
Steve Harris
3e66acde96
Issue #1871 - Merge branch 'vlab' into development
...
Conflicts:
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
Former-commit-id: 26bf27c70d3745089239
2013-05-30 14:33:24 -05:00
Everett Kladstrup
9541c93640
Issue #2052 Fix FeatureExplorer feature comparison
...
* fixes complaint when feature A includes features B and C
which both include feature D.
Used to get error that plugin X is in feature D and feature D
* Updated FeatureExplorer jar in build.edex to reflect change
Change-Id: Ifbd5957a33f9815143794d8d4a29a6e66ce275c7
Former-commit-id: 46212713290b2839fd43
2013-05-30 13:02:49 -05:00
Dustin Johnson
463bed7647
Issue #2038 Remove unused schemas from datadelivery spring files
...
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26
Former-commit-id: b99a8bc4f9efc3c6a2f2
2013-05-30 09:49:09 -05:00
Bryan Kowal
52a1addb29
Issue #2048 - foss jars that have associated source code will no longer be removed from the distribution
...
Change-Id: I444a4c9fd2d2e7fbe1ab1af7c1a4d22bcdaafc14
Former-commit-id: bd9251eba07b24cd293a
2013-05-29 21:52:10 -05:00
Nate Jensen
740237c317
Issue #1989 remove unused schemas
...
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594
Former-commit-id: fc691cbb2ff3258e77f7
2013-05-29 16:19:28 -05:00
Nate Jensen
927da5cffb
Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
...
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3
Former-commit-id: 3f3e0a788d99b4a21414
2013-05-29 14:49:43 -05:00
Nate Jensen
7059967ae9
Issue #1989 remove high memory mode, reorganize wrapper.conf
...
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f
Former-commit-id: 148b20f57ccaf414bab0
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
e16dc02a54
Issue #2036 Implemented federated query capabilities
...
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69
Former-commit-id: d5263b2b754747f7d319
2013-05-29 10:34:22 -05:00
Dustin Johnson
7ca6f18405
Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
...
Former-commit-id: ac292f124266c941fc3f
2013-05-29 09:27:30 -05:00
Nate Jensen
808ab352c5
Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
...
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c
Former-commit-id: 36bc35b5c882d6c03669
2013-05-29 09:20:53 -05:00
Dustin Johnson
c76fa3bc2a
Issue #2038 More information when bandwidth manager can't schedule a subscription
...
Amend: Peer review comments
Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d
Former-commit-id: 31e01a9f9a0a9e7ed740
2013-05-29 09:02:47 -05:00
Nate Jensen
b7cecb931e
Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
...
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61
Former-commit-id: 1fd2f8965f1978133177
2013-05-23 11:20:40 -05:00
Richard Peter
edd70dfe47
Merge "Issue #1989 fix clustered routes suspending/starting" into development
...
Former-commit-id: 9ca63e7d2657933400b9
2013-05-23 10:10:51 -05:00
Matt Nash
bbc7406812
Issue #1871 fix for 64 bit ints from Python to Java
...
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae
Former-commit-id: 30c7ca8d36bd64f70d1a
2013-05-23 09:07:56 -05:00
Bryan Kowal
575944f70d
Issue #1927 - patch ant includegen task
...
Former-commit-id: 24c0728db940e8f544ea
2013-05-22 18:00:43 -05:00
Nate Jensen
57e560b745
Issue #1989 fix clustered routes suspending/starting
...
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a
Former-commit-id: a6d525ec964ab1d90d67
2013-05-22 16:39:24 -05:00
Benjamin Phillippe
7a908bbeaf
Issue #2022 Added registry federation capabilities
...
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028
Former-commit-id: c3a376475bb9f2bde20e
2013-05-22 11:38:42 -05:00
Richard Peter
3d84e1dd53
Merge branch 'omaha_13.4.1' (13.4.1-11) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java
Former-commit-id: 930ff50fb88aa4b0025c
2013-05-21 12:11:21 -05:00
Richard Peter
4809b3c15b
Merge branch 'master_13.4.1' into omaha_13.4.1
...
Former-commit-id: 77a08ebd3173372622f7
2013-05-21 10:35:00 -05:00
Bryan Kowal
081d1c724a
Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE.
...
Former-commit-id: e4874a873a99ba7adfe7
2013-05-20 15:03:33 -05:00
Steve Harris
68fe2134b8
13.4.1-10 baseline
...
Former-commit-id: 92152778b99a403b3615
2013-05-20 10:52:47 -04:00
Richard Peter
648a1b25ae
Merge branch 'omaha_13.4.1' (13.4.1-9) into development
...
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt
Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c
Former-commit-id: a9869f07baa33ddbd1a6
2013-05-17 10:33:18 -05:00
Nate Jensen
bc8d798973
Issue #1989 disable camel JMX to speed up edex
...
Change-Id: I982228927752e03fdda399396c90ed093d01f019
Former-commit-id: d905453660bfcdcb607a
2013-05-16 17:13:46 -05:00
