xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1320 commits 31 branches 40 tags 3.8 GiB
Commit graph

122 commits

Author SHA1 Message Date
Ben Steffensmeier
7c93db759c Issue #1108 initial implementation of mappings 
Change-Id: I05a3643e288778dbb97e80f881f2e71f6373067d

Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/META-INF/MANIFEST.MF

Former-commit-id: 20e618eb4f [formerly 535c73051d] [formerly 693090cb36 [formerly 8db340a796df354059f3d4142db92dfd5fa527f5]]
Former-commit-id: 693090cb36
Former-commit-id: 884c82c4fe
 2012-11-08 14:45:36 -06:00
Nate Jensen
2fe69a5871 Merge "Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration." into development 
Former-commit-id: 20a63254e2 [formerly b32a9e839e] [formerly 6b205399d4 [formerly 1902ab64c3ab11c41af906e5d78368689833561f]]
Former-commit-id: 6b205399d4
Former-commit-id: e3208d48a0
 2012-11-07 18:18:06 -06:00
Max Schenkelberg
5a5bd522a1 Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration. 
Change-Id: If392126da6b7b27be20bbcb2423ab0e851307345

Former-commit-id: f069f34a96 [formerly 2f90120248] [formerly ca4177dd08 [formerly a9c7374d162296c170f7c1b80e1fb2978b854cfd]]
Former-commit-id: ca4177dd08
Former-commit-id: 747ab974e9
 2012-11-07 10:44:42 -06:00
Bryan Kowal
d928e2f257 Issue #1276 - v1.0 of multiple WA deployment support 
Change-Id: I2468458fdf690f05841124300c166d217b81f6b5

Former-commit-id: cae04523db [formerly 9263a0ac57] [formerly 4fd43ee45c [formerly 2d35b221dca2248da68ae1d11f20b40dfb11052c]]
Former-commit-id: 4fd43ee45c
Former-commit-id: 2c14ea1bb7
 2012-11-06 16:13:26 -06:00
Dustin Johnson
7b4967b5bb Issue #1302 Fixes for data delivery merge with development branch. 
Change-Id: Ibff04f82290ff0b417b3fd8d1892925241aec753

Former-commit-id: 8d5c86f31e [formerly 2f28e19bf6] [formerly a8f9c4f90a [formerly 87641d4b41b10f66e12c8d839548b8012e900438]]
Former-commit-id: a8f9c4f90a
Former-commit-id: 7f994472ae
 2012-11-01 16:31:14 -05:00
