Commit graph

120 commits

Author SHA1 Message Date
mjames-upc
7dbbe402bc pint 0.7.2 and six 1.10.0 2016-03-03 18:39:49 -06:00
mjames-upc
2701dbcd62 more etc/profile.d changes. java, cli, yajsw, postgres build updates 2016-02-08 19:12:25 -06:00
mjames-upc
9c8c01aae7 15.1.1 cave build is still broken here 2016-02-05 09:32:57 -06:00
mjames-upc
d4d392f1ab pqact default changes; build package mods 2016-01-28 12:18:34 -07:00
mjames-upc
96cb99cc84 build updates 2016-01-13 13:53:43 -07:00
mjames-upc
a7f8996b3f awips2-tools rpm naming 2015-12-31 15:16:41 -07:00
mjames-upc
5bf237ee1a database rpm scripts should use su - when switching to awips account. build update 14.4.1-10n12
Former-commit-id: fee48ec56d
2015-12-10 14:46:17 -07:00
mjames-upc
97483f127d build updates for 14.4.1-10n11
Former-commit-id: a5814eb787
2015-11-09 14:21:35 -07:00
mjames-upc
0f2ceab5c6 add fxa data/nationalData dirs and files to awips2-cli build
Former-commit-id: 7b3f08ae01
2015-11-05 19:36:44 -07:00
mjames-upc
c8c366b66d building hydroapps-shared again
Former-commit-id: 8a34128f51
2015-11-05 12:32:38 -07:00
mjames-upc
c77433061e build 14.4.1-7n8
Former-commit-id: 50fd8e2554
2015-10-07 16:43:18 -06:00
mjames-upc
8e43e23bd3 directory permissions for logs + enable qpidNotify call from dcgunzip
Former-commit-id: 882c6321db
2015-09-08 20:01:47 -06:00
mjames-upc
d205400d77 various: dcgunzip, qpid-python-0.32 src, build increment
Former-commit-id: 472aeeca1a
2015-09-08 18:01:20 -06:00
mjames-upc
a547de2b85 hydroapps copy large files from awips-scm; edex-upc dependencies added for install order
Former-commit-id: b776244703
2015-09-07 21:27:23 -06:00
mjames-upc
1cb873889d build 14.4.1-5n4
Former-commit-id: 7febbb5651
2015-09-06 18:27:20 -06:00
mjames-upc
50bc8e5702 build updates for scipy and shapely
Former-commit-id: e551918e93e8feb814252ca321ba8b2173fcd2bc [formerly db4fc7e169]
Former-commit-id: 0f67569b4f
2015-08-24 11:41:22 -06:00
mjames-upc
b9aa6afe50 build updates
Former-commit-id: 9c284dc55c32b83f8d985aaa80d507cb53eba0fe
Former-commit-id: 10e066baa7252f1a092b36d7f3b201b59be95146 [formerly 6cfaae2ce7]
Former-commit-id: 9cb5412a02
2015-08-19 12:45:51 -06:00
mjames-upc
1bfba8c21b roll back to numpy 1.5.0 due to httpd-pypies errors
Former-commit-id: e443b685fd [formerly c9af69efd1] [formerly c3d039b415a162a1e9ed4ba84b8333e3c1e41b06 [formerly 85b42d3bbd]]
Former-commit-id: cfc76e34b475b45f22fa2e02caa39bd611d9e940 [formerly f11c4297a6]
Former-commit-id: 69ba7a4d15
2015-08-17 12:49:21 -06:00
mjames-upc
a5fb033fa7 pyparsing 2.0.1 and six 1.9.0
Former-commit-id: f0d18c7ab3 [formerly 755e8a07fb] [formerly ca15bbcb1ed28f29b85b92d615a85380f76592a1 [formerly b77e15ce03]]
Former-commit-id: 180be5b97744ee2d870096c51fded0039d3f6586 [formerly d4efcc78c3]
Former-commit-id: abc63d2f3e
2015-08-06 15:42:35 -06:00
AWIPS User
1f2c7dd237 updated numpy, scipy, matplotlib. added cython, metpy, python-dateutil, six, pint.
Former-commit-id: fee97d57cc [formerly 829afc3e85] [formerly fa5e33604b6a832bb5b5d4d082a26d8d68e690ad [formerly 2982d68160]]
Former-commit-id: c2259e888b996bcc79c7e8d23f2752e578886af2 [formerly 28f92948a0]
Former-commit-id: ab36035399
2015-08-02 10:31:57 -06:00
AWIPS User
78f6ab7ba1 numpy->1.9.2, cython 0.22.1 added for rpm build
Former-commit-id: 811013d84e [formerly f89120af6b] [formerly 421b0e5856091c2f61feae3bc3256c2babd65e16 [formerly 53c4a138c9]]
Former-commit-id: 93a640569c67ea160ec8c819278fded601201964 [formerly e6133124ac]
Former-commit-id: 1746b74950
2015-08-01 16:06:25 -06:00
mjames-upc
5043990913 build updates for 14.4.1-1n15
Former-commit-id: ddc43fc394 [formerly e263acdd2b] [formerly f5c6815027bce985d786850ccaec18c25176d90c [formerly d0774eea44]]
Former-commit-id: 7d9bfff17fd08f0add7486eaa3e7519a758e645c [formerly 9cce96fffa]
Former-commit-id: ec29d9124e
2015-07-09 14:46:43 -06:00
AWIPS User
cebb8b38c8 build updates
Former-commit-id: 18aa0e5dc7 [formerly a3cef2f93b] [formerly 3d4cb2094519fd1f7d725ba29867111d886bf589 [formerly 6f457198ce]]
Former-commit-id: d76925435260a8a00d7978ea1c0ee7359793f42c [formerly e9ec10cbc4]
Former-commit-id: 98f56937b5
2015-04-24 06:23:59 -06:00
mjames-upc
36d4337756 build update, remove leftover plugins or else CAVE build barfs
Former-commit-id: 4a83aa7b8a [formerly 06825dfa09] [formerly cdedc4c022eeafa4e36a1a88d5985a1cacbb0d60 [formerly 9327b7b7bc]]
Former-commit-id: 8ca8ba460a435d5e754a635d31ce96f27203ebfa [formerly 5098e0c346]
Former-commit-id: 973adde1cc
2015-04-20 17:29:07 -06:00
mjames-upc
ee3d447aa1 build increment
Former-commit-id: ff29d1e215 [formerly 4b252ba378] [formerly 8178f1396b695988589804287ea38a8dacf34c44 [formerly 668c5ee330]]
Former-commit-id: 2d68043cdfa717e98da2299fc90407abab9acfe2 [formerly 0b5fac3877]
Former-commit-id: 8b8a367019
2015-04-17 10:38:28 -06:00
mjames-upc
8a681fea2a build update for 14.4.1: with these edits CAVE will finally build, but only if you use previous version of eclipse with current PyDev update, which is stupid because Raytheon says to use current eclipse which breaks on build attempts. smh.
Former-commit-id: c3e1cc66e6 [formerly 6f67b802f0] [formerly 971b16644f0a85387c661f26aa5a530e66c7998e [formerly 5756a3cde9]]
Former-commit-id: 2603f49de242adb24e0b33768ad64fe1a8f95b61 [formerly c30abec01b]
Former-commit-id: 0d371744a4
2015-03-06 13:42:26 -07:00
AWIPS User
ea30abe01b merge upc development orphan branch into upc_14.4.1
Former-commit-id: 4458299928 [formerly 06a7f2ad9d] [formerly 1f4613a97ecb170f991ddd5ca9be32b5c63945b0 [formerly c9f28fd594]]
Former-commit-id: 76393e9e3ea8a386189eecfc4953a49d04ba95df [formerly 892c265b12]
Former-commit-id: 1ac670fc00
2015-03-01 12:44:45 -07:00
mjames-upc
38cf8403cb a lot of build updates for 14.4.1. removed desktop autostart stuff, edits to get wes2bridge to build, and reoganization of UPC build programs.
Former-commit-id: 1a280b79d6
2015-02-12 21:55:36 -07:00
mjames-upc
f5c4e36686 modified code BUILD - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 2ce37e10db
2015-01-12 14:12:30 -07:00
mjames-upc
886cd5940f Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
2015-01-12 14:02:58 -07:00
mjames-upc
e29a717f80 moved awips2-edex-shapefiles RPM build to separate script, reduce time to run buildEDEX by 20 minutes
Former-commit-id: 38b0e2e9dd
2015-01-08 17:08:33 -07:00
Bryan Kowal
4b83570666 Omaha #3508 - remove the previous version of yajsw. Enable the build of the yajsw rpm.
Former-commit-id: 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 4aaf636e18 [formerly 289689e774] [formerly 19f6551c88] [formerly 48ec32e595 [formerly 19f6551c88 [formerly f6a3317e329728080f8efe8db545e3324161986e]]]]
Former-commit-id: 48ec32e595
Former-commit-id: 0e79d9e7a8 [formerly aba4679eb6] [formerly 39a25df1c5ea9e51a812bdbf1ec764e207623861 [formerly 9f5297504d]]
Former-commit-id: 53663102c30f8e33519ac669cb7464894a692105 [formerly ec8371db52]
Former-commit-id: 258f7a93ca
2014-12-05 09:20:23 -06:00
mjames-upc
0ca315be49 build scripts updates
Former-commit-id: a9e2247af9
2014-10-28 19:51:00 -06:00
mjames-upc
534a084919 build increment for python and postgres
Former-commit-id: e3d26435d4
2014-10-16 17:00:56 -06:00
Ron Anderson
92071a03c6 Omaha #3682 Remove awips2-data.hdf5-gfe.climo rpm
Change-Id: I2972686a3467d59701cf26bf18273027e5fad4e8

