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

237 commits

Author SHA1 Message Date
Matt Nash
63a4dd32c0 Issue #1871 fix for 64 bit ints from Python to Java 
Change-Id: Ib4c6f04945514df602fbc5b3173b80ae010799ae

Former-commit-id: bbc7406812 [formerly bd64f70d1a] [formerly bbc7406812 [formerly bd64f70d1a] [formerly 30c7ca8d36 [formerly 73c05444468ee8a3d4efa73bdd5da9f5db1ab3f0]]]
Former-commit-id: 30c7ca8d36
Former-commit-id: 230e3d149e [formerly ca208f913c]
Former-commit-id: 1bfa549b40
 2013-05-23 09:07:56 -05:00
Matt Nash
8c58a5b367 Issue #1991 change hydro database in setup.env to reflect new one 
Change-Id: I2d7759ea34c4c8a63b484288603bd4988844c1dd

Former-commit-id: 023e9a0bb8 [formerly f5fe72f776] [formerly 023e9a0bb8 [formerly f5fe72f776] [formerly 1e354eddc4 [formerly 8aac19338c40e2f278709c8bdbe85ec0b84c75d6]]]
Former-commit-id: 1e354eddc4
Former-commit-id: f839dcb3be [formerly c389c77256]
Former-commit-id: 2db79b7608
 2013-05-13 09:05:30 -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
