Commit graph

19 commits

Author SHA1 Message Date
Richard Peter
ef23a8f65b Merge branch 'development' into development_on_RHEL6
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/stationprofile/StationProfileDlg.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
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/GfeIRT.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.ldadhydro/src/com/raytheon/edex/plugin/ldadhydro/dao/HydroDecoder.java
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.bufrua/src/com/raytheon/uf/common/dataplugin/bufrua/UAObs.java
	nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
	nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	rpms/awips2.core/Installer.httpd-pypies/component.spec
	rpms/build/i386/build.sh
	rpms/build/i386/build.sh-keep-10032013
	rpms/build/i386/build.sh-keep-11012013
	rpms/build/x86_64/build.sh
	rpms/build/x86_64/build.sh.orig

Change-Id: Id1498fac3a822ab2db55e783ef0ebe5519c66461

Former-commit-id: 7ba466f5a6 [formerly 306bd6fae1] [formerly 7ba466f5a6 [formerly 306bd6fae1] [formerly 460a7b8b5d [formerly 333073fc97c9d454d0e41f8fbe01be3a19b18184]]]
Former-commit-id: 460a7b8b5d
Former-commit-id: 3f68fc6eed [formerly 59671c1e7d]
Former-commit-id: c8ef435295
2013-11-12 11:11:36 -06:00
Richard Peter
5fb6587980 Issue #2499: Update Wes2Bridge Configuration and logging.
Change-Id: I95a530bc8b647c58cff36f449d55bff39943fbc9

Former-commit-id: 0566c1976e [formerly 73d0d1236c] [formerly 0566c1976e [formerly 73d0d1236c] [formerly 55b226e104 [formerly 9449bc5f562fd638e0a02ea6c2dc4c6828e73561]]]
Former-commit-id: 55b226e104
Former-commit-id: 0a5323a740 [formerly 0be00ed984]
Former-commit-id: 0317d65b98
2013-11-05 15:08:23 -06:00
Bryan Kowal
f5bb76a01e Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/bundles/StationPlot.xml
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/RollbackMasterInterface.py
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	nativeLib/ncep_grib2module/.cproject
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so

Former-commit-id: 38464427d3 [formerly feaacd9356] [formerly 38464427d3 [formerly feaacd9356] [formerly c8d7a32e2e [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: f02d4b7a0b [formerly d366e70934]
Former-commit-id: eaaa3d022c
2013-10-31 15:34:46 -05:00
Steve Harris
da4589ec2b 14.1.1-4 baseline
Former-commit-id: 82dec19b6a [formerly bd95bb6a4e] [formerly 82dec19b6a [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]
Former-commit-id: 99e3707c5b
Former-commit-id: b60635cd70 [formerly 7590a56e0e]
Former-commit-id: 98ae84da42
2013-10-28 10:55:16 -04:00
Roger Ferrel
7bb7770fbf Issue #2326 Added user roles for Archive case and retention.
Change-Id: If1261bdb14f083f1b9cd565f6382db6213a94967

Former-commit-id: c959cedd99 [formerly 7f7064d457] [formerly c959cedd99 [formerly 7f7064d457] [formerly 42705e4dfa [formerly 07785f02c3edbfd46154d9864272b58e92b26cd6]]]
Former-commit-id: 42705e4dfa
Former-commit-id: 220769dab0 [formerly 4c27adcc53]
Former-commit-id: 029eec5dc4
2013-10-03 12:33:26 -05:00
Roger Ferrel
efde4f9297 Issue #2147 Changes to allow option hour field in category tag and change to Retentions end time.
Change-Id: I7f878a0e71c0989e41aaf943b1520c93f45f1859

Former-commit-id: 2ba7117d13 [formerly a76fc08e93] [formerly 2ba7117d13 [formerly a76fc08e93] [formerly e65b8a9f6e [formerly 6a6159e07eddbac712e4696023c464d58ad250f7]]]
Former-commit-id: e65b8a9f6e
Former-commit-id: 34ea90f18a [formerly 71737f069d]
Former-commit-id: 0d86e00182
2013-10-01 16:36:34 -05:00
Roger Ferrel
f4e99b457a Issue #2299 fixed purger running ingest out of memory.
Change-Id: If1877049574fd546e90479f3c56feb94ffbe088a

Former-commit-id: 7d9afba0db [formerly 1d71cf8beb] [formerly 7d9afba0db [formerly 1d71cf8beb] [formerly 79d8c93563 [formerly f75af60ec46f734bd5e815eeeab2bc82d3436229]]]
Former-commit-id: 79d8c93563
Former-commit-id: 94e5a0eec0 [formerly 01b99b17a2]
Former-commit-id: 5b5b2005e6
2013-09-12 11:50:02 -05:00
Roger Ferrel
d22e68a2d3 Issue #2225 Changes for make tar compressed files.
Change-Id: I154683fec10b57d548944dd9037d4ca61cbe1b1b

Former-commit-id: 24729e66c6 [formerly 48ae3b65f4] [formerly 24729e66c6 [formerly 48ae3b65f4] [formerly a73ee97bb5 [formerly 70584120f397f3087d35f908744d45a44c8b27ba]]]
Former-commit-id: a73ee97bb5
Former-commit-id: 0b1dd822ca [formerly fee4ea45e5]
Former-commit-id: 1ca2c937c4
2013-09-12 11:46:06 -05:00
Roger Ferrel
f8f435d30a Issue #2220 Better response using priority queues and delay getting display data.
Change-Id: I5f7b8eb904dcde9ef52acc2f39df864ac62080bb

Former-commit-id: 486169feb6 [formerly 76a6afc46f] [formerly 486169feb6 [formerly 76a6afc46f] [formerly 7879979110 [formerly f6f5a236056e2d3cbbcd2fdb3a1efa1c76ef5178]]]
Former-commit-id: 7879979110
Former-commit-id: 6b0635b424 [formerly 451a11aa58]
Former-commit-id: 9b21d8876a
2013-09-12 11:42:36 -05:00
Roger Ferrel
8774a89457 Issue #2224 Bug fixes to pass unit test.
Change-Id: I6f1c5721afaab21ade5a7f780ba92ca7b4ea8a00

Former-commit-id: 8da461743f [formerly 3569155bc0] [formerly 8da461743f [formerly 3569155bc0] [formerly ac538a0476 [formerly 3a7e798e473e90de6fe4e6f50c645ecce5a37c51]]]
Former-commit-id: ac538a0476
Former-commit-id: 5d3f410f14 [formerly d7db78d9e8]
Former-commit-id: c491057767
2013-09-12 11:42:26 -05:00
Roger Ferrel
cc01c09e03 Issue #2224 Changes to have DataSet in configuration.
Change-Id: If626c4ef5b1da5bf5b6c660a0337009620a04db8

Former-commit-id: 4e9a6a73e3 [formerly 8110b6f450] [formerly 4e9a6a73e3 [formerly 8110b6f450] [formerly ecef7234a5 [formerly 80b773eecdce3d80e35262f04d56f6ae37d369bb]]]
Former-commit-id: ecef7234a5
Former-commit-id: c32aac47b1 [formerly a08b099e8c]
Former-commit-id: beb3b0229e
2013-09-12 11:42:03 -05:00
Roger Ferrel
409dba419d Issue #2222 Changes to allow display of all selected data.
Change-Id: I1594f7f3cf888a3de7e6458e5e225eaa4d337adb

Former-commit-id: cd90096d54 [formerly 6bf67dd7f5] [formerly cd90096d54 [formerly 6bf67dd7f5] [formerly ad634081ae [formerly e7b7d4c4507ebc32bde3007d04d93c5808cf6d2f]]]
Former-commit-id: ad634081ae
Former-commit-id: 63934b011a [formerly 47169f4d1d]
Former-commit-id: 94d1be8423
2013-09-12 11:41:48 -05:00
Roger Ferrel
914d384379 Issue #2221 - Changes to have select configuration files for retention and case creation.
Change-Id: Ia24898f04c3a2a626ea0aeb04c2c302e406afa1f

Former-commit-id: 6f2c8da31a [formerly cd848ded29] [formerly 6f2c8da31a [formerly cd848ded29] [formerly 6694f17f42 [formerly 303a5b6dada429257e00b4059c8846a2d97a85de]]]
Former-commit-id: 6694f17f42
Former-commit-id: 3dc47deabf [formerly 07ea33c123]
Former-commit-id: 81e029489b
2013-09-12 11:41:35 -05:00
Roger Ferrel
09a2f977a5 Issue #2220 Removed synchronized from most methods.
Change-Id: I863fd9017e53212b1cdf926ae32a163e2d327858

Former-commit-id: 0a63b743b2 [formerly d44f5b3b8a] [formerly 0a63b743b2 [formerly d44f5b3b8a] [formerly 1410a55293 [formerly e212ffad7d0451caa7192561a7c41aec1d5987c9]]]
Former-commit-id: 1410a55293
Former-commit-id: 155df8b7fb [formerly 2d81476221]
Former-commit-id: 166755b524
2013-09-12 11:41:22 -05:00
Roger Ferrel
68dcfcd14f Issue #2220 Implement Archive GUI's recompute sizes.
Change-Id: Ib80dadc33762a155d5b48bd9ae2e7cf5273f01ea

Former-commit-id: d47816f5a0 [formerly 34ba55485d] [formerly d47816f5a0 [formerly 34ba55485d] [formerly 01ca37d574 [formerly 0091d8e60a9d1b5eb16326ab27ae1de53f1bac9a]]]
Former-commit-id: 01ca37d574
Former-commit-id: 232e097d7c [formerly 0b7bf83d00]
Former-commit-id: 99d7080a78
2013-09-12 11:41:06 -05:00
Steve Harris
767b7fdb4d 13.5.1-8 baseline
Former-commit-id: 392faf86e7 [formerly 3bece5e5d0] [formerly 392faf86e7 [formerly 3bece5e5d0] [formerly dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]]
Former-commit-id: dfbf9a5afe
Former-commit-id: a7d4c6274e [formerly 2afb46f814]
Former-commit-id: 1a3197efdf
2013-07-26 09:02:34 -04:00
Greg Armendariz
b601345c9f 13.5.1-6 baseline
Former-commit-id: 5894853996 [formerly 7e09fa5a0b] [formerly 5894853996 [formerly 7e09fa5a0b] [formerly b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]]
Former-commit-id: b9044b1195
Former-commit-id: 93b71934c0 [formerly 12a09f9aa7]
Former-commit-id: ec2637676d
2013-07-10 10:04:22 -04:00
Steve Harris
c05a6c8b50 13.5.1-4 baseline
Former-commit-id: c56be8a332 [formerly 70e4ff30a6] [formerly c56be8a332 [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]
Former-commit-id: e197f23ce3
Former-commit-id: 640b022e84 [formerly f658320357]
Former-commit-id: c183e08922
2013-06-28 09:46:25 -04:00
Steve Harris
859965fc9d 13.5.1-1 baseline
Former-commit-id: 6384018950 [formerly 998961612c] [formerly 6384018950 [formerly 998961612c] [formerly fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]
Former-commit-id: fe872355a7
Former-commit-id: 0aab285b8a [formerly 30ba1d634e]
Former-commit-id: 146c5e8940
2013-06-10 15:17:17 -04:00