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

70 commits

Author SHA1 Message Date
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
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
Richard Peter
ba88ac2d5c Merge branch 'omaha_13.4.1' (13.4.1-13) into development 
Conflicts:
	cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
	edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
	edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
	tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java

Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]]
Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8]
Former-commit-id: 22f6319986
 2013-06-04 14:06:53 -05:00
Matt Nash
854a63f7d0 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective 
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly aa13a1ed3a [formerly 7d61737d79] [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7895dfa2e4 [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]]]
Former-commit-id: cb59b82add
Former-commit-id: efdb42ab54 [formerly c61b9d95e5] [formerly e32c05019af2175b9cb52b0d115b6de5640bce6f [formerly 5d492a4b10]]
Former-commit-id: 054ceaf89a593647c65a3915436f2882db3ed630 [formerly 0d06f59694]
Former-commit-id: 2b85258c26
 2013-06-03 09:58:43 -05:00
Steve Harris
7e31d1a9a1 13.4.1-13 baseline 
Former-commit-id: 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly 9a7ef48967 [formerly e3b8086bd0] [formerly 87b9712009] [formerly de476791fb [formerly 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]]
Former-commit-id: de476791fb
Former-commit-id: 70ecafa237 [formerly 418f8aef56] [formerly 0455657ac09be5391a236a0b109f8e55687afaa3 [formerly b58cf237bf]]
Former-commit-id: 28cd3469f8ef78216f243c61430c36c1ad67dd52 [formerly c9155c1631]
Former-commit-id: 176f4d392f
 2013-05-29 16:30:09 -04:00
Steve Harris
6a5b97e11e Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 511f938c3f [formerly 570128b986] [formerly 8496832064] [formerly 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]]
Former-commit-id: 3590310f17
Former-commit-id: d477564678 [formerly 389eefd1f9] [formerly 186ffe99686bcdd0c279e9784ea72d113f36fb2e [formerly 0f9e0b343d]]
Former-commit-id: 95db422c792e933bcfe1e19c2b8955eb8698bece [formerly c184d31779]
Former-commit-id: 61debd93bf
 2013-05-22 16:13:08 -05:00
Steve Harris
cf67535a3a 13.4.1-12 baseline 
Former-commit-id: 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly 623f813923 [formerly 397bbf674a] [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]]
Former-commit-id: e53ada66b8
Former-commit-id: fb41995981 [formerly b745b332ae] [formerly 2f1cc0615a2004fad57c6bc60c7b79567c46436b [formerly bd4f93e859]]
Former-commit-id: 0563320c3a39f9ddb056e9b1876ed4108f818501 [formerly 0d9e71aee2]
Former-commit-id: 71e13c4d4d
 2013-05-22 16:42:39 -04:00
Richard Peter
dd2ceed4ae Merge branch 'omaha_13.4.1' (13.4.1-7) into development 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly 207c17d5af [formerly 2c009eb618] [formerly a12830f762] [formerly c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]]
Former-commit-id: c5040038d3
Former-commit-id: 994357c357 [formerly 6c09ab9bdf] [formerly 4a7cd13915319fef7cf3e6405d041ffee0348571 [formerly bcf4dcc810]]
Former-commit-id: 10a9ca07796d13205616f7696c5af614917400a1 [formerly f7470fbd8f]
Former-commit-id: c7755a649b
 2013-05-13 17:11:05 -05:00
Steve Harris
f04a1e8fc0 13.4.1-6 baseline 
Former-commit-id: 5544c4a072 [formerly 6fcbb5ae6b] [formerly 8379977673] [formerly 5544c4a072 [formerly 6fcbb5ae6b] [formerly 8379977673] [formerly 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]]]
Former-commit-id: 16fe8cc5a2
Former-commit-id: 5568ada76b [formerly 5be793f2f9] [formerly f649c7ad7b4bf50f9a110308d2253393bb3d2506 [formerly 979700c302]]
Former-commit-id: 772ececc049088d7fcf3524449b57d47ac45e322 [formerly 2e835dc591]
Former-commit-id: 5e54a425fb
 2013-05-07 08:47:39 -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
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
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
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
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
Mike Duff
868a6c3ddf Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1 
Conflicts:
	cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
	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.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
	cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.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/Wx.java
	edexOsgi/build.edex/edex/allElements.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	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/server/GridParm.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/GridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.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/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/awips2.qpid/0.7/build.sh
	rpms/awips2.qpid/build.sh

Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb

Former-commit-id: f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly f767014e9a [formerly c1f7d33bb8] [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 5d72795e1b [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 1314976753 [formerly b366778df0] [formerly 66366ecca6a9baeda295e8caa2bd45103113d7ee [formerly 4c3011edce]]
Former-commit-id: 428a7b37d44680f4388cb79776fa256ccd460279 [formerly efec4d0365]
Former-commit-id: 493014d466
 2013-03-26 09:19:39 -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
0929de5965 Merge branch 'omaha_13.3.1' into development 
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 96ba08115a [formerly d00dc0d174] [formerly 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]]
Former-commit-id: b81ab6022fde7cae7ff4586a3467e9e741b445f7 [formerly 6d4512fa3a]
Former-commit-id: 352c267fc9
 2013-03-20 13:45:11 -05:00
Mike Duff
4943f6f2d8 Issue #1457 - Fix mpe problems - displaying gages on map and running fieldgen 
Change-Id: I9c341235d0d9bfcf6b9b04aeed2ac2a1d96136ff

Former-commit-id: 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 361434a64f [formerly 70efff8f0a] [formerly b115d3611c] [formerly 058064ce0d [formerly b115d3611c [formerly 7fc127dfaacc36b4051fa5a46774c2823b1d42b2]]]]
Former-commit-id: 058064ce0d
Former-commit-id: e205993cba [formerly 3e1b4ba54b] [formerly f1784284db525c1ae3413ff04b935577969880b1 [formerly 7e66c8e46d]]
Former-commit-id: bda98ae3e9d9fb64c0dfddbd5de2cf785f5bcbb7 [formerly 144223ed9b]
Former-commit-id: c22d1962de
 2013-03-19 10:10:01 -05:00
Steve Harris
4c10c7a5be Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly b64fbe549a [formerly 28ef804e1b] [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly b8f0635ad6 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 027eda5dce [formerly 2a26783ba7] [formerly 43739ee91e600eb0ff17b60915bab97a42d2b3aa [formerly 900b9aadde]]
Former-commit-id: 8012cd58ae8927dc32f50de6d568a7829c75f0a6 [formerly 22bb7ecd33]
Former-commit-id: 481cee4c74
 2013-03-18 16:52:00 -05:00
Steve Harris
c1bb0c2749 Merge branch 'master_13.3.1' (13.3.1-8) into omaha_13.3.1 
Conflicts (just history comments):
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/gfe/userPython/procedures/TCMWindTool.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java


Former-commit-id: 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly 3e69490ab2 [formerly 27c418812f] [formerly 1a999fee5a] [formerly c18b96dc4c [formerly 1a999fee5a [formerly 5927ff20543395733d9302eba2e6772315730a80]]]]
Former-commit-id: c18b96dc4c
Former-commit-id: 0e9919f6be [formerly ea27f9cd17] [formerly e2239b3a3593dcd59bcf723bcb944913f4da1785 [formerly 245afb28c8]]
Former-commit-id: e6c80b59106bc4b2d5423de97088b928e09b489c [formerly fc6748cb3e]
Former-commit-id: 9d4d1baefe
 2013-03-18 16:43:22 -05:00