e1a369a499 13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4) 
Former-commit-id: 344054d3e9 [formerly 1a6fd7edfd] [formerly 344054d3e9 [formerly 1a6fd7edfd] [formerly 0f76c3cbee [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]]
Former-commit-id: 0f76c3cbee
Former-commit-id: c1349f4a6d [formerly 99a7521fd6]
Former-commit-id: 764924cd1e
 2013-05-03 09:20:30 -05:00
Nate Jensen
8dac3e828a Merge "Issue #1870 add Python and XML Incremental Override, implemented for both Java and Python" into development 
Former-commit-id: dd9d33f966 [formerly eedf5cfb2e] [formerly dd9d33f966 [formerly eedf5cfb2e] [formerly b438ff7294 [formerly 834382386db28affb25c7ca00614d647f988c0e4]]]
Former-commit-id: b438ff7294
Former-commit-id: 4c501588cf [formerly ac7477c78b]
Former-commit-id: e227f2907c
 2013-05-02 14:04:25 -05:00
Matt Nash
ccfcc23bee Issue #1870 add Python and XML Incremental Override, implemented for both Java 
and Python

Change-Id: I293b6abcdffbd2cef35e9b986362113186583c55

Former-commit-id: f544fdd9e1 [formerly 288bd3b02c] [formerly f544fdd9e1 [formerly 288bd3b02c] [formerly 7943769110 [formerly 27f86d4c39ce8b8e708408511c820a5dd765e4cb]]]
Former-commit-id: 7943769110
Former-commit-id: 5b62180a2a [formerly ae21592cbf]
Former-commit-id: 40c3731f4a
 2013-05-02 13:39:55 -05:00
Dustin Johnson
2b5b4cb493 Merge "Issue #1959 MADIS implementation peice in AWIPS II baseline" into development 
Former-commit-id: 48d8bf941a [formerly 00dc4787f6] [formerly 48d8bf941a [formerly 00dc4787f6] [formerly 8a29b450c4 [formerly e892ed6958df9141768b9593dee93492d8e707d3]]]
Former-commit-id: 8a29b450c4
Former-commit-id: 6ab64bbbcd [formerly f00d9146e4]
Former-commit-id: fc203fe328
 2013-05-02 12:54:37 -05:00
Dave Hladky
252ce5bfbd Issue #1959 MADIS implementation peice in AWIPS II baseline 
Change-Id: Ice4af1f640cd9c8fb92ed129402b7300b92f65da

Former-commit-id: f833c4cc35 [formerly a770e2fb99] [formerly f833c4cc35 [formerly a770e2fb99] [formerly 0869f14084 [formerly d5ad257cb446a8605bb4df56cc1dba319f0e5abe]]]
Former-commit-id: 0869f14084
Former-commit-id: ba0db0d7d7 [formerly d677614620]
Former-commit-id: cfd01dd5e4
 2013-05-02 11:30:32 -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
Benjamin Phillippe
32b7d24807 Issue #1948 Implemented Pulling notifications on demand 
Change-Id: I1d6debf2e67631708ec8471f50fd2c36b938abaf

Former-commit-id: f0c56cc09d [formerly 9962173468] [formerly f0c56cc09d [formerly 9962173468] [formerly bb7e91d673 [formerly 4696a86bd969bebbcc48363bd14fdf6c2234b836]]]
Former-commit-id: bb7e91d673
Former-commit-id: 84921616bb [formerly 8fe6f260ca]
Former-commit-id: 68abfc8847
 2013-04-30 20:12:05 -05:00
Ben Steffensmeier
9f5eaa52f7 Issue #1961 Add ability to disable grib tables. 
Former-commit-id: c46c523ba0 [formerly 1b15b0d916] [formerly c46c523ba0 [formerly 1b15b0d916] [formerly 63d20bc2e1 [formerly 1370f32e8a2e2efd4b238b0a9b0e3621ad13043d]]]
Former-commit-id: 63d20bc2e1
Former-commit-id: b88b19568b [formerly 159533b986]
Former-commit-id: 031e8f6c57
 2013-04-30 14:29:21 -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
Ron Anderson
cd3b3889d7 Issue #1939 Fix deadlock at CAVE start up. 
Change-Id: Ic3a0f527cdae7ee1abc32662c90d9594686d4bab

Former-commit-id: 2c2e2b4baa [formerly 6f2a6ce80c] [formerly 2c2e2b4baa [formerly 6f2a6ce80c] [formerly fcc157a91b [formerly b38ba1c92e4e176364dc3967d11b98fbd66478cd]]]
Former-commit-id: fcc157a91b
Former-commit-id: 1d00b3d37a [formerly 3ea6817796]
Former-commit-id: bef81f7f06
 2013-04-25 09:40:59 -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
Benjamin Phillippe
90d4a9daec Issue #1931 Implemented REST binding for registry 
Change-Id: I604c02dc849e380f70e2d27fa1f2b30dadcf0776

Former-commit-id: 9a7971c872 [formerly 9065ebcb65] [formerly 9a7971c872 [formerly 9065ebcb65] [formerly 3d2e073dd7 [formerly daef43d8947f690d15f9314f85b8cf31d30c06ab]]]
Former-commit-id: 3d2e073dd7
Former-commit-id: 6edfda46bf [formerly cf7da4b001]
Former-commit-id: a45aba204f
 2013-04-22 13:17:53 -05:00
Dustin Johnson
e5be88929a Issue #1932 Allow yajsw to kill the wrapped process after timeout in debug mode 
Change-Id: If638edfbb0111fb7b58901584899a0523142c518

Former-commit-id: 43314cdd3c [formerly 4128e76180] [formerly 43314cdd3c [formerly 4128e76180] [formerly 86931a613a [formerly a8cbb9fb5341cfcc3af3272ba0700bfc451bc1d2]]]
Former-commit-id: 86931a613a
Former-commit-id: b6f2a338b7 [formerly 50dfb1f67c]
Former-commit-id: 0bf5c317f3
 2013-04-22 08:31:05 -05:00
Ron Anderson
4dd37ae7cd Issue #1787 Fixed to support changes to D2D grid location 
Change-Id: I9ba8a45cf5b4f1ada6eaf1390f922bc5560d6e5c

Former-commit-id: 4ea01a29ce [formerly c233ce042d] [formerly 4ea01a29ce [formerly c233ce042d] [formerly 4cd87f2726 [formerly 5a15d9add4f47cb2016bbd453008039cef8f765f]]]
Former-commit-id: 4cd87f2726
Former-commit-id: 24a6a3590f [formerly e9f674a575]
Former-commit-id: 89a2d99bfe
 2013-04-15 18:02:47 -05:00
Benjamin Phillippe
1967c632e5 Issue #1802 Implemented ebxml registry replication 
Change-Id: I9ddcb2f3a8410e5bae8f03b4c881625ecef8a531

Former-commit-id: e3f3483b51 [formerly 120906de78] [formerly e3f3483b51 [formerly 120906de78] [formerly ec69cdeb44 [formerly 078545ff0fdbd591ebf69f22eb2e8400386c2bdf]]]
Former-commit-id: ec69cdeb44
Former-commit-id: e5fbf006dd [formerly c0099a8a39]
Former-commit-id: d9b5511b8b
 2013-04-12 11:27:45 -05:00
Bryan Kowal
272441938c Issue #1901 - EDEX will no longer automatically be killed during shutdown 
Former-commit-id: fabebb7adf [formerly 36fa6f932b] [formerly fabebb7adf [formerly 36fa6f932b] [formerly 81423bdca1 [formerly 5b6452684b4a64620586e265f54dbcfa15c974ff]]]
Former-commit-id: 81423bdca1
Former-commit-id: d2cb482ead [formerly 694e7fe9ee]
Former-commit-id: 28570210c6
 2013-04-12 10:36:15 -05:00
Matt Nash
63a13ef503 Issue #1871 convert parameters to Strings and make sure to return them 
Change-Id: I18063a0be05646b98404eea2225fc7a0f5d95ea7

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

Change-Id: Ic37728e269a9899adaf8be1c6d86cd644f417ba1

Former-commit-id: 2ab1cf8abb [formerly 3af61d7117] [formerly 2ab1cf8abb [formerly 3af61d7117] [formerly b44ee44664 [formerly 01971b490beee0cc87df4ed478c3a66bbad2158f]]]
Former-commit-id: b44ee44664
Former-commit-id: e6fc7942b8 [formerly c95e825d35]
Former-commit-id: 7b25f73a9a
 2013-04-12 09:31:16 -05:00
Steve Harris
98fd30b0d5 Issue #1872 - Merge branch 'master_13.3.1' (13.3.1-19) into omaha_13.4.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.binlightning/src/com/raytheon/uf/common/dataplugin/binlightning/BinLightningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.cwat/src/com/raytheon/uf/common/dataplugin/cwat/CWATRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fog/src/com/raytheon/uf/common/dataplugin/fog/FogRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.grib/src/com/raytheon/uf/common/dataplugin/grib/GribRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.preciprate/src/com/raytheon/uf/common/dataplugin/preciprate/PrecipRateRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.qpf/src/com/raytheon/uf/common/dataplugin/qpf/QPFRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.radar/src/com/raytheon/uf/common/dataplugin/radar/RadarRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.scan/src/com/raytheon/uf/common/dataplugin/scan/ScanRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.vil/src/com/raytheon/uf/common/dataplugin/vil/VILRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncairep/src/gov/noaa/nws/ncep/common/dataplugin/ncairep/NcAirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncgrib/src/gov/noaa/nws/ncep/common/dataplugin/ncgrib/NcgribRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpirep/src/gov/noaa/nws/ncep/common/dataplugin/ncpirep/NcPirepRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncscd/src/gov/noaa/nws/ncep/common/dataplugin/ncscd/NcScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.nctaf/src/gov/noaa/nws/ncep/common/dataplugin/nctaf/NcTafRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwh/src/gov/noaa/nws/ncep/common/dataplugin/sgwh/SgwhRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.sgwhv/src/gov/noaa/nws/ncep/common/dataplugin/sgwhv/SgwhvRecord.java

Former-commit-id: 0d86b95f1b [formerly 55d9909d6d] [formerly 0d86b95f1b [formerly 55d9909d6d] [formerly 0fed14d765 [formerly 6dced3d81d2733f9f7c5f3d54cb123bf8ba055b2]]]
Former-commit-id: 0fed14d765
Former-commit-id: 55dda49d47 [formerly fe6a078c64]
Former-commit-id: a9d3e94b3b
 2013-04-11 13:14:00 -05:00
Steve Harris
7b7efd0bd1 13.3.1-19 baseline 
Former-commit-id: dc9fef33a9 [formerly 9be238bcc4] [formerly dc9fef33a9 [formerly 9be238bcc4] [formerly abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]]
Former-commit-id: abaf9f12f9
Former-commit-id: ed4150db5f [formerly 340a2cfb23]
Former-commit-id: 7d76371536
 2013-04-09 08:37:12 -05:00
Steve Harris
0e857a47e9 Issue #1872 - added the edexOsgi/build.edex/esb/bin/yajsw/ content for rpm builds 
Former-commit-id: 2711be871a [formerly 53492c2902] [formerly 2711be871a [formerly 53492c2902] [formerly 84370207a1 [formerly da94d1f4ffc37edd53f17118c0b4420dd6500099]]]
Former-commit-id: 84370207a1
Former-commit-id: 5f5dd9a031 [formerly 0105f15306]
Former-commit-id: ee08ef663f
 2013-04-08 13:47:34 -05:00
Bryan Kowal
82db2880b7 Issue #1873 - reduce EDEX shutdown time 
Former-commit-id: b252ca6506 [formerly bec051d00a] [formerly b252ca6506 [formerly bec051d00a] [formerly 82a1b0752e [formerly 954e71e2a22252cf62041be5ee0c5de7f1418298]]]
Former-commit-id: 82a1b0752e
Former-commit-id: e05b72b17e [formerly 3bd9819e59]
Former-commit-id: 0285965657
 2013-04-04 17:36:09 -05:00
David Gillingham
cdba87a6f3 Issue #1759: Convert ifpnetCDF and iscMosaic to use more robust request 
implementations, convert request handlers to use new python concurrent
framework, excise GfeScript and GfeScriptExecutor from the system.

Change-Id: I801b7b9812a72fdfc72975a311d8dc3806cda152

Conflicts:

	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py


Former-commit-id: 5ae3fbd325 [formerly d24fcc85e2] [formerly 5ae3fbd325 [formerly d24fcc85e2] [formerly 56235e370f [formerly 37020656f1502afee59e41ed7daf16775e200cbf]]]
Former-commit-id: 56235e370f
Former-commit-id: b97b1766ee [formerly 60e8146a18]
Former-commit-id: a49920c978
 2013-04-04 13:00:36 -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
Steve Harris
53ee0151ca 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: 069ee8a748 [formerly 9a321b6ac8] [formerly 069ee8a748 [formerly 9a321b6ac8] [formerly 3073951b3d [formerly d05c9f3a6a4b080b0da71c856f1ba6cd0d6d264e]]]
Former-commit-id: 3073951b3d
Former-commit-id: 6e48567370 [formerly a4bf236cc7]
Former-commit-id: 90ec2d3fbf
 2013-03-27 22:16:15 -05:00
Steve Harris
21332cb0b5 Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: 979d6a5d8c [formerly 2a0e399dc8] [formerly 979d6a5d8c [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]]
Former-commit-id: d997aeaee4
Former-commit-id: 428ec8a472 [formerly e67b16bb03]
Former-commit-id: f3a84e952e
 2013-03-27 18:21:05 -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
Richard Peter
786b68279d Issue #1833: Add performance log file to ingest and ingestGrib 
Change-Id: I650fa5893a31bee6c4f0e96af87754518df6d25d

Former-commit-id: 25d4905570 [formerly 5287a3296b] [formerly 25d4905570 [formerly 5287a3296b] [formerly b75ceeeeb3 [formerly 53cb92842c43349968b70bb5fec5beb100773b63]]]
Former-commit-id: b75ceeeeb3
Former-commit-id: 6923e10550 [formerly f99242f539]
Former-commit-id: 33c602b13e
 2013-03-26 20:55:42 -05:00
Steve Harris
0bd1d5bdef Merge branch 'omaha_13.3.1' into development 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

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

Former-commit-id: ad357638b3 [formerly 1df8d39919] [formerly ad357638b3 [formerly 1df8d39919] [formerly bebfc60317 [formerly 4114f40bee478e8ab004c7b3d5fd7bdd0980bb14]]]
Former-commit-id: bebfc60317
Former-commit-id: bf196a7782 [formerly 07487a27dc]
Former-commit-id: 45bf26aa00
 2013-03-26 10:33:42 -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
Richard Peter
af956fe92d Merge "Issue #1802 Refactored DD transaction management" into development 
Former-commit-id: b3631390d2 [formerly c3268aa02c] [formerly b3631390d2 [formerly c3268aa02c] [formerly 5c92140024 [formerly b8516f99386ded052745e766911094edfd57d7ec]]]
Former-commit-id: 5c92140024
Former-commit-id: 072bc7affc [formerly 351f08dba3]
Former-commit-id: bcb5b0b73e
 2013-03-25 15:37:18 -05:00
Bryan Kowal
d5c958b2f8 Issue #1661 - it will no longer be necessary to connect to EDEX before EDEX "completely" starts when running EDEX in debug mode. 
- keep a log of every source file that has been modified for AWIPS II
- identify the modification with a comment

Change-Id: Ic8751b25e69486ab448c85dfc4ade8caaa1c71bc

Former-commit-id: 09263dbf8c [formerly 9e647beded] [formerly 09263dbf8c [formerly 9e647beded] [formerly 6758a9a50d [formerly 8c8f3437723cf8ad931d3d149d547cac82cca9fb]]]
Former-commit-id: 6758a9a50d
Former-commit-id: 1eba8622d4 [formerly 4c02dabb3d]
Former-commit-id: e41f926ac2
 2013-03-25 15:23:32 -05:00
Bryan Kowal
3728413ecf Issue #1661 - yajsw will now log to both the console and log file indefinitely 
- yajsw can now be built from source on-demand
- the console debug parameter set by start.sh will now be passed to the jvm

Change-Id: I6146cbcb29887b462d9bda53bd3803b5775031d0

Former-commit-id: 541d096faf [formerly c55efaadb0] [formerly 541d096faf [formerly c55efaadb0] [formerly a6cd17feeb [formerly 96edb01711d6c0f33cff0bfb03bb8c681884c1b3]]]
Former-commit-id: a6cd17feeb
Former-commit-id: 2093c6a495 [formerly c4cec34e47]
Former-commit-id: 99a3e25b3d
 2013-03-25 15:23:31 -05:00
Benjamin Phillippe
5e50d32bdb Issue #1802 Refactored DD transaction management 
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39

Former-commit-id: 4675bed4c2 [formerly b10b1150be] [formerly 4675bed4c2 [formerly b10b1150be] [formerly af05feb5a7 [formerly 534777d96a45b275abd9cc26818b7df200974595]]]
Former-commit-id: af05feb5a7
Former-commit-id: 541646148b [formerly 4d1a8805ab]
Former-commit-id: c250bda12b
 2013-03-25 15:15:38 -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
Steve Harris
961c0b56a7 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java

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

Former-commit-id: a9ced3a7ef [formerly fa15f03e1b] [formerly a9ced3a7ef [formerly fa15f03e1b] [formerly dc419068f0 [formerly c789962e3ddb094ca93415864e9f1b8ed0619ba4]]]
Former-commit-id: dc419068f0
Former-commit-id: f4e26fd94d [formerly 31044eabd1]
Former-commit-id: 8065161896
 2013-03-20 16:06:20 -05:00
Steve Harris
e6ab10cc26 13.3.1-10 baseline 
Former-commit-id: 57f4676b6c [formerly 073687d9a9] [formerly 57f4676b6c [formerly 073687d9a9] [formerly 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]]
Former-commit-id: 7078eec1b1
Former-commit-id: e9f0328808 [formerly 7c2e617d26]
Former-commit-id: f2cc967a4f
 2013-03-20 15:53:01 -05:00
Steve Harris
352c267fc9 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: 310474ae9b [formerly 36df63be5c] [formerly 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: d00dc0d174 [formerly 104e6e79e8]
Former-commit-id: 6d4512fa3a
 2013-03-20 13:45:11 -05:00
Dave Hladky
1aef08f449 Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb

Former-commit-id: dc7b231bf0 [formerly 90f7f2110b] [formerly dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: 01c6ff12a0 [formerly bd17b99bd1]
Former-commit-id: 8299b2872a
 2013-03-20 12:41:33 -05:00
Steve Harris
37beeaab69 13.3.1-9 baseline 
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 7e96d841d9 [formerly 0375805e79]
Former-commit-id: 65f522fc87
 2013-03-19 14:22:56 -05:00
Dustin Johnson
17fe9aee59 Merge "Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development!" into development 
Former-commit-id: bc323d3f25 [formerly 5b4035fb11] [formerly bc323d3f25 [formerly 5b4035fb11] [formerly 8363eba409 [formerly 9761b41160000713d00113c5267badafc9613a0d]]]
Former-commit-id: 8363eba409
Former-commit-id: 3c8e14edc7 [formerly e0b6e6187e]
Former-commit-id: 889953c712
 2013-03-19 13:09:48 -05:00
Dave Hladky
af0898807b Issue #1796 Resurrected DPA code from old 5-DataDelviery repo, merged with current development! 
Change-Id: I71b56de45f61bef15c03ee4fc3f45790c59b527d

Former-commit-id: d7e8709cde [formerly ddb23ae59f] [formerly d7e8709cde [formerly ddb23ae59f] [formerly 81ad1ce2ed [formerly a52596494feb2255269513a3cd19490628d4ae10]]]
Former-commit-id: 81ad1ce2ed
Former-commit-id: 618f737fab [formerly f0244f54a4]
Former-commit-id: 64f8c46e64
 2013-03-19 13:08:14 -05:00