Commit graph

190 commits

Author SHA1 Message Date
Bryan Kowal
e005f18132 Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: 875c17399a [formerly f806c880d3] [formerly d081a2afcd] [formerly 4faf8aefbe [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]]
Former-commit-id: 4faf8aefbe
Former-commit-id: 7cd233f6e540666556c9d7a93a89b4d6dfd51ec6 [formerly 497bf33892]
Former-commit-id: c4709b1bfb
2013-02-28 18:09:25 -06:00
Bryan Kowal
6f57b06d52 Issue #1638 - update CAVE rpm name generation
Change-Id: Ia574741cfbe5765875924c27848d41ff7b82379f

Former-commit-id: 37e9c0cb20 [formerly a9123a2b84] [formerly b8496877ff] [formerly 5eb888fb98 [formerly b8496877ff [formerly 7cf0100415245ae81fa232e398936fe33a2b1bc3]]]
Former-commit-id: 5eb888fb98
Former-commit-id: 16e35fbbb02090042f28676c5c7015864604ab11 [formerly 22acca8f3d]
Former-commit-id: da0d99d22f
2013-02-28 14:43:53 -06:00
Richard Peter
f3528bedea Merge "Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm" into development
Former-commit-id: bcd6b4d82b [formerly b354ebb862] [formerly 6c766ddd85] [formerly 84e1b2f999 [formerly 6c766ddd85 [formerly d89e15dc9528bfbc67f67cc1d8a2989e7390131d]]]
Former-commit-id: 84e1b2f999
Former-commit-id: 1d88c5c600f75ba32fbd740729eacc1432ef74f4 [formerly 9fa37933e6]
Former-commit-id: 0f1c3dd256
2013-02-27 11:43:18 -06:00
Steve Harris
f30d1cdf87 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 90b0bab156 [formerly 0a4564eb97] [formerly 67f090638f] [formerly 6ec9e73035 [formerly 67f090638f [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: bd72fedeff4f0ceca04ec0a96bb50b7706e7a460 [formerly 0051276ad1]
Former-commit-id: e46625f8f2
2013-02-25 15:58:48 -06:00
Bryan Kowal
ec53fa98cd Issue #1634 - force added wrapper jars in bin directory
Change-Id: If9bee93b5893fb8ecc244045fa0672d3f5b92f48

Former-commit-id: 6f419ae22f [formerly 4cd5453e0a] [formerly 7c62991edf] [formerly d5c8b82941 [formerly 7c62991edf [formerly 4f07f09e39949f6323dac4688913e02672a17fd8]]]
Former-commit-id: d5c8b82941
Former-commit-id: e7559e2861931ac623033c77973bf5ebff63f7c9 [formerly 5a5914c010]
Former-commit-id: 53b9e69868
2013-02-22 09:28:37 -06:00
Steve Harris
7e48d3e684 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: abdc733151 [formerly 64744fdb19] [formerly a0573644c4] [formerly 2641d578e2 [formerly a0573644c4 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4a25bf4d6d77c9356aa1e74660e835a98a31e78b [formerly 33dd2589f1]
Former-commit-id: 4f155a183a
2013-02-21 15:41:39 -06:00
Bryan Kowal
6a47017449 Issue #1634 - replaced tanuki java service wrapper with yet another java service wrapper
- disabled the startup of the admin web application in the jetty container
- removed configuration and libraries specific to the tanuki java service wrapper
- updated the rpm build and developer deployment
- added jetty-util-6.1.26.jar to resolve a dependency on org.mortbay.log...


Former-commit-id: 0d4a63efe4 [formerly 519ce2c0fb] [formerly a8fb04f41c] [formerly 803397c7c7 [formerly a8fb04f41c [formerly a5d554c271b87fa6d6b264ebb677802b58ebb763]]]
Former-commit-id: 803397c7c7
Former-commit-id: 6195241ffacf1c8bdcb22aae44f96bfee0eedf78 [formerly 450e8e7a4c]
Former-commit-id: b2a0a7c148
2013-02-21 13:55:28 -06:00
Steve Harris
db712e1fcf 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]
Former-commit-id: e4435815c9
2013-02-20 16:19:40 -06:00
Steve Harris
bca88ba9c7 Merge branch 'omaha_13.2.1' (13.2.1-8) into development
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]
Former-commit-id: d123c044c3
Former-commit-id: d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]
Former-commit-id: 81f1fb83a0
2013-02-19 12:22:00 -06:00
Steve Harris
435be40166 Merge "Issue #1632 - new FOSS licenses added for Data Delivery plugins" into omaha_13.2.1
Former-commit-id: fcef63a7af [formerly b8720e185d] [formerly 1874b07ab4] [formerly 6318348e3b [formerly 1874b07ab4 [formerly c397745e9c36a88bf71d87b671f0a8c826e117ea]]]
Former-commit-id: 6318348e3b
Former-commit-id: b6bfbd19eba2539cd1cfc863faeaf188664f3a8f [formerly 4777c782e2]
Former-commit-id: 85fa1539ef
2013-02-18 09:52:22 -06:00
Steve Harris
6c16384c5c Issue #1632 - new FOSS licenses added for Data Delivery plugins
Former-commit-id: 0e7cd27efc [formerly 049c219f2b] [formerly 02ec634536] [formerly b9ce5b8b35 [formerly 02ec634536 [formerly 82d2a8bdfe9a82cce28637153c8cbb169bd1aa5a]]]
Former-commit-id: b9ce5b8b35
Former-commit-id: 93562620757b43bfd2d1bd9159c4db359d64f1ad [formerly 3c3681420e]
Former-commit-id: 7a9501de55
2013-02-18 09:39:31 -06:00
Steve Harris
db02d32440 13.2.1-8 baseline
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]
Former-commit-id: 053156f02e
Former-commit-id: 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]
Former-commit-id: 8cffb55371
2013-02-18 09:09:41 -06:00
Bryan Kowal
72d844d751 Issue #1576 - all of the qpid broker-plugins will now be built and included in the qpid broker rpm
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used
- source jars will no longer be included in the rpms

Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774

