Commit graph

132 commits

Author SHA1 Message Date
Greg Armendariz
6f74a2427d Issue #2509 - Fix merge issue
Former-commit-id: 7ab7156b61 [formerly a281147055] [formerly b4c3337ffd] [formerly 7ab7156b61 [formerly a281147055] [formerly b4c3337ffd] [formerly fadf9346d2 [formerly b4c3337ffd [formerly d742b452ab114935b76cb9097db7d6a08651bb2e]]]]
Former-commit-id: fadf9346d2
Former-commit-id: cbf9f6fe6b [formerly 1561f091e3] [formerly 4f461d5d2d81a6c8c37fb34ea3a2a847bafb9adc [formerly d530a65ee3]]
Former-commit-id: 1bcfa976fd51ce58285b7672804c82c121a4a90f [formerly c90f8115f3]
Former-commit-id: 3061eb1bc0
2013-11-01 10:31:08 -05:00
Bryan Kowal
6a0ddf11e4 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: 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly 5164a7c0b1 [formerly 38464427d3] [formerly feaacd9356] [formerly c8d7a32e2e [formerly feaacd9356 [formerly bb2efa59ed211345e071829f47d41eba232baae9]]]]
Former-commit-id: c8d7a32e2e
Former-commit-id: d3062ea58f [formerly f02d4b7a0b] [formerly fc14f5a833bc96ed1a9a8b8cb4ac6b0c2897f30f [formerly d366e70934]]
Former-commit-id: a385091a8de68d44ac589d69363d2af9bd0275a7 [formerly eaaa3d022c]
Former-commit-id: f5bb76a01e
2013-10-31 15:34:46 -05:00
Steve Harris
cbf859daf6 14.1.1-4 baseline
Former-commit-id: cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly cb3b53f205 [formerly 82dec19b6a] [formerly bd95bb6a4e] [formerly 99e3707c5b [formerly bd95bb6a4e [formerly 0cda967cc9da9d2a08a0197db23d48c65f03be81]]]]
Former-commit-id: 99e3707c5b
Former-commit-id: 2039d101ef [formerly b60635cd70] [formerly 2d757fef6618aded3efb26a4e6771f03101fe824 [formerly 7590a56e0e]]
Former-commit-id: 973d527ee973fdb4fc285ca2d02f0a43a03bb0fa [formerly 98ae84da42]
Former-commit-id: da4589ec2b
2013-10-28 10:55:16 -04:00
Steve Harris
c784003711 14.1.1-3 baseline
Former-commit-id: a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly a0ba2e1252 [formerly 851f9df229] [formerly 94f24e0d8a] [formerly 5739b4f832 [formerly 94f24e0d8a [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]]]]
Former-commit-id: 5739b4f832
Former-commit-id: 2d30611c6d [formerly aa59400b67] [formerly 164f1968b2ad159ca45dcba9ade0490d55b9ed19 [formerly 4a6a209aea]]
Former-commit-id: 9a1c18417dfee86a141522f27e066ec83d4258d5 [formerly 8d67ffede4]
Former-commit-id: 472c0a1a5e
2013-10-28 10:46:02 -04:00
Bryan Kowal
d6d7b8d2ac Merge branch 'omaha_14.1.1' into development_on_RHEL6
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/CombinationsInterface.py
	cave/build/static/common/cave/etc/ncep/ResourceDefns/GRID/FFG_TIR_HIRES/FFG_TIR_HIRES.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/CombinationsFileUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/com.raytheon.edex.ingestsrv/res/spring/persist-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.airep/res/spring/airep-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.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/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/handler/SmartInitRequestHandler.java
	edexOsgi/com.raytheon.edex.plugin.pirep/res/spring/pirep-ingest.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery-edex-impl.xml
	edexOsgi/com.raytheon.uf.edex.ogc.common/com.raytheon.uf.edex.ogc.common.ecl
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/com.raytheon.uf.edex.plugin.grib.ogc.ecl
	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.edex.plugin.ncairep/res/spring/ncairep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.ncpirep/res/spring/ncpirep-ingest.xml
	ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
	rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/python.site-packages/Installer.qpid/component.spec