Former-commit-id: f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f97651285a [formerly 35657166ea] [formerly ec1530c5e8] [formerly f44ac32b1e [formerly ec1530c5e8 [formerly 5db9a6f87fa658f6bc7fdfabdae5b785a7f33e59]]]]
Former-commit-id: f44ac32b1e
Former-commit-id: 88aae9d195 [formerly 841e270b6f] [formerly 8544b7d76afb53dadb3f5d65587b33d13b6e8ede [formerly b59e41705c]]
Former-commit-id: a736762ec6fda2c02a849ad08fec20a2cb13b150 [formerly 50acd7dc68]
Former-commit-id: 2d64e79be9
2014-09-30 14:09:31 -05:00
mjames-upc
f8d3334985 build updates
Former-commit-id: a38a3b112e
2014-09-26 17:32:27 -06:00
mjames-upc
badf695f7d UPC build updates
Former-commit-id: 3c934c7e2d
2014-09-10 15:10:37 -06:00
mjames-upc
8b5d136564 build edits, LDM and EDEX updates for /data_store -> /awips2/data_store. Added -httpd build option for RPMs.
Former-commit-id: 03271b03a2
2014-07-23 12:42:51 -06:00
mjames-upc
0b8a58eec9 ldm and edex-upc rpmbuild.
Former-commit-id: 6b3d83313a
2014-07-16 20:22:10 -06:00
Bryan Kowal
7a007960cf Omaha #3339 - created a method to build non-EDEX and non-CAVE RPMs contributed by Work Assignments.
Former-commit-id: ee4b7c4ee8 [formerly 58a2ae8bc8] [formerly 98a310f4a7] [formerly ee4b7c4ee8 [formerly 58a2ae8bc8] [formerly 98a310f4a7] [formerly 6a197f845d [formerly 98a310f4a7 [formerly e0bb64fc5112a15d9d991eb8f39de42b541f4e54]]]]
Former-commit-id: 6a197f845d
Former-commit-id: b2d4debdce [formerly ac1b94c63f] [formerly ed8425afeb482fb12b827adf7402a0eda661e5fb [formerly 0fdfc0fd4a]]
Former-commit-id: d14384ae75f25093f489626ca51658c2d08fe2cc [formerly d1898937e0]
Former-commit-id: ec5f9c6623
2014-07-08 09:31:21 -05:00
mjames-upc
cfea8da633 added awips2-edex-upc RPM build. various updates relates to other RPM builds. incremented LDM rpm.
Former-commit-id: 42c43cf844
2014-07-07 16:39:10 -06:00
mjames-upc
df3f2fa30e First build Unidata 14.2.1. Added directory rpms/unidata/ which includes current build script (adapted from NCEP) and custom environment file all based on /awips2 directory home for everything needed. Edits made to awips.product and developer.product to remove a perspective flag which was causing errors on RPM install. Qpid build for .7 added; edit made to build for .18. awips2-pgadmin RPM spec file updated to remove the stringent rhel6 package name and version requirements, allowing to install without error across different linux systems. Installer.topo edits for awipscm, the as-yet-un-committed shapefile directory that apparently is needed to build RPMs, but not included in the source (I had to extract the files from previously built RPMs in order to build the same RPM... bootstrap much?)
Former-commit-id: a88e08a7ac
2014-06-11 17:09:46 -06:00
Steve Harris
86d6a0cd4d Merge branch 'omaha_14.3.1' (14.3.1-7) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge4ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge5ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge6ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge7ftIncr_PHISH.xml
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/AbstractGLImagingExtension.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/StatusStore.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/statusline/UrgentMessagesDialog.java
	edexOsgi/build.edex/esb/conf/modes.xml
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/SHEFParser.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ShefSeparator.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.uf.common.derivparam/src/com/raytheon/uf/common/derivparam/library/DerivedParameterGenerator.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/CapeStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/Wind.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/uStk.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/vStk.xml
	edexOsgi/com.raytheon.uf.common.wxmath/src/com/raytheon/uf/common/wxmath/TempOfTe.java