Former-commit-id: 815ad5b07d [formerly 306842b297] [formerly 612d4fca1f] [formerly 917bc533d6 [formerly 612d4fca1f [formerly 30086ab14cfaab149a689b84803ac906754ddd13]]]
Former-commit-id: 917bc533d6
Former-commit-id: acb15021906a2fbc2d6f7f79ec35350ccb2b9bf7 [formerly d94543a01c]
Former-commit-id: 92e5f2df54
2013-02-11 15:13:07 -06:00
Richard Peter
928aa2cfcc Merge "Issue #1576 - updated qpid 0.18 rpms" into development
Former-commit-id: 1e07d66c7f [formerly bb317b1acf] [formerly 221a6e1ca1] [formerly b774fadb60 [formerly 221a6e1ca1 [formerly 16b20a7f05e0a16ef02881a950bd541f7b4a4a1e]]]
Former-commit-id: b774fadb60
Former-commit-id: 247a9d4fe6c3743d5405cc1ae8912c81d4b14a04 [formerly fa4dd004f9]
Former-commit-id: 2e02b222f2
2013-02-05 09:25:55 -06:00
Bryan Kowal
3d6d5e37b7 Issue #1576 - updated qpid 0.18 rpms
- the broker-plugins/management-jmx module is now built
- the broker-plugins-management-jmx plugins and the common-management plugins are now included in the rpms

Change-Id: I273772b2fb8f339a55cc3e523f90ca3b2398b222

Former-commit-id: e839188ca1 [formerly 145cd06eae] [formerly 1678618015] [formerly 09523f1e84 [formerly 1678618015 [formerly c43c4268ba13e5758dfb4c504d57dead5ae89d63]]]
Former-commit-id: 09523f1e84
Former-commit-id: 86ff68fed5e171beed0483e50df55cec431c39b9 [formerly 513bda11bc]
Former-commit-id: fe70d57c36
2013-02-04 12:31:23 -06:00
Brad Gonzales
3e4338339b Issue #1517 Added SPC Prob menu changes.
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
       Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
       Updated units in spcGuideNDFD.xml.
       Removed local configuration menu items and tags.
       Updated pqact.conf.template SPC entry.
       Update SPC.py with levels.

Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1

