Commit graph

391 commits

Author SHA1 Message Date
Steve Harris
f658320357 13.5.1-4 baseline
Former-commit-id: 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: e197f23ce3
2013-06-28 09:46:25 -04:00
Brad Gonzales
4f54596904 Issue #1965 added File filtering by file date extension in archive purge.
Amend: updated purge cron time to once every hour.
       moved archive.purge.cron to cron.properties.
       removed purge code from DataArchiver.
       added back isHoursToKeep in DataArchiver.
       updated CategoryFileDateHelper for CategoryConfig dirPattern lists.
       updates from peer review.
       updated test cases to work with Roger's refactoring.
       fixes for ArchiveConfigManager createArchive.
       clean up of ArchiveConfigManager purgeFile.

Change-Id: I096c2a103211caab7b7ec00f18111077cfe3e519

Former-commit-id: 137c66539e [formerly 2094b7f9fde97873c759da217498bcf62254a287]
Former-commit-id: 276f05233f
2013-06-27 11:46:44 -05:00
Dave Hladky
671b6ee566 Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: 5aee30a473 [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]
Former-commit-id: fe5cde7afd
2013-06-25 13:31:37 -05:00
Richard Peter
af1099b3fb Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]
Former-commit-id: b007d4a302
2013-06-24 18:51:56 -05:00
Richard Peter
a7594f8c93 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: 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]
Former-commit-id: 37645245e5
2013-06-24 18:36:15 -05:00
Nate Jensen
a44073cce6 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: b1bd29e784 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]
Former-commit-id: 69eec45f13
2013-06-24 09:10:01 -05:00
Steve Harris
810388f00a 13.5.1-3 baseline
Former-commit-id: 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]
Former-commit-id: 72d22a30c9
2013-06-24 09:29:43 -04:00
Matt Nash
4fa399c710 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: 54a114d789 [formerly 95ec6db9b349890a29bd13860193ada39b43c294]
Former-commit-id: 99e9194921
2013-06-20 06:59:05 -05:00
Nate Jensen
a9c077f0a9 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: 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]
Former-commit-id: c4283b0336
2013-06-19 10:16:06 -05:00
Dustin Johnson
dab308afc8 Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

Former-commit-id: 6f8246262b [formerly 3a2ae4a33dcc29f6b5278c008c0117965040dd2f]
Former-commit-id: 314331c9a4
2013-06-19 08:56:43 -05:00
Dustin Johnson
728f54c6ea Merge "Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed" into development
Former-commit-id: 8d139f3325 [formerly 4979a93f2cf0d697d4565641be3de40f4e1e4610]
Former-commit-id: 2e1d54e686
2013-06-18 13:55:51 -05:00
Dave Hladky
7df10e06ae Issue #2113 Improved MADIS ingest to be more resource frugal, target version fixed
Change-Id: I0495187f7fbec1ed8c7c476ede2bc8384e054fb8

Former-commit-id: 235484e91d [formerly 75a57b55a997db3edbf9829146b424b8da90cc77]
Former-commit-id: 6ea9d25f9f
2013-06-18 13:40:02 -05:00
Dustin Johnson
50cb2e26a2 Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route
Change-Id: I3a5bd49f128ed8918033fef4248bcdd5a57d0ad7

Former-commit-id: 9bc7c854ab [formerly 6c9c92fa660197bf5628da9d4d75e0ef2025aac1]
Former-commit-id: 7ee918a548
2013-06-18 12:34:25 -05:00
Bryan Kowal
abd96b92b7 Issue #2100 - export EDEX_BITS earlier
Change-Id: I81cb45a6354c3bbd635369084d552d6aa34af420

Former-commit-id: 0e01520e11 [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]
Former-commit-id: 9b1596dc0c
2013-06-17 15:57:18 -05:00
Steve Harris
cb3e34813f 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: 43316cbff9 [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]
Former-commit-id: 532d41787b
2013-06-17 15:29:01 -05:00
Steve Harris
41fb06e6ea 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: 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]
Former-commit-id: 40359c27c3
2013-06-17 15:25:32 -05:00
Steve Harris
3926dc20f7 13.5.1-2 baseline
Former-commit-id: adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]
Former-commit-id: 3386330894
2013-06-17 15:01:22 -04:00
Dave Hladky
608c43b64a Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a

Former-commit-id: e48e4eeb69 [formerly e4a345b9c4ce48210297ab5af6f25031268eb18e]
Former-commit-id: 752f7106bc
2013-06-14 12:29:08 -05:00
Dave Hladky
b401764a23 Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I5942d35c77eaa0232147581381e1ff96c690cc03

Former-commit-id: 776bbbba21 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]
Former-commit-id: 5512104d86
2013-06-13 22:13:49 -05:00
Nate Jensen
2200c7cded Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]
Former-commit-id: 0f6d897ff3
2013-06-13 11:39:30 -05:00
Nate Jensen
53784c5a86 Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: 30f9bba5c4 [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]
Former-commit-id: 08eb034abc
2013-06-12 14:05:15 -05:00
Steve Harris
30ba1d634e 13.5.1-1 baseline
Former-commit-id: 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: fe872355a7
2013-06-10 15:17:17 -04:00
David Gillingham
3f4b44fbbc Issue #2023: Pure python client implementation of Data Access Framework.
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427