Steve Harris
0b0c5e4bec 13.3.1-8 baseline 
Former-commit-id: dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly dd30a5f940 [formerly bc9df0a8f9] [formerly f97d78994b] [formerly c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]]]
Former-commit-id: c15b3ffe20
Former-commit-id: 2fd4ac9397 [formerly 81a3f29afc] [formerly 6578eddad397d44d5b9e9908233734077c464b81 [formerly 5f492500ea]]
Former-commit-id: 419ae74464bf2fde736619a602f8bbae8a6b4c86 [formerly 0c94cc97fb]
Former-commit-id: 1c2dffd66d
 2013-03-18 15:43:32 -05:00
Steve Harris
072065191b Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 47cde9bd09 [formerly bca46a1354] [formerly 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]]
Former-commit-id: afba0e5b2a5a76c08ffa616eefd96f2ca6363113 [formerly 5232592cfa]
Former-commit-id: 346b22b196
 2013-03-12 16:04:23 -05:00
Dave Hladky
87992329b4 Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 
Conflicts:
	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
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
	ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
Change-Id: I02fce82c45560fb3f150864eb56e4a6f264f3227

Former-commit-id: e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly e17f8e0511 [formerly 5c65862b8f] [formerly a1006667e0] [formerly 4b08491880 [formerly a1006667e0 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]]
Former-commit-id: 4b08491880
Former-commit-id: eefd544e4b [formerly 155903d135] [formerly ad56918be504d78eeaaedaf28f186a5531e74b1f [formerly 6ea95002de]]
Former-commit-id: 70f3f744097c668c89b07b6780fc8db6c04380d8 [formerly 29ed641a13]
Former-commit-id: cdfbcc7136
 2013-03-12 15:48:34 -05:00
Steve Harris
ed1788343e 13.3.1-6 baseline 
Former-commit-id: 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 4eef6862d6 [formerly 2e110bd151] [formerly 3a4c7931e1] [formerly 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]]
Former-commit-id: 566b677d09
Former-commit-id: 0cec06c171 [formerly 6fe4b16924] [formerly d7e03fcb3e7009a23e58cf48707fadfffebfe3d0 [formerly 4ed21b702b]]
Former-commit-id: 0e585016165e18d475399f775c1938136de541c6 [formerly c6f379f59a]
Former-commit-id: c28f3aeb02
 2013-03-12 08:35:45 -05:00
Ben Steffensmeier
c903521884 Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 8e2333d0d7 [formerly d27d30c2db] [formerly f46686a6e2] [formerly 2ca86633d6 [formerly f46686a6e2 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 4936191404 [formerly 334af0001b] [formerly fa7abe8431fbbdea60e6504cd61a867956d20856 [formerly 5068b18c6a]]
Former-commit-id: 387e3e95805ed9aa6efd193b1112d4ae6d8ac95a [formerly 0778375180]
Former-commit-id: 866c873f71
 2013-02-28 17:00:56 -06:00
Ron Anderson
0b173f616b Merge "Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. Change-Id: I48738965df0da9052f810dfc1f312ed032693390" into development 
Former-commit-id: 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 9c2caa95a0 [formerly 70050ac749] [formerly f1ad632c3f] [formerly 884d9ff787 [formerly f1ad632c3f [formerly ec5be70336a0f6bb6874c51b72b67046fbde2c68]]]]
Former-commit-id: 884d9ff787
Former-commit-id: c0364ee665 [formerly 744391e3f6] [formerly 0135351e11c5776ecfe36b40d5d95a0c1101bb82 [formerly 2c8d14406b]]
Former-commit-id: 1338a5bc6e6053c9351096c4a9796a28b268cf42 [formerly fa5872a35d]
Former-commit-id: b6cd0dfcf8
 2013-02-19 18:46:16 -06:00
Steve Harris
b7446ac966 Merge branch 'omaha_13.2.1' (13.2.1-8) into development 
Former-commit-id: f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly f1f5359a2f [formerly c2327ce33d] [formerly ea50a5db77] [formerly d123c044c3 [formerly ea50a5db77 [formerly 819f88fb8b26ec0a83164df82b31e9b824b49da8]]]]
Former-commit-id: d123c044c3
Former-commit-id: bca88ba9c7 [formerly 81f1fb83a0] [formerly d8887e78bdc5e20d85019ee8b30e177eceb18ccf [formerly 1c08acab38]]
Former-commit-id: cb9ccc383baf32e35d0325fdfa001bdd7a62b969 [formerly 5a33182da5]
Former-commit-id: 77a66598fe
 2013-02-19 12:22:00 -06:00