Former-commit-id: 7cef72a460 [formerly 35cc853c74] [formerly f459554e33] [formerly 5bc6dd5498 [formerly f459554e33 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]]
Former-commit-id: 5bc6dd5498
Former-commit-id: 62d4c20906235f41b4a9b49850da7af9a09a8dfd [formerly f3ef309293]
Former-commit-id: 8fc5c18ebd
2013-02-04 08:52:33 -06:00
Steve Harris
41b14f0fa2 Merge branch '13.2.1_delivery' into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: f207d282bc [formerly c218786986] [formerly 658bea377b] [formerly ec56acde81 [formerly 658bea377b [formerly 60b2fd0496097fb1086207cbb01779dbfea877a0]]]
Former-commit-id: ec56acde81
Former-commit-id: 60daaf3ef91fb7f1318c36d98b7b63e339bd5c61 [formerly 6383bf8ed2]
Former-commit-id: 73d9455c65
2013-01-31 10:19:14 -06:00
Steve Harris
c9bc690eca Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
Former-commit-id: e6093b159e [formerly e655d297f7] [formerly 0505ed0a72] [formerly 6040272573 [formerly 0505ed0a72 [formerly 70ddefcaed9acb5b220faf36693a91ab43a508e2]]]
Former-commit-id: 6040272573
Former-commit-id: 53394d76c4582419b448c742c4d56f7d91e3eff7 [formerly 513d49939f]
Former-commit-id: 75f6e61e6f
2013-01-29 15:57:21 -06:00
Steve Harris
03989493ae 13.2.1-3 baseline
Former-commit-id: b84acc06da [formerly 283147571f] [formerly f45120a1f4] [formerly 7a739c6a5b [formerly f45120a1f4 [formerly fc7291332a08966a746605aef725e1947ec9643c]]]
Former-commit-id: 7a739c6a5b
Former-commit-id: aad469752c5128fb65382f8daefbea8fbb0e4069 [formerly 3edfa1e0be]
Former-commit-id: daca1c3e73
2013-01-29 15:52:43 -06:00
Bryan Kowal
a8d1496454 Issue #1537 - fixed the edex-environment build
Former-commit-id: 792230a38e [formerly a960b34230] [formerly 7116bb86ef] [formerly fa511e980b [formerly 7116bb86ef [formerly 4b9bd72e929e36d5c949589d5cc4ed6648a069ac]]]
Former-commit-id: fa511e980b
Former-commit-id: 7a615a201ed2fac7d12eeef3455b28a530f92660 [formerly aefeada9d6]
Former-commit-id: f4e7bead66
2013-01-29 09:51:54 -06:00
Bryan Kowal
f8e120a219 Issue #1503 - initial commit for build of Qpid 0.18 rpms
-created a qpid service script

Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3

Former-commit-id: 7b4935a0ef [formerly ec584b4d4b] [formerly ff34587e94] [formerly 54697ff658 [formerly ff34587e94 [formerly ee5806c98eb57680403e4f7768f92af1faa75de4]]]
Former-commit-id: 54697ff658
Former-commit-id: 32df1491d555132dea478823ea8d5513fb36a0d5 [formerly 0cf405d8d9]
Former-commit-id: 45dd0b02ff
2013-01-28 11:21:24 -06:00
Steve Harris
0f4fcd0ba8 13.2.1-2 baseline
Former-commit-id: 74bfe9595c [formerly 0006a2b6cb] [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly 7a7f7c45ca [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]]
Former-commit-id: c3e4551dfa
Former-commit-id: 5477d57f4fbcde663b844cacbae089a9292a22a1 [formerly 1153d80c5b]
Former-commit-id: 251a9c0195
2013-01-25 09:07:12 -06:00
Steve Harris
d069467e81 13.2.1-3 baseline
Former-commit-id: 7d2e979c51 [formerly a5a0da5c02] [formerly 7435527b25] [formerly 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]]
Former-commit-id: 2b6ac028bd
Former-commit-id: 32e4736725f3f6d880854f4dba7503e4939e28b7 [formerly cc0fdef15c]
Former-commit-id: 9d248cff7a
2013-01-23 11:24:17 -05:00
Steve Harris
ce726fadc7 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]
Former-commit-id: 328c6dccad
Former-commit-id: f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]
Former-commit-id: d9be4dce21
2013-01-23 11:18:44 -05:00
Steve Harris
1d1791b3b4 13.2.1-1 baseline
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]
Former-commit-id: c63f9bcae0
Former-commit-id: b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]
Former-commit-id: 8ed6a53113
2013-01-23 11:13:03 -05:00
Bryan Kowal
a9c31457b8 Issue #1490 - updated edex-environment
- actually include the modified files in the commit this time

- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot

Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d

Former-commit-id: 3a0114558b [formerly 792c03d5f4] [formerly b4964c0a19] [formerly 9e33969536 [formerly b4964c0a19 [formerly c96d7532679555f3ccf8a0d7bc07866e63ac177f]]]
Former-commit-id: 9e33969536
Former-commit-id: 912fb037ce61d59d861a7468a62b5455d51ea0aa [formerly b47d484e70]
Former-commit-id: bc757e5bc1
2013-01-18 12:44:37 -06:00
Roger Ferrel
96deac5f43 Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
Changes based on code review and added listener to GridManager and unit test.

Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650

Former-commit-id: 863bdb4d52 [formerly 972db12324] [formerly 1cd076671c] [formerly 1e492b81ff [formerly 1cd076671c [formerly 7f70c2f65453db6bf3097ae8157511c38a36b136]]]
Former-commit-id: 1e492b81ff
Former-commit-id: ea2ddcc686b917f0c5feca15fbe115c2be0949d6 [formerly f10521f861]
Former-commit-id: 86d51634dc
2013-01-16 16:53:29 -06:00
Richard Peter
d880361e06 Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 20520c8f0152154419357d990f91f1ce998a888a [formerly 3fb7d96ec1]] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]
Former-commit-id: 1dbb34523b
Former-commit-id: 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]
Former-commit-id: 79ef100838
2013-01-14 18:07:17 -06:00
Steve Harris
3d35fd52d5 13.2.1-1 baseline
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]
Former-commit-id: 81849e3cbb
Former-commit-id: c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]
Former-commit-id: e34695538d
2013-01-14 18:42:21 -05:00
Richard Peter
9da3b7e2dd Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: 4e1f66abb3 [formerly ae3ea75cbf] [formerly 1318f53902] [formerly b8e42dabc0 [formerly 1318f53902 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]]
Former-commit-id: b8e42dabc0
Former-commit-id: bb2a6cb1f185f4b5c4f896fbc2ccaf6004754a84 [formerly aa9e16b038]
Former-commit-id: fa6247baf7
2013-01-14 17:38:38 -06:00
Steve Harris
13be9f8987 13.1.2-8 baseline
Former-commit-id: 5aaacf4eec [formerly b864fdc303] [formerly e6217a17de] [formerly 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: d0dddac1b9c0f73936bff6a2a8424513b3f8a42d [formerly 3caf592e83]
Former-commit-id: 7d0109a349
2013-01-11 16:19:07 -05:00
Richard Peter
177a54d19a Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]
Former-commit-id: 328be6ac2b
Former-commit-id: e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]
Former-commit-id: 80bf1d7a28
2013-01-09 17:55:05 -06:00
Bryan Kowal
0e985cf0f3 Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
Former-commit-id: 199e202979 [formerly ab8b346489] [formerly c8a43edd9e] [formerly d6b4cb65f4 [formerly c8a43edd9e [formerly b535a90fb25287945485c10b3c85749c11285171]]]
Former-commit-id: d6b4cb65f4
Former-commit-id: acd3a92b4c1f1e4b7e0fc18eb618a5d77643ccb8 [formerly 146c43a606]
Former-commit-id: 6d7f57c62a
2013-01-07 12:16:01 -06:00
Steve Harris
fe763963e9 13.1.2-6 baseline
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]
Former-commit-id: 82a1ed77a4
2013-01-06 14:55:11 -06:00
Steve Harris
82cdde8491 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]
Former-commit-id: cd4185ef5c
2013-01-06 14:32:24 -06:00
Bryan Kowal
9cea52c3bd Issue #1373 - prevent file naming conflicts
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02