Former-commit-id: ae3e7a64b0 [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]
Former-commit-id: 4bdf7178bd
2013-06-06 13:47:31 -05:00
Bryan Kowal
98150aa493 Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
Former-commit-id: 4b5c653363 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]
Former-commit-id: 2abb257d35
2013-06-04 18:25:58 -05:00
Dustin Johnson
42d1d74b04 Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: fc807288a7 [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]
Former-commit-id: 05bd3e113d
2013-05-31 09:29:44 -05:00
Dustin Johnson
58b11e075c Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: c01ea33d5b [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]
Former-commit-id: e4ecae9e7e
2013-05-30 17:11:19 -05:00
Dave Hladky
90e6d184e7 Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: 1608d407d1 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]
Former-commit-id: 83dae4fe01
2013-05-30 17:04:16 -05:00
Steve Harris
1691fa413c Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]
Former-commit-id: 26bf27c70d
2013-05-30 14:33:24 -05:00
Dustin Johnson
b1d66a0450 Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: efc3c6a2f2 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]
Former-commit-id: b99a8bc4f9
2013-05-30 09:49:09 -05:00
Nate Jensen
6214f529a7 Issue #1989 remove unused schemas
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]
Former-commit-id: fc691cbb2f
2013-05-29 16:19:28 -05:00
Nate Jensen
a1f314948f Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]
Former-commit-id: 3f3e0a788d
2013-05-29 14:49:43 -05:00
Nate Jensen
72ed3e21b3 Issue #1989 remove high memory mode, reorganize wrapper.conf
Change-Id: I41f0ccbd37a491ee47ea1406d99aa35986d8822f

Former-commit-id: caf414bab0 [formerly 19d32f4ffee269e244b77988f908a8e263374430]
Former-commit-id: 148b20f57c
2013-05-29 12:06:15 -05:00
Benjamin Phillippe
7cca4d8794 Issue #2036 Implemented federated query capabilities
Change-Id: I0a729281a1b08267486a9d5fdddd876ededf6e69

Former-commit-id: 4747f7d319 [formerly eac19de99604769ad8d9bb4f53c6ffce95903d9a]
Former-commit-id: d5263b2b75
2013-05-29 10:34:22 -05:00
Dustin Johnson
ef43634c56 Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development
Former-commit-id: 66c941fc3f [formerly 346f09f53275928fc43d86dd41d7edd519581caf]
Former-commit-id: ac292f1242
2013-05-29 09:27:30 -05:00
Nate Jensen
cb4b66d37a Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]
Former-commit-id: 36bc35b5c8
2013-05-29 09:20:53 -05:00
Dustin Johnson
187a1e49ef Issue #2038 More information when bandwidth manager can't schedule a subscription
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: 0a9e7ed740 [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]
Former-commit-id: 31e01a9f9a
2013-05-29 09:02:47 -05:00
Nate Jensen
49b20e5d20 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]
Former-commit-id: 1fd2f8965f
2013-05-23 11:20:40 -05:00
Matt Nash
ca208f913c Issue #1871 fix for 64 bit ints from Python to Java
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]
Former-commit-id: 30c7ca8d36
2013-05-23 09:07:56 -05:00
Nate Jensen
431e97742d Issue #1989 fix clustered routes suspending/starting
Change-Id: I09a75388458eefb998ad43d90e531f63ff13b04a

Former-commit-id: 4ab1d90d67 [formerly 7b7be58af4a3b2f41a5af3c1291bd9718e3ef62b]
Former-commit-id: a6d525ec96
2013-05-22 16:39:24 -05:00
Benjamin Phillippe
ad039bae0c Issue #2022 Added registry federation capabilities
Change-Id: Ifbebc9b5487c34d41af613b869a0cc8384191028

Former-commit-id: b9f2bde20e [formerly 44c567e7c74cb4e8f27a5ea1435f3f7819efd7aa]
Former-commit-id: c3a376475b
2013-05-22 11:38:42 -05:00
Richard Peter
81ae3ea8bf 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: 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]
Former-commit-id: 930ff50fb8
2013-05-21 12:11:21 -05:00
Steve Harris
b1fc4e625b 13.4.1-10 baseline
Former-commit-id: 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]
Former-commit-id: 92152778b9
2013-05-20 10:52:47 -04:00
Richard Peter
c47eb36e43 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: a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]
Former-commit-id: a9869f07ba
2013-05-17 10:33:18 -05:00
Nate Jensen
c3bafc88cd Issue #1989 disable camel JMX to speed up edex
Change-Id: I982228927752e03fdda399396c90ed093d01f019

Former-commit-id: bfcdcb607a [formerly e620cf1f588ded1ba331b49c8d0bd4630d0c17bc]
Former-commit-id: d905453660
2013-05-16 17:13:46 -05:00
Nate Jensen
04c7c4a4da Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: 1ecdd989df [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]
Former-commit-id: ce2579a289
2013-05-16 10:25:38 -05:00
Steve Harris
0766ae20dd 13.4.1-9 baseline
Former-commit-id: bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]
Former-commit-id: aff41713f9
2013-05-16 11:12:07 -04:00
Nate Jensen
0234e6788b Issue #1989 removing unused jars
Change-Id: Ie3ebef448051d50cc7bbf55342ad5f54b42b0301

Former-commit-id: 9c2b6bad3e [formerly 954bf56fff24cc485c1dd02cbf64695d7b8dd509]
Former-commit-id: f4b8c0dc60
2013-05-15 14:44:30 -05:00
Nate Jensen
1b62b066c9 Issue #1989 jetty fixes
Change-Id: I01c00ee8f754132b9c57d84f971d744c16dda07d

Former-commit-id: d894aca768 [formerly fecb2dc4da19aba5a188834780e33c791d312e1b]
Former-commit-id: 958ed1f6a2
2013-05-14 18:27:00 -05:00
Nate Jensen
22c23492c4 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]
Former-commit-id: 6f1684b85c
2013-05-14 16:16:13 -05:00
Steve Harris
a1c4cd2a39 13.4.1-8 baseline
Former-commit-id: 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]
Former-commit-id: c59b52a266
2013-05-14 09:21:41 -04:00