Commit graph

5643 commits

Author SHA1 Message Date
Roger Ferrel
487b66ffc4 Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8

Former-commit-id: c226ef3596 [formerly 039f4826ea [formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]
Former-commit-id: 039f4826ea
Former-commit-id: 6bfacf85ab
2014-05-09 09:34:49 -05:00
Brad Gonzales
286cecb8fb Omaha #3032 updated jdk to java 1.7.0_55
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8

Former-commit-id: 35f6a5ac25 [formerly 91f94499aa [formerly 49cc6d83ac5fffc3f737699ab605948fa38117db]]
Former-commit-id: 91f94499aa
Former-commit-id: ad464cc0da
2014-05-08 16:15:42 -05:00
Richard Peter
c4b6c6cc6e Omaha #1458: Remove reference to cron.properties
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29

Former-commit-id: 0430619d7b [formerly 86aea04167 [formerly f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2]]
Former-commit-id: 86aea04167
Former-commit-id: 63114b4f82
2014-05-08 12:58:49 -05:00
Steve Harris
9b4b0d5c01 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: ff4a6b8122 [formerly ce2b030743 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]
Former-commit-id: ce2b030743
Former-commit-id: a804a071c0
2014-05-08 09:50:34 -05:00
Nate Jensen
733740f64f Merge "Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting." into omaha_14.4.1
Former-commit-id: 4851989a7a [formerly 51608c090e [formerly 3d76d2510d7a0b96f3d8800e2c46727d08ad1fa6]]
Former-commit-id: 51608c090e
Former-commit-id: 8365e5aa56
2014-05-08 09:36:04 -05:00
Richard Peter
ab64a3e814 Omaha #1458: Break-out cron.properties.
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528

Former-commit-id: 348bc25760 [formerly 6469ae94ed [formerly 5954c321f38ba64d305c15270b12289fb34ccdff]]
Former-commit-id: 6469ae94ed
Former-commit-id: ad3f6c4af3
2014-05-08 09:18:49 -05:00
Richard Peter
731f55d574 Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: adff7b5684 [formerly d5ec01f7c0 [formerly fe464020d287bbf21b7bc04402d31c97114c195b]]
Former-commit-id: d5ec01f7c0
Former-commit-id: 242716fb0f
2014-05-08 09:06:31 -05:00
Steve Harris
03908ba8ae Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
	edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
	edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml

Former-commit-id: b7a1bda98c [formerly e37e40ed19 [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]
Former-commit-id: e37e40ed19
Former-commit-id: ddd6e35478
2014-05-07 16:01:53 -05:00
Everett Kladstrup
4ea3156453 Omaha #3133 Remove some unecessary dependencies
* Remove viz.core dependency from uf.common.ohd
* Remove org.osgi.framework dependency from uf.edex.ndm
* Remove non-existant activator from uf.edex.ndm manifest


Former-commit-id: b4a76a575a [formerly 3a00185e3c [formerly ce1379d30d26f96959dc07d8a7f3a1fc3d355c99]]
Former-commit-id: 3a00185e3c
Former-commit-id: 516a50a6a1
2014-05-07 12:54:37 -05:00
Ben Steffensmeier
5a52d61636 Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 973c6fdb55 [formerly 18ec643a30 [formerly 3bd0a076add20c38fad41461295fb430e8ceb5cb]]
Former-commit-id: 18ec643a30
Former-commit-id: 462ec63608
2014-05-06 18:06:44 -05:00
Nate Jensen
7193103faf Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
Former-commit-id: 69b6c9426f [formerly ddb3610e24 [formerly 31d9df701d689ceaf76c9d241d36df5c9c463bb3]]
Former-commit-id: ddb3610e24
Former-commit-id: be75956418
2014-05-06 17:29:45 -05:00
Nate Jensen
e93e248f9a Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 0f1cab916a [formerly d271dfb1a5 [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]
Former-commit-id: d271dfb1a5
Former-commit-id: daac0701fc
2014-05-06 17:09:56 -05:00
Nate Jensen
3aa9bfdca1 Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: aa7c1fac90 [formerly 5191b61b30 [formerly 4659c0240aa31b615bc50228906d514f47a72f94]]
Former-commit-id: 5191b61b30
Former-commit-id: 49d34cc4e4
2014-05-06 17:08:04 -05:00
Everett Kladstrup
129f3017bb Omaha #3112 Fix adding classes to WFS jaxb
* Rebuild JAXBContext after adding additional classes
* Set output directory in build.properties to fix deploy location
* Remove unecessary dependencies from wfs manifest


Former-commit-id: aedb166b4d [formerly 1184e77f1a [formerly bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1]]
Former-commit-id: 1184e77f1a
Former-commit-id: 2ee2db6f38
2014-05-06 17:07:23 -05:00
Ben Steffensmeier
34c4ce1630 Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 70df0ee87e [formerly bbbf957ba8 [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]
Former-commit-id: bbbf957ba8
Former-commit-id: e70a6999b7
2014-05-06 16:19:58 -05:00
Nate Jensen
0b046a18e1 Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 8f8ea5d014 [formerly a583493711 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]
Former-commit-id: a583493711
Former-commit-id: 26f47e3b00
2014-05-06 16:15:41 -05:00
Richard Peter
2044b64206 Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: 611c010968 [formerly 03ab7599de [formerly c12469d133558750e85049f7ce0f0a42b802c2b9]]
Former-commit-id: 03ab7599de
Former-commit-id: 884562700a
2014-05-06 15:54:23 -05:00
Nate Jensen
37b72c933b Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 87b6df4840 [formerly ff6c77420c [formerly 0a7265da59457e8dc6a122db81b134d6555d5276]]
Former-commit-id: ff6c77420c
Former-commit-id: 7701820902
2014-05-06 13:10:48 -05:00
Nate Jensen
8b2c2d4be5 Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: 4f734ae7f9 [formerly 0e3876de34 [formerly c68f2924c4c7f998af859d7c88cd9d0049d636e5]]
Former-commit-id: 0e3876de34
Former-commit-id: d83fad0054
2014-05-06 13:09:12 -05:00
Nate Jensen
1d38804eb2 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 7cea97ab15 [formerly 71b4227061 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]
Former-commit-id: 71b4227061
Former-commit-id: 3719c41d2b
2014-05-06 12:26:21 -05:00
Brian Clements
73b643e157 Omaha #3116 changed log formatter class to match camel 2.12.3
Former-commit-id: 51eb6c9f06 [formerly c77ba25dc8 [formerly a63f569de8d9e8c924de9a9d9ca101e3e04e567d]]
Former-commit-id: c77ba25dc8
Former-commit-id: 170ce2c157
2014-05-06 11:38:38 -05:00
Richard Peter
f76ed476c8 Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: 4dc91f494f [formerly b148d11ec9 [formerly 9b9d2b475f4777febf125e4013cba0d971eaf8e8]]
Former-commit-id: b148d11ec9
Former-commit-id: 8ae9cfba55
2014-05-06 09:46:41 -05:00
Brian Clements
02c921ed12 Issue #3076 added clear all to shared display sessions
Former-commit-id: 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]
Former-commit-id: f545c548cc
Former-commit-id: 729e717be1
2014-05-06 09:30:07 -05:00
Nate Jensen
c07a4c0069 Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
Former-commit-id: 596b5268d0 [formerly 7d11e31b06 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]
Former-commit-id: 7d11e31b06
Former-commit-id: db4fc0c4d2
2014-05-05 16:58:44 -05:00
Lee Venable
a57f0e338d Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: b0a251f4e3 [formerly a6c2260dd1 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]
Former-commit-id: a6c2260dd1
Former-commit-id: 550668cbf7
2014-05-05 16:13:31 -05:00
Steve Harris
dd01a4282b Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (updated in ufcore):
	cave/com.raytheon.uf.viz.application.feature/feature.xml
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
	edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java


Former-commit-id: 83368e4b4e [formerly 73ed3251bd [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]
Former-commit-id: 73ed3251bd
Former-commit-id: a8d3f4d885
2014-05-05 16:04:09 -05:00
Brian Clements
46b526473d Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: c61e30a422 [formerly 1502354f87 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]
Former-commit-id: 1502354f87
Former-commit-id: dec5159216
2014-05-05 15:29:06 -05:00
Nate Jensen
f76ace3c9b Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: d82f6e5ff6 [formerly 0cf0f724f4 [formerly cf0bb31583f0ec0b2135aa9101f3247e88e877d0]]
Former-commit-id: 0cf0f724f4
Former-commit-id: 2b6c30e67d
2014-05-05 13:06:08 -05:00
Dave Hladky
7d244313a5 Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java

Former-commit-id: ccaaa1cfea [formerly 333bf8b36d [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]
Former-commit-id: 333bf8b36d
Former-commit-id: 0ac4de6ad0
2014-05-05 12:15:14 -05:00
Nate Jensen
a2607513bf Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: d6518bede1 [formerly e9b3041170 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]
Former-commit-id: e9b3041170
Former-commit-id: f233d104d7
2014-05-05 09:45:11 -05:00
Brad Gonzales
0470903200 Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115

Former-commit-id: 39a2ec8f46 [formerly df353f06f5 [formerly 9372afbd268a61e63b2c9ba2b25529e654cfee6e]]
Former-commit-id: df353f06f5
Former-commit-id: cbcd7dcc3e
2014-05-02 13:09:57 -05:00
Richard Peter
98fa705dd0 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 132d63ac44 [formerly dc0b598fd4 [formerly 28b33188773001c34946464093319dc2a1117be9]]
Former-commit-id: dc0b598fd4
Former-commit-id: f38816d168
2014-05-02 10:05:59 -05:00
Richard Peter
39467f210d Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: 24f1c7b385 [formerly 51ba60d62b [formerly cab873d5b9437b8abd22adb65c42b886710e50a9]]
Former-commit-id: 51ba60d62b
Former-commit-id: 6bb353a05d
2014-05-02 10:05:29 -05:00
Richard Peter
aeebf17373 Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: d4a138c534 [formerly 478cedd3a3 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]
Former-commit-id: 478cedd3a3
Former-commit-id: 4e1bc16d70
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
80104eaf42 Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: 23d6da4a18 [formerly 6bdaba048c [formerly a3081bf46908788e78c707bf51e08f6c98d997bc]]
Former-commit-id: 6bdaba048c
Former-commit-id: 956f62a6ec
2014-05-01 18:02:08 -05:00
Richard Peter
36d579c206 Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: bcd87195ee [formerly a9b088146c [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]
Former-commit-id: a9b088146c
Former-commit-id: 1738b065b8
2014-05-01 16:30:21 -05:00
Nate Jensen
54c6d5d07f Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]
Former-commit-id: f4d20c41f4
Former-commit-id: d759efcaa8
2014-05-01 16:28:16 -05:00
Nate Jensen
8d5ec4bb04 Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: a73a310709 [formerly 137818d03a [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]
Former-commit-id: 137818d03a
Former-commit-id: 3222914fde
2014-05-01 16:20:35 -05:00
Richard Peter
c7f5b23633 Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: a4fb460e17 [formerly 4056f53fa2 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]
Former-commit-id: 4056f53fa2
Former-commit-id: 25fd0e03f4
2014-05-01 14:47:41 -05:00
Steve Harris
d2905e51d4 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 779e85cc77 [formerly c8ba70a146 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]
Former-commit-id: c8ba70a146
Former-commit-id: 9ecd871825
2014-05-01 13:25:15 -05:00
Steve Harris
05d6049e35 Omaha #3085 - re-deleted stuff that was re-added in the merge from omaha_14.3.1 to omaha_14.4.1
Change-Id: Id13953881429545bccb590a550c23a73f77d585e

Former-commit-id: ab0b1ec047 [formerly 70ee74a311 [formerly 75d4816f97b0b6fa2bf93847038c4f15b3479e39]]
Former-commit-id: 70ee74a311
Former-commit-id: 11ca44c583
2014-05-01 12:53:06 -05:00
Nate Jensen
dba33e281e Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: 96071c250d [formerly b7536a398b [formerly 1ccbd542f3a5025ba0e0c8d640170972823a583d]]
Former-commit-id: b7536a398b
Former-commit-id: ba9ed2aba3
2014-05-01 12:40:41 -05:00
Brian Clements
eae19ec5ca Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: dd5412e119 [formerly 3ca4f8cc52 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]
Former-commit-id: 3ca4f8cc52
Former-commit-id: 93912625ea
2014-05-01 12:34:09 -05:00
Bryan Kowal
dfd5e3dbad Issue #3099 - handle empty location name lists in the data request
Former-commit-id: a9b9a8b8c4 [formerly 5eac78f0e0 [formerly 79603ec579d6ebcd1ef707f637e1b207ae18f803]]
Former-commit-id: 5eac78f0e0
Former-commit-id: ff21ef813c
2014-05-01 12:12:42 -05:00
Nate Jensen
b911f3e9b5 Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: bcb82bedc6 [formerly 7fbdb9ff83 [formerly a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2]]
Former-commit-id: 7fbdb9ff83
Former-commit-id: 1d157a16e3
2014-05-01 12:06:13 -05:00
Nate Jensen
97ea9dd708 Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: 244183db25 [formerly b28e5291d6 [formerly c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa]]
Former-commit-id: b28e5291d6
Former-commit-id: 03b412c136
2014-05-01 11:21:54 -05:00
Nate Jensen
fc261ab303 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 76ad31501b [formerly 2a0775e748 [formerly 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb]]
Former-commit-id: 2a0775e748
Former-commit-id: 7b2ed421f0
2014-05-01 11:01:37 -05:00
Dave Hladky
f844c98853 Issue #2992 Missed perl script
Former-commit-id: 904a608495 [formerly 23433f628d [formerly b2c19dd8cfa3eee138f2b9abf7289d464d94ef46]]
Former-commit-id: 23433f628d
Former-commit-id: 9a43ac36e6
2014-05-01 08:48:38 -05:00
Greg Armendariz
fece69eb09 Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: 58eaf444bd [formerly 1e48076fb2 [formerly b4c0a78c01c9048ccac6fcd098d274380159fd0c]]
Former-commit-id: 1e48076fb2
Former-commit-id: 2994753636
2014-04-30 19:34:43 -05:00
Brian Clements
fe53a23d2c Issue #2903 set commons.lang to unpack in feature to fix odd bug
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help


Former-commit-id: f45e435f2c [formerly 873efa1c64 [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]
Former-commit-id: 873efa1c64
Former-commit-id: fee0a858cb
2014-04-30 17:52:43 -05:00