Commit graph

82 commits

Author SHA1 Message Date
Richard Peter
c7755a649b 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: 2c009eb618 [formerly a12830f762] [formerly 2c009eb618 [formerly a12830f762] [formerly c5040038d3 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]]
Former-commit-id: c5040038d3
Former-commit-id: 6c09ab9bdf [formerly bcf4dcc810]
Former-commit-id: f7470fbd8f
2013-05-13 17:11:05 -05:00
Mike Duff
3df65a2ad9 Issue #1919 - Fix VGBs in FFMP
Former-commit-id: d087b03eb3 [formerly f887a41875] [formerly d087b03eb3 [formerly f887a41875] [formerly 7874521269 [formerly f5ab8a230b2c63bd025d32a2364a52b3536536d4]]]
Former-commit-id: 7874521269
Former-commit-id: 311ce09129 [formerly d262dc63f0]
Former-commit-id: 83304c3e4c
2013-05-10 09:58:02 -05:00
Nate Jensen
6c69f1b82f Issue #1986 optimized table sorting
Change-Id: I699b5c99960fd28a327e8c2f7301fac3183894b0

Former-commit-id: 7eb8725c69 [formerly bc1d029bd4] [formerly 7eb8725c69 [formerly bc1d029bd4] [formerly 8ad319d0f6 [formerly 2b9f07f2b7eaf500d554424daa0e2740384164f1]]]
Former-commit-id: 8ad319d0f6
Former-commit-id: 03d798817d [formerly 1700be8b03]
Former-commit-id: ac747f4e02
2013-05-08 13:09:17 -05:00
Dustin Johnson
c45b787817 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: 881cbc496b [formerly fadbca34ef] [formerly 881cbc496b [formerly fadbca34ef] [formerly 49b6526d12 [formerly e41878377e33f794d7ad67f232e6413a61bc1c18]]]
Former-commit-id: 49b6526d12
Former-commit-id: d118d673e3 [formerly 5eb7c5bc9e]
Former-commit-id: 45e04b906a
2013-05-06 15:04:23 -05:00
Richard Peter
0bf43c4a4d Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.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.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.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/smartinit/IFPWE.java
	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/gfeLevelMappingFile.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	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.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
	pythonPackages/qpid/bin/qpid-queue-count
	pythonPackages/qpid/bin/qpid-stat
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
	rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/x86_64/build.sh
	tests/.classpath

Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb

Former-commit-id: 17a5f519cc [formerly 083700d315] [formerly 17a5f519cc [formerly 083700d315] [formerly 2b496de6d8 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]
Former-commit-id: 2b496de6d8
Former-commit-id: 398e808300 [formerly 349bcc15d7]
Former-commit-id: 7db060699c
2013-05-05 14:25:36 -05:00
Steve Harris
210f5ee219 13.4.1-5 baseline
Former-commit-id: aa9a719836 [formerly 85bbf6d242] [formerly aa9a719836 [formerly 85bbf6d242] [formerly 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]]
Former-commit-id: 4ae0e2e858
Former-commit-id: e0af96524f [formerly aa4624c58f]
Former-commit-id: 53daaea355
2013-05-03 09:29:14 -05:00
Steve Harris
5dbfeb38ac 13.4.1-4 baseline
Former-commit-id: 99f4569650 [formerly d33e5861aa] [formerly 99f4569650 [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 4357e2dacc [formerly 7828293d32]
Former-commit-id: e0986cfda8
2013-05-02 10:00:38 -05:00
Steve Harris
d8da1e82f5 13.4.1-3 baseline
Former-commit-id: 3486902772 [formerly 54afedf617] [formerly 3486902772 [formerly 54afedf617] [formerly 86e96f378c [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]]
Former-commit-id: 86e96f378c
Former-commit-id: 9fb6f3835c [formerly 8a41dd2048]
Former-commit-id: 7e923539d5
2013-04-29 12:25:07 -05:00
Ben Steffensmeier
2e4de5eccc Issue #1954 Minor code cleanup throughout FFMP.
Former-commit-id: 05d142cbd4 [formerly 64736c6447] [formerly 05d142cbd4 [formerly 64736c6447] [formerly 820b29235b [formerly fca2bb60f97912f1748f2919df5fc638c1b635e1]]]
Former-commit-id: 820b29235b
Former-commit-id: 19476fc85d [formerly f85e5da204]
Former-commit-id: ec9860cbaa
2013-04-26 18:24:49 -05:00
Ben Steffensmeier
8f74fbc3f2 Issue #1954 Skip extent checking for FFMP shape generation.
Change-Id: I2fba0813e34293598c8b95992a4e7eb6ffa152c1

Former-commit-id: a3762906a4 [formerly 5b209c4b9a] [formerly a3762906a4 [formerly 5b209c4b9a] [formerly a837b1626f [formerly 19a24779aaf6f982d7997f128066c7ac66403ea3]]]
Former-commit-id: a837b1626f
Former-commit-id: 5d3d3363ba [formerly ea41b0893f]
Former-commit-id: 77d66b5d91
2013-04-25 15:21:43 -05:00
Mike Duff
c389982373 Issue #1902 - Fixed attributes dialog, added isDisposed check
Change-Id: Idead5a377dfce286ed65b2e369b0035ce76b622a

Former-commit-id: 65b2898e78 [formerly 058c52cd7c] [formerly 65b2898e78 [formerly 058c52cd7c] [formerly 1ee134cc8a [formerly 646b02b535174c8e40b37c090e93b2e31b6b6902]]]
Former-commit-id: 1ee134cc8a
Former-commit-id: d009ba626c [formerly dd3f614b59]
Former-commit-id: b658e0d7fb
2013-04-25 10:07:28 -05:00
Steve Harris
722e428c74 13.4.1-1 baseline
Former-commit-id: f95e0ad10b [formerly 2f517b7713] [formerly f95e0ad10b [formerly 2f517b7713] [formerly 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]
Former-commit-id: 00332e6305
Former-commit-id: 0e950655f1 [formerly 4accbb80db]
Former-commit-id: 4001e050e7
2013-04-24 17:15:55 -05:00
Ben Steffensmeier
405e19daad Issue #1912 decrease the number of seperate database requests in the FFMPDataLoader.
Former-commit-id: e85f5fa0d0 [formerly 7a43a052f6] [formerly e85f5fa0d0 [formerly 7a43a052f6] [formerly a0fb4b9b5b [formerly 1ba1f77bab277fb191a416e02f5cc56a0147b15d]]]
Former-commit-id: a0fb4b9b5b
Former-commit-id: c5df5345b7 [formerly bd751b44f0]
Former-commit-id: ca6a967cf9
2013-04-22 11:32:25 -05:00
Ben Steffensmeier
55f98b6bbe Issue #1912 increase bulk requests to pypies.
Former-commit-id: 82d2c832b1 [formerly 2b11b35462] [formerly 82d2c832b1 [formerly 2b11b35462] [formerly 0e59516135 [formerly 50da745da0b9e963c3505512b86b3c59101f8ed7]]]
Former-commit-id: 0e59516135
Former-commit-id: 745c9e016b [formerly f842d5d036]
Former-commit-id: b04215896e
2013-04-22 10:59:34 -05:00
Ben Steffensmeier
dc914ac07c Issue #1912 Initial bulk hdf5 access for ffmp
Change-Id: If2b9afbd23d0388c16f05ddaaf47a1ac8dc6b339

Former-commit-id: 7a5835a43a [formerly 4db55d9a58] [formerly 7a5835a43a [formerly 4db55d9a58] [formerly fada8ae7dd [formerly 972ca525d04ca13eb43816bdfeb9bf4fb4786d76]]]
Former-commit-id: fada8ae7dd
Former-commit-id: 09c34a3eae [formerly 84ee23cc58]
Former-commit-id: 9582c84385
2013-04-17 16:35:50 -05:00
Dave Hladky
14a08d6f66 Issue #1890 moved date keys to references in FFMPRecord instead of hard object in FFMPBasin
Change-Id: I840e0805422686856744f0d39dda0aeac4755bb8

Former-commit-id: c52445652a [formerly 60fa768195] [formerly c52445652a [formerly 60fa768195] [formerly 978e68d893 [formerly 4c1e41a6a77ea89f2a0c0253671b8d6cca071c04]]]
Former-commit-id: 978e68d893
Former-commit-id: d0ec4f0d87 [formerly 5789936212]
Former-commit-id: 0f7843f0b7
2013-04-15 17:58:06 -05:00
Mike Duff
00b3600ad6 Issue #1904 - FFMPConfig no longer able to be reset.
Change-Id: I9e7a7628ca1cd77964574fbc84c2cd2f78364872

Former-commit-id: 2323505f91 [formerly 18e5561dd2] [formerly 2323505f91 [formerly 18e5561dd2] [formerly f9c0de442f [formerly 5775e40e5f939ca847527ae562cba71dc3984a60]]]
Former-commit-id: f9c0de442f
Former-commit-id: b847733566 [formerly c0f6fe5199]
Former-commit-id: 5253e6e535
2013-04-15 13:02:58 -05:00
Mike Duff
feb9fc93ef Issue #1902 - FFMP permormance/cleanup
peer review comments

Change-Id: Id0c238906a1189c9c88e3dc99aa0a60cbfa00a15

Former-commit-id: 8271eaf328 [formerly 020713663a] [formerly 8271eaf328 [formerly 020713663a] [formerly 85f1aba297 [formerly 15b28d081af503387ed1c350f4ec23258c41d68f]]]
Former-commit-id: 85f1aba297
Former-commit-id: 7a1809afca [formerly f61bae1c3e]
Former-commit-id: 812599d8db
2013-04-15 09:40:07 -05:00
Dave Hladky
2adea3bb0a Issue #1886 double pfaf in mouseover text
Change-Id: I4f89aede6985126cfda5491b6df5bc4e18f34362

Former-commit-id: ed0afbec22 [formerly 7c1e2eddbc] [formerly ed0afbec22 [formerly 7c1e2eddbc] [formerly 53fbf8815e [formerly e1d484049e276877ef4327b5fbd8d722e1eda20c]]]
Former-commit-id: 53fbf8815e
Former-commit-id: 18b34a2b16 [formerly 8e1e4bb5f0]
Former-commit-id: cca803dac3
2013-04-11 09:06:03 -05:00
Ben Steffensmeier
88e24c35ef Issue #1896 Make FFMPResource work better with D2D time matcher.
Former-commit-id: 2fc12b739b [formerly 6637ae7c0e] [formerly 2fc12b739b [formerly 6637ae7c0e] [formerly f58e1fe7b4 [formerly 8253598d2f19321c86a1d2da2a6b634a5ae7cd31]]]
Former-commit-id: f58e1fe7b4
Former-commit-id: 0b740cc760 [formerly c321a387fc]
Former-commit-id: ec5daf4cb0
2013-04-10 14:30:50 -05:00
Mike Duff
f159af03fa Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: 57146e3c95 [formerly 42fa10a859] [formerly 57146e3c95 [formerly 42fa10a859] [formerly 15c4f53172 [formerly 33f7392176acf8da158f309451557edd677c7805]]]
Former-commit-id: 15c4f53172
Former-commit-id: c2e22945f6 [formerly dd5dc7f0d2]
Former-commit-id: f7d644f051
2013-04-04 13:20:28 -05:00
Lee Venable
ca38aca6df Merge "Issue #1830 - Don't allow base level config files for FFMP" into development
Former-commit-id: e994040887 [formerly 4a8c4b64df] [formerly e994040887 [formerly 4a8c4b64df] [formerly f1e8faf9ff [formerly 9c117d43e77ffa074c8464771918116f8835b382]]]
Former-commit-id: f1e8faf9ff
Former-commit-id: 58c83b9662 [formerly 35d27f89f1]
Former-commit-id: e66a72fbed
2013-04-01 12:26:23 -05:00
Steve Harris
a112803c98 13.3.1-17 baseline
Former-commit-id: f28b85d42f [formerly 7bf9966dcb] [formerly f28b85d42f [formerly 7bf9966dcb] [formerly a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]]
Former-commit-id: a3fe998f8f
Former-commit-id: ef413da5f7 [formerly 4afa41d4e7]
Former-commit-id: 50becef97f
2013-04-01 12:04:56 -05:00
Mike Duff
e07f3971c0 Issue #1830 - Don't allow base level config files for FFMP
Change-Id: Ib408e51eda5367a1d66684685935b6163acbbb77

Former-commit-id: fa8ca827d1 [formerly 261a39122d] [formerly fa8ca827d1 [formerly 261a39122d] [formerly 9c2ac87482 [formerly 9ecafb5aacbdb2928902435f342aa4547c2f5903]]]
Former-commit-id: 9c2ac87482
Former-commit-id: e627279d7c [formerly 11ca7c2c20]
Former-commit-id: 63489a0873
2013-04-01 11:36:53 -05:00
Roger Ferrel
791fbba888 Issue #1790 Last of the bug fixes. Reviewer changes
Change-Id: I451799e34e9621723c9d652f339c880da3aa7caa

Former-commit-id: 20f6baba0e [formerly 8f4492c63c] [formerly 20f6baba0e [formerly 8f4492c63c] [formerly 463407a40e [formerly 336427570fba81616b8d02f3ed2948042d7dbf41]]]
Former-commit-id: 463407a40e
Former-commit-id: 8c1116eaae [formerly ec5f32aec6]
Former-commit-id: c1ffc82920
2013-03-29 11:35:08 -05:00
Roger Ferrel
18b74a6aa7 Issue #1790 Bug fixes for SCAN.
Change-Id: I5743cd94be6c06808acb0add38d63ea381d13c65

Former-commit-id: 009cd032cb [formerly 9c560ab626] [formerly 009cd032cb [formerly 9c560ab626] [formerly e204276c17 [formerly 2bb23a6015638266ed17034777489c9ec6dc1307]]]
Former-commit-id: e204276c17
Former-commit-id: 380846374f [formerly 216fa1b23b]
Former-commit-id: 3bb55722f5
2013-03-28 09:16:24 -05:00
Steve Harris
f59f1f02b0 13.3.1-14 baseline
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]]
Former-commit-id: 9fba973fd0
Former-commit-id: 936e4adda2 [formerly 2ca160caf0]
Former-commit-id: 8237fdadaa
2013-03-27 17:59:34 -05:00
Steve Harris
feba54ac83 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: b0621d90bc [formerly fd71e44f0f] [formerly b0621d90bc [formerly fd71e44f0f] [formerly a23cecdb26 [formerly d0ce26b91945ae5388028c312cbafd314d57c0e6]]]
Former-commit-id: a23cecdb26
Former-commit-id: 02105701a0 [formerly e96e95b565]
Former-commit-id: e6ab1deba2
2013-03-26 10:12:34 -05:00
Mike Duff
493014d466 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: c1f7d33bb8 [formerly 5d72795e1b] [formerly c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]]
Former-commit-id: 9ebc7606b1
Former-commit-id: b366778df0 [formerly 4c3011edce]
Former-commit-id: efec4d0365
2013-03-26 09:19:39 -05:00
Steve Harris
120fc26670 13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]
Former-commit-id: aaac0b51e5
Former-commit-id: f80f98cee2 [formerly bc439aee4f]
Former-commit-id: f1d156779a
2013-03-25 13:27:13 -05:00
Mike Duff
e126320f82 Issue #1818 - Added an isDisposed check to the Attributes Dialog open action
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]]
Former-commit-id: 7118f04843
Former-commit-id: fcb46897e3 [formerly c682fb2e9a]
Former-commit-id: 516965bea3
2013-03-24 12:21:51 -05:00
Steve Harris
481cee4c74 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: 28ef804e1b [formerly b8f0635ad6] [formerly 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 2a26783ba7 [formerly 900b9aadde]
Former-commit-id: 22bb7ecd33
2013-03-18 16:52:00 -05:00
Dave Hladky
871c4718ab Issue #1769 Try catches to try to trap hs-pid error happening during CAVE crash of FFMP table
Change-Id: I7bc3eb18a72753cc9847601aabab23cd32d109a1

Former-commit-id: a1c4148918 [formerly 9b495681ec] [formerly a1c4148918 [formerly 9b495681ec] [formerly c57d5574ef [formerly 8b498ee96ab7309bc3cb70a4f93e05c0af60c824]]]
Former-commit-id: c57d5574ef
Former-commit-id: 3ba473351b [formerly db207a732c]
Former-commit-id: 5bf3f5f89f
2013-03-14 15:59:39 -05:00
Dave Hladky
b85e19282b Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 9e97fc9efe [formerly 160e1594b8]
Former-commit-id: cb5ee4a7b8
2013-03-13 13:56:33 -05:00
Dustin Johnson
be4fe08b9d Issue #1784 Move NCF bandwidth manager code to data delivery repo
Amend:
  Publish JUnit test reports as XML, in support of Jenkins.
  Fix build/merge of 13.3.1 code so it compiles.

Change-Id: Ida653ee4ea8cd9d37f0b7d51f2d00db8fda38ca4

Former-commit-id: 2983ed29e4 [formerly 71365cd945] [formerly 2983ed29e4 [formerly 71365cd945] [formerly 1930183036 [formerly 60efd125706d618ae06eb84f959302213da2f7f1]]]
Former-commit-id: 1930183036
Former-commit-id: f5a3b57107 [formerly 48a96911c8]
Former-commit-id: 06b39b848b
2013-03-13 08:39:08 -05:00
Steve Harris
346b22b196 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: 36261cb095 [formerly 753a5213ab] [formerly 36261cb095 [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: bca46a1354 [formerly d5bcdb0015]
Former-commit-id: 5232592cfa
2013-03-12 16:04:23 -05:00
Dave Hladky
cdfbcc7136 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: 5c65862b8f [formerly a1006667e0] [formerly 5c65862b8f [formerly a1006667e0] [formerly 4b08491880 [formerly 71a04da8f5aa339146bb45cce71c7b295735f43f]]]
Former-commit-id: 4b08491880
Former-commit-id: 155903d135 [formerly 6ea95002de]
Former-commit-id: 29ed641a13
2013-03-12 15:48:34 -05:00
Steve Harris
c28f3aeb02 13.3.1-6 baseline
Former-commit-id: 2e110bd151 [formerly 3a4c7931e1] [formerly 2e110bd151 [formerly 3a4c7931e1] [formerly 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]]
Former-commit-id: 566b677d09
Former-commit-id: 6fe4b16924 [formerly 4ed21b702b]
Former-commit-id: c6f379f59a
2013-03-12 08:35:45 -05:00
Dave Hladky
a24150df56 Issue #1769 Crashing FFMP caused by thread wait
Change-Id: I2d3af2c70cc28487a26b7a42fbdeb709f0b17611

Former-commit-id: 50696bee89 [formerly 2a854d7c30] [formerly 50696bee89 [formerly 2a854d7c30] [formerly bb4c54eff0 [formerly 6ad5dcd3f980677a9120633f043887527cbe0eda]]]
Former-commit-id: bb4c54eff0
Former-commit-id: dd446abd03 [formerly 73c21a6ead]
Former-commit-id: 6fe48593f0
2013-03-08 09:58:17 -06:00
Steve Harris
2b489e4e40 Merge branch 'omaha_13.3.1' into development
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]]
Former-commit-id: aa0e9acefd
Former-commit-id: 4a0b8772ec [formerly b9563da8a8]
Former-commit-id: 46d0c9fcee
2013-03-05 12:29:44 -06:00
Dave Hladky
ac69f97305 Issue #1729 Fixed tertiary loader blocking of FFMP dialog draw.
Change-Id: Ib8a66439ac12ed3c55a585219abc7e4200ab10b4

Former-commit-id: 22ebfe0ecb [formerly 680317d9c4] [formerly 22ebfe0ecb [formerly 680317d9c4] [formerly fc36146f48 [formerly ef45479b067655db8203f199502ea4e772a80e34]]]
Former-commit-id: fc36146f48
Former-commit-id: 0f3c9ba997 [formerly 1260b40307]
Former-commit-id: fc90d47619
2013-03-04 17:41:11 -06:00
Ben Steffensmeier
866c873f71 Issue #1532 Delete uf.common.image and clean up the mess it left behind.
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]]
Former-commit-id: 2ca86633d6
Former-commit-id: 334af0001b [formerly 5068b18c6a]
Former-commit-id: 0778375180
2013-02-28 17:00:56 -06:00
Steve Harris
9db68d0585 Merge branch 'development' into omaha_13.3.1
Former-commit-id: 0a4564eb97 [formerly 67f090638f] [formerly 0a4564eb97 [formerly 67f090638f] [formerly 6ec9e73035 [formerly 52683c1ffba08b80b0d1f2b619161e108ca598b8]]]
Former-commit-id: 6ec9e73035
Former-commit-id: e46625f8f2 [formerly 0051276ad1]
Former-commit-id: 140ae3191c
2013-02-25 15:58:48 -06:00
Mike Duff
383f5c075e Issue #1552 - Implement FFMP Data Access
Peer review comments
Change-Id: Ibf11c96248972a86a6a0d779ba482cd133125b55