Former-commit-id: ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly ab10c1dd5b [formerly bb5ef114d1] [formerly aa4ea792c1] [formerly 542f5f2349 [formerly aa4ea792c1 [formerly 606030384b5fe1eb9411d4b35d3282b15b1398b4]]]]
Former-commit-id: 542f5f2349
Former-commit-id: 3534686eb5 [formerly de61382dc7] [formerly 518cc2598c60d171ae83c427ee2062c4d7ef8025 [formerly 5d5ccb7599]]
Former-commit-id: 0c291efdbf84e5f8baf1abb4fbbc4e083a99112e [formerly 86f7af5968]
Former-commit-id: 93dbbc2321
2013-10-08 14:44:38 -05:00
Steve Harris
90889f8aa3 13.5.2-8 baseline
Former-commit-id: 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 553238dca4 [formerly 8ba7d392d6] [formerly 94aa71fcd1] [formerly 18325949fb [formerly 94aa71fcd1 [formerly 6effdd3f5ce46910c89236306fa33499eada174f]]]]
Former-commit-id: 18325949fb
Former-commit-id: 9e5ad5cd96 [formerly 21b84f0290] [formerly 728c3d36e228a9bf13f56508d31b8e5babc82b06 [formerly d89fbf73d9]]
Former-commit-id: eb4c9e248ff87b2b8f9c421f3a28ac71ab1d6fac [formerly 088eb89ca7]
Former-commit-id: e1f7463a41
2013-10-04 11:30:03 -04:00
Steve Harris
08f26c03de 13.5.2-7 baseline
Former-commit-id: cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly cbda847929 [formerly b5cb693619] [formerly 0f8fc513bf] [formerly a212c30bd7 [formerly 0f8fc513bf [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]]]]
Former-commit-id: a212c30bd7
Former-commit-id: 430d088fae [formerly 06ba0dbf6c] [formerly 8a4b80da2796beb7c54f486f50af54a82a51b808 [formerly 02d6145782]]
Former-commit-id: 2b43017e06d19d174d794056f4c10668bd2a1f3c [formerly 5e4023b974]
Former-commit-id: 79d71e33d0
2013-09-30 13:05:31 -04:00
Steve Harris
6e9e71c2c6 13.5.2-6 baseline
Former-commit-id: 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3cb4574635 [formerly 059549438a] [formerly 3821475d4e] [formerly 3837fbe670 [formerly 3821475d4e [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]]]]
Former-commit-id: 3837fbe670
Former-commit-id: 4f4af06329 [formerly 557a7c87d5] [formerly 3c4113cbd9b34d856c9d3a2aa3b0c92346ba75b4 [formerly 22cb9b98cd]]
Former-commit-id: 5d26a3bd0b975f9318873a838bde4603b2acc0b7 [formerly f91cf37d43]
Former-commit-id: b7b8d4a0b7
2013-09-23 10:03:15 -04:00
Steve Harris
3a21a9eb6c 13.5.2-4 baseline
Former-commit-id: 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 3d0b711ccf [formerly 595e7bc0d9] [formerly e3c935d48b] [formerly 58c6821427 [formerly e3c935d48b [formerly da631849bc9eaaa5c83c2393520b6099413107a5]]]]
Former-commit-id: 58c6821427
Former-commit-id: a8201afb82 [formerly 4c6790f10f] [formerly 1a01e9adff02825a5599659ed7c17823430819bc [formerly abed443b59]]
Former-commit-id: d4668ee6901a6bb072be3a88eaad320aed699c0f [formerly e2398f74e5]
Former-commit-id: 609926f1f4
2013-09-12 11:13:59 -04:00
Nate Jensen
6747586438 Issue #2210 moved base cave_static colormaps to common_static and updated code
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 6d7d504f20 [formerly 960dc1e81e] [formerly a1a9a4751a] [formerly 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]]]
Former-commit-id: 27dd27a73f
Former-commit-id: 9c6c35e033 [formerly 04d55ac1c0] [formerly 5da0c0771f6b8cf3997cc0c8fb770658e04f2445 [formerly 15006517a2]]
Former-commit-id: 77dc1df5e9af04c402774c681981e485f8b8553d [formerly 22861240c8]
Former-commit-id: 077c619bbf
2013-08-06 17:17:53 -05:00
Nate Jensen
583c06d64a Issue #2032 move warngen files out of build.edex
Change-Id: Ie91caef086abca30d4b509453e1172a75fbaa09f

Former-commit-id: 7b22b2f72d [formerly 6180a3ba60] [formerly 22e72a646f] [formerly 7b22b2f72d [formerly 6180a3ba60] [formerly 22e72a646f] [formerly 4eb21a4ea3 [formerly 22e72a646f [formerly eabd12dbcb081897ed340394efee2e9482fab3c7]]]]
Former-commit-id: 4eb21a4ea3
Former-commit-id: d7e194a476 [formerly b02bd4f7d8] [formerly 044de761ebafac76ebf4e508d988ea954ff88168 [formerly 72726a8484]]
Former-commit-id: 77c46ef5c3cffa175bf1116e2d5e6ab5f7405c67 [formerly 6450502d65]
Former-commit-id: 0ea836cc8d
2013-07-24 09:35:24 -05:00
Richard Peter
1d08e54d43 Merge branch 'omaha_13.5.1' (13.5.1-7) into development
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly 19dacc32c1 [formerly 401ed88e44] [formerly 15d1a6eab0] [formerly c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]]]
Former-commit-id: c6386e306f
Former-commit-id: 4c53471f8e [formerly e7ec068c7e] [formerly e1fa5bd1d05a5aa1d607bb1e33e99826fc290d81 [formerly 12993d9539]]
Former-commit-id: 468a024f2957450aa44633c7888eb3aad2011b85 [formerly 85fc9c773b]
Former-commit-id: 2a9cfe51af
2013-07-22 09:40:18 -05:00
Nate Jensen
2ac94b1152 Issue #2032 moving localization edex_static files to respective plugins, except colormaps
Change-Id: I287fe0a7d44782dc45265a9ffe2312549d95edbf

Former-commit-id: 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly 3d226c0e69 [formerly 2ee87452db] [formerly da311b00a8] [formerly b7ea2ae30b [formerly da311b00a8 [formerly 69c812bb8f03844333497feba62951fbdcbc9e2b]]]]
Former-commit-id: b7ea2ae30b
Former-commit-id: e0650650c9 [formerly 41d3e45e60] [formerly d21a0f2bca28d0f158a5d74da9f0d15c638ab7ac [formerly dce6c06174]]
Former-commit-id: 1adfa30cf69529b0b748acde939b453b7a7d7b49 [formerly b997f2a670]
Former-commit-id: 6d7658e02e
2013-07-18 17:20:27 -05:00
Steve Harris
adf2f89d57 13.5.1-7 baseline
Former-commit-id: 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 67299457b1 [formerly 630705aa3f] [formerly bf58a81b38] [formerly 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]]]
Former-commit-id: 86ce1248c2
Former-commit-id: 0fe8173b7b [formerly cb50a0028d] [formerly 5aea78fbd5da8a55b6f4dc4542505312f878d73d [formerly f9c9aecba5]]
Former-commit-id: bc809e3e0a77e3fbc4971821c0a9d912bb8a28a4 [formerly eff4fb29dd]
Former-commit-id: 513c089375
2013-07-18 12:07:22 -04:00
Nate Jensen
6c2fa164e3 Issue #2032 removing user-specific colormap files
Change-Id: Ia48f3100233c185514ca65acd0086a72f26ec7f1