Steve Harris
0b53108cbe 13.2.1-8 baseline 
Former-commit-id: d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly d176ec1f38 [formerly 18da2e93d7] [formerly f81b382c04] [formerly 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]]]
Former-commit-id: 053156f02e
Former-commit-id: db02d32440 [formerly 8cffb55371] [formerly 609380ceb2a4b7bcee69d80b0285d0756125ad49 [formerly c6d584758f]]
Former-commit-id: db6d42ff3ca25509616d69de95cc4fe49742d3a6 [formerly edac913af7]
Former-commit-id: 32ad300b47
 2013-02-18 09:09:41 -06:00
Ben Steffensmeier
0713bb380c Issue #1616 Add option for interpolation of colormap parameters, disable colormap interpolation by default. 
Change-Id: I48738965df0da9052f810dfc1f312ed032693390

Former-commit-id: bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly bd6e0f8462 [formerly 1940a92596] [formerly aa4c7526ff] [formerly 8c0e9d3d9e [formerly aa4c7526ff [formerly ccf08fbd82aac8b1ae1d4f42b455ec7c3f995970]]]]
Former-commit-id: 8c0e9d3d9e
Former-commit-id: 4140260659 [formerly 086f6aabe9] [formerly badd785e8aa7a433093d24b4c4bf0d45450daf4a [formerly 455aa4628f]]
Former-commit-id: 03ba4f1d1c1eb50df898c9573eb2b7f62eaa5359 [formerly 49b700da85]
Former-commit-id: c300faa186
 2013-02-14 15:34:25 -06:00
Mike Duff
eb613ad337 Issue #1550 - Add ability for MPE to preload maps on perspective open. 
Former-commit-id: 1740e14fa9 [formerly 944c5a4732] [formerly f9fec9668c] [formerly 1740e14fa9 [formerly 944c5a4732] [formerly f9fec9668c] [formerly 5940423ac8 [formerly f9fec9668c [formerly 779ff3238cd9aba2980f589721a0f5ccfff4a15e]]]]
Former-commit-id: 5940423ac8
Former-commit-id: ac13852b92 [formerly 2edb4f1117] [formerly 199352144e883563c5a96c9514598f1ea31d4c67 [formerly b55adb3cce]]
Former-commit-id: dfd19cb8e65ecd1d065187cd30ed6b36e2e0f926 [formerly e1c6fbc93d]
Former-commit-id: 302b467d5e
 2013-01-29 15:39:40 -06:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline 
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
 2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58 13.2.1-1 baseline 
Former-commit-id: 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly 11b05eedeb [formerly 48d1aa7732] [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]]]
Former-commit-id: c63f9bcae0
Former-commit-id: 1d1791b3b4 [formerly 8ed6a53113] [formerly b971e3aabeeb8f14462f7ad6502dafe876153e63 [formerly f6670806bf]]
Former-commit-id: c7cd6e75591b001d138f41ea10b2ed691477e255 [formerly 9146e727f9]
Former-commit-id: 08bf724a6c
 2013-01-23 11:13:03 -05:00
Max Schenkelberg
56d05965a7 Issue #1457 Initial changes for MPE time refactor. Wrote custom resource that handles multiple times and tailored code to use resource instead of old XmrgResource which was not written to support multiple frames 
Amend: Cleaned up comments and some bugs in code after review

Amend: Rebased changes

Change-Id: I512b9bb30a08b9a1cfc5e8d9b5008ebc4f352c2d