Former-commit-id: 8a8e8f7a73 [formerly 8bddd467b1] [formerly 8a8e8f7a73 [formerly 8bddd467b1] [formerly 81649d346a [formerly 544c90e8a0b5aba5470e60beac18d86d972c05cd]]]
Former-commit-id: 81649d346a
Former-commit-id: 01ef273417 [formerly b1a549a99f]
Former-commit-id: a92492ed07
2013-02-25 09:29:16 -06:00
Steve Harris
b5d9e75b95 Merge branch 'development' into omaha_13.3.1
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]]
Former-commit-id: 2641d578e2
Former-commit-id: 4f155a183a [formerly 33dd2589f1]
Former-commit-id: f3c3191a1c
2013-02-21 15:41:39 -06:00
Steve Harris
8c828dbd75 13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]
Former-commit-id: d2a654625f
Former-commit-id: e4435815c9 [formerly 46d28be4a4]
Former-commit-id: b3b56830b0
2013-02-20 16:19:40 -06:00
Dave Hladky
87cfb35394 Issue #1635 Second Guidance source verification, general cleanup
Change-Id: Ie7807a653862335ae50e11337c47c7c7fcbde526

Former-commit-id: e7993c968d [formerly 7b36b055f1] [formerly e7993c968d [formerly 7b36b055f1] [formerly 41f2ea7efe [formerly 798b106211b1248c7fc932cfb2ebccddf15a0d66]]]
Former-commit-id: 41f2ea7efe
Former-commit-id: 261d00c544 [formerly b1c8f153e0]
Former-commit-id: cd74938355
2013-02-20 16:13:08 -06:00
Nate Jensen
4e60106ebc Issue #1639 Replaced monitor's ConcurrentHashMaps with data structures, removed references to FFMPCacheRecord
Change-Id: I24cbcbfe1b3cc5309a78469da9ba021f6953b0eb

