Commit graph

375 commits

Author SHA1 Message Date
Nate Jensen
0ea836cc8d Issue #2032 move warngen files out of build.edex
Change-Id: Ie91caef086abca30d4b509453e1172a75fbaa09f

Former-commit-id: 6180a3ba60 [formerly 22e72a646f] [formerly 6180a3ba60 [formerly 22e72a646f] [formerly 4eb21a4ea3 [formerly eabd12dbcb081897ed340394efee2e9482fab3c7]]]
Former-commit-id: 4eb21a4ea3
Former-commit-id: b02bd4f7d8 [formerly 72726a8484]
Former-commit-id: 6450502d65
2013-07-24 09:35:24 -05:00
Ron Anderson
6548d151d3 Merge "Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS emulator program to support new directory structure and some code cleanup and refactoring." into development
Former-commit-id: 89a1c1b2c9 [formerly eb7893c0ba] [formerly 89a1c1b2c9 [formerly eb7893c0ba] [formerly 6540885809 [formerly ba587ef79d0db60aa31b681e1a0614d2fee65417]]]
Former-commit-id: 6540885809
Former-commit-id: 8425e10cbc [formerly d54aa6fe0b]
Former-commit-id: 577819698c
2013-07-22 13:29:24 -05:00
Richard Peter
2a9cfe51af Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 401ed88e44 [formerly 15d1a6eab0] [formerly 401ed88e44 [formerly 15d1a6eab0] [formerly c6386e306f [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]
Former-commit-id: c6386e306f
Former-commit-id: e7ec068c7e [formerly 12993d9539]
Former-commit-id: 85fc9c773b
2013-07-22 09:40:18 -05:00
Nate Jensen
6d7658e02e Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: 2ee87452db [formerly da311b00a8] [formerly 2ee87452db [formerly da311b00a8] [formerly b7ea2ae30b [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: 41d3e45e60 [formerly dce6c06174]
Former-commit-id: b997f2a670
2013-07-18 17:20:27 -05:00
Steve Harris
513c089375 13.5.1-7 baseline
Former-commit-id: 630705aa3f [formerly bf58a81b38] [formerly 630705aa3f [formerly bf58a81b38] [formerly 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]
Former-commit-id: 86ce1248c2
Former-commit-id: cb50a0028d [formerly f9c9aecba5]
Former-commit-id: eff4fb29dd
2013-07-18 12:07:22 -04:00
Nate Jensen
e721095714 Issue #2032 removing user-specific colormap files
Change-Id: Ia48f3100233c185514ca65acd0086a72f26ec7f1

Former-commit-id: 50c17a691c [formerly 5aef034545] [formerly 50c17a691c [formerly 5aef034545] [formerly ba6851b0e6 [formerly bd0401862fb0778cabb98e1fa8ef65925e25f649]]]
Former-commit-id: ba6851b0e6
Former-commit-id: ffe57ce04e [formerly d479258121]
Former-commit-id: c63066c708
2013-07-18 11:06:45 -05:00
Nate Jensen
06502f57ef Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 188d76ea71 [formerly 5264d3a5b8] [formerly 188d76ea71 [formerly 5264d3a5b8] [formerly b767760a9c [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]
Former-commit-id: b767760a9c
Former-commit-id: 93713d9698 [formerly c77936c6c0]
Former-commit-id: 175a28da9a
2013-07-18 09:53:53 -05:00
Nate Jensen
2a28bb772b Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 621a4da9b7 [formerly 81d9a28d53] [formerly 621a4da9b7 [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]
Former-commit-id: a0aeeedd23
Former-commit-id: 5c123e60d8 [formerly 447ac6311d]
Former-commit-id: 6d8c46e6d6
2013-07-17 14:03:43 -05:00
David Gillingham
a5df825bcd Issue #2009: Implement dual-domain GFE export_grids solution. Update MHS
emulator program to support new directory structure and some code cleanup and
refactoring.

Change-Id: Ib3cf5c0123cd87497517d4221edea5883db9157d

Former-commit-id: 4702fd8a72 [formerly ae75638063] [formerly 4702fd8a72 [formerly ae75638063] [formerly 2c4acfec0b [formerly baaefbd38040c69ba42feaa8b00e8ca4d69f4ba1]]]
Former-commit-id: 2c4acfec0b
Former-commit-id: d57767c225 [formerly b788025b37]
Former-commit-id: d6802fe8b7
2013-07-17 13:19:23 -05:00
Nate Jensen
41469baa50 Issue #2142 fix ingest logback configuration
Change-Id: I8e21298a190eb1d4f1aac087ce3d7efb0c6accbc

Former-commit-id: 2da58b4567 [formerly 0a29d56ecb] [formerly 2da58b4567 [formerly 0a29d56ecb] [formerly ace22e2bf8 [formerly 8b0f80f46c4d0e148cacfbae39d249e8ae040b88]]]
Former-commit-id: ace22e2bf8
Former-commit-id: 795f43f53d [formerly 6a565452b2]
Former-commit-id: eb8279cede
2013-07-12 08:58:53 -05:00
Greg Armendariz
b601345c9f 13.5.1-6 baseline
Former-commit-id: 5894853996 [formerly 7e09fa5a0b] [formerly 5894853996 [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0 [formerly 12a09f9aa7]
Former-commit-id: ec2637676d
2013-07-10 10:04:22 -04:00
Bryan Kowal
f56e42195e Issue #2133 - qpid is now a wrapped java application; incremented qpid release
- Amend: wes2bridge compatibility updates
- Amend: running deploy.xml in the yajsw project will now deploy it to both its EDEX and QPID destination
- Amend: fixed monitoring in qpid wrapper.conf
- Amend: no longer restart qpid when >= 90% of the heap is used
- Amend: specify maximum memory directly in wrapper.conf

Change-Id: I2e3e6881f456535bac08f51f1e541e708be20f58

Former-commit-id: 1932480e2b [formerly f6412117e1] [formerly 1932480e2b [formerly f6412117e1] [formerly 38aa7723c6 [formerly 24c451a8afbd1b406ee7f83997e0ab92f1625b89]]]
Former-commit-id: 38aa7723c6
Former-commit-id: 56c7afbc0f [formerly 32190c8848]
Former-commit-id: 22c2eef5ee
2013-07-03 15:55:53 -05:00
Greg Armendariz
13ac0b1062 13.5.1-5 baseline
Former-commit-id: 82aabf1066 [formerly 492f92ef7b] [formerly 82aabf1066 [formerly 492f92ef7b] [formerly ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]
Former-commit-id: ea7ac37930
Former-commit-id: d899faec3d [formerly 869922cb82]
Former-commit-id: dc881f4ed8
2013-07-03 12:20:27 -04:00
Nate Jensen
86b096bc9b Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: a4de603bcf [formerly 316d6c09c6] [formerly a4de603bcf [formerly 316d6c09c6] [formerly db6152e524 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]
Former-commit-id: db6152e524
Former-commit-id: 5a6b0f99cc [formerly 6da64f329c]
Former-commit-id: efcf0c8519
2013-07-01 14:41:05 -05:00
Richard Peter
cca3d4c19b Merge branch 'omaha_13.5.1' (13.5.1-4) into development
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml

Former-commit-id: edeb3e255b [formerly 162261c395] [formerly edeb3e255b [formerly 162261c395] [formerly 76bc31aa77 [formerly 3ec3b75f720bc7622430f69a81ae566936be4363]]]
Former-commit-id: 76bc31aa77
Former-commit-id: f8213c16bd [formerly d3017ca60f]
Former-commit-id: 3d6754337a
2013-07-01 00:04:43 -05:00
Brad Gonzales
245de9c408 Issue #1965 added edex archive to the build.edex build.xml.
Change-Id: I27973b5f824e03f9bdbe5f485e8c35291db3fd3b

Former-commit-id: 2d1c6a0ec5 [formerly ba661b9e39] [formerly 2d1c6a0ec5 [formerly ba661b9e39] [formerly add108398a [formerly 6d2d22cee3f911da40eafceb1a52868a78fd3172]]]
Former-commit-id: add108398a
Former-commit-id: bc766efb7a [formerly 5c9ce05ce3]
Former-commit-id: c4daf04c32
2013-06-28 13:25:46 -05:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Brad Gonzales
9a5c3e259d 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: 67b4a2e202 [formerly 137c66539e] [formerly 67b4a2e202 [formerly 137c66539e] [formerly 276f05233f [formerly 2094b7f9fde97873c759da217498bcf62254a287]]]
Former-commit-id: 276f05233f
Former-commit-id: d6fb315096 [formerly 4f54596904]
Former-commit-id: d047e6a137
2013-06-27 11:46:44 -05:00
Dave Hladky
7dda985dd1 Issue #2144 Switched hibernate to Post GIS config
Change-Id: I9393b60fbc2a8880c588f707758a84cebf909725

Former-commit-id: b4e41b137d [formerly 5aee30a473] [formerly b4e41b137d [formerly 5aee30a473] [formerly fe5cde7afd [formerly 8452dcd917810d1c6f582b75e4ddceaba7229043]]]
Former-commit-id: fe5cde7afd
Former-commit-id: 34400e34c7 [formerly 671b6ee566]
Former-commit-id: c038109d5d
2013-06-25 13:31:37 -05:00
Richard Peter
ed15c2edcc 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: ad353c34f9 [formerly d262c02612] [formerly ad353c34f9 [formerly d262c02612] [formerly b007d4a302 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]
Former-commit-id: b007d4a302
Former-commit-id: e03283ad4a [formerly af1099b3fb]
Former-commit-id: 8f49eea08f
2013-06-24 18:51:56 -05:00
Richard Peter
9acddf6eeb 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: 0fa3bf800d [formerly 744eb64856] [formerly 0fa3bf800d [formerly 744eb64856] [formerly 37645245e5 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]
Former-commit-id: 37645245e5
Former-commit-id: be094a1745 [formerly a7594f8c93]
Former-commit-id: 4b582fef50
2013-06-24 18:36:15 -05:00
Nate Jensen
a103586ecd 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: 8a76694b9f [formerly b1bd29e784] [formerly 8a76694b9f [formerly b1bd29e784] [formerly 69eec45f13 [formerly a0e0cb180cd59e79a30d0292899e36f69c711472]]]
Former-commit-id: 69eec45f13
Former-commit-id: f4a6354929 [formerly a44073cce6]
Former-commit-id: 1c9458d595
2013-06-24 09:10:01 -05:00
Steve Harris
50d4376af7 13.5.1-3 baseline
Former-commit-id: d8176d4a4c [formerly 63803c1424] [formerly d8176d4a4c [formerly 63803c1424] [formerly 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]
Former-commit-id: 72d22a30c9
Former-commit-id: deebdb874a [formerly 810388f00a]
Former-commit-id: 1e939939b5
2013-06-24 09:29:43 -04:00
Matt Nash
967983972d 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: 0fe30ac2fb [formerly 54a114d789] [formerly 0fe30ac2fb [formerly 54a114d789] [formerly 99e9194921 [formerly 95ec6db9b349890a29bd13860193ada39b43c294]]]
Former-commit-id: 99e9194921
Former-commit-id: 6486801d2c [formerly 4fa399c710]
Former-commit-id: dc54f30149
2013-06-20 06:59:05 -05:00
Nate Jensen
8091cae89d 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: c0f95eb55a [formerly 81fc4fa753] [formerly c0f95eb55a [formerly 81fc4fa753] [formerly c4283b0336 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]]
Former-commit-id: c4283b0336
Former-commit-id: afae330d8a [formerly a9c077f0a9]
Former-commit-id: 73c0514c3d
2013-06-19 10:16:06 -05:00
Dustin Johnson
89d5b4327d Issue #2117 Separate log purging to its own Spring file for datadelivery/dpa
Change-Id: I90ee9ac94ac97ab2c704ba131505531d834a3576

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

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

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

Former-commit-id: da49d311e9 [formerly 0e01520e11] [formerly da49d311e9 [formerly 0e01520e11] [formerly 9b1596dc0c [formerly 745ee1a76e2d9ff8fccfa46b588cde5e0862c0e1]]]
Former-commit-id: 9b1596dc0c
Former-commit-id: f5af2ea95e [formerly abd96b92b7]
Former-commit-id: 5345a0ae10
2013-06-17 15:57:18 -05:00
Steve Harris
01dee712d5 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: 12248cade1 [formerly 43316cbff9] [formerly 12248cade1 [formerly 43316cbff9] [formerly 532d41787b [formerly df49d4d975e97a6b6c35e710dfd8244455eb21eb]]]
Former-commit-id: 532d41787b
Former-commit-id: 251b3c1a9e [formerly cb3e34813f]
Former-commit-id: 316d2ec667
2013-06-17 15:29:01 -05:00
Steve Harris
c27136275f 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: 41748175b6 [formerly 97631f9c62] [formerly 41748175b6 [formerly 97631f9c62] [formerly 40359c27c3 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]
Former-commit-id: 40359c27c3
Former-commit-id: 0e4504c0fa [formerly 41fb06e6ea]
Former-commit-id: 9c75ca8493
2013-06-17 15:25:32 -05:00
Steve Harris
afc02d5731 13.5.1-2 baseline
Former-commit-id: bc60b22f00 [formerly adb779323d] [formerly bc60b22f00 [formerly adb779323d] [formerly 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]
Former-commit-id: 3386330894
Former-commit-id: ccd66c0724 [formerly 3926dc20f7]
Former-commit-id: 332a74c4de
2013-06-17 15:01:22 -04:00
Dave Hladky
8babe7152c Issue #2101 Subscription retrieval for WFS (MADIS) follow on of #1763, #2062 for 13.6.1
Change-Id: I4072d87c50e42b30f4e54dedbe25d4335a27874a

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

Former-commit-id: 292a7a49dc [formerly 776bbbba21] [formerly 292a7a49dc [formerly 776bbbba21] [formerly 5512104d86 [formerly 00fcd53e94c1ff71d65c42b5f7644f653a1fd179]]]
Former-commit-id: 5512104d86
Former-commit-id: 8d0d10a4f1 [formerly b401764a23]
Former-commit-id: 6f5039cb43
2013-06-13 22:13:49 -05:00
Nate Jensen
c5d88a6dce Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: f55b3cbdbe [formerly c2faa0e3bf] [formerly f55b3cbdbe [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: 4a39d586d2 [formerly 2200c7cded]
Former-commit-id: 853f5c7546
2013-06-13 11:39:30 -05:00
Dustin Johnson
edcf1392be Issue #2090 Create Data Provider Agent feature
Amend: Remove dataplugins feature from dataprovideragent

Change-Id: I7ff421d478ad060c67eaffd4a1b2b40209ed2901

Former-commit-id: fd61a1e056 [formerly e33cd9d00d] [formerly fd61a1e056 [formerly e33cd9d00d] [formerly 45600f3d55 [formerly 2147018ade8a96b4a89c6117e345d569b4d1af76]]]
Former-commit-id: 45600f3d55
Former-commit-id: e617f569ff [formerly dfdfbe642b]
Former-commit-id: 3a2f752a22
2013-06-12 15:41:32 -05:00
Nate Jensen
ce7068cbad Issue #1989 fix wrapper.conf
Change-Id: I0ed435ba0f124f175142ede157038bd45623f2ce

Former-commit-id: dae8945d1a [formerly 30f9bba5c4] [formerly dae8945d1a [formerly 30f9bba5c4] [formerly 08eb034abc [formerly 5b8d1fafd2f2a1696f4f39d0cc6ddcb817054126]]]
Former-commit-id: 08eb034abc
Former-commit-id: 8516c28fdf [formerly 53784c5a86]
Former-commit-id: 9b42439288
2013-06-12 14:05:15 -05:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00
Greg Armendariz
0bf01b9b09 Merge "Issue #1927 - remove obsolete files" into development
Former-commit-id: e220ed1ae4 [formerly 367d9850b3] [formerly e220ed1ae4 [formerly 367d9850b3] [formerly afed5f12a0 [formerly e19a1da294b9d0e34c126537a13a12e8aba8f35f]]]
Former-commit-id: afed5f12a0
Former-commit-id: e9aea7130e [formerly 61d6d42121]
Former-commit-id: 3c25f8969d
2013-06-06 16:49:05 -05:00
Bryan Kowal
6e1273ed38 Issue #1927 - remove obsolete files
Former-commit-id: 6aecf2370f [formerly 6d642232dd] [formerly 6aecf2370f [formerly 6d642232dd] [formerly 4962310360 [formerly 00f7ba0212f84db3b36805e2dcc2790d67fcfaac]]]
Former-commit-id: 4962310360
Former-commit-id: fa1add535d [formerly fee1818521]
Former-commit-id: 1f320ec6b4
2013-06-06 16:35:04 -05:00
David Gillingham
a8c3259817 Issue #2023: Pure python client implementation of Data Access Framework.
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427

Former-commit-id: 2c0af328b6 [formerly ae3e7a64b0] [formerly 2c0af328b6 [formerly ae3e7a64b0] [formerly 4bdf7178bd [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 242d3a5493 [formerly 3f4b44fbbc]
Former-commit-id: 402b6c4f86
2013-06-06 13:47:31 -05:00
Bryan Kowal
a4cf78cd95 Issue #2066 - defined a hibernate log that all hibernate errors would be redirected to.
Former-commit-id: 3427534c29 [formerly 4b5c653363] [formerly 3427534c29 [formerly 4b5c653363] [formerly 2abb257d35 [formerly 289cd9fbe02da77b3c56729ec1ee4d3e89256a08]]]
Former-commit-id: 2abb257d35
Former-commit-id: b3b85069ea [formerly 98150aa493]
Former-commit-id: 4f871084ec
2013-06-04 18:25:58 -05:00
Dustin Johnson
b122700fed Issue #2038 Fix ability to get shared subscriptions by id
Change-Id: Iff7d9ab52e8152e7f950a536e49d92acad45dd19

Former-commit-id: b4bc2ca947 [formerly fc807288a7] [formerly b4bc2ca947 [formerly fc807288a7] [formerly 05bd3e113d [formerly e308ea7b1bc786832d4414369f86cc2d02f71ae2]]]
Former-commit-id: 05bd3e113d
Former-commit-id: 3f4b010b84 [formerly 42d1d74b04]
Former-commit-id: 62131327ed
2013-05-31 09:29:44 -05:00
Dustin Johnson
f8d7eaa98b Merge "Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS" into development
Former-commit-id: 54045d6b9b [formerly c01ea33d5b] [formerly 54045d6b9b [formerly c01ea33d5b] [formerly e4ecae9e7e [formerly f91e04da588da1714fd791ade2ecbfa826c9cdca]]]
Former-commit-id: e4ecae9e7e
Former-commit-id: 353630fcca [formerly 58b11e075c]
Former-commit-id: 89d71040c6
2013-05-30 17:11:19 -05:00
Dave Hladky
1b07bcea0c Issue #2049 Sister ticket to #753, WFS retrieval impl for MADIS
Change-Id: I5e3f2a1f4047ab61d6d19a1fde0ff539df3863b7

Former-commit-id: c292bf1b55 [formerly 1608d407d1] [formerly c292bf1b55 [formerly 1608d407d1] [formerly 83dae4fe01 [formerly 636bed36a4f7adc5db8b476d618ff4d67c806671]]]
Former-commit-id: 83dae4fe01
Former-commit-id: 64596d3468 [formerly 90e6d184e7]
Former-commit-id: 8c0c235087
2013-05-30 17:04:16 -05:00
Nate Jensen
f6d958a18b Merge "Issue #2052 Fix FeatureExplorer feature comparison" into development
Former-commit-id: 10dd7ea61f [formerly 4aa3657d1a] [formerly 10dd7ea61f [formerly 4aa3657d1a] [formerly e4578ca7ba [formerly 3d6d6acb67bdd0a3d1e41a66873441686ed2c895]]]
Former-commit-id: e4578ca7ba
Former-commit-id: 698d793e9c [formerly c0bca7ec27]
Former-commit-id: cdd438d3e2
2013-05-30 14:50:39 -05:00
Steve Harris
4d8d9354e7 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 3e66acde96 [formerly 3745089239] [formerly 3e66acde96 [formerly 3745089239] [formerly 26bf27c70d [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]
Former-commit-id: 26bf27c70d
Former-commit-id: 629e76e0ff [formerly 1691fa413c]
Former-commit-id: 9704fd6a82
2013-05-30 14:33:24 -05:00
Everett Kladstrup
033b8bae36 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: 9541c93640 [formerly 0b2839fd43] [formerly 9541c93640 [formerly 0b2839fd43] [formerly 4621271329 [formerly 792255325dd584238c47f53d5cf1d642465b53d6]]]
Former-commit-id: 4621271329
Former-commit-id: 282ec3b45f [formerly 9ad045d141]
Former-commit-id: 83adbb8545
2013-05-30 13:02:49 -05:00
Dustin Johnson
03cbf9a455 Issue #2038 Remove unused schemas from datadelivery spring files
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 463bed7647 [formerly efc3c6a2f2] [formerly 463bed7647 [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 74d985af51 [formerly b1d66a0450]
Former-commit-id: 3dbb682493
2013-05-30 09:49:09 -05:00