Former-commit-id: 427ab79e9c [formerly 50c17a691c] [formerly 5aef034545] [formerly 427ab79e9c [formerly 50c17a691c] [formerly 5aef034545] [formerly ba6851b0e6 [formerly 5aef034545 [formerly bd0401862fb0778cabb98e1fa8ef65925e25f649]]]]
Former-commit-id: ba6851b0e6
Former-commit-id: f337ec5f02 [formerly ffe57ce04e] [formerly 5d6e67fb9a9c95a5af359967fd4f6518739f952c [formerly d479258121]]
Former-commit-id: f001f64c329cfb14d8204eea8aadef6034794bf6 [formerly c63066c708]
Former-commit-id: e721095714
2013-07-18 11:06:45 -05:00
Nate Jensen
2d6737f52c Issue #2032 move build.edex's common-static files to appropriate plugins
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly 87bfe94322 [formerly 188d76ea71] [formerly 5264d3a5b8] [formerly b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]]]
Former-commit-id: b767760a9c
Former-commit-id: 0509e362b9 [formerly 93713d9698] [formerly 85f35fc0d31289c55393eeee4cf0917b4eabadb0 [formerly c77936c6c0]]
Former-commit-id: 0d2fa08b78da80bd2050c50580bfb6d7564771fc [formerly 175a28da9a]
Former-commit-id: 06502f57ef
2013-07-18 09:53:53 -05:00
Greg Armendariz
5e1549062b 13.5.1-5 baseline
Former-commit-id: ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ed9da994c7 [formerly 82aabf1066] [formerly 492f92ef7b] [formerly ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]]]
Former-commit-id: ea7ac37930
Former-commit-id: d5bea0fc06 [formerly d899faec3d] [formerly 95bf0ef285bd2b4a9686028c226e04cf2a86cfe7 [formerly 869922cb82]]
Former-commit-id: 22058c6a24f6da687ba40d05b28790e525082567 [formerly dc881f4ed8]
Former-commit-id: 13ac0b1062
2013-07-03 12:20:27 -04:00
Steve Harris
9f5469bc6e 13.5.1-4 baseline
Former-commit-id: 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly 2487a8b435 [formerly c56be8a332] [formerly 70e4ff30a6] [formerly e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]]]
Former-commit-id: e197f23ce3
Former-commit-id: 43bb696901 [formerly 640b022e84] [formerly 3369892ae14fdcfd7af44c724a72588adeb9f95b [formerly f658320357]]
Former-commit-id: 17bc09e30781d1ef9fbd82b80c952ef26b67bf7c [formerly c183e08922]
Former-commit-id: c05a6c8b50
2013-06-28 09:46:25 -04:00
Richard Peter
f6e6c3c531 Merge branch 'omaha_13.5.1' (omaha_13.5.1-3) into development
Conflicts:
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java

Change-Id: Idbf62886d6dbb4a4feeedb6ac17e8978cad2d59c

Former-commit-id: cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly cf29af8d65 [formerly ad353c34f9] [formerly d262c02612] [formerly b007d4a302 [formerly d262c02612 [formerly 98e25be1049113faf4b2cde1eea38ce7e432b6de]]]]
Former-commit-id: b007d4a302
Former-commit-id: bf6e4c1f71 [formerly e03283ad4a] [formerly e422f5095871dd256779ff7c9c2a352c6ebe88ac [formerly af1099b3fb]]
Former-commit-id: 1de9b6af0b5cf07a5ce19b7ea696b742fc341cd8 [formerly 8f49eea08f]
Former-commit-id: ed15c2edcc
2013-06-24 18:51:56 -05:00
Richard Peter
7ef16a186e Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly f47f42e31e [formerly 0fa3bf800d] [formerly 744eb64856] [formerly 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]]]
Former-commit-id: 37645245e5
Former-commit-id: 46ee2f5dd7 [formerly be094a1745] [formerly 3ed4e51d40f169d3901d163de305a8fd2a8d852b [formerly a7594f8c93]]
Former-commit-id: cacc5fb146cf2c652dd6ad6ea3b7938c9d320b73 [formerly 4b582fef50]
Former-commit-id: 9acddf6eeb
2013-06-24 18:36:15 -05:00
Steve Harris
d3517d7c1d 13.5.1-3 baseline
Former-commit-id: a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly a0ff6c20ea [formerly d8176d4a4c] [formerly 63803c1424] [formerly 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]]]
Former-commit-id: 72d22a30c9
Former-commit-id: e1a5587dd0 [formerly deebdb874a] [formerly d0cb0ee5e39989d9bf546dcfaef136a80153b511 [formerly 810388f00a]]
Former-commit-id: 295839b2b350f5da0fea64ca71fc6c7482abe123 [formerly 1e939939b5]
Former-commit-id: 50d4376af7
2013-06-24 09:29:43 -04:00
Matt Nash
f901b78686 Issue #2121 add weather and discrete grid support to data access framework and add remove identifier ability for python interpreter requests
Change-Id: I8ede8f8149be84e58d10d30066e08d3c80d543e5

Former-commit-id: 22a6ac6460 [formerly 0fe30ac2fb] [formerly 54a114d789] [formerly 22a6ac6460 [formerly 0fe30ac2fb] [formerly 54a114d789] [formerly 99e9194921 [formerly 54a114d789 [formerly 95ec6db9b349890a29bd13860193ada39b43c294]]]]
Former-commit-id: 99e9194921
Former-commit-id: 389c518d07 [formerly 6486801d2c] [formerly 3285d64a25c4b063cb7870f164e60f088e108622 [formerly 4fa399c710]]
Former-commit-id: 11b755cfce90e11ad9ace2a096651ee1e1112abc [formerly dc54f30149]
Former-commit-id: 967983972d
2013-06-20 06:59:05 -05:00
Steve Harris
173bcd08e1 Merge branch 'master_13.5.1' into omaha_13.5.1
Conflicts (self-resolved with kdiff3):
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java


Former-commit-id: dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly dadf03acaf [formerly 41748175b6] [formerly 97631f9c62] [formerly 40359c27c3 [formerly 97631f9c62 [formerly aac449bf94a60b1e2ab3bfcd2e97e310fd6ee414]]]]
Former-commit-id: 40359c27c3
Former-commit-id: a5fb9b721d [formerly 0e4504c0fa] [formerly adcb195c0b5c3c2f9853c9d7f17196c0bdceb3c3 [formerly 41fb06e6ea]]
Former-commit-id: 1687a46a12349027ac3ffa219ac1d360a20b95bd [formerly 9c75ca8493]
Former-commit-id: c27136275f
2013-06-17 15:25:32 -05:00
Steve Harris
4d75e573f4 13.5.1-2 baseline
Former-commit-id: 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 7fe15db2f8 [formerly bc60b22f00] [formerly adb779323d] [formerly 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]]]
Former-commit-id: 3386330894
Former-commit-id: 0f83e19dab [formerly ccd66c0724] [formerly ba43c81d4e5345330a6dab60b2a537923dc72f9e [formerly 3926dc20f7]]
Former-commit-id: 9e1fb182b15a5170eec651f5840744e66e08f619 [formerly 332a74c4de]
Former-commit-id: afc02d5731
2013-06-17 15:01:22 -04:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
David Gillingham
dc185b8e49 Issue #2023: Pure python client implementation of Data Access Framework.
Change-Id: I801b88192aafb4b139b5a1b397b33620c0b9f427