Former-commit-id: 77c2ae6ad1 [formerly e5cd1901a5] [formerly ff72ce0b0c] [formerly 77c2ae6ad1 [formerly e5cd1901a5] [formerly ff72ce0b0c] [formerly db3e7bab99 [formerly ff72ce0b0c [formerly ab74da7808aa343983f532ee076820c7e63fdded]]]]
Former-commit-id: db3e7bab99
Former-commit-id: 4e507c57f6 [formerly fac8769336] [formerly 36ba7490bc83dc4ce324f378bdf66b8020044b22 [formerly c246f56568]]
Former-commit-id: 8a42c64afd5c2350c96215ef1e4d9f285971a7a1 [formerly 21dae56a1b]
Former-commit-id: be1fb93c1b
 2013-01-15 14:41:19 -06:00
Richard Peter
0a55bcfd67 Merge branch 'ss_builds' (13.2.1-1) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 6e42fa32d3 [formerly a966546e31] [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 3fb7d96ec1 [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]]]
Former-commit-id: 1dbb34523b
Former-commit-id: d880361e06 [formerly 79ef100838] [formerly 85a5d2a8fdf64c0ba9efe9815c5ef9cb8f27eb62 [formerly 345dfd2ca9]]
Former-commit-id: ef42f50f6a062518b4a0d8effc537eaf4c7292a1 [formerly cd2014bf8d]
Former-commit-id: e838f2db25
 2013-01-14 18:07:17 -06:00
Steve Harris
e5f32a2bbe 13.2.1-1 baseline 
Former-commit-id: 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 8dd688c878 [formerly 5dfe4d10f1] [formerly e62172c8c7] [formerly 81849e3cbb [formerly e62172c8c7 [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]]]
Former-commit-id: 81849e3cbb
Former-commit-id: 3d35fd52d5 [formerly e34695538d] [formerly c835df6c612355b23abcc04a384d5b398d1c5ec6 [formerly 8713dfc5ca]]
Former-commit-id: d5a28dcde502767d0f84d7301207580849e0a584 [formerly ebff2a6275]
Former-commit-id: b4556ea28f
 2013-01-14 18:42:21 -05:00
Richard Peter
7d529beed2 Issue #1408: Merge 13.1.2-6 into development 
Former-commit-id: 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 95f0508c29 [formerly d0a6ba23e5] [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 029ebaa63a [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]]]
Former-commit-id: 328be6ac2b
Former-commit-id: 177a54d19a [formerly 80bf1d7a28] [formerly e62c56e99c7920d8884c0d3271ccfd750504bf46 [formerly 6a5a0d7d09]]
Former-commit-id: 8e36b37de071d25b4a9a89babcf0974ae973fdbe [formerly 709af3b25e]
Former-commit-id: 398b47967d
 2013-01-09 17:55:05 -06:00
Steve Harris
3e63f280a2 13.1.2-6 baseline 
Former-commit-id: 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 1d4d25b49b [formerly efd3392abe] [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]]
Former-commit-id: 59969775ad
Former-commit-id: fe763963e9 [formerly 82a1ed77a4] [formerly fa884fbcd584330564fea44a1538e11036e753a8 [formerly dbcae57f57]]
Former-commit-id: 385d5b42196eb703cc60637c47506c02c454b5fc [formerly 05bdc0ecd2]
Former-commit-id: b7f180d9d3
 2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409 13.1.2-2 baseline 
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
 2013-01-06 14:32:24 -06:00
Max Schenkelberg
8f83ab09b5 Issue #1329 Committing some of the core classes touched for MPE time refactor. Made GL data mapping work properly with non float types. Made GriddedImageDisplay2 use new TileSetRenderable for processing and memory efficieny 
Change-Id: Ib12a3a6bb1f20f1e8eeb6dbd170802cf79359cfb

Former-commit-id: 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 24938de2d2 [formerly be99f6c7ca] [formerly 3e128b266a] [formerly 5db71ca943 [formerly 3e128b266a [formerly eaeb75b4f2dd1c19f805c8cf4f4d010b455d99e8]]]]
Former-commit-id: 5db71ca943
Former-commit-id: cf9e6ff3b2 [formerly d43e0c1c25] [formerly e215a3aeda7dede45a9e7e93feb2e2f2e9e6e34b [formerly b74d788909]]
Former-commit-id: 56e64154314976881dc1506547d9d9b8c9f9f150 [formerly 206116ab66]
Former-commit-id: 2030832669
 2012-12-12 11:39:32 -06:00