Former-commit-id: 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly 4469d87a8f [formerly 718c78d984] [formerly be80bd01f3] [formerly dc74953978 [formerly be80bd01f3 [formerly 802843fa475654ffab03545a4970f4e5857590cd]]]]
Former-commit-id: dc74953978
Former-commit-id: aa133cc8a3 [formerly 0e9d0b2ef5] [formerly b7d992179f759d29da9804b9ffcafec8048bcefa [formerly 713cfeffc7]]
Former-commit-id: 4b80090552f8712feaf5137c27c2f010cda148e2 [formerly 6412cc1427]
Former-commit-id: 5fda99b1fe
2014-05-28 09:01:00 -05:00
Greg Armendariz
336be12f33 Omaha #3215 - Add option for RPM build,
Change-Id: Ic3a50f9a493c9cd7b92ac99aeb026d3d991f69a5

Former-commit-id: 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly 45856116c0 [formerly 0806135d2e] [formerly 265a455ca1] [formerly a2e157ed35 [formerly 265a455ca1 [formerly 615c83cb701e3c8ddf7cbcc1c1fb735711771d3b]]]]
Former-commit-id: a2e157ed35
Former-commit-id: 9301eb1844 [formerly db01c4b45e] [formerly 220403a4b2cfd4083d722e770928cca821f9a677 [formerly 81ca8ed4c6]]
Former-commit-id: 559db09b22e37642d03476bd447ec4aa342fe2ad [formerly bdbdfdaa7a]
Former-commit-id: 1a976cb67b
2014-05-27 14:56:33 -05:00
Steve Harris
cf2950abdb Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
	edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
	edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
	edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml

Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66