Dustin Johnson
e7a0f96a9a 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: 8e69107b5a [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 31d7d09c10
Former-commit-id: bcf575966b
 2012-11-01 13:36:06 -05:00
Brad Gonzales
4ffe05d37e Issue #1274 Updated customAssembly.xml and customTargets.xml for automated build deployment of resources. 
Change-Id: I84f2a0a4aca987d8bda418b5b5c334381f44ff41

Former-commit-id: 449e4a2182 [formerly 9137f334b5] [formerly 20a5fe3577 [formerly 540bbd59715aaf7479b5a824a021ce79bb387335]]
Former-commit-id: 20a5fe3577
Former-commit-id: 2ffcd5d684
 2012-11-01 11:02:48 -05:00
Brad Gonzales
7807eca270 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: 75e77feb58 [formerly 68a3a98547] [formerly 44e9238fa9 [formerly 96bb97c32f664e015a29ac5c3187e6b27160a872]]
Former-commit-id: 44e9238fa9
Former-commit-id: 253c19ae05
 2012-10-31 21:20:40 -05:00
Ben Steffensmeier
1d94435220 merge branch Unifeid_Grid into developement 
Former-commit-id: 272e057bf1 [formerly d0a2ed32b5] [formerly b6a1563bb2 [formerly 85a18d2cfdd70a24356f6e5ae490ec0c3fdb73e7]]
Former-commit-id: b6a1563bb2
Former-commit-id: 92fd247ccc
 2012-10-30 12:24:54 -05:00
Brad Gonzales
781265a6a8 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: d26119c383 [formerly b2656df2f8] [formerly 24fc32ee14 [formerly 6db4ef518672ee4fdfde9109ea4b606ccf6c5e55]]
Former-commit-id: 24fc32ee14
Former-commit-id: 5949c8b09c
 2012-10-26 14:00:55 -05:00
Ben Steffensmeier
45cc834fc3 Merge branch 'ss_builds' (12.11.1-10) into Unified_Grid 
Former-commit-id: 7734a983f5 [formerly b7d61e7543] [formerly 6f2c1ede9e [formerly 8bcb077174ef7bcb923dd974e53e82f12936b580]]
Former-commit-id: 6f2c1ede9e
Former-commit-id: 54f414a7e0
 2012-10-25 16:17:54 -05:00
Ben Steffensmeier
9b8f2bcdbd merge Unified_Grid with ss_builds to 12.11.1-7 
Former-commit-id: 4f503d3a1e [formerly 6a9ff88b33] [formerly c2934ae7a5 [formerly ab80625b5c573d8ab1350b4c251414ea036ef016]]
Former-commit-id: c2934ae7a5
Former-commit-id: a77d2097f8
 2012-10-25 12:22:11 -05:00
Nate Jensen
8ee3d9b304 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: 409da6ad67 [formerly c70d361f2d] [formerly 73bc74d3d5 [formerly e032f584ec1caa3c9c973d554123678f828791a7]]
Former-commit-id: 73bc74d3d5
Former-commit-id: 29c8908ef7
 2012-10-24 15:27:56 -05:00
Steve Harris
28dccc0278 Merge branch 'ss_builds' (12.11.1-10) into development 
Former-commit-id: af3161539a [formerly e8e3ef530c] [formerly 1b2cb0db6c [formerly 5a8bdbc21d671bf456be4d22da7c8773042e3f09]]
Former-commit-id: 1b2cb0db6c
Former-commit-id: 19dca3feca
 2012-10-24 15:15:14 -05:00
Steve Harris
61224dec54 12.11.1-10 baseline 
Former-commit-id: 63dddc5f5f [formerly e845c605e6] [formerly 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: 0ba69044a2
Former-commit-id: cc21977c35
 2012-10-24 15:13:57 -05:00
Ron Anderson
a0402bb612 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: bd5537e63d [formerly e226e41852] [formerly e0b809db9f [formerly f00655f5c5fb53af0682313e5054124a459b9649]]
Former-commit-id: e0b809db9f
Former-commit-id: 56a04517a8
 2012-10-24 14:11:30 -05:00
Steve Harris
8486da2fd3 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: 3eff876edd [formerly a7337d9160] [formerly 1807100932 [formerly de600d1a0e309ddbb4838526a9f92af05282cd1a]]
Former-commit-id: 1807100932
Former-commit-id: 892e4df811
 2012-10-18 16:01:05 -05:00
Steve Harris
8beb6fc0b8 12.11.1-6 baseline 
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
 2012-10-18 15:53:01 -05:00
Steve Harris
85ad066b70 12.11.1-5 baseline 
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
 2012-10-18 15:46:42 -05:00
Ben Steffensmeier
db2c9b41ec Issue #189 fix unified grid problems found during install/upgrade on testbed 
Former-commit-id: f3331dc743 [formerly 830a8bd7c2] [formerly 90b815d412 [formerly 4c444ce1a007f844010eb43846070d97d6c811bf]]
Former-commit-id: 90b815d412
Former-commit-id: ea2f15c0df
 2012-10-18 13:27:37 -05:00
Steve Harris
d0e91329b4 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: da7a11fe97 [formerly 4610ecc513] [formerly 751563e331 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
 2012-10-16 15:48:14 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Steve Harris
f0121b6fa8 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: 8b7665418a [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 63da835aef
 2012-10-16 09:20:37 -05:00
Steve Harris
725b2f8ba5 12.11.1-3 baseline 
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
 2012-10-15 16:30:31 -05:00
Nate Jensen
93143bbda0 Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default 
Change-Id: If87b57083015bcb4df0d8d302121fd3b981b1eae

Former-commit-id: cbc2da0c06 [formerly f2cbf0c5c3] [formerly 8e4a7ec406 [formerly 6d20dbb01981135ea49e1a883c3ba307bdcd8ff1]]
Former-commit-id: 8e4a7ec406
Former-commit-id: 5bdf9d4d38
 2012-10-12 15:16:27 -05:00
Ben Steffensmeier
fde1e73d58 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: de3769129c [formerly 8b7256b1ae] [formerly 266a2f317f [formerly f5ae7bbd116ddc19b4fd6c8518089fa11b78ec90]]
Former-commit-id: 266a2f317f
Former-commit-id: fed5a35af3
 2012-10-12 12:45:50 -05:00
Ron Anderson
488d357413 Issue #1091 Fixed combination file generation. 
Change-Id: I734709bfbda00a0914a9edcafd5611d08cea2cb2

Former-commit-id: c264f72a53 [formerly 4ca413a222] [formerly 510cabe655 [formerly 0c4bf9ce1271334d2a07205a42efc60cf7c397f0]]
Former-commit-id: 510cabe655
Former-commit-id: e0fc2a36c6
 2012-10-12 10:32:36 -05:00
Ron Anderson
cd4c7db6f1 Issue #1260 Changed D2DGridDatabase to do slab requests. Added GFEPerformance logging statements. 
Change-Id: I84928d372e771a6cd33b1c37dc6161e6f2e3b511

Former-commit-id: 363e4e9aea [formerly 7450fe4147] [formerly f186cb007e [formerly 2a65735c97eb4f2285cea5c01760f190a5ad26ab]]
Former-commit-id: f186cb007e
Former-commit-id: e3414c4e7e
 2012-10-11 15:03:13 -05:00
Ron Anderson
453b7c9a04 Issue #1239 Fixed 64-bit Cave crash 
Change-Id: I83d729b1f463b2043b1186615751dde047e5e824

Former-commit-id: ebdfe3816e [formerly ad1d532459] [formerly e0236dc5c9 [formerly 6b835a2d9f92d8bc4fc76e883ba4fb84256e185b]]
Former-commit-id: e0236dc5c9
Former-commit-id: 71351d7247
 2012-10-08 15:01:44 -05:00
Ben Steffensmeier
b6fd0f6826 Issue #189 switch FFMP source config to grid. 
Former-commit-id: 691753fef2 [formerly 4007fa442b] [formerly 0b2121d3af [formerly 85dac537f47cea6cc8ee6b0e0092c80544b6a89a]]
Former-commit-id: 0b2121d3af
Former-commit-id: ad8d2a2892
 2012-10-01 16:10:32 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Ron Anderson
1612c8d2c8 Issue #1091 Code cleanup and update of online help files. 
Change-Id: Ifa3a34c46b17f86dcb3d52c25b9d498f35f967e2

Former-commit-id: f1fb73e815 [formerly 4373858ac6] [formerly 34382eb228 [formerly 0a65facc3537a5ad1002aa6c78cf5537bea7cc0b]]
Former-commit-id: 34382eb228
Former-commit-id: a609aab630
 2012-09-25 16:07:05 -05:00
Ben Steffensmeier
d1c3a0c1eb Issue #189 convert grib decoder to produce both grib and grid records. 
Change-Id: I12ea0a06f9ce941d77f5a4c0b2d7617f07550640

Former-commit-id: 5f787b6a6b [formerly 4be2aa88c7] [formerly 0132d35871 [formerly 20f41b849a468c968e866fc84ec9e50c13773f2b]]
Former-commit-id: 0132d35871
Former-commit-id: 174d8ad029
 2012-09-20 12:24:35 -05:00
Ron Anderson
f5463c2e83 Issue #1091 Added localMaps.py capability 
Change-Id: Ifae18fabd6c3914a34bfc66f4e54c7286153f67f

Former-commit-id: dbe4f8f9b8 [formerly 6e2130a790] [formerly 776214bf24 [formerly 21db6a603d237716744d7cac93482c9a51952403]]
Former-commit-id: 776214bf24
Former-commit-id: e917b45f38
 2012-09-19 17:41:48 -05:00
Ben Steffensmeier
6b058ace34 Issue #189 checkin of gridcoverage plugin and switch existing grib to use new plugin 
Change-Id: I060f13ce68e7947e54d62d25d90ebdad2666bece

Former-commit-id: 4fe2127bfb [formerly bd8eb7fc15] [formerly 05849f634d [formerly 8f164a7b948e462b14caf6576de2b898a9a4e880]]
Former-commit-id: 05849f634d
Former-commit-id: b547d9dd8f
 2012-09-18 15:19:05 -05:00
Steve Harris
7abc080c21 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: 15a625adb7 [formerly dd6ac67e17] [formerly 39f15fe032 [formerly 4e988dde641d01295134080111e738f25a110e6d]]
Former-commit-id: 39f15fe032
Former-commit-id: 9de7b02008
 2012-09-17 15:46:11 -05:00
Steve Harris
a903893a09 12.10.1-5 baseline 
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: 4fd8893e55
Former-commit-id: deed84c1a2
 2012-09-17 15:42:31 -05:00
Steve Harris
e23b030dfd 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: 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 04d9735c8f
Former-commit-id: 53673f63e6
 2012-09-13 13:26:13 -05:00
Steve Harris
684feb34e5 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00
Richard Peter
9d1413ff28 Merge "Issue #1134 - edex will now use the same jep library that CAVE does" into development 
Former-commit-id: c8443cf85c [formerly 701960a246] [formerly 60b21393fc [formerly 978e35357ee01c8b5d7fc4f4ced8ba82a3ddd0b6]]
Former-commit-id: 60b21393fc
Former-commit-id: b5d3a41fb1
 2012-09-12 08:27:11 -05:00
Steve Harris
f376a4b4db 12.10.1-3 baseline 
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 438d139fdd
 2012-09-11 16:00:38 -05:00
David Gillingham
64bf7f0613 Issue #1150: Fix regression caused by previous text product generation changes by ensuring all 
directories get created.

Change-Id: I855b4afcc02e8b7c9e7f4d70b1a7ba3d449ff3c0

Former-commit-id: cff73c9e1d [formerly f192c8d115] [formerly 83681d1ff6 [formerly 74e7d98c5bde7cefaedf354ecfbac147b2ff801a]]
Former-commit-id: 83681d1ff6
Former-commit-id: 9d13d3244d
 2012-09-07 12:29:36 -05:00
Bryan Kowal
8a04029498 Issue #1134 - edex will now use the same jep library that CAVE does 
Former-commit-id: 3c63f21cfc [formerly ec89c440fe] [formerly 04b574f56e [formerly 70b61ecb34df8dc082fb9dcd35eec13aff4c042c]]
Former-commit-id: 04b574f56e
Former-commit-id: 84f7083b81
 2012-09-07 10:28:51 -05:00
Steve Harris
dbcb28ce77 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: 51eb89eb2a [formerly 91e39617cb] [formerly a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]]
Former-commit-id: a71dac6cad
Former-commit-id: 87a602dfee
 2012-08-27 09:53:55 -05:00
Steve Harris
34fa4b5804 12.9.1-5 baseline (with forgotten bin files now included) 
Former-commit-id: 7a4f4ac493 [formerly b8ab6066f6] [formerly b77a4d40d7 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b77a4d40d7
Former-commit-id: b2c0dd1abb
 2012-08-22 16:00:33 -05:00
Steve Harris
b335416e06 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: 084ac9fbd4 [formerly d38f8b80f0] [formerly 44a7cb75e7 [formerly 6d33469c48d659279c02e5e9489b67b00576381a]]
Former-commit-id: 44a7cb75e7
Former-commit-id: 77369f78a6
 2012-08-21 16:17:58 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline 
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
 2012-08-21 15:27:03 -05:00
Ron Anderson
6e3674f9fc 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: 16231374f8 [formerly d7a818fd1d] [formerly 7662d249ab [formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: 7662d249ab
Former-commit-id: d3693827a1
 2012-08-17 12:41:49 -05:00
Ron Anderson
e5952c1c99 Issue #436 merging elevation base changes into branch off of development baseline. 
Former-commit-id: 93c632c1ff [formerly 1321db6a99] [formerly 819b9c8e56 [formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 819b9c8e56
Former-commit-id: 6eafdda705
 2012-08-17 12:20:08 -05:00
root
537dbadf64 Merge 12.9.1-4 into development_on_ss_builds 
Former-commit-id: 0987fc6b3d [formerly cb46f57879] [formerly 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]
Former-commit-id: 5a453ee984
Former-commit-id: 8a66b2f209
 2012-08-15 22:15:20 +00:00