Commit graph

6285 commits

Author SHA1 Message Date
Mark Peters
d04f7dd252 Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca

Former-commit-id: e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]
Former-commit-id: e638d2f41b
Former-commit-id: b5a25e7372
2014-07-21 17:07:02 -05:00
Steve Harris
3439348ffa Merge branch 'omaha_14.3.1' into omaha_14.4.1
Former-commit-id: a5491e2d9f [formerly 6b19a1ccb5 [formerly 3dceeec9d010a590353f6ab3327743781cd014f1]]
Former-commit-id: 6b19a1ccb5
Former-commit-id: 933355b964
2014-07-17 10:40:27 -05:00
Nate Jensen
40806f74b6 Merge "Omaha #3350 Fix build...again" into omaha_14.4.1
Former-commit-id: 006642adfb [formerly 1bc55915ac [formerly 5645cbc048baa63287c6599c0774949cf363edc9]]
Former-commit-id: 1bc55915ac
Former-commit-id: b72ef26e13
2014-07-17 08:59:05 -05:00
Benjamin Phillippe
90f0d70867 Omaha #3350 Fix build...again
Former-commit-id: e99a59d8fb [formerly ad6b7cb8f3 [formerly 4ca53671a23ea0b232d17453aee12c72d8f80bce]]
Former-commit-id: ad6b7cb8f3
Former-commit-id: 8c060c7854
2014-07-17 08:53:40 -05:00
Richard Peter
4acf2dfb23 Merge "Omaha #3350 Fix Build" into omaha_14.4.1
Former-commit-id: 6054cb4b6e [formerly 4675d335f4 [formerly 362aa326ca9792cfc5507f3324d37dac74cfb106]]
Former-commit-id: 4675d335f4
Former-commit-id: 9e8c84a1c3
2014-07-16 17:03:58 -05:00
Benjamin Phillippe
6a2648c84e Omaha #3350 Fix Build
Former-commit-id: b203666598 [formerly 31e2999556 [formerly 71268a5d54542628d36f7e7ea6665761b9d4342f]]
Former-commit-id: 31e2999556
Former-commit-id: 09a62bb1cc
2014-07-16 16:54:45 -05:00
Greg Armendariz
585f28b5e6 Merge "Omaha #3300 moving 15.1.1 deltascript back into 14.4.1" into omaha_14.4.1
Former-commit-id: d410f5b2fd [formerly b787ba53db [formerly 8d25cc0eb9bc92d29fa2e4832b8fa974953a5609]]
Former-commit-id: b787ba53db
Former-commit-id: 5c8e4250a3
2014-07-16 15:26:25 -05:00
Richard Peter
20a0fd5643 Merge "Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components." into omaha_14.4.1
Former-commit-id: 74b806cbb7 [formerly 4d9c25c63e [formerly eb2dbad6c50eb770a57dcbb59ceb7a08e88b059f]]
Former-commit-id: 4d9c25c63e
Former-commit-id: 37151ec879
2014-07-16 15:05:45 -05:00
Steve Harris
5272683878 Omaha #3300 moving 15.1.1 deltascript back into 14.4.1
Former-commit-id: 74fff3659f [formerly b9a02bf34a [formerly 33cde5250c39fda59bbb08d7b8075cb5645c028f]]
Former-commit-id: b9a02bf34a
Former-commit-id: 17ec38ef34
2014-07-16 14:53:18 -05:00
Steve Harris
005d453875 Merge branch 'omaha_15.1.1' into omaha_14.4.1
Former-commit-id: 5e04680687 [formerly 308246ac7b [formerly 7605f77e2027026c83c0cc4c1e27ba617efbe70f]]
Former-commit-id: 308246ac7b
Former-commit-id: 76d548cdc4
2014-07-16 13:21:53 -05:00
Benjamin Phillippe
c74f855d31 Omaha #3350 Added user/role authentication. Added XACML authorization
Change-Id: Id307fdc04ba7a74c9e81650c7b4ba272405cf6df

Former-commit-id: 6cb73e63a1 [formerly cebfbebea6 [formerly 81d0249971d4004067b6aef672e00417ddb83b36]]
Former-commit-id: cebfbebea6
Former-commit-id: d4997f5a90
2014-07-16 10:49:24 -05:00
Brian Clements
a3f91f92cc Omaha #3373 jaxb manager refactor
api changes
reworked ogc jaxb manager to use parent class

