Commit graph

5644 commits

Author SHA1 Message Date
Brian Clements
08a406ff18 Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 294a489ba547bf90df9d6b6a5107c8993c5b8333
2014-05-09 15:43:46 -05:00
Brian Clements
3bb680802a Omaha #3147 removed spring from groovy RPM component spec
Former-commit-id: 979ff20d55cc86319805f77ec53f32cb39555eb3
2014-05-09 10:31:28 -05:00
Brad Gonzales
91f94499aa Omaha #3032 updated jdk to java 1.7.0_55
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8

Former-commit-id: 49cc6d83ac5fffc3f737699ab605948fa38117db
2014-05-08 16:15:42 -05:00
Richard Peter
86aea04167 Omaha #1458: Remove reference to cron.properties
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29

Former-commit-id: f95bb3a43e5a445c0a43628a9ed5e11e23a6a9b2
2014-05-08 12:58:49 -05:00
Steve Harris
ce2b030743 Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 241ca845ebcce8426bf61d730baa5e97a7762381
2014-05-08 09:50:34 -05:00
Nate Jensen
51608c090e 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: 3d76d2510d7a0b96f3d8800e2c46727d08ad1fa6
2014-05-08 09:36:04 -05:00
Richard Peter
6469ae94ed Omaha #1458: Break-out cron.properties.
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528

Former-commit-id: 5954c321f38ba64d305c15270b12289fb34ccdff
2014-05-08 09:18:49 -05:00
Richard Peter
d5ec01f7c0 Omaha #2782: Update thread based logging
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8

Former-commit-id: fe464020d287bbf21b7bc04402d31c97114c195b
2014-05-08 09:06:31 -05:00
Steve Harris
e37e40ed19 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: 396a7cbfefed07cd25e4f8b1f028c566a06e4065
2014-05-07 16:01:53 -05:00
Everett Kladstrup
3a00185e3c 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: ce1379d30d26f96959dc07d8a7f3a1fc3d355c99
2014-05-07 12:54:37 -05:00
Ben Steffensmeier
18ec643a30 Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
Former-commit-id: 3bd0a076add20c38fad41461295fb430e8ceb5cb
2014-05-06 18:06:44 -05:00
Nate Jensen
ddb3610e24 Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
Former-commit-id: 31d9df701d689ceaf76c9d241d36df5c9c463bb3
2014-05-06 17:29:45 -05:00
Nate Jensen
d271dfb1a5 Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 37c2d25d9ff0076d1cab4f818e45c6ccead82105
2014-05-06 17:09:56 -05:00
Nate Jensen
5191b61b30 Issue #3101 fix some derived parameters on win64 platform
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86

Former-commit-id: 4659c0240aa31b615bc50228906d514f47a72f94
2014-05-06 17:08:04 -05:00
Everett Kladstrup
1184e77f1a 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: bd479bc83287f3c1bb9dd65176b9ea3f5b8901d1
2014-05-06 17:07:23 -05:00
Ben Steffensmeier
bbbf957ba8 Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 35845fa63be35661893d31510f83e2d9ab6f60af
2014-05-06 16:19:58 -05:00
Nate Jensen
a583493711 Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 26eb2500104f7afe3fb07ddd66299aa1486375d2
2014-05-06 16:15:41 -05:00
Richard Peter
03ab7599de Issue #2726: update smartInit threads to 1
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0

Former-commit-id: c12469d133558750e85049f7ce0f0a42b802c2b9
2014-05-06 15:54:23 -05:00
Nate Jensen
ff6c77420c Issue #2060 genericize DataURIFieldConverter
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4

Former-commit-id: 0a7265da59457e8dc6a122db81b134d6555d5276
2014-05-06 13:10:48 -05:00
Nate Jensen
0e3876de34 Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
Former-commit-id: c68f2924c4c7f998af859d7c88cd9d0049d636e5
2014-05-06 13:09:12 -05:00
Nate Jensen
71b4227061 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 949d132cf3260db5f75ea665f21601ab91440958
2014-05-06 12:26:21 -05:00
Brian Clements
c77ba25dc8 Omaha #3116 changed log formatter class to match camel 2.12.3
Former-commit-id: a63f569de8d9e8c924de9a9d9ca101e3e04e567d
2014-05-06 11:38:38 -05:00
Richard Peter
b148d11ec9 Issue #2726: Autoset route startup order.
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc

Former-commit-id: 9b9d2b475f4777febf125e4013cba0d971eaf8e8
2014-05-06 09:46:41 -05:00
Brian Clements
f545c548cc Issue #3076 added clear all to shared display sessions
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
2014-05-06 09:30:07 -05:00
Nate Jensen
7d11e31b06 Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
Former-commit-id: dee25d151cecf83f23d2ef9df20146c68069e957
2014-05-05 16:58:44 -05:00
Lee Venable
a6c2260dd1 Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: d875f73ff44986b2c7862f0dee06504d576fd96b
2014-05-05 16:13:31 -05:00
Steve Harris
73ed3251bd 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: e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285
2014-05-05 16:04:09 -05:00
Brian Clements
1502354f87 Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: 6595f5be37941f35c33b46231deef7d41e967380
2014-05-05 15:29:06 -05:00
Nate Jensen
0cf0f724f4 Issue #2060 fix sat precip for grid data URI removal
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58

Former-commit-id: cf0bb31583f0ec0b2135aa9101f3247e88e877d0
2014-05-05 13:06:08 -05:00
Dave Hladky
333bf8b36d 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: 2e5ee5565d1847490e46c59866b14f77555e2a7e
2014-05-05 12:15:14 -05:00
Nate Jensen
e9b3041170 Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: c4d06eea732629d5fac66593269ec82b9ee6463d
2014-05-05 09:45:11 -05:00
Brad Gonzales
df353f06f5 Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115

Former-commit-id: 9372afbd268a61e63b2c9ba2b25529e654cfee6e
2014-05-02 13:09:57 -05:00
Richard Peter
dc0b598fd4 Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
Former-commit-id: 28b33188773001c34946464093319dc2a1117be9
2014-05-02 10:05:59 -05:00
Richard Peter
51ba60d62b Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
Former-commit-id: cab873d5b9437b8abd22adb65c42b886710e50a9
2014-05-02 10:05:29 -05:00
Richard Peter
478cedd3a3 Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: f124cee1070a3dd0e09cb54f773f63095f18bd16
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
6bdaba048c Issue #3095 Update JGridData for creation of numeric java package.
Former-commit-id: a3081bf46908788e78c707bf51e08f6c98d997bc
2014-05-01 18:02:08 -05:00
Richard Peter
a9b088146c Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 7d69b9fdc60b0c07121eab0119cf45b1624653cd
2014-05-01 16:30:21 -05:00
Nate Jensen
f4d20c41f4 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: a24190f35b87351a5f699ac05041bec7a13a1cdb
2014-05-01 16:28:16 -05:00
Nate Jensen
137818d03a Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b

Former-commit-id: 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64
2014-05-01 16:20:35 -05:00
Richard Peter
4056f53fa2 Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b
2014-05-01 14:47:41 -05:00
Steve Harris
c8ba70a146 Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8
2014-05-01 13:25:15 -05:00
Steve Harris
70ee74a311 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: 75d4816f97b0b6fa2bf93847038c4f15b3479e39
2014-05-01 12:53:06 -05:00
Nate Jensen
b7536a398b Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
Former-commit-id: 1ccbd542f3a5025ba0e0c8d640170972823a583d
2014-05-01 12:40:41 -05:00
Brian Clements
3ca4f8cc52 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: ee24eaf54704dcfdf698089a8269e055f7856c80
2014-05-01 12:34:09 -05:00
Bryan Kowal
5eac78f0e0 Issue #3099 - handle empty location name lists in the data request
Former-commit-id: 79603ec579d6ebcd1ef707f637e1b207ae18f803
2014-05-01 12:12:42 -05:00
Nate Jensen
7fbdb9ff83 Merge "Issue #2854: Reorganize deltaScripts" into omaha_14.3.1
Former-commit-id: a57a632a37cbee857a5f9fb8eb1f1cfa6a59a0b2
2014-05-01 12:06:13 -05:00
Nate Jensen
b28e5291d6 Merge "Issue #3101 safe cast numpy shape values to Number" into omaha_14.3.1
Former-commit-id: c1dae5ae673d9db6d4c1b887b68b5cbaa815c6fa
2014-05-01 11:21:54 -05:00
Nate Jensen
2a0775e748 Issue #3101 safe cast numpy shape values to Number
Change-Id: Ie81917cf19819e159195a50d6ad786d20c32136c

Former-commit-id: 8df8db0d9b9cc0848bf73a09bcedb8cb7947a4bb
2014-05-01 11:01:37 -05:00
Dave Hladky
23433f628d Issue #2992 Missed perl script
Former-commit-id: b2c19dd8cfa3eee138f2b9abf7289d464d94ef46
2014-05-01 08:48:38 -05:00
Greg Armendariz
1e48076fb2 Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1
Former-commit-id: b4c0a78c01c9048ccac6fcd098d274380159fd0c
2014-04-30 19:34:43 -05:00