Former-commit-id: a4576aeb23 [formerly 94fe1c8f59] [formerly b1a296fea57d24afb40c49372dfa9b1d96c7fa51 [formerly 9079c2dd3f]] [formerly 2c9e5d68fa [formerly 9079c2dd3f [formerly b7c11d1a5d55908a9e60e29b68fa01bf924c1429]]]
Former-commit-id: 2c9e5d68fa
Former-commit-id: 9dd0aeae5d8737f589956e4d1a2827d65b6fc693 [formerly 6580901b03]
Former-commit-id: 5aed64be97
2013-01-05 10:40:10 -06:00
Bryan Kowal
2cb595f8bb Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
Former-commit-id: 09fe6a9c03 [formerly 2d9e54ddf8] [formerly 9062ed93d7] [formerly e131b5bc72 [formerly 9062ed93d7 [formerly 96fe189b5af5fbf0424504cc0b27d44c1defc0c2]]]
Former-commit-id: e131b5bc72
Former-commit-id: 4cab8f42ca65f8a1e9fd3656f1c5391c169ad000 [formerly 8a4bc85bad]
Former-commit-id: ce21e23e52
2013-01-04 12:50:37 -06:00
Richard Peter
38c6856d3c Issue #1373: Update jvm startup to load a service list for services to start.
Former-commit-id: f941605942 [formerly af5b616282] [formerly 1c560f5013] [formerly c1765f776c [formerly 1c560f5013 [formerly b58fed7cb8f04d26397eb9df2273be6588737035]]]
Former-commit-id: c1765f776c
Former-commit-id: b3978f7df010c7a6841e8680eae5b357ababaca4 [formerly 424cb12ef6]
Former-commit-id: 9f991104dd
2013-01-03 16:27:32 -06:00
Richard Peter
38ae6f7f0a Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
Former-commit-id: 218b69a387 [formerly 314bcffd15] [formerly c3e9f40479] [formerly 45f901c1b0 [formerly c3e9f40479 [formerly da48ac436f44dcff85723dfd5befaee9101b6978]]]
Former-commit-id: 45f901c1b0
Former-commit-id: f773ae0c7fbeaee4d49304db8a1346465706b19a [formerly 54778e7490]
Former-commit-id: a608ba1a88
2012-12-18 13:08:40 -06:00
Roger Ferrel
50d3a97bcc Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc

Former-commit-id: ecec7603df [formerly 8c4e70fa9a] [formerly 0c5d10e66a] [formerly 43fd607a30 [formerly 0c5d10e66a [formerly c1567c66f77077f9411a04f349a17d368424db5f]]]
Former-commit-id: 43fd607a30
Former-commit-id: 6ca37b251db62a9996f567e8425299a3fb6ce14e [formerly 6d4946290f]
Former-commit-id: 07fbeb2928
2012-12-18 09:00:46 -06:00
Bryan Kowal
f8df1139b2 Issue #1416: added the python package shapely
- shapely and dependencies will now be built as part of the
  32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
  MSFT Windows environment


Former-commit-id: efe8f338b0 [formerly ef0b12813d] [formerly 8d1e29448a] [formerly 5e22c24657 [formerly 8d1e29448a [formerly 82872ebbfb8f2793fb7d95842d33ba8a0cd41ae6]]]
Former-commit-id: 5e22c24657
Former-commit-id: 6b0159b5868c1e9370ac2d621cc75a1b66d8575f [formerly 6103e7c485]
Former-commit-id: 976834171e
2012-12-17 15:27:43 -06:00
Bryan Kowal
10960c5d62 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds

Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396