Former-commit-id: 98b288f275 [formerly 2c0af328b6] [formerly ae3e7a64b0] [formerly 98b288f275 [formerly 2c0af328b6] [formerly ae3e7a64b0] [formerly 4bdf7178bd [formerly ae3e7a64b0 [formerly edc77397fb74f07c66dd9f7b9ede5e8af81b4b18]]]]
Former-commit-id: 4bdf7178bd
Former-commit-id: 3dca4cce4c [formerly 242d3a5493] [formerly 9db7659ae79bb9f296e845275e0f20ae041ad376 [formerly 3f4b44fbbc]]
Former-commit-id: fd74a36a14878f4d53eb50e60772ff2b8614666b [formerly 402b6c4f86]
Former-commit-id: a8c3259817
2013-06-06 13:47:31 -05:00
Steve Harris
617bfcfc26 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 4e0ce194d9 [formerly 3e66acde96] [formerly 3745089239] [formerly 26bf27c70d [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]]]
Former-commit-id: 26bf27c70d
Former-commit-id: e83fa33a36 [formerly 629e76e0ff] [formerly 1a20439be64f0eb903e06ca2e50db5a76b284942 [formerly 1691fa413c]]
Former-commit-id: 3f4447bcb9d22cc2cdec3a061500d9497c6a3d38 [formerly 9704fd6a82]
Former-commit-id: 4d8d9354e7
2013-05-30 14:33:24 -05:00
Matt Nash
497b73eda1 Issue #1871 fix for 64 bit ints from Python to Java
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 1ecf5d26af [formerly bbc7406812] [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly bd64f70d1a [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: e9735dc410 [formerly 230e3d149e] [formerly 98364944a63f530252908f2eab510fc15f4a9823 [formerly ca208f913c]]
Former-commit-id: d5ca4e682343b0d9d3563f3267a259d7b0dc4c84 [formerly 1bfa549b40]
Former-commit-id: 63a4dd32c0
2013-05-23 09:07:56 -05:00
Richard Peter
c8484145dd Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly efd545925e [formerly 3d84e1dd53] [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]]
Former-commit-id: 930ff50fb8
Former-commit-id: ffe0b35085 [formerly 76f11f00ae] [formerly 46e481dc9690072f98dbbc406652f3eb9dc84d1f [formerly 81ae3ea8bf]]
Former-commit-id: ec9c4ee8853532d468f5912a752730400ce59ccd [formerly 046de916fd]
Former-commit-id: 7966576f23
2013-05-21 12:11:21 -05:00
Steve Harris
0b9bf76434 13.4.1-10 baseline
Former-commit-id: 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 294c127b0a [formerly 68fe2134b8] [formerly 9a403b3615] [formerly 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]]
Former-commit-id: 92152778b9
Former-commit-id: ac83fff244 [formerly 7e04d8cd13] [formerly 8c493e450ca4bda573630558025eb5e5d0941004 [formerly b1fc4e625b]]
Former-commit-id: 3963e7aafef444157e59ab93198e8eb33ab5acb5 [formerly 322036ea82]
Former-commit-id: b41118326c
2013-05-20 10:52:47 -04:00
Richard Peter
4a410e92b9 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]]
Former-commit-id: a9869f07ba
Former-commit-id: f186912fe1 [formerly aff520d61b] [formerly fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]]
Former-commit-id: 597cb507dad744955c6d4c7e9004386c40c57fbc [formerly 969fa704e5]
Former-commit-id: fb910196c0
2013-05-17 10:33:18 -05:00
Steve Harris
202e373f01 13.4.1-9 baseline
Former-commit-id: 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly 301821988e [formerly 88eee9cbfa] [formerly bcf7f15c90] [formerly aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]]]
Former-commit-id: aff41713f9
Former-commit-id: 7d55d0e959 [formerly 67a95d07d2] [formerly b841f2e35f17e9dfe7719399d45daaa6c9bb3bc2 [formerly 0766ae20dd]]
Former-commit-id: a7c4bec32a032d07ef14566103e744b20ea31401 [formerly 3f87ea1a15]
Former-commit-id: 1730b6c41e
2013-05-16 11:12:07 -04:00
Dustin Johnson
8364458947 Issue #1977 Merge branch 'omaha_13.4.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/CaveHttpsCredentialsHandler.java
	cave/com.raytheon.uf.viz.feature.alertviz/feature.xml
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/fffg/FFFGDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanResource.java
	cave/com.raytheon.uf.viz.npp.sounding/.classpath
	cave/com.raytheon.uf.viz.npp/.classpath
	cave/com.raytheon.uf.viz.npp/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.personalities.cave/.classpath
	cave/com.raytheon.uf.viz.personalities.cave/.settings/org.eclipse.jdt.core.prefs
	cave/com.raytheon.uf.viz.productbrowser/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/action/TimeOfArrivalAction.java
	cave/com.raytheon.viz.core/src/com/raytheon/viz/core/topo/TopoResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.grid/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.volumebrowser/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/build.edex/esb/bin/yajsw/wrapper.jar
	edexOsgi/build.edex/esb/bin/yajsw/wrapperApp.jar
	edexOsgi/build.edex/esb/conf/wrapper.conf
	edexOsgi/build.edex/esb/data/utility/common_static/base/python/JUtil.py
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/exception/MissingLocalMapsException.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/isc/IscReceiveSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm202.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm207.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm211.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/ngm213.xml
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/IHttpsConfiguration.java
	edexOsgi/com.raytheon.uf.common.datadelivery.harvester/.classpath
	edexOsgi/com.raytheon.uf.common.datadelivery.harvester/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.harvester/component-deploy.xml
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/PointTime.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/WFSPointDataSet.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/GridDataHistory.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.crimss/src/com/raytheon/uf/common/dataplugin/npp/crimss/CrimssRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/build.properties
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.nucaps/src/com/raytheon/uf/common/dataplugin/npp/nucaps/NucapsRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/.classpath
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.image/.classpath
	edexOsgi/com.raytheon.uf.common.image/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.localization.python/.classpath
	edexOsgi/com.raytheon.uf.common.localization.python/src/com/raytheon/uf/common/localization/python/package-info.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializableManager.java
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
	edexOsgi/com.raytheon.uf.common.spatial/.settings/org.eclipse.jdt.core.prefs
	edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/bandwidth-datadelivery.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/hibernate/HibernateBandwidthInitializer.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/crawler/Crawler.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/src/com/raytheon/uf/edex/datadelivery/harvester/purge/OpenDapGriddedPurgeImpl.java
	edexOsgi/com.raytheon.uf.edex.ebxml/.classpath
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
	edexOsgi/com.raytheon.uf.edex.plugin.grib.ogc/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.obs.ogc/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.scan/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/dao/DbInit.java
	edexOsgi/com.raytheon.uf.edex.topo/src/com/raytheon/uf/edex/topo/StatusConstants.java
	edexOsgi/com.raytheon.uf.edex.wcs/.classpath
	edexOsgi/com.raytheon.uf.edex.wfs/.classpath
	javaUtilities/yajsw/.project
	javaUtilities/yajsw/build/ReadMe.txt
	javaUtilities/yajsw/build/abeille/ReadMe.txt
	javaUtilities/yajsw/build/gradle/.gradle/0.9.2/taskArtifacts/cache.bin
	javaUtilities/yajsw/build/gradle/gradle/wrapper/gradle-wrapper.properties
	javaUtilities/yajsw/build/gradle/gradlew.bat
	javaUtilities/yajsw/build/gradle/gradlew.sh
	javaUtilities/yajsw/build/gradle/readMe.txt
	javaUtilities/yajsw/build/ws/ReadMe.txt
	javaUtilities/yajsw/build/ws/genKeyStore.bat
	javaUtilities/yajsw/lib/core/ReadMe.txt
	javaUtilities/yajsw/lib/extended/ReadMe.txt
	javaUtilities/yajsw/lib/groovy/ReadMe.txt
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/CIDR.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/CIDR4.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/CIDR6.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterListener.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterRuleHandler.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilterRuleList.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilteringHandler.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpFilteringHandlerImpl.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpSet.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpSubnet.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpSubnetFilterRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpV4Subnet.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/IpV4SubnetFilterRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/OneIpFilterHandler.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/PatternRule.java
	javaUtilities/yajsw/src/ahessian/org/jboss/netty/handler/ipfilter/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/Constants.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/server/AsyncFileServiceImpl.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/server/FileObjectImpl.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/service/AsyncFileService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/file/remote/service/FileObject.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/client/Client.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/client/RPCClientMixinPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/client/RPCClientSessionPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/server/RPCServerMixinPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/server/RPCServerSessionPipelineFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/server/Server.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/AsyncMBeanServerConnection.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/JmxSerializerFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/MBeanServerConnectionAsyncAdapter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/ObjectNameDeserializer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/application/jmx/remote/service/ObjectNameSerializer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/AuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/AuthTokenList.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/AuthTokenListFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/Base64AuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/ByteArrayWrapper.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/ClientAuthFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/EncryptedAuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/ServerAuthFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/auth/SimpleAuthToken.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/ClientCryptoFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/CryptoConstants.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/CryptoException.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/RC4Cipher.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/Salsa20.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/ServerCryptoFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/StreamCipher.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/StreamCipherFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/crypto/Util.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/CRCInputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/CRCOutputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/InputStreamBuffer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/InputStreamConsumer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/InputStreamDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/OutputStreamBuffer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/OutputStreamEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/PullInputStreamConsumer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/PushInputStreamConsumer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/io/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/log/OutLogger.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/Callback.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/CallbackReplyMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/ClientCallback.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/callback/ServerCallbackProxy.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/AsyncHessianProxy.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/BootstrapProvider.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/HessianProxyFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/HessianProxyFuture.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/ReconnectHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/SyncHessianProxy.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/client/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/io/Hessian2Output.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/io/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/FlushRequestMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/GroupedMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCCallDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCCallEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCCallMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCReplyDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCReplyEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/HessianRPCReplyMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/MappingSerializerFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/Message.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/OutputProducer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/message/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/Continuation.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ContinuationService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/DefaultContinuation.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ExecutorInvokeService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/HessianRPCServiceHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/HessianSkeleton.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ImmediateInvokeService.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/Service.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/ServiceSessionProvider.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/server/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ClientInputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ClientStreamManager.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/InputStreamReplyMessage.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ServerInputStream.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/rpc/stream/ServerInputStreamManager.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/serialization/HessianDecoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/serialization/HessianEncoder.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/serialization/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/ClientSessionFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/MixinPipeline.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/ServerSessionFilter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/ServiceSession.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/Session.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/SessionFactory.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/SessionImpl.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/session/package-info.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/stopable/StopHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/stopable/StopableHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/stopable/StopablePipeline.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/AbstractHeartBeatHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/ClientHeartBeatHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/IntervalTimer.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/timeout/ServerHeartBeatHandler.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/MyBlockingQueue.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/MyLinkedBlockingQueue.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/MyReentrantLock.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/ahessian/utils/TimedBlockingPriorityQueue.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/MulticastEndpoint.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/bridge/MulticastAccessPoint.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/bridge/MulticastAdapter.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/discovery/DiscoveryClient.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/discovery/DiscoveryListener.java
	javaUtilities/yajsw/src/ahessian/org/rzo/netty/mcast/discovery/DiscoveryServer.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/AbstractWrapperJVMMain.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperGroovyMain.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperJVMMain.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperMainServiceUnix.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperMainServiceWin.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperManager.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperManagerClassLoader.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/app/WrapperManagerProxy.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperClassLoader.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperExeBooter.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperLoader.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/boot/WrapperServiceBooter.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/DateFileHandler.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/MyFileHandler.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/MyLogger.java
	javaUtilities/yajsw/src/app/java/org/rzo/yajsw/log/PatternFormatter.java
	javaUtilities/yajsw/src/build/java/org/rzo/builder/JarBuilder.java
	javaUtilities/yajsw/src/build/java/org/rzo/builder/PolicyFileBuilder.java
	javaUtilities/yajsw/src/hessian/com/caucho/hessian4/io/FlushableOutput.java
	javaUtilities/yajsw/src/main/java/com/sun/jna/PlatformEx.java
	javaUtilities/yajsw/src/main/java/com/sun/jna/StringBlock.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/Advapi32.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/Options.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINBASE.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINERROR.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINNT.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINREG.java
	javaUtilities/yajsw/src/main/java/jnacontrib/jna/WINSVC.java
	javaUtilities/yajsw/src/main/java/jnacontrib/win32/Registry.java
	javaUtilities/yajsw/src/main/java/jnacontrib/win32/Win32Service.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/AbstractConfiguration.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/ConfigurationBinding.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/GInterpolator.java
	javaUtilities/yajsw/src/main/java/org/apache/commons/configuration/Interpolator.java
	javaUtilities/yajsw/src/main/java/org/codehaus/groovy/binding/PropertyBinding.java
	javaUtilities/yajsw/src/main/java/org/jboss/netty/logging/SimpleLogger.java
	javaUtilities/yajsw/src/main/java/org/jboss/netty/logging/SimpleLoggerFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/Constants.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/WrapperExe.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/WrapperExeBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/YajswVersion.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/Action.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/ActionFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/ThreadDumpImpl5.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/action/ThreadDumpImpl6.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/app/WrapperManagerImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/app/WrapperManagerImplMBean.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/cache/Cache.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/condition/Condition.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/ConfigUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/YajswConfiguration.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/YajswConfigurationImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/config/jnlp/JnlpSupport.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/AbstractController.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/Message.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/Controller.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/ControllerHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/ControllerPipelineFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/JVMController.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/MessageDecoder.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/jvm/MessageEncoder.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/controller/runtime/RuntimeController.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/groovy/WrapperBuilder.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/groovy/XHashMap.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/CircularBuffer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/CyclicBufferFileInputStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/CyclicBufferFilePrintStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/NonBlockingWriter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/TeeInputStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/TeeOutputStream.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/Test.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/io/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/ChannelGroupFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/Condition.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/ConditionFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/LoggingFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/SystemOutLoggingFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/nettyutils/WhitelistFilter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/AbstractProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/AbstractService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/DummyWindow.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/FileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/JavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Keyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Mouse.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/OperatingSystem.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/OsException.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Process.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/Service.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ServiceInfo.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ServiceInfoImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/StopableService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/SystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/TaskList.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/Cluster.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/ClusterNodeChangeListener.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/DummyWindow.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/FileUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/OperatingSystemWindowsXP.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/Pdh.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/PdhBufferedCounter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/PdhCounter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/ScriptCounter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPKeyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPMouse.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/WindowsXPTaskList.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/ms/win/w32/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/OperatingSystemPosix.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixKeyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixMouse.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/PosixSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/UpdateRcParser.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/Utils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/VelocityLog.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/AppStarter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/BSDSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/OperatingSystemBSD.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/MacOsXSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/bsd/macosx/OperatingSystemMacOsX.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxKeyboard.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/LinuxServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/linux/OperatingSystemLinux.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/OperatingSystemSolaris.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisErrorHandler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisFileManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisJavaHome.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisProcessManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisServiceManager.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/os/posix/solaris/SolarisSystemInformation.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/RestartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/StartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/StopJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/Timer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/quartz/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/AbstractScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/GroovyScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/RunScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/RunScriptBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/Script.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/ScriptFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/ShellScript.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/script/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/DummyTimer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/RestartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/StartJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/StopJob.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/Timer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/TimerFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/TimerImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/timer/package.html
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tools/ConfigGenerator.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tools/JCLParser.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ByteFormat.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/Console.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/TrayIconMain.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/TrayIconMainBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIcon.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIconDummy.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIconFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/WrapperTrayIconImpl.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/client/AHessianClientPipelineFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/client/AHessianJmxClient.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/server/AHessianJmxServer.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/server/AHessianServerPipelineFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/tray/ahessian/server/AhessianLogging.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/InstallAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/InstallerBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/InstallerMain.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/UpdateAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/UpdaterBooter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/updater/UpdaterMain.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/CaseInsensitiveMap.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/CommonsLoggingAdapter.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/Cycler.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/DaemonThreadFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/File.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/MyReentrantLock.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/SimpleThreadFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/Utils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/VFSFileValidator.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/util/VFSUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/AbstractWrappedProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/AbstractWrappedProcessMBean.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/AlphanumComparator.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/FileUtils.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/MissingTriggerAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/StateChangeListener.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TrayIconMessage.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TrayIconProxy.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TriggerAction.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/TriggerListener.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedGroovyProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedJavaProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedProcessFactory.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedProcessList.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedRuntimeProcess.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedService.java
	javaUtilities/yajsw/src/main/java/org/rzo/yajsw/wrapper/WrappedServiceFactory.java
	javaUtilities/yajsw/src/main/java/test/HelloWorld.java
	javaUtilities/yajsw/src/main/java/test/HelloWorld2.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/AsyncServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/ClientBooter.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/ClientMain.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/HiddenTable.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/Host.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/HostsTable.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/RPCClientPipelineFactory.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/client/ServicesTable.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubBooter.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubMain.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubService.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/HubServiceServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/hub/RPCServerPipelineFactory.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/AbstractServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/RPCServerPipelineFactory.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ServerBooter.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ServerMain.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/srvmgr/server/ms/win/WinServiceManagerServer.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/util/BeanTableFormat.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/util/ObservableList.java
	javaUtilities/yajsw/src/srvmgr/java/org/rzo/yajsw/util/ObservableObject.java
	javaUtilities/yajsw/src/test/java/org/rzo/test/RunGroovyTestNg.java
	javaUtilities/yajsw/src/ws/java/org/rzo/yajsw/ws/WebStartBooter.java
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database/component.spec
	rpms/awips2.core/Installer.edex-environment/edex/component.spec
	rpms/awips2.core/Installer.ldm/patch/bin/edexBridge
	rpms/awips2.core/Installer.maps-database/component.spec
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.qpid/0.18/SOURCES/qpidd
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/i386/build.sh
	rpms/build/x86_64/build.sh
	tests/.classpath