Change-Id: I92b4cd6a48faf80462b9ca483a4f5d6cba78de48

Former-commit-id: e428f257cb [formerly e4c85f7cd5 [formerly 125c31f035057676d8c97a9b6c7a1d7b1b7f5bcb]]
Former-commit-id: e4c85f7cd5
Former-commit-id: 33684f3c97
2014-07-16 09:00:59 -05:00
David Gillingham
96f97f6b54 Omaha #3389: Add ability for deploy-install.xml to run WA-specific deploy script for standalone components.
Change-Id: I39fe60ae80c8a62b9ed6052e353e314783bba999

Former-commit-id: afc28adc7a [formerly fc715e98a5 [formerly 334cfcf418b0659b496088d7ac2b2f111cf8bc72]]
Former-commit-id: fc715e98a5
Former-commit-id: f9ca189dfc
2014-07-15 16:00:46 -05:00
Richard Peter
35b7c07625 Merge "Omaha #3184 throw incompatible request exceptions when trying to get levels on FFMP or IHFS" into omaha_15.1.1
Former-commit-id: 0a24d7452f [formerly 58628db2c5 [formerly 95816d39509fa3499494b369ad09fb026c07108d]]
Former-commit-id: 58628db2c5
Former-commit-id: 6eb299d022
2014-07-14 17:05:22 -05:00
Richard Peter
935b0c20e0 Issue #3146 Fix alert viz log statement.
Change-Id: Id55d73a77b7f408e02ea6fe6d528650839e535d0

Former-commit-id: 216d3ba749 [formerly e484749e1c [formerly deef73c921f9ba90b3db0f5793355f05ae861ffa]]
Former-commit-id: e484749e1c
Former-commit-id: 148bbebd42
2014-07-14 17:01:53 -05:00
Roger Ferrel
d989718a09 Omaha #3344 Updated import for GRID_FILL_VALUE.
Former-commit-id: 88aa28c46b [formerly 3ce6447418 [formerly d490bc82905d37ad284485d30a493c1fd7e3ed6f]]
Former-commit-id: 3ce6447418
Former-commit-id: 8fdfb4b6e2
2014-07-14 17:01:32 -05:00
Nate Jensen
355f388653 Omaha #3184 throw incompatible request exceptions when trying to get
levels on FFMP or IHFS

Change-Id: I599799cc95835708fdb48b6ce8a8e977daceff26

Former-commit-id: a1dadba524 [formerly 9c1e33521e [formerly 2fdb210c8fe8e6763b6a6422b5710c35ee7e48a8]]
Former-commit-id: 9c1e33521e
Former-commit-id: 8cc62dae6b
2014-07-14 14:25:51 -05:00
Steve Harris
a46c22c588 Merge branch 'omaha_14.4.1' into omaha_15.1.1
Conflicts:
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java

Former-commit-id: a43ffbe052 [formerly 05de3fbe54 [formerly 6d1d1a86cfb70e9ca096f59d9aadf8219efdaeb3]]
Former-commit-id: 05de3fbe54
Former-commit-id: a893b9b08a
2014-07-14 12:08:09 -05:00
Steve Harris
42123642eb Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 4df5ae5a60 [formerly 0cb8d202f5 [formerly f352b47e1d930bfe2bc46f956c781375881e41f9]]
Former-commit-id: 0cb8d202f5
Former-commit-id: 27b08f8bcd
2014-07-14 11:54:53 -05:00
Nate Jensen
a67b7a3005 Merge "Omaha #3371 all subprocesses now killed when cave.sh is killed" into omaha_14.4.1
Former-commit-id: 9f58d2e08b [formerly 2531649c55 [formerly 97a0d0d8be7dd87e472dc0422a68df94d43095e1]]
Former-commit-id: 2531649c55
Former-commit-id: a55162c74b
2014-07-14 11:15:01 -05:00
Brian Clements
481e503df9 Omaha #2587 update script to set reftime as non null in db
Change-Id: Ibcfb61b607645fcbb91e793f2088c8fb7432ecf4