Steve Harris
179755f156 Merge branch 'ss_builds' (12.12.1-12) into development 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java

Former-commit-id: d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly d27c5237c3 [formerly 4d4771ee3a] [formerly 43ddfe98c4] [formerly f6988eefff [formerly 43ddfe98c4 [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]]]
Former-commit-id: f6988eefff
Former-commit-id: 377804398b [formerly f02c1ef71d] [formerly e2ccbce82667d7cf9a91d423288dfe898f82ff00 [formerly 6287b32e7d]]
Former-commit-id: 6cdb793c9cb97ebc00900dfc9ab29e81bccdb479 [formerly ebcc9975c4]
Former-commit-id: b0a60923c4
 2012-12-11 08:45:53 -06:00
Steve Harris
5f22640e99 12.12.1-8 baseline 
Former-commit-id: 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 8790caf84e [formerly 2d338b4cec] [formerly 19962f41ba] [formerly 5093a7c442 [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]]
Former-commit-id: 5093a7c442
Former-commit-id: a45a7fe1bf [formerly ff4131c2ee] [formerly 8bc76fd17f954171eeb656097e29d253329915de [formerly ee06a94735]]
Former-commit-id: d1f389a14d75a14807b83f7528cff619dda45f17 [formerly ec2cdc1593]
Former-commit-id: 0b22b3c014
 2012-12-06 09:02:51 -06:00
Max Schenkelberg
8215537399 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins 
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly a113ecd2ea [formerly 56ae27e172] [formerly b648c5828e] [formerly ed77d56a84 [formerly b648c5828e [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]]]
Former-commit-id: ed77d56a84
Former-commit-id: 1f8c88490a [formerly f681c1304c] [formerly 9fbbf5fdd49d3393d497c172fb165e221cdc3c0c [formerly b24440cc37]]
Former-commit-id: c5ee37a2251945312e76e97b444e5dc6495a440a [formerly b8b98a78c3]
Former-commit-id: a7b239f9c1
 2012-11-29 10:29:36 -06:00
Steve Harris
b5fd6ed2fd Merge branch 'ss_builds' (12.12.1-3) into development 
Former-commit-id: 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 1ee8938748 [formerly 8fc896f7d4] [formerly 448dd1c35f] [formerly 00f3d51546 [formerly 448dd1c35f [formerly 7a44f29952ec89991e578c67357e1ef3f3c51d59]]]]
Former-commit-id: 00f3d51546
Former-commit-id: 98670f1cc2 [formerly 21ecd53719] [formerly 2de30d78d62b41d67562abff25e91b45ac8ab8fc [formerly c8cac52915]]
Former-commit-id: 02f982c590df771367e3d55fa354bfe951bed8de [formerly 59efd9a217]
Former-commit-id: ae9d9985cd
 2012-11-13 17:28:50 -06:00
Steve Harris
9e4dbe2640 12.12.1-2 baseline 
Former-commit-id: 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 7192b19284 [formerly ed809a02db] [formerly a8560580f8] [formerly 6868eb9b23 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 5365b72401 [formerly 111e7607cf] [formerly 454cf3b19a973251055686ba6bcf2017dd870e1d [formerly df89fe9bed]]
Former-commit-id: 0a26a9f757bec6107dd0eb5024ce9aaf5d84b865 [formerly 96a4a4f3f5]
Former-commit-id: 53d74c66e7
 2012-11-13 17:14:24 -06:00
Dustin Johnson
eb82c7672b Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
 2012-11-08 09:57:16 -06:00
Dustin Johnson
4bc4d95b21 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: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
 2012-11-01 13:36:06 -05:00