Former-commit-id: c93a8f9305 [formerly 881cbc496b] [formerly fadbca34ef] [formerly c93a8f9305 [formerly 881cbc496b] [formerly fadbca34ef] [formerly 49b6526d12 [formerly fadbca34ef [formerly e41878377e33f794d7ad67f232e6413a61bc1c18]]]]
Former-commit-id: 49b6526d12
Former-commit-id: 7d7464fb42 [formerly d118d673e3] [formerly af9221bdea1455b9753d2dc6bcb7704a74f3f8f3 [formerly 5eb7c5bc9e]]
Former-commit-id: 9de21efcad5566572fa248b6d9dac739849edbdf [formerly 45e04b906a]
Former-commit-id: c45b787817
2013-05-06 15:04:23 -05:00
Steve Harris
ab612b6c0f 13.4.1-5 baseline
Former-commit-id: 313481c30e [formerly aa9a719836] [formerly 85bbf6d242] [formerly 313481c30e [formerly aa9a719836] [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]]]
Former-commit-id: 4ae0e2e858
Former-commit-id: 450dbb7e8d [formerly e0af96524f] [formerly 2eb97f64bb7ce7cc6616c74badc76ecc130a4aee [formerly aa4624c58f]]
Former-commit-id: e4922fa3c05c1291bbfa71f38018a0dbf70e2b58 [formerly 53daaea355]
Former-commit-id: 210f5ee219
2013-05-03 09:29:14 -05:00
Matt Nash
e86a2bcf57 Issue #1870 add Python and XML Incremental Override, implemented for both Java
and Python

