Nate Jensen
baa755e914
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
...
Former-commit-id: 17d9ff2607650edc41f3eff5a8e32fab064743f4eff5a8e32fab064743f47afd18662dc57623dc52
2014-05-12 11:56:34 -05:00
Nate Jensen
78e3feab07
Merge "Omaha #2733 changes to match ufcore distribution pattern changes" into omaha_14.4.1
...
Former-commit-id: 12ac619cb60a3a7c2b7d03ff2df660ccc69d4e7003ff2df660ccc69d4e70467891a7ad8b272d5626
2014-05-12 09:28:37 -05:00
Brian Clements
26064a9629
Omaha #2733 changes to match ufcore distribution pattern changes
...
this change depends on changes from #3151
required plugins will prevent edex from starting if there are no valid dist patterns
removed distribution registration from geomag since it did not contain any valid patterns
Former-commit-id: 4d2d5f81df243ba8476a8b07016f25316bfe3b6f8b07016f25316bfe3b6f9cc5ee88b5546cf300df
2014-05-12 09:14:28 -05:00
Nate Jensen
b4747e1967
Omaha #3075 updates for pydev 3.4.1
...
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: 7e3a38d4735fcc126e57e6569b4a7dbb32858c04e6569b4a7dbb32858c045d08184312651ce74777
2014-05-09 16:45:39 -05:00
Brian Clements
87d24b248b
Omaha #3107 added timeout handling logic for leader transfer verification
...
Former-commit-id: 7db361813c26d206f78008a406ff187b7bc5be9708a406ff187b7bc5be973d3d7f04bb98e74677fd
2014-05-09 15:43:46 -05:00
Brian Clements
08eeff08a7
Omaha #3147 removed spring from groovy RPM component spec
...
Former-commit-id: b6155d54829d67a6c30b3bb680802ab334038a283bb680802ab334038a283a48b2036e6192ab51ae
2014-05-09 10:31:28 -05:00
Brad Gonzales
52c91e75c3
Omaha #3032 updated jdk to java 1.7.0_55
...
Change-Id: If1bcb03386aec265196cf8133a3f1e6b34eb1fc8
Former-commit-id: 286cecb8fbad464cc0da91f94499aa35f6a5ac2591f94499aa35f6a5ac25f7cf5741b06bee1ed107
2014-05-08 16:15:42 -05:00
Richard Peter
c7ed1a1a93
Omaha #1458 : Remove reference to cron.properties
...
Change-Id: Ia77204b32b9bfcc56ae795d47cdce4ceea307b29
Former-commit-id: c4b6c6cc6e63114b4f8286aea041670430619d7b86aea041670430619d7b02c77af062328a48a33d
2014-05-08 12:58:49 -05:00
Steve Harris
bfd8f9b971
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
...
Former-commit-id: 9b4b0d5c01a804a071c0ce2b030743ff4a6b8122ce2b030743ff4a6b8122988ad59a0d532b861bce
2014-05-08 09:50:34 -05:00
Nate Jensen
69e5254ffc
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: 733740f64f8365e5aa5651608c090e4851989a7a51608c090e4851989a7a80d97584d36a71446d52
2014-05-08 09:36:04 -05:00
Richard Peter
899b8ce879
Omaha #1458 : Break-out cron.properties.
...
Change-Id: I8d0cdafe812c42158ce38cdb3903737693b6f528
Former-commit-id: ab64a3e814ad3f6c4af36469ae94ed348bc257606469ae94ed348bc2576095488f49b1c9d8bfdd06
2014-05-08 09:18:49 -05:00
Richard Peter
e3e1298591
Omaha #2782 : Update thread based logging
...
Change-Id: Ifec2b15741c0fb4fa97e3c17659ddb80b69c47a8
Former-commit-id: 731f55d574242716fb0fd5ec01f7c0adff7b5684d5ec01f7c0adff7b56847a7b65860b741710881f
2014-05-08 09:06:31 -05:00
Steve Harris
f1032ccc05
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: 03908ba8aeddd6e35478e37e40ed19b7a1bda98ce37e40ed19b7a1bda98c9591532ffd7a7c1167c2
2014-05-07 16:01:53 -05:00
Everett Kladstrup
a472cd5363
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: 4ea3156453516a50a6a13a00185e3cb4a76a575a3a00185e3cb4a76a575ace743b3c43a1070cc1ac
2014-05-07 12:54:37 -05:00
Ben Steffensmeier
efd43c399e
Omaha #3093 Improvements to hprof tool: spelling fixes, allow grid memory >2GB, output for radar memory troubleshooting.
...
Former-commit-id: 5a52d61636462ec6360818ec643a30973c6fdb5518ec643a30973c6fdb550bd28752bc3e9e6abde2
2014-05-06 18:06:44 -05:00
Nate Jensen
02be49d972
Merge "Issue #3101 fix some derived parameters on win64 platform" into omaha_14.3.1
...
Former-commit-id: 7193103fafbe75956418ddb3610e2469b6c9426fddb3610e2469b6c9426f7360ee5c1af2e1ee0aeb
2014-05-06 17:29:45 -05:00
Nate Jensen
1adf6d304f
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
...
Former-commit-id: e93e248f9adaac0701fcd271dfb1a50f1cab916ad271dfb1a50f1cab916a70f70371b189621db281
2014-05-06 17:09:56 -05:00
Nate Jensen
c333277d30
Issue #3101 fix some derived parameters on win64 platform
...
Change-Id: I9de1d31e7f7c19af437aef834aa84f163bf36d86
Former-commit-id: 3aa9bfdca149d34cc4e45191b61b30aa7c1fac905191b61b30aa7c1fac908c1748d370815aa21d8e
2014-05-06 17:08:04 -05:00
Everett Kladstrup
de20eacce2
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: 129f3017bb2ee2db6f381184e77f1aaedb166b4d1184e77f1aaedb166b4d08e8a4a60a5f378b30f0
2014-05-06 17:07:23 -05:00
Ben Steffensmeier
c83559ee61
Issue #3117 update satellite inventory for new sectors or elements.
...
Former-commit-id: 34c4ce1630e70a6999b7bbbf957ba870df0ee87ebbbf957ba870df0ee87e945fe1db2f81916ecdb6
2014-05-06 16:19:58 -05:00
Nate Jensen
baf8e4a3ea
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
...
Former-commit-id: 0b046a18e126f47e3b00a5834937118f8ea5d014a5834937118f8ea5d014f1c48f10b14f3570324a
2014-05-06 16:15:41 -05:00
Richard Peter
8e8e1c45ed
Issue #2726 : update smartInit threads to 1
...
Change-Id: Ic2d432087f66fd9f03b3d6f01fefce8af0d5b0b0
Former-commit-id: 2044b64206884562700a03ab7599de611c01096803ab7599de611c0109684f2d470801be288505e0
2014-05-06 15:54:23 -05:00
Nate Jensen
b16bfd2b38
Issue #2060 genericize DataURIFieldConverter
...
Change-Id: I885b0a8ec64eb69256c04fa2476814b1300fcdd4
Former-commit-id: 37b72c933b7701820902ff6c77420c87b6df4840ff6c77420c87b6df4840a6363fc3d4d1a040b9c2
2014-05-06 13:10:48 -05:00
Nate Jensen
de7bade647
Merge "Issue #2060 fill in units on GridRecords created from URIs" into omaha_14.3.1
...
Former-commit-id: 8b2c2d4be5d83fad00540e3876de344f734ae7f90e3876de344f734ae7f9044d086fc1732aaa6001
2014-05-06 13:09:12 -05:00
Nate Jensen
e8ca9729eb
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 1d38804eb23719c41d2b71b42270617cea97ab1571b42270617cea97ab156bdbfb7e1a5bf1554597
2014-05-06 12:26:21 -05:00
Brian Clements
474068d56a
Omaha #3116 changed log formatter class to match camel 2.12.3
...
Former-commit-id: 73b643e157170ce2c157c77ba25dc851eb6c9f06c77ba25dc851eb6c9f06b8a648f5435b26766041
2014-05-06 11:38:38 -05:00
Richard Peter
9846fbd82c
Issue #2726 : Autoset route startup order.
...
Change-Id: I1f4165b6eab12207cf6b6d31964e8170ebe1bddc
Former-commit-id: f76ed476c88ae9cfba55b148d11ec94dc91f494fb148d11ec94dc91f494fc6719da76b7fe7b43ee2
2014-05-06 09:46:41 -05:00
Brian Clements
0fbb5dc22a
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 02c921ed12729e717be1f545c548cc1432aa1302f545c548cc1432aa13025583c3903b8674841154
2014-05-06 09:30:07 -05:00
Nate Jensen
7cec722176
Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
...
Former-commit-id: c07a4c0069db4fc0c4d27d11e31b06596b5268d07d11e31b06596b5268d0bad26fdd7dbff03681a4
2014-05-05 16:58:44 -05:00
Lee Venable
a8864844bb
Issue #3109 - removed code that sets the Cave cursor.
...
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: a57f0e338d550668cbf7a6c2260dd1b0a251f4e3a6c2260dd1b0a251f4e3631a8d3cb1a092fd45dc
2014-05-05 16:13:31 -05:00
Steve Harris
7245029570
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: dd01a4282ba8d3f4d88573ed3251bd83368e4b4e73ed3251bd83368e4b4ecaadbd3dd9ea24d1dadc
2014-05-05 16:04:09 -05:00
Brian Clements
89fbf5f2bc
Omaha #3061 only shared display capable clients get payload in invite
...
Former-commit-id: 46b526473ddec51592161502354f87c61e30a4221502354f87c61e30a42258f45fa7d09d25e9dcb8
2014-05-05 15:29:06 -05:00
Nate Jensen
3853ef16bb
Issue #2060 fix sat precip for grid data URI removal
...
Change-Id: Iaa5144a63ff455f5c12a060a9daad0dd0bd04e58
Former-commit-id: f76ace3c9b2b6c30e67d0cf0f724f4d82f6e5ff60cf0f724f4d82f6e5ff697597c3ab109091ccf25
2014-05-05 13:06:08 -05:00
Dave Hladky
d9243205e4
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: 7d244313a50ac4de6ad0333bf8b36dccaaa1cfea333bf8b36dccaaa1cfea7611339cd893ca9cfe6a
2014-05-05 12:15:14 -05:00
Nate Jensen
dcbedcbbc0
Merge "Issue #2956 more safety checks" into omaha_14.3.1
...
Former-commit-id: a2607513bff233d104d7e9b3041170d6518bede1e9b3041170d6518bede18ee8937dafe8e971d434
2014-05-05 09:45:11 -05:00
Brad Gonzales
58fda9c22a
Omaha #3106 Updated deploy and install ant scripts to handle the 14.4.1 repository structure.
...
Change-Id: I7de7600fbcc6bb6ebc9392aef291babc086f3115
Former-commit-id: 0470903200cbcd7dcc3edf353f06f539a2ec8f46df353f06f539a2ec8f4678714c6ff7b33bd153f4
2014-05-02 13:09:57 -05:00
Richard Peter
2507aaf753
Merge "Issue #2940 Better error message for bad XMRG config in FFMP" into omaha_14.3.1
...
Former-commit-id: 98fa705dd0f38816d168dc0b598fd4132d63ac44dc0b598fd4132d63ac445314b412b48e141a137a
2014-05-02 10:05:59 -05:00
Richard Peter
0dda5a7c40
Merge "Issue #3095 Update JGridData for creation of numeric java package." into omaha_14.3.1
...
Former-commit-id: 39467f210d6bb353a05d51ba60d62b24f1c7b38551ba60d62b24f1c7b3851f7e076018592e9171e1
2014-05-02 10:05:29 -05:00
Richard Peter
4537e1276f
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
...
Former-commit-id: aeebf173734e1bc16d70478cedd3a3d4a138c534478cedd3a3d4a138c5341b7dd13525160ce06137
2014-05-02 09:50:40 -05:00
Ben Steffensmeier
ae0185a740
Issue #3095 Update JGridData for creation of numeric java package.
...
Former-commit-id: 80104eaf42956f62a6ec6bdaba048c23d6da4a186bdaba048c23d6da4a183300d8c75cd2c0499f2c
2014-05-01 18:02:08 -05:00
Richard Peter
2d597d61ab
Issue #2854 : Pack commons.lang for alertviz
...
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 36d579c2061738b065b8a9b088146cbcd87195eea9b088146cbcd87195eee1a2767f8f926cd5f6d1
2014-05-01 16:30:21 -05:00
Nate Jensen
9f08442039
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: 54c6d5d07fd759efcaa8f4d20c41f47d142d9d9df4d20c41f47d142d9d9df3b68178bd6f211aa9f8
2014-05-01 16:28:16 -05:00
Nate Jensen
834dd4895a
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 8d5ec4bb043222914fde137818d03aa73a310709137818d03aa73a31070984dbedcff5b245e49d53
2014-05-01 16:20:35 -05:00
Richard Peter
3297632b5d
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: c7f5b2363325fd0e03f44056f53fa2a4fb460e174056f53fa2a4fb460e17c3c7ebb146f364f02f58
2014-05-01 14:47:41 -05:00
Steve Harris
9a268173ac
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: d2905e51d49ecd871825c8ba70a146779e85cc77c8ba70a146779e85cc77bdf6d0b6be9a6ab8c52f
2014-05-01 13:25:15 -05:00
Steve Harris
e72b097763
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: 05d6049e3511ca44c58370ee74a311ab0b1ec04770ee74a311ab0b1ec047579eb6e47abeba75f87c
2014-05-01 12:53:06 -05:00
Nate Jensen
c617423fd7
Merge "Issue #3099 - handle empty location name lists in the data request" into omaha_14.3.1
...
Former-commit-id: dba33e281eba9ed2aba3b7536a398b96071c250db7536a398b96071c250d4c2923246adbca36c2bc
2014-05-01 12:40:41 -05:00
Brian Clements
8fc0feed89
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: eae19ec5ca93912625ea3ca4f8cc52dd5412e1193ca4f8cc52dd5412e1192337d5ef563fd504f1de
2014-05-01 12:34:09 -05:00
Bryan Kowal
5267bae3dd
Issue #3099 - handle empty location name lists in the data request
...
Former-commit-id: dfd5e3dbadff21ef813c5eac78f0e0a9b9a8b8c45eac78f0e0a9b9a8b8c42079aec2bb4775dc1f40
2014-05-01 12:12:42 -05:00
Nate Jensen
8ae67e0d7f
Merge "Issue #2854 : Reorganize deltaScripts" into omaha_14.3.1
...
Former-commit-id: b911f3e9b51d157a16e37fbdb9ff83bcb82bedc67fbdb9ff83bcb82bedc6e5eb1ab87e037fe502d7
2014-05-01 12:06:13 -05:00