Former-commit-id: 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 08308cd279 [formerly 3de24b7b07] [formerly 99bc6f990c] [formerly 3b16bbafb1 [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9458ea3648 [formerly bfa4255eea] [formerly 85d55d73802af25d3be5119fe234f4bf09ff39dc [formerly 9b98b41cd4]]
Former-commit-id: a54e34e905540883ccd6d6eb5c78370ac905f651 [formerly 144354c369]
Former-commit-id: 172cca39d9
2014-05-27 14:48:24 -04:00
mjames-upc
7479b318af update env var and RPM build scripts
Former-commit-id: 2bec1dedfb
2014-05-16 09:49:33 -06:00
Steve Harris
24df80c520 Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
	edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
	tests/.classpath
	tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
	tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java

Former-commit-id: 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly 343444715e [formerly 848519177d] [formerly cf62cf4a6e] [formerly fc2bf6b45c [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]]]
Former-commit-id: fc2bf6b45c
Former-commit-id: ae2d525c8a [formerly 32f255cada] [formerly a8635bd2e1fdd0fe84e47c2435e9f0073d86e4e2 [formerly 233922471a]]
Former-commit-id: d12e1920a9ce76da64ae45fed23fe5b2ed9fa884 [formerly 74a325ce74]
Former-commit-id: 82045e2409
2014-05-12 16:13:19 -05:00
Brian.Dyke
9bc1055c87 CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 82ce970ad6 [formerly 3aa2f7974b] [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]]
Former-commit-id: 41ba5fc348
Former-commit-id: 4004b627e2 [formerly dc5bc1d2a4] [formerly 3193dce8b50276edb5c6e0829236339aa91b9172 [formerly 2f704c898d]]
Former-commit-id: 4b5ff1e5a8372daadb66b3b58132714ed0a54eae [formerly 82663c0ab6]
Former-commit-id: 464cc1a479
2014-05-12 14:07:11 -04:00
Steve Harris
55644af2ca Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
	cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
	cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
	cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
	cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
	edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml

Former-commit-id: 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 010301045d [formerly 9e149df799] [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly 6ef3b9f1e5 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 4b54c0498e [formerly 927a87b126] [formerly b9b41ab717fa5a9d55725f89e087b2c62f5811fa [formerly b797b4b1fa]]
Former-commit-id: 66b0c211b5eee3caba67b313d56f7fda8fa60cc9 [formerly 17318b1870]
Former-commit-id: 4fe84ba0fd
2014-05-05 08:21:02 -05:00
mjames-upc
b4c0da1971 first commit orphan branch from remotes/origin/ncep_14.2.1
Former-commit-id: 27eaf7aa70
2014-04-30 19:22:58 -06:00