Change-Id: I293b6abcdffbd2cef35e9b986362113186583c55

Former-commit-id: a72e130f18 [formerly f544fdd9e1] [formerly 288bd3b02c] [formerly a72e130f18 [formerly f544fdd9e1] [formerly 288bd3b02c] [formerly 7943769110 [formerly 288bd3b02c [formerly 27f86d4c39ce8b8e708408511c820a5dd765e4cb]]]]
Former-commit-id: 7943769110
Former-commit-id: 25fac01538 [formerly 5b62180a2a] [formerly 09b0ecdb20cc917f603bc05f2a53cae1c74ee3ea [formerly ae21592cbf]]
Former-commit-id: 07822a8f4f1084499d7851ed610c106db7d9fd65 [formerly 40c3731f4a]
Former-commit-id: ccfcc23bee
2013-05-02 13:39:55 -05:00
Steve Harris
ba48ab0362 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7d085660f8 [formerly 4357e2dacc] [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]]
Former-commit-id: 6fc143d13d42b0d419bcede3614f0ee982260764 [formerly e0986cfda8]
Former-commit-id: 5dbfeb38ac
2013-05-02 10:00:38 -05:00
Steve Harris
7193eee657 13.4.1-3 baseline
Former-commit-id: 03ff5cd82c [formerly 3486902772] [formerly 54afedf617] [formerly 03ff5cd82c [formerly 3486902772] [formerly 54afedf617] [formerly 86e96f378c [formerly 54afedf617 [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]]]
Former-commit-id: 86e96f378c
Former-commit-id: 63a820bca5 [formerly 9fb6f3835c] [formerly 9ed4bd11d8f4f59100814b197a573e16fc302211 [formerly 8a41dd2048]]
Former-commit-id: efce989e4749e088495f2c8e2c2e6ff2660cbac9 [formerly 7e923539d5]
Former-commit-id: d8da1e82f5
2013-04-29 12:25:07 -05:00
Steve Harris
b0fb1f49be 13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89 [formerly 0e950655f1] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7]
Former-commit-id: 722e428c74
2013-04-24 17:15:55 -05:00
Matt Nash
9044f422ba Issue #1871 convert parameters to Strings and make sure to return them
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