Former-commit-id: e0884ed550 [formerly c2d4f8e164] [formerly e0884ed550 [formerly c2d4f8e164] [formerly e6e2d8905c [formerly 4582146fd6f0ea348c7f4d01fdb68f6473439761]]]
Former-commit-id: e6e2d8905c
Former-commit-id: f5a1165062 [formerly a7b74e1f79]
Former-commit-id: d5dceaaf93
2013-02-20 13:48:26 -06:00
Mike Duff
2aee18ea9d Issue #1584 - FFMP performance stats and performance logger
Peer review comments
Change-Id: I991b3fe21f1b458f45907bdc3b4716afc348992c

Former-commit-id: 897262630c [formerly 0b044dba9c] [formerly 897262630c [formerly 0b044dba9c] [formerly 9c1e0ab639 [formerly 1334488810c13f02e692c234a52d8f0f505a5846]]]
Former-commit-id: 9c1e0ab639
Former-commit-id: 3e59308771 [formerly 079ec4b6dd]
Former-commit-id: 72f6e95a67
2013-02-18 08:16:57 -06:00
Dave Hladky
8810b8e486 Issue #1627 Sped up FFMp load by removing un-needed DB calls.
Change-Id: Ice81630bd72b7f64d6f0817d2e531877b0072956

Former-commit-id: 83fe9ca104 [formerly 8247da158f] [formerly 83fe9ca104 [formerly 8247da158f] [formerly a8f6635a6f [formerly db09538ad0664b8a7f3eb83f062a47490975f7b1]]]
Former-commit-id: a8f6635a6f
Former-commit-id: 7f6381ec5c [formerly 4cd9b2e8b2]
Former-commit-id: 7b723067a4
2013-02-14 15:12:29 -06:00