Former-commit-id: faa29355b0 [formerly 2a5af8ce1f [formerly dfafe89ab5cb4589d2408564b82a03adc9fc1143]]
Former-commit-id: 2a5af8ce1f
Former-commit-id: fbf4111d6c
2014-07-14 08:40:37 -05:00
Brian Clements
d6e181d301 Omaha #3371 all subprocesses now killed when cave.sh is killed
Change-Id: Ibceb3f8c8902b9df94b16fac83db69b0c4dcccc2

Former-commit-id: ae5fa893a9 [formerly 7e70fbda27 [formerly e4becce5325aad266fd93548d27e5e122b145011]]
Former-commit-id: 7e70fbda27
Former-commit-id: 0973e5ac41
2014-07-14 08:05:18 -05:00
Richard Peter
90d2108293 Merge "Omaha #3379 Removing DWR" into omaha_14.4.1
Former-commit-id: 1c40dc11ef [formerly 0222a89cd4 [formerly 1ed0d8bf50a7a043f9e91afb2bbc849c4399557e]]
Former-commit-id: 0222a89cd4
Former-commit-id: 88419fb8f3
2014-07-11 17:46:14 -05:00
Brian Clements
f969720868 Omaha #3333 added grid lightning to cave
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 29fc7e7ec4 [formerly a50f1e8e70 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]
Former-commit-id: a50f1e8e70
Former-commit-id: 555251982b
2014-07-11 12:18:05 -05:00
Benjamin Phillippe
e613cb932e Omaha #3379 Removing DWR
Former-commit-id: 4e1d93abf8 [formerly d110e8428b [formerly a6c52bb0cc501ed55f4f07cc1ff2c1747f713a2e]]
Former-commit-id: d110e8428b
Former-commit-id: cc9e9b427a
2014-07-11 11:56:44 -05:00
Brian Clements
f24c94b118 Omaha #3364 added jmap -heap to capture script
Change-Id: Iec03ca13ce0b3a63779162d14d358ae81db97153

Former-commit-id: d5506736df [formerly 82cf017cbe [formerly 65c88529acfb31c408777337f456da5dce879146]]
Former-commit-id: 82cf017cbe
Former-commit-id: 146318e49e
2014-07-11 10:20:48 -05:00
Richard Peter
e84e988c7d Merge "Omaha #3318 Delta script for GEFS h5 file updates" into omaha_14.4.1
Former-commit-id: 98d7cbab0d [formerly c3740f0f11 [formerly b5d7d388acb17911b4592182884ac8bfac687c4f]]
Former-commit-id: c3740f0f11
Former-commit-id: 57318e4446
2014-07-10 17:47:50 -05:00
Nate Jensen
abd06c4d76 Merge "Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh" into omaha_14.4.1
Former-commit-id: f92d9eb817 [formerly 68170f4a3e [formerly c114f3578804f9eb2fd130428bb327c968f0fbdf]]
Former-commit-id: 68170f4a3e
Former-commit-id: 205b90cb24
2014-07-10 17:02:48 -05:00
Nate Jensen
a19c2dde43 Merge "Omaha #3165 update manifests for ll.netcdf rename" into omaha_14.4.1
Former-commit-id: b267109497 [formerly ffa31a72ab [formerly 599f7a6d2eff8723cbf515b14afefc270f42cdd0]]
Former-commit-id: ffa31a72ab
Former-commit-id: c3e7b245af
2014-07-10 16:32:02 -05:00
Brian Clements
ed03db05ea Omaha #3363 fixed ini lookup precedence and improved loggin in cave.sh
Change-Id: Ib710d0720a36791d00018e3a4905d27b0b435298

Former-commit-id: 0113e109d3 [formerly 871a8655c8 [formerly e89daec94625b33f20fc6a9106a63202f4bc7075]]
Former-commit-id: 871a8655c8
Former-commit-id: 987d514fa3
2014-07-10 16:31:11 -05:00
Roger Ferrel
c9601b1194 Omaha #3318 Delta script for GEFS h5 file updates
Former-commit-id: 9eaeb01624 [formerly d007725e9a [formerly 2e6eeaeac3018a34bf5a471f4ebcae58e608fbca]]
Former-commit-id: d007725e9a
Former-commit-id: 577790589f
2014-07-10 16:30:03 -05:00
Everett Kladstrup
4abb66a103 Omaha #3165 update manifests for ll.netcdf rename
Former-commit-id: febe13a241 [formerly 4e3b76ae29 [formerly 434ab5131e44d772d04c029833e2979fc19b6421]]
Former-commit-id: 4e3b76ae29
Former-commit-id: 9cf007e546
2014-07-10 16:19:42 -05:00
Bryan Kowal
7220057d30 Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration.
The WA-specific directory is assumed to be in the edex directory of the work assignment and named deploy.edex-${NAME} where ${NAME} is the name of the Work Assignment.


Former-commit-id: 49ffec76ff [formerly 984842331d [formerly 146e5ebed335bf25cbae152eef1b0544e833f741]]
Former-commit-id: 984842331d
Former-commit-id: 32aa07f1fc
2014-07-10 11:16:19 -05:00
Nate Jensen
61fa1f41f0 Omaha #3165 fix bad manifests
Change-Id: I9cef6a2086a7688fa5db412073af2b565396958a

Former-commit-id: eef97e7ec0 [formerly c323b72f48 [formerly 4792e114d091b244b46d54b0846b8535583e4068]]
Former-commit-id: c323b72f48
Former-commit-id: b874c80f93
2014-07-10 09:20:24 -05:00
Ron Anderson
6ead047f79 Issue #3146 Added check for duplicate smartInit.
Added alertViz message for GFE site activation failure

Change-Id: I68a2b995922ac9ba7e75d02f317357fddde7f004

Former-commit-id: 468668e19b [formerly 0c0739bd72 [formerly eafc406ec75d5e1a1bbc93bb0b472a053922eb3a]]
Former-commit-id: 0c0739bd72
Former-commit-id: 9f4e89347a
2014-07-09 16:42:43 -05:00
Brian Clements
fc246aa082 Omaha #3214 fixed cache object usage in lightning resource
pulse and cloud flashes were not updated properly in the cache

Change-Id: Idf17aeb444f93c73901c26da9640f0a8f4a6a486

Former-commit-id: ac8f861112 [formerly 994226e82b [formerly 206fd1556b6b7bdfcf432b0c13af9b38d1f1d393]]
Former-commit-id: 994226e82b
Former-commit-id: dba1fb3fc1
2014-07-09 14:13:47 -05:00
Nate Jensen
c3619bf0e6 Merge "Omaha #3361 reduce number of extraneous localization requests at GFE startup" into omaha_14.4.1
Former-commit-id: 2a18111bdc [formerly 9f7aef5f3e [formerly 56263f9c5dbc38d838e8da5df252ba5043f846ab]]
Former-commit-id: 9f7aef5f3e
Former-commit-id: 011089ab35
2014-07-09 09:47:07 -05:00
Nate Jensen
93012a8b76 Omaha #3361 reduce number of extraneous localization requests at GFE
startup

Change-Id: Ib33eadd0ef11ad0ef778538061c53ee88e4228ed

Former-commit-id: 5547ea1c7d [formerly 0c397d2b7e [formerly efa10ca2702ecee4535711be06373e5d079ac117]]
Former-commit-id: 0c397d2b7e
Former-commit-id: c3bd61a2c0
2014-07-09 09:24:31 -05:00
Nate Jensen
a226c1fde5 Merge "Omaha #3357 Ingest JVM shouldn't pull in DPA beans Change-Id: I59d0cf13a7704499093b401328bda5867197c525" into omaha_14.4.1
Former-commit-id: b9b26f1b54 [formerly 25f5e8f2e0 [formerly a1a17c4757be0a60d6634384e5de1cbfd611096d]]
Former-commit-id: 25f5e8f2e0
Former-commit-id: c818bca5c3
2014-07-08 13:29:37 -05:00
Dave Hladky
8434edf807 Omaha #3357 Ingest JVM shouldn't pull in DPA beans
Change-Id: I59d0cf13a7704499093b401328bda5867197c525

Former-commit-id: a0d305355b [formerly 53f26636f7 [formerly 4a5e3dc51e01bfb1fa6c50df7ba4f1a65bac9ba1]]
Former-commit-id: 53f26636f7
Former-commit-id: 36b0428ff9
2014-07-08 12:29:04 -05:00
Bryan Kowal
ee4b7c4ee8 Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: 6a197f845d [formerly 98a310f4a7 [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]
Former-commit-id: 98a310f4a7
Former-commit-id: 58a2ae8bc8
2014-07-08 09:31:21 -05:00
Ben Steffensmeier
ea41558db5 Merge "Omaha #3356 remove common register buddies to uf.viz.core" into omaha_15.1.1
Former-commit-id: 9eb9abd3f4 [formerly 3bbf29f639 [formerly 98cc84304173c5a8ae366b8a60273f46d97bf2ee]]
Former-commit-id: 3bbf29f639
Former-commit-id: 3394a6230e
2014-07-07 18:48:49 -05:00
Nate Jensen
356a23ce94 Omaha #3356 remove common register buddies to uf.viz.core
Change-Id: I8da0d7bb51c7aa3585c29ada43ba9d6470ec41e4

Former-commit-id: 886aee2bf9 [formerly 5148898b23 [formerly 3fc986e2d7b24a6a3a9642a9bb0c71b296573a68]]
Former-commit-id: 5148898b23
Former-commit-id: 57635e6f3f
2014-07-07 17:32:37 -05:00
Brian Clements
392b640b47 Omaha #3333 removed redundant field from viz lightning
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978

Former-commit-id: e4795f6a13 [formerly 572d95e78a [formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]
Former-commit-id: 572d95e78a
Former-commit-id: 91b136c2a0
2014-07-07 15:13:28 -05:00
Brian Clements
c024dd86a1 Omaha #1255 fixed collaboration colors
config.xml was not in build.properties
provided a fallback default if config is missing

Change-Id: I9e531b210d6bbe48ce5daf8a760b0bbcf2daa3c6

Former-commit-id: da53d9ccc7 [formerly 0d4cd4bab8 [formerly 5ee2e28b8eb94174c7fce660cccc4a77345617a4]]
Former-commit-id: 0d4cd4bab8
Former-commit-id: aeb093ad95
2014-07-07 12:29:12 -05:00
Richard Peter
1dca75e12d Merge "Omaha #3318 Changes to add GEFS to volumen browser." into omaha_14.4.1
Former-commit-id: 8c17e9cef2 [formerly ba1bd20407 [formerly 3bbe66d8fe2faacc90c695822b61ffad9de0041f]]
Former-commit-id: ba1bd20407
Former-commit-id: 4219dbeec8
2014-07-07 09:39:28 -05:00
Richard Peter
c2deb63b76 Merge "Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response" into omaha_15.1.1
Former-commit-id: 06a1d1555c [formerly 42ec8874c8 [formerly 6d960e34632c2f615720c0550296d38feb8c90f6]]
Former-commit-id: 42ec8874c8
Former-commit-id: 4312c9c569
2014-07-07 09:30:09 -05:00
Richard Peter
16e6f93285 Merge "Omaha #3350 Removing OBE classes/files for registry user registry and identity management" into omaha_14.4.1
Former-commit-id: 98d82de231 [formerly a50a5b1663 [formerly 0312ae103ee4dedea47c9ede9bb5651629e5a5b9]]
Former-commit-id: a50a5b1663
Former-commit-id: 8a5608d851
2014-07-07 09:21:02 -05:00
Ron Anderson
56389537c2 Omaha #3149 Limit number of grids returned by GFE to constrain size of Thrift response
Change-Id: I525cb3a69128425f8dddede0d3b32d44937613bc

Former-commit-id: 24faa48233 [formerly 8d50f9d15a [formerly 1e9e5abc477785c5b8cda9dd214da7de83532b9f]]
Former-commit-id: 8d50f9d15a
Former-commit-id: fd16321f82
2014-07-07 09:02:14 -05:00
Roger Ferrel
045cd846ec Omaha #3348 Handle Enter event on Open's tree and text field.
Change-Id: I3409e7cdee6c97d7d7f2c320ba0ac233fbf602d4

Former-commit-id: f064f0d102 [formerly 6305bfdcb6 [formerly 29cc43c5f9b43a51b24b702f04f0a62fab1bd356]]
Former-commit-id: 6305bfdcb6
Former-commit-id: 1964c7c4f7
2014-07-07 08:52:50 -05:00