Former-commit-id: 6f12e80c0d [formerly 64323fc0af] [formerly cd77308fac] [formerly 6f12e80c0d [formerly 64323fc0af] [formerly cd77308fac] [formerly 6c488cee05 [formerly cd77308fac [formerly 429b21c5f258fa9cd267933506bfe7091bb0e30b]]]]
Former-commit-id: 6c488cee05
Former-commit-id: 6e4cdda323 [formerly 4ee6085bda] [formerly b7dde24ffa640c3ec2a075a60bbac138bc9b7837 [formerly 7dd72ab7d5]]
Former-commit-id: bb7a2e01e84d6a44c089c22831f81e386f072be2 [formerly 6969b0c0ae]
Former-commit-id: 63a13ef503
2013-04-12 09:31:23 -05:00
Matt Nash
eb17cb0e94 Issue #1871 add default values for times so they don't need to be sent in from
Python, move getLatLonCoords()

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 01e9ab8a06 [formerly 2ab1cf8abb] [formerly 3af61d7117] [formerly 01e9ab8a06 [formerly 2ab1cf8abb] [formerly 3af61d7117] [formerly b44ee44664 [formerly 3af61d7117 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]]
Former-commit-id: b44ee44664
Former-commit-id: 6a755f6a4b [formerly e6fc7942b8] [formerly 2a5d354ea6b4a6308cc09c3d485c9d2ea3778f71 [formerly c95e825d35]]
Former-commit-id: 8b3973aa378e7fd3ef3866d756662f36aa72b401 [formerly 7b25f73a9a]
Former-commit-id: dc0f234f02
2013-04-12 09:31:16 -05:00
Steve Harris
fd3b082c54 13.3.1-17 baseline
Former-commit-id: 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly 1b8e623c9b [formerly f28b85d42f] [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]]
Former-commit-id: a3fe998f8f
Former-commit-id: a6ff543f88 [formerly ef413da5f7] [formerly 4f7db3036276e18944f4e769d33a7d819e6ace34 [formerly 4afa41d4e7]]
Former-commit-id: aceedb117eb5695a6155a52973b981de9bb6252a [formerly 50becef97f]
Former-commit-id: a112803c98
2013-04-01 12:04:56 -05:00
Steve Harris
f2a81e18e9 Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/AbstractVizPerspectiveManager.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/EnsembleGridAssembler.java
	edexOsgi/com.raytheon.uf.edex.common.core.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.registry.feature/feature.xml