Former-commit-id: 8d50e95643 [formerly 7fb4e993e6] [formerly 660a9b615f] [formerly f39489c44c [formerly 660a9b615f [formerly 0c579409321e8be6ea9bf2c98c44769fcdf28dcc]]]
Former-commit-id: f39489c44c
Former-commit-id: edcca021807dc76971231ad55a5724539778b5ee [formerly c44c4bd061]
Former-commit-id: 8579adf932
2012-12-16 21:40:26 -06:00
Richard Peter
785b6c7bfe Revert "Issue #1262:"
This reverts commit 333e7ab7d4 [formerly bad53d1b7f] [formerly 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]] [formerly 0970259114] [formerly 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]]


Former-commit-id: 80a95c53ba [formerly 9d03a53fb5] [formerly 9a7cfa2383] [formerly f37f948456 [formerly 9a7cfa2383 [formerly a4e51a9f814ff0e004be46460b6d27a848cb2fe9]]]
Former-commit-id: f37f948456
Former-commit-id: efeeaf09bb60e407eb7f16418882f2261396e41e [formerly 48641ca26f]
Former-commit-id: 2100b136a9
2012-12-16 20:37:21 -06:00
Bryan Kowal
333e7ab7d4 Issue #1262:
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib


Former-commit-id: 2f31d21ac3 [formerly c3da463f39] [formerly a210f08acc] [formerly 0970259114 [formerly a210f08acc [formerly 3205e61aaeba7ec7bccb0a4bd2ed8a6e83a77951]]]
Former-commit-id: 0970259114
Former-commit-id: 9daf66759db7f15cffd920e394ee9cbc9ce0ff8c [formerly 9490652103]
Former-commit-id: bad53d1b7f
2012-12-13 12:40:31 -06:00
Roger Ferrel
5cd4fc444b Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4

Former-commit-id: 4dfc153172 [formerly 6929a73900] [formerly b677a5ba3d] [formerly aefa650cda [formerly b677a5ba3d [formerly b406c990607a06678a58e36118edcddaab073b26]]]
Former-commit-id: aefa650cda
Former-commit-id: c67e79c92750b1d329293564dce947f07a6fc957 [formerly f64a99d554]
Former-commit-id: 662d51cda1
2012-12-11 15:43:54 -06:00
Steve Harris
377804398b Merge branch 'ss_builds' (12.12.1-12) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]
Former-commit-id: f6988eefff
Former-commit-id: e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]
Former-commit-id: f02c1ef71d
2012-12-11 08:45:53 -06:00
Steve Harris
79b0e973ef 12.12.1-12 baseline
Former-commit-id: 8b74846a1b [formerly 89def5cf03] [formerly e8e41630e8] [formerly 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 033c9cde2068548258f7d65e7f805b1255162c44 [formerly 7bb37caa23]
Former-commit-id: 69ab975fab
2012-12-06 09:18:28 -06:00
Steve Harris
a45a7fe1bf 12.12.1-8 baseline
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]
Former-commit-id: ff4131c2ee
2012-12-06 09:02:51 -06:00
Bryan Kowal
904637f0a3 Issue #1392 - update tar directory access paths for awips2-edex-native
Former-commit-id: 7fd81fb133 [formerly 14555d54d8] [formerly 73e0f4b278] [formerly 6ff82d812e [formerly 73e0f4b278 [formerly 65d91d9235a76c5ee82450d3dd6332f92e29c326]]]
Former-commit-id: 6ff82d812e
Former-commit-id: 2f6a9a4156b04d3607ba4a68ec03f068751ba84b [formerly 43f888ccb8]
Former-commit-id: d7ce3f5840
2012-12-05 10:15:37 -06:00
Bryan Kowal
7c25f7a517 Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf

Former-commit-id: 8fe14a9a60 [formerly 3a4ca9582d] [formerly d3b455c955] [formerly f99d351995 [formerly d3b455c955 [formerly ca0b97b8d8db19900107ab38f6a6af8a9ee7b935]]]
Former-commit-id: f99d351995
Former-commit-id: e09ce067241433822f5df68635984933d876ecc4 [formerly b0c65323b6]
Former-commit-id: ae64e9ce3b
2012-11-28 16:30:10 -06:00