Commit graph

119 commits

Author SHA1 Message Date
Bryan Kowal
4fd43ee45c Issue #1276 - v1.0 of multiple WA deployment support
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: 2d35b221dca2248da68ae1d11f20b40dfb11052c
2012-11-06 16:13:26 -06:00
Dustin Johnson
a8f9c4f90a Issue #1302 Fixes for data delivery merge with development branch.
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: 87641d4b41b10f66e12c8d839548b8012e900438
2012-11-01 16:31:14 -05:00
Dustin Johnson
31d7d09c10 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 89583d97c8823818f87dc1a234078d85ba7bea4a
2012-11-01 13:36:06 -05:00
Brad Gonzales
20a5fe3577 Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources.
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 540bbd59715aaf7479b5a824a021ce79bb387335
2012-11-01 11:02:48 -05:00
Brad Gonzales
44e9238fa9 Issue #1274 Added Token control for java code and scripts started by RFC Crons.
Added tokens for app control to the Apps_Defaults configuration file.
Added AppsDefaults token checks to the cron java code and scripts.
Updated Executor.start() to load system properties from properties files
in a conf resources properties directory and also to load site specific
properties from a conf resources properties site directory.

Amend:
Removed tabs in MainMethod.java.
Updates from peer review.
Removed old commented out code in ohd cron properties file and commented-out code in MainMethod.execute().

Change-Id: I44e74791dadc9af09c99244d8d099cea581863cc

Former-commit-id: 96bb97c32f664e015a29ac5c3187e6b27160a872
2012-10-31 21:20:40 -05:00
Ben Steffensmeier
b6a1563bb2 merge branch Unifeid_Grid into developement
Former-commit-id: 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7
2012-10-30 12:24:54 -05:00
Brad Gonzales
24fc32ee14 Issue # 1292 Migrate the common and edex projects required for stats from the 5-Data_Delivery branch to the development branch in the AWIPS2_baseline repository:
edexOsgi/com.raytheon.uf.common.event
edexOsgi/com.raytheon.uf.common.stats
edexOsgi/com.raytheon.uf.edex.event.feature
edexOsgi/com.raytheon.uf.edex.event
edexOsgi/com.raytheon.uf.edex.stats

update the edex feature and edex build.xml to include the edex stat projects.

Change-Id: I8d3232a765124eefa5d6f8387d6ca386163382c4

Former-commit-id: 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55
2012-10-26 14:00:55 -05:00
Ben Steffensmeier
6f2c1ede9e Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid
Former-commit-id: 8bcb077174ef7bcb923dd974e53e82f12936b580
2012-10-25 16:17:54 -05:00
Ben Steffensmeier
c2934ae7a5 merge Unified_Grid with ss_builds to 12.11.1-7
Former-commit-id: ab80625b5c573d8ab1350b4c251414ea036ef016
2012-10-25 12:22:11 -05:00
Nate Jensen
73bc74d3d5 Merge "Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run" into development
Former-commit-id: e032f584ec1caa3c9c973d554123678f828791a7
2012-10-24 15:27:56 -05:00
Steve Harris
1b2cb0db6c Merge branch 'ss_builds' (12.11.1-10) into development
Former-commit-id: 5a8bdbc21d671bf456be4d22da7c8773042e3f09
2012-10-24 15:15:14 -05:00
Steve Harris
0ba69044a2 12.11.1-10 baseline
Former-commit-id: 9dd41e6322bad3e7dced1a32867d9a7f886d70cf
2012-10-24 15:13:57 -05:00
Ron Anderson
e0b809db9f Issue #1291 Implement RollBackImporter in Init.py to ensure the correct site modules are reloaded each time a smartInit is run
Change-Id: Ie9bfc66b5cba7639155944765701833ffa788660

Former-commit-id: f00655f5c5fb53af0682313e5054124a459b9649
2012-10-24 14:11:30 -05:00
Steve Harris
1807100932 Merge branch 'ss_builds' (12.11.1-6) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: de600d1a0e309ddbb4838526a9f92af05282cd1a
2012-10-18 16:01:05 -05:00
Steve Harris
5c1f3cdc46 12.11.1-6 baseline
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
2012-10-18 15:53:01 -05:00
Steve Harris
a0eaf651ff 12.11.1-5 baseline
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
2012-10-18 15:46:42 -05:00
Ben Steffensmeier
90b815d412 Issue #189 fix unified grid problems found during install/upgrade on testbed
Former-commit-id: 4c444ce1a007f844010eb43846070d97d6c811bf
2012-10-18 13:27:37 -05:00
Steve Harris
751563e331 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: 07beab271f793ae79fcf9233f9d384702ead22a9
2012-10-16 15:48:14 -05:00
Steve Harris
6958b861f0 12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
2012-10-16 13:27:07 -05:00
Steve Harris
63ffdac2b7 Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.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

Former-commit-id: 5ebfa0e773d325c57ac8097b46537817d5d47842
2012-10-16 09:20:37 -05:00
Steve Harris
5d796f775c 12.11.1-3 baseline
Former-commit-id: 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86
2012-10-15 16:30:31 -05:00
Nate Jensen
8e4a7ec406 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1
2012-10-12 15:16:27 -05:00
Ben Steffensmeier
266a2f317f Merge branch 'ss_builds' into Unified_Grid
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/parameterInfo/hpcGuideNDFD.xml

Former-commit-id: f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90
2012-10-12 12:45:50 -05:00
Ron Anderson
510cabe655 Issue #1091 Fixed combination file generation.
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: 0c4bf9ce1271334d2a07205a42efc60cf7c397f0
2012-10-12 10:32:36 -05:00
Ron Anderson
f186cb007e Issue #1260 Changed D2DGridDatabase to do slab requests. Added GFEPerformance logging statements.
Change-Id: I84928d372e771a6cd33b1c37dc6161e6f2e3b511

Former-commit-id: 2a65735c97eb4f2285cea5c01760f190a5ad26ab
2012-10-11 15:03:13 -05:00
Ron Anderson
e0236dc5c9 Issue #1239 Fixed 64-bit Cave crash
Change-Id: I83d729b1f463b2043b1186615751dde047e5e824

Former-commit-id: 6b835a2d9f92d8bc4fc76e883ba4fb84256e185b
2012-10-08 15:01:44 -05:00
Ben Steffensmeier
0b2121d3af Issue #189 switch FFMP source config to grid.
Former-commit-id: 85dac537f47cea6cc8ee6b0e0092c80544b6a89a
2012-10-01 16:10:32 -05:00
Steven Harris
feec28f274 12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
2012-09-27 15:57:45 -05:00
Ron Anderson
34382eb228 Issue #1091 Code cleanup and update of online help files.
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b
2012-09-25 16:07:05 -05:00
Ben Steffensmeier
0132d35871 Issue #189 convert grib decoder to produce both grib and grid records.
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 20f41b849a468c968e866fc84ec9e50c13773f2b
2012-09-20 12:24:35 -05:00
Ron Anderson
776214bf24 Issue #1091 Added localMaps.py capability
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: 21db6a603d237716744d7cac93482c9a51952403
2012-09-19 17:41:48 -05:00
Ben Steffensmeier
05849f634d Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 8f164a7b948e462b14caf6576de2b898a9a4e880
2012-09-18 15:19:05 -05:00
Steve Harris
39f15fe032 Merge branch 'ss_builds' (12.10.1-5) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java

Former-commit-id: 4e988dde641d01295134080111e738f25a110e6d
2012-09-17 15:46:11 -05:00
Steve Harris
4fd8893e55 12.10.1-5 baseline
Former-commit-id: 28dc700c3ef97a134c8871c2c52086fe7db43035
2012-09-17 15:42:31 -05:00
Steve Harris
04d9735c8f Merge branch 'ss_builds' (12.10.1-4) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb
2012-09-13 13:26:13 -05:00
Steve Harris
49c3861597 12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
2012-09-13 12:08:11 -05:00
Richard Peter
60b21393fc Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development
Former-commit-id: 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6
2012-09-12 08:27:11 -05:00
Steve Harris
969e7e6dfd 12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
2012-09-11 16:00:38 -05:00
David Gillingham
83681d1ff6 Issue #1150: Fix regression caused by previous text product generation changes by ensuring all
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: 74e7d98c5bde7cefaedf354ecfbac147b2ff801a
2012-09-07 12:29:36 -05:00
Bryan Kowal
04b574f56e Issue #1134 - edex will now use the same jep library that CAVE does
Former-commit-id: 70b61ecb34df8dc082fb9dcd35eec13aff4c042c
2012-09-07 10:28:51 -05:00
Steve Harris
a71dac6cad Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: b9db13cf5bff60511d815f92f0239a4313498265
2012-08-27 09:53:55 -05:00
Steve Harris
b77a4d40d7 12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e977bd92cef6986b14725164c9eaa417ecf359cf
2012-08-22 16:00:33 -05:00
Steve Harris
44a7cb75e7 Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds
Conflicts:
	cave/com.raytheon.viz.ui/schema/editorMenuAddition.exsd
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/ContributedEditorMenuAction.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/build.edex/edex/customAssembly.xml
	edexOsgi/build.edex/esb/lib/lib_illusion/x86_64/libpython.so
	edexOsgi/build.edex/esb/lib/native/linux64/libjep.so
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.guess
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/config.sub
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/depcomp
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/install-sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/ltmain.sh
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/missing
	nativeLib/rary.cots.jasper/jasper-1.900.1/acaux/mkinstalldirs
	nativeLib/rary.cots.jasper/jasper-1.900.1/configure
	rpms/awips2.core/Installer.python/nativeLib/i386/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/i386/gridslice.so
	rpms/awips2.core/Installer.python/nativeLib/i386/libjasper.so.1.0.0
	rpms/awips2.core/Installer.python/nativeLib/x86_64/grib2.so
	rpms/awips2.core/Installer.python/nativeLib/x86_64/libjasper.so.1.0.0
	rpms/awips2.edex/deploy.builder/build.sh
	rpms/build/i386/build.sh
	tools/scripts/commit-msg
	tools/scripts/git-u-setup
	tools/scripts/uamend
	tools/scripts/ucommit
	tools/scripts/upull
	tools/scripts/upush
	tools/scripts/ustat

Former-commit-id: 6d33469c48d659279c02e5e9489b67b00576381a
2012-08-21 16:17:58 -05:00
Steve Harris
f2fac39428 12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
2012-08-21 15:27:03 -05:00
Ron Anderson
7662d249ab Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.

Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff

Former-commit-id: 18f0efe7a8d9f2c31786fc449403f720b554b95d
2012-08-17 12:41:49 -05:00
Ron Anderson
819b9c8e56 Issue #436 merging elevation base changes into branch off of development baseline.
Former-commit-id: 9287cf98369abb8a674fd5bab99439d055218a05
2012-08-17 12:20:08 -05:00
root
5a453ee984 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: a178af491f4b4cd75ed1517f023354bab0b9c8c8
2012-08-15 22:15:20 +00:00
Steve Harris
33b95fb96d 12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
2012-08-15 15:19:10 -05:00
Steve Harris
79ce6cfd97 12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
2012-08-15 13:59:00 -05:00
Steve Harris
a1071e3204 Merge branch 'development' into development_on_ss_builds
Former-commit-id: fa3dac43f4e945514906fb7844f10fb3782bcead
2012-08-06 08:23:04 -05:00