Former-commit-id: 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 02f49bc2e4 [formerly 069ee8a748] [formerly 9a321b6ac8] [formerly 3073951b3d [formerly 9a321b6ac8 [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]]
Former-commit-id: 3073951b3d
Former-commit-id: b7beed13a5 [formerly 6e48567370] [formerly e4a57946b3b4e9eac62e9d834189b893fff56fad [formerly a4bf236cc7]]
Former-commit-id: 0d9762105b7449280eb42aff17e841196ee5e518 [formerly 90ec2d3fbf]
Former-commit-id: 53ee0151ca
2013-03-27 22:16:15 -05:00
Steve Harris
cdad316568 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly bb88c2133a [formerly 979d6a5d8c] [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]]
Former-commit-id: d997aeaee4
Former-commit-id: 3f99eed860 [formerly 428ec8a472] [formerly d995dd5e3b86e69398a1b22b4ea692658d3dcec9 [formerly e67b16bb03]]
Former-commit-id: 81096335a88ae0f8d272c7ae379aa77289f918fa [formerly f3a84e952e]
Former-commit-id: 21332cb0b5
2013-03-27 18:21:05 -05:00
Steve Harris
43942dad11 13.3.1-14 baseline
Former-commit-id: f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly f9b3430485 [formerly 91a5e4578e] [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 3cbf22bd96 [formerly 936e4adda2] [formerly 38d1148d2eae21bb316bf579672305ceffd84c1c [formerly 2ca160caf0]]
Former-commit-id: 8c6b23e522a402fa4cd1e6df150e646e4689e3b0 [formerly 8237fdadaa]
Former-commit-id: f59f1f02b0
2013-03-27 17:59:34 -05:00
Steve Harris
56522d8cf5 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 690f451746 [formerly 4e54025fcd] [formerly 5fcfaf4360] [formerly 65df96a419 [formerly 5fcfaf4360 [formerly 99cd1f52511023794d9dcb21c68720c4e47faec5]]]]
Former-commit-id: 65df96a419
Former-commit-id: 6e4b9a6f01 [formerly 5bb29627dc] [formerly db9839345c6d211e370f415e6567c95c5596977e [formerly 346b97a39a]]
Former-commit-id: 0576f0394c9924a93def2e1b0d821a8dd15e6468 [formerly fdd07bd72c]
Former-commit-id: 0bd1d5bdef
2013-03-26 12:47:40 -05:00
David Gillingham
c3a87654de Issue #1823: Trigger SAT smart inits based only on sector id and physical element.
Change-Id: I2d8c44ea6dbe9c227e3984f64caf5071b1c62e79

Former-commit-id: 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly 4c5493d607 [formerly ad357638b3] [formerly 1df8d39919] [formerly bebfc60317 [formerly 1df8d39919 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]]
Former-commit-id: bebfc60317
Former-commit-id: 1c24ec516d [formerly bf196a7782] [formerly a809765d33e0a62afbe50224ec11b4f9d9365c4f [formerly 07487a27dc]]
Former-commit-id: 04ffee131ad16fc238cce01414a4a0035486bafd [formerly 45bf26aa00]
Former-commit-id: 3b29423947
2013-03-26 10:33:42 -05:00
Steve Harris
81a8604bfe Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/data/IColorMapDataRetrievalCallback.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/dataformat/GLColorMapDataFormatFactory.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/ext/mosaic/GLMosaicImageExtension.java
	edexOsgi/com.raytheon.edex.ingestsrv/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.bufrua/src/com/raytheon/edex/plugin/bufrua/BufrUADecoder.java
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/plugin/satellite/SatelliteDecoder.java
	edexOsgi/com.raytheon.edex.plugin.sfcobs/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly e154e58354 [formerly b0621d90bc] [formerly fd71e44f0f] [formerly a23cecdb26 [formerly fd71e44f0f [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]]
Former-commit-id: a23cecdb26
Former-commit-id: 5be2208aaf [formerly 02105701a0] [formerly 26c72d3b440387cfdf094f0ac6a91b946edf8f59 [formerly e96e95b565]]
Former-commit-id: 1234c0205c914f2be5f36fcfc47900e46f0e87db [formerly e6ab1deba2]
Former-commit-id: feba54ac83
2013-03-26 10:12:34 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
616cddf60c Merge branch 'omaha_13.3.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly b7994fb77b [formerly 0055a3213d] [formerly e2496455b2] [formerly 0379be06d2 [formerly e2496455b2 [formerly 67b25fa95817acafd25818c825656236597b6e09]]]]
Former-commit-id: 0379be06d2
Former-commit-id: 0a86e74ea5 [formerly 8db98c2d71] [formerly 1678ef2604a244a5bc388e58878b710069703255 [formerly 4fc2bb7bba]]
Former-commit-id: f6d20e2ee3c08859d481aeb137ed2ce12d7d43af [formerly a91fcf98a2]
Former-commit-id: 961c0b56a7
2013-03-20 16:09:26 -05:00
Steve Harris
2b05476c98 Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/procedures/TCMWindTool.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

Former-commit-id: ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly ea052b14bb [formerly a9ced3a7ef] [formerly fa15f03e1b] [formerly dc419068f0 [formerly fa15f03e1b [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]]
Former-commit-id: dc419068f0
Former-commit-id: 2cbd2a1bc9 [formerly f4e26fd94d] [formerly 64b470b4de5f62b27c8e9b8b00161d778a7472ba [formerly 31044eabd1]]
Former-commit-id: 3df5100c782adf8e60ee861fd034fa4cad0232ba [formerly 8065161896]
Former-commit-id: c129fed15e
2013-03-20 16:06:20 -05:00