Ana Rivera
f94b97d128
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Change-Id: I1d6fac5acc7e468e2ff5f79869201018d849d209
Former-commit-id: 46215020b2461db8a395420132b39646215020b2461db8a395420132b3966191c93a9c420132b3966191c93a9c163822ed83726045354bd8b54a59cf85de48c8bfcb4300775b
2015-02-11 22:00:40 +00:00
Fay.Liang
0b0f41fa37
Merge branch 'master_14.3.2' into master_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/util/DailyQcUtils.java
edexOsgi/com.raytheon.edex.plugin.gfe/.settings/org.eclipse.jdt.core.prefs
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTableSrv.java
edexOsgi/com.raytheon.uf.edex.datadelivery.service/src/com/raytheon/uf/edex/datadelivery/service/services/overlap/SubscriptionOverlapHandler.java
rpms/awips2.core/Installer.java/1.7/component.spec
Former-commit-id: 4bcae42022e3107ce1e459f3f871904bcae42022e3107ce1e459f3f8719043c7161dcf59f3f8719043c7161dcfee6acc8fdd149102ec850b98fc8be62d5858f8f031607db1e1
2015-02-09 17:19:41 -05:00
Greg Armendariz
76bbe51da6
Omaha #3839 - Add script to /awips2/edex/bin/
...
Former-commit-id: d8eca1c90aefbdfa504b25cb96ec19d8eca1c90aefbdfa504b25cb96ec19bb8a61a99625cb96ec19bb8a61a996d8a5867989c3b4d790a3d405e4bfe1956a8fd092b0121df3bc
2015-02-04 09:59:06 -06:00
Greg Armendariz
05647adcaf
Omaha #4065 - Update EDEX RPM install to modify date stamp
...
Change-Id: I425408d1d038194207469f187be74f8c88f5d3c0
Former-commit-id: 290192e2d619d79f71d38c38289cf7290192e2d619d79f71d38c38289cf7fbadd1deb18c38289cf7fbadd1deb15538a3bd3c6a7891d660a3d4342498fdf1408c06e3f22bed4c
2015-02-03 10:12:54 -06:00
Fay.Liang
bccf70f0bd
ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
...
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
rpms/awips2.core/Installer.postgres/component.spec
rpms/awips2.core/Installer.python/component.spec
rpms/awips2.core/Installer.tools/component.spec
rpms/python.site-packages/Installer.h5py/component.spec
rpms/python.site-packages/Installer.matplotlib/component.spec
rpms/python.site-packages/Installer.nose/component.spec
rpms/python.site-packages/Installer.pupynere/component.spec
rpms/python.site-packages/Installer.qpid/component.spec
rpms/python.site-packages/Installer.scientific/component.spec
rpms/python.site-packages/Installer.scipy/component.spec
rpms/python.site-packages/Installer.shapely/component.spec
rpms/python.site-packages/Installer.tables/component.spec
Former-commit-id: 19a29da5de6b77894bd0c6bd5d767519a29da5de6b77894bd0c6bd5d7675eed6737801c6bd5d7675eed673780123ba9f4154f3ecae85735cc8e5b4af06ac6b396e1e9024ede9
2015-01-12 13:03:31 -05:00
Qinglu.Lin
25a8e87b9a
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
...
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 0eb9f8c7222d4a045e3c3b3780fd130eb9f8c7222d4a045e3c3b3780fd13baa96590f13b3780fd13baa96590f17cb4e6f236f4d78ec480cae57983d8484799b7f54caef3c695
2014-12-17 16:53:31 -05:00
Brian Clements
f2481c2d2f
Issue #3935 prevent warning when using init.d script to stop edex
...
Change-Id: I61d4ed16e76b38d69e2a71549ce31035f4837b03
Former-commit-id: 80c720eac006d82c9f4ed2774cffc280c720eac006d82c9f4ed2774cffc26ae64007a2d2774cffc26ae64007a24aa912075314a6f678ca53f28e0b75db5e0013a86794196b7c
2014-12-17 14:35:16 -06:00
Bryan Kowal
d66c1a0d43
Omaha #3508 - remove references to yajsw in %files
...
Former-commit-id: 121f1068ca16a33efd8b9e55db1c52121f1068ca16a33efd8b9e55db1c529e77b9635e9e55db1c529e77b9635ee1a62ff16756449016347575599185cc4ee082443ec292bebb
2014-12-05 10:04:42 -06:00
Bryan Kowal
0c1ec8e447
Omaha #3508 - purge non-centralized yajsw distributions
...
amend: ensure edex is dependent on yajsw
Change-Id: I31ecdaa27d6bffbcd52ff69a413ea87190e9ea55
Former-commit-id: 2d7a7eff76cf5353e36871cf3136662d7a7eff76cf5353e36871cf3136660894efaaa371cf3136660894efaaa377df8dc2553c95967633ccb7cead64d55f5e0c638ac5284fff
2014-12-04 17:33:43 -06:00
Nate Jensen
4d5d6f8f16
Merge "Issue #2984 another attempt to fix build" into development
...
Former-commit-id: 8a1e3a9bef7f56e20c035424ffb8508a1e3a9bef7f56e20c035424ffb85026b20a770a5424ffb85026b20a770ab63c42673f0c82511428cf3e9e9020146d8259db9621b9f8bf
2014-04-15 13:27:29 -05:00
Nate Jensen
7b1ac642f8
Issue #2984 another attempt to fix build
...
Change-Id: Ie7a678bc9b56072e0c5d7d4b9f5cbefc99a9ebfb
Former-commit-id: fc8be532a1cb406ef865a2354a1d2afc8be532a1cb406ef865a2354a1d2a09305d263ea2354a1d2a09305d263ef0ea970f513186527f1860b8b6e4ad529939f3d3eb9fba0305
2014-04-15 13:16:17 -05:00
Richard Peter
c37f234cb0
Issue #2726 : Fix context mappings for topics
...
Change-Id: I636883170c5061cdaf42cbfafffdd4b4b7e3e23f
Former-commit-id: bb04dd7885f533275291ecbd0d5720bb04dd7885f533275291ecbd0d57204ac996336eecbd0d57204ac996336ec54607083fd40449dae935b8b8bc15100a0d3bbdc4edd6fd84
2014-04-15 12:49:15 -05:00
Richard Peter
47cfb79a36
Issue #2726 : Fix edex_camel to wait for process to finish on stop, add logging of service calls to log files.
...
Change-Id: Ie1e8fce80e7e06b294e01deaf9174a6fb7180d5d
Former-commit-id: 63c484cf1445e6301b914709e66b3463c484cf1445e6301b914709e66b34fa25d553844709e66b34fa25d55384a0c08e67ea7e3e0fb984fa5c0f71ad4ed2eb3b0364c9dbb764
2014-04-15 11:50:28 -05:00
Nate Jensen
e7c0adcec7
Issue #2984 attempt to fix build
...
Change-Id: I1447939ec3950425ef5b052e65e464a1ac99257d
Former-commit-id: f39f61518fce585ca9e44aaa7c7096f39f61518fce585ca9e44aaa7c7096456359ab1a4aaa7c7096456359ab1ae91352d8a80177329d67f6b3c3c05fc5ad3ae2a224e970b87a
2014-04-15 09:57:11 -05:00
Bryan Kowal
87750ddaef
Issue #2422 - Merge branch 'omaha_14.1.1' into development_on_RHEL6
...
Conflicts:
cave/build/alertviz/customTargets.xml
cave/build/p2-build.xml
edexOsgi/com.raytheon.uf.edex.distribution/src/com/raytheon/uf/edex/distribution/DistributionSrv.java
edexOsgi/meteolib.jni.linux64/libmeteoLib.so
javaUtilities/build.wes2bridge.utility/wes2bridge/customTargets.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
nativeLib/ncep_grib2module/.cproject
nativeLib/rary.meteorological/.cproject
nativeLib/rary.meteorological/src/dcapeFunc.c
rpms/awips2.cave/Installer.cave-etc/component.spec
rpms/awips2.cave/Installer.cave-feature/component.spec
rpms/awips2.core/Installer.aviation/component.spec
rpms/awips2.qpid/0.18/deploy.builder/build.sh
rpms/python.site-packages/Installer.qpid/component.spec
Former-commit-id: 3b7573154cbb5acf7c11c125b5b0533b7573154cbb5acf7c11c125b5b0539829477cedc125b5b0539829477cedf7009e8d150f825df590ef789bf9120efd4c7c507bd9ea3d30
2013-09-30 18:00:31 -05:00
Bryan Kowal
147412207e
Issue #2163 - RHEL6 14.1.1 build updates
...
Former-commit-id: 861a88708417d652a8dd9415560b38861a88708417d652a8dd9415560b38ab3485a3ed9415560b38ab3485a3edece1f596c6751f00522817b8ded0826de01af674a8898ec348
2013-09-03 13:46:19 -05:00
Everett Kladstrup
b04c00446e
Issue #2240 Fix incorrect environment assumptions
...
* using $awips_home as the prefix for java/python/psql causes
problems on edex-environment (wes2bridge) installs; where
$awips_home does not contain the java/python/psql installs, instead
they are located at /awips2
Change-Id: Iadfe6c2b2ca1a1d9e55bb9cfc73ed6042e6fdcee
Former-commit-id: 07f18003f12803eded49535248b69b07f18003f12803eded49535248b69bfba53e9fe3535248b69bfba53e9fe338a8d8268fb602d373576883cdc38908bbf8620aeb14f5a5fe
2013-08-16 11:02:15 -05:00
Bryan Kowal
67a52cd7b0
Issue #2163 - remaining RHEL6 RPM changes
...
- Amend: update build.sh to build the full set of rpms
Change-Id: I182f23ffc67f2dc84a0e5436b2830311e29f534f
Conflicts:
rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0
Former-commit-id: 23fb13a41c7d7511af9b19d80d96c323fb13a41c7d7511af9b19d80d96c3c0458d512d19d80d96c3c0458d512d2a9f4d41c9f68943aeef6b305d4ea35b55bd8c72a3f3f45f4b
2013-08-15 15:39:37 -05:00
Greg Armendariz
df73c0e2e9
13.5.1-6 baseline
...
Former-commit-id: e375a74bc858948539967e09fa5a0be375a74bc858948539967e09fa5a0bb9044b11957e09fa5a0bb9044b1195f23d42e97793b71934c012a09f9aa7ec2637676db601345c9f
2013-07-10 10:04:22 -04:00
Steve Harris
9f5469bc6e
13.5.1-4 baseline
...
Former-commit-id: 2487a8b435c56be8a33270e4ff30a62487a8b435c56be8a33270e4ff30a6e197f23ce370e4ff30a6e197f23ce343bb696901640b022e84f658320357c183e08922c05a6c8b50
2013-06-28 09:46:25 -04:00
Steve Harris
d3517d7c1d
13.5.1-3 baseline
...
Former-commit-id: a0ff6c20ead8176d4a4c63803c1424a0ff6c20ead8176d4a4c63803c142472d22a30c963803c142472d22a30c9e1a5587dd0deebdb874a810388f00a1e939939b550d4376af7
2013-06-24 09:29:43 -04:00
Steve Harris
97a4c59662
13.5.1-1 baseline
...
Former-commit-id: 5d99df99696384018950998961612c5d99df99696384018950998961612cfe872355a7998961612cfe872355a743b7a9b4100aab285b8a30ba1d634e146c5e8940859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
603bc2535a
13.4.1-11 baseline
...
Former-commit-id: 65d8f51034d6319a2ca62edee3615865d8f51034d6319a2ca62edee36158c0376ce9ed2edee36158c0376ce9ed5db95cce554d888635156df093ef482767fd893cd9f967c811
2013-05-21 09:19:25 -04:00
Steve Harris
a2c35a5f3f
13.4.1-7 baseline
...
Former-commit-id: 81bc07bff48072752c774c6ff79e7181bc07bff48072752c774c6ff79e718347bed50e4c6ff79e718347bed50e6e1e454a9fff7a21ac37b35027f661dffa6d3bdcc7c6ea343e
2013-05-13 12:58:10 -04:00
Steve Harris
fd735b8ff8
13.3.1-12 baseline
...
Former-commit-id: 6f374b35d0be962822070be473728a6f374b35d0be962822070be473728aaaac0b51e50be473728aaaac0b51e5bb30a41300f80f98cee2bc439aee4ff1d156779a120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
b92dfd1b62
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccadce726fadc7d9be4dce2147cc08ac79547c1dedd12779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
3e63f280a2
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775adfe763963e982a1ed77a4dbcae57f5705bdc0ecd2b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3ae8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb382cdde8491cd4185ef5c941337c553b6fa9b4858f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54c77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac39428d9faed979f7fb0b17bd572824561cb9b5c2094ed2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
31353e2296
12.9.1-1 baseline
...
Former-commit-id: b9fb1c89d48309193ce931ae7ea218b9fb1c89d48309193ce931ae7ea21879ce6cfd9731ae7ea21879ce6cfd97d3023f15acaed7a644df0c5d9e241663bcadf12116d7d955fc
2012-08-15 13:59:00 -05:00
Steve Harris
1098368e19
12.8.1-5 baseline
...
Former-commit-id: 2e804fc8c42653ddc2e3fd2abfb6f12e804fc8c42653ddc2e3fd2abfb6f1cd49ef3edafd2abfb6f1cd49ef3eda4f47148ceddab00b12e6e0c3722fd1e86949a8d3d3be09bd74
2012-08-01 10:45:37 -05:00
Steve Harris
23dc8deeb0
12.7.1-8 baseline
...
Former-commit-id: b242dd98d611f96dbedd16bf591a33b242dd98d611f96dbedd16bf591a33c42ae0fa3916bf591a33c42ae0fa39e1eb7f5972f2102bfb249f971829649aabe438b936e2ad3023
2012-07-19 16:20:40 -05:00
Steve Harris
46068c6716
12.5.1-15 baseline
...
Former-commit-id: 2f10c7a1e48552902906b13cbb7e002f10c7a1e48552902906b13cbb7e003904c4ccf5b13cbb7e003904c4ccf51f521a70b397c4db937e676ea3192f9054c5ab6c39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
5b35d8a6e0
12.4.1-4 baseline
...
Former-commit-id: 4767b0e069750b7543dd67a5a683004767b0e069750b7543dd67a5a683002a216f333c67a5a683002a216f333c98d8b3f188a2a6a18faea4e519f3cd8cd5974f4c74b66d9683
2012-04-18 15:18:16 -05:00
Bryan Kowal
4f320a2de2
Issue #202 - remove obsolete edex prefix verifications.
...
Former-commit-id: 48d5fd8ee6475849bd911e3e31a65748d5fd8ee6475849bd911e3e31a657c2cd292c321e3e31a657c2cd292c322fa51704a0d4367098a749a30a5b1a8350501de448f3f1e2d7
2012-02-23 16:46:48 -06:00
Bryan Kowal
a9438f6213
Issue #202 - no longer attempt to build awips2-edex-ncep-nsharp.
...
Former-commit-id: e723d502444881def0e9bae0cb555ee723d502444881def0e9bae0cb555ee135f4508dbae0cb555ee135f4508d70afebc3a9fa23b673c45c86773a774a78479648511f0efe24
2012-02-23 14:20:50 -06:00
Steve Harris
587c928f4e
Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
Seems to have solved itself or was not actually a conflict
Former-commit-id: 0be3703c7e4981170462dcadf7baa40be3703c7e4981170462dcadf7baa486e586befedcadf7baa486e586befefbb5de922a4eb1ef5b0f938dc5b21c2c958713b693d99ca49c
2012-02-23 12:38:55 -06:00
Steve Harris
3a4af24369
Merging SS OB12.2.1 into ss_sync
...
Former-commit-id: 829d2791e98da36046dec8aae98741829d2791e98da36046dec8aae9874154be9660f1c8aae9874154be9660f113a3edd4f6b55a488ed84450cf896315c56d11bc978d22db50
2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8
Merge branch 14-NCEP into 'ss_sync'
...
Former-commit-id: a811ac888f85075e610794c2ea985ba811ac888f85075e610794c2ea985b9995d22e2594c2ea985b9995d22e25139d42c594610fdf3f4eaaead73ec5156ad8471d01d72ca3c9
2012-02-22 10:12:49 -06:00
Steve Harris
f0c1c03fff
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: eda787edead971880b98cabf9fd956eda787edead971880b98cabf9fd9565e9d2dd367cabf9fd9565e9d2dd3672e0f1d3eccb12f5e5d7533483f3960acd7845ebdbcccffbaa4
2012-02-20 13:03:39 -06:00
Bryan Kowal
3476936eac
Issue #202 - fix deploy-install and the edex-cots rpm specification in test_sync.
...
Former-commit-id: eda0f92b175754f9dfd810a0ca252deda0f92b175754f9dfd810a0ca252d682c10767d10a0ca252d682c10767de326a29d2fcc8c6597a22ba23624b48403801a2bce9165ce58
2012-02-17 12:17:14 -06:00
Bryan Kowal
8590880e2f
Issue #202 - make edex-cots specs compatible with the branch.
...
Former-commit-id: 30ef4b72b8a19dd6ff337ca62dc7d630ef4b72b8a19dd6ff337ca62dc7d61855bbcbee7ca62dc7d61855bbcbeeafed3a624588b67b497727c4557e0a8cef173e1d3e8caa6467
2012-02-09 12:14:37 -06:00
Bryan Kowal
94a4de607b
Issue #202 - no longer build edex-ncep-nsharp for the ncep branch.
...
Former-commit-id: d885bdcb6eb6a8534258998337f9f4d885bdcb6eb6a8534258998337f9f42554090d0d998337f9f42554090d0d53dd09e1d1b271da085c2745f9cac7bafb26c8be1c9ee91f6c
2012-01-30 16:01:45 -06:00
Bryan Kowal
a89f0a64f0
Issue #202 - restoring rpm directory to ss_sync.
...
Former-commit-id: d537df4ab04453ad2d1065e1e4ee0bd537df4ab04453ad2d1065e1e4ee0bea1c82452b65e1e4ee0bea1c82452b69f4822ad19f6780c4dd7f1b468010dafb6b18d8bb662ca175
2012-01-20 13:38:00 -06:00
Matt Nash
515196cb86
Moving 12.1.1 into ss_sync
...
Former-commit-id: d8da2252c3580e2938d766be3bec40d8da2252c3580e2938d766be3bec40c83e5ff47466be3bec40c83e5ff474fa4cd88c9082300ccdcf21d2361f001faae4248421d2361f00bcc32c10bc
2012-01-19 11:53:12 -06:00
Bryan Kowal
5c81820a8a
Issue #34 - merging build changes originally made for the new svn transition into git.
...
Former-commit-id: 48c7c3b95063f6f44fe143c3807a3248c7c3b95063f6f44fe143c3807a329d64e1df1243c3807a329d64e1df12f19cf1c4ee281be5e0b79ceb347a7706187b93be9ceb347a775d92644c26
2012-01-18 16:00:45 -06:00
root
7dbd17a5aa
Initial revision of AWIPS2 11.9.0-7p5
...
Former-commit-id: 133dc97f67a02aeb236c9f19e3f712133dc97f67a02aeb236c9f19e3f71206a8b51d6d9f19e3f71206a8b51d6d9bb8decbcf8e80217e59377dcd10b93360eb6c5f377dcd10b9e2ecdcfe33
2012-01-06 08:55:05 -06:00
