xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #3168 Move DD retrieval distibution to correct feature/RPM

Browse source 
Change-Id: I1110eec9d4cde805a67cc33254b98fc00fd8a7b1

Former-commit-id: 3b544c74b6 [formerly c72be97b9b] [formerly 3b544c74b6 [formerly c72be97b9b] [formerly 783cd9e308 [formerly d94e7f139573caa508b260902870c9f745080bb8]]]
Former-commit-id: 783cd9e308
Former-commit-id: 971910f7fc [formerly 25c2dd4f7d]
Former-commit-id: 88ebc6921e
This commit is contained in:
Dave Hladky 2014-05-14 12:44:50 -05:00
parent cc7a9bce10
commit 7868ab0891
8 changed files with 16 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
edexOsgi/build.edex/esb/conf/modes.xml
View file

@ -269,7 +269,7 @@
<include>bandwidth-datadelivery-.*-ncf.xml</include>
<exclude>.*datadelivery.*-wfo.*</exclude>
<exclude>.*datadelivery.*-monolithic.*</exclude>
<exclude>.*dpa*</exclude>
<exclude>.*dpa.*</exclude>
</mode>
<mode name="statsTemplate" template="true">
@ -314,7 +314,7 @@
<mode name="excludeDpaAndOgc" template="true">
<!-- exclude dpa services -->
<exclude>.*dpa*</exclude>
<exclude>.*dpa.*</exclude>
<!-- exclude OGC services -->
<exclude>.*ogc.*</exclude>
<exclude>grid-metadata.xml</exclude>
@ -323,9 +323,9 @@
<mode name="excludeHarvester" template="true">
<!-- exclude dpa services -->
<exclude>.*dpa*</exclude>
<exclude>.*dpa.*</exclude>
<!-- exclude crawler/harvester -->
<exclude>.*harvester*</exclude>
<exclude>.*harvester.*</exclude>
<exclude>.*crawler*</exclude>
</mode>
@ -344,7 +344,7 @@
<include>bandwidth-datadelivery-edex-impl-monolithic.xml</include>
<include>bandwidth-datadelivery-wfo.xml</include>
<exclude>.*datadelivery.*-ncf.*</exclude>
<exclude>.*dpa*</exclude>
<exclude>.*dpa.*</exclude>
</mode>
<mode name="sbnSimulator">
@ -422,7 +422,7 @@
</mode>
<mode name="dataProviderAgentTemplate" template="true">
<include>manualIngest*</include>
<include>manualIngest.*</include>
<include>time-common.xml</include>
<include>distribution-spring.xml</include>
<include>persist-ingest.xml</include>
@ -458,10 +458,5 @@
<include>madis-common.xml</include>
<include>madis-ogc.xml</include>
<include>madis-ogc-registry.xml</include>
<!-- pointdata/obs specific services
<include>obs-common.xml</include>
<include>pointdata-common.xml</include>
<include>obs-dpa-ingest.xml</include>
<include>obs-ogc.xml</include>-->
</mode>
</edexModes>

25
edexOsgi/com.raytheon.uf.edex.datadelivery.client.feature/feature.xml
View file

@ -18,31 +18,6 @@
</license>
<requires>
<import plugin="com.raytheon.uf.common.auth" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.serialization" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.serialization.comm" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.util" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.status" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.registry.schemas.ebxml" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.localization" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="org.geotools" version="2.6.4" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.comm" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="org.apache.commons.lang" version="2.3.0" match="greaterOrEqual"/>
<import plugin="com.google.guava" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.time" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.registry.ebxml" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.gridcoverage" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.dataplugin" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.geospatial" version="1.12.1174" match="greaterOrEqual"/>
<import plugin="javax.measure" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.datadelivery.request" version="1.0.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.codec" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.apache.commons.cxf" version="1.0.0" match="greaterOrEqual"/>
<import plugin="javax.persistence"/>
<import plugin="javax.persistence" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.datadelivery.registry" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.event" version="1.0.0" match="greaterOrEqual"/>
<import plugin="com.raytheon.uf.common.stats" version="1.0.0" match="greaterOrEqual"/>
<import feature="com.raytheon.uf.edex.common.core.feature" version="0.0.0"/>
<import feature="com.raytheon.uf.edex.core.feature" version="0.0.0"/>
<import feature="com.raytheon.uf.edex.registry.client.feature" version="0.0.0"/>

6
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/.settings/org.eclipse.jdt.core.prefs
View file

@ -1,7 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.7
org.eclipse.jdt.core.compiler.source=1.6

2
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/META-INF/MANIFEST.MF
View file

@ -4,4 +4,4 @@ Bundle-Name: Dist
Bundle-SymbolicName: com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: RAYTHEON
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

11
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/res/spring/retrieval-ingest.xml
View file

@ -7,17 +7,6 @@
<constructor-arg type="java.lang.String" value="dataDeliveryRetrieval" />
</bean>
<bean id="dataDeliveryRetrievalProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
<property name="pluginName" ref="dataDeliveryRetrievalPluginName" />
<property name="pluginFQN"
value="com.raytheon.uf.edex.plugin.datadelivery.retrieval" />
</bean>
<bean id="dataDeliveryRetrievalRegistered" factory-bean="pluginRegistry"
factory-method="register">
<constructor-arg ref="dataDeliveryRetrievalPluginName" />
<constructor-arg ref="dataDeliveryRetrievalProperties" />
</bean>
<!-- Writes files that match pattern to DataDeliveryRetrieval process
Queue -->
<bean factory-bean="distributionSrv"

2
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval.dist/src/com/raytheon/uf/edex/plugin/datadelivery/retrieval/distribution/package-info.java
View file

@ -26,7 +26,7 @@
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 14, 2014 dhladky Initial creation
* May 14, 2014 #3168 dhladky Initial creation
*
* </pre>
*

22
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/datadelivery-retrieval-common.xml
View file

@ -1,22 +0,0 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="dataDeliveryRetrievalPluginName" class="java.lang.String">
<constructor-arg type="java.lang.String" value="dataDeliveryRetrieval" />
</bean>
<bean id="dataDeliveryRetrievalProperties" class="com.raytheon.uf.common.dataplugin.PluginProperties">
<property name="pluginName" ref="dataDeliveryRetrievalPluginName" />
<property name="pluginFQN"
value="com.raytheon.uf.edex.plugin.datadelivery.retrieval" />
</bean>
<bean id="dataDeliveryRetrievalRegistered" factory-bean="pluginRegistry"
factory-method="register">
<constructor-arg ref="dataDeliveryRetrievalPluginName" />
<constructor-arg ref="dataDeliveryRetrievalProperties" />
</bean>
</beans>

11
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/datadelivery-wfo-retrieval-process.xml
View file

@ -4,22 +4,21 @@
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="dataDeliveryRetrievalDecoder"
class="com.raytheon.uf.edex.plugin.datadelivery.retrieval.SbnDataDeliveryRetrievalDecoder">
<constructor-arg value="notifyRetrieval" />
</bean>
class="com.raytheon.uf.edex.plugin.datadelivery.retrieval.SbnDataDeliveryRetrievalDecoder">
<constructor-arg value="notifyRetrieval" />
</bean>
<camelContext id="dataDeliveryRetrieval-camel"
xmlns="http://camel.apache.org/schema/spring" errorHandlerRef="errorHandler">
<route id="dataDeliveryRetrievalProcess">
<from
uri="jms-generic:queue:dataDeliveryRetrievalProcess?destinationResolver=#qpidDurableResolver" />
uri="jms-durable:queue:dataDeliveryRetrievalProcess" />
<doTry>
<bean ref="stringToFile" />
<bean ref="dataDeliveryRetrievalDecoder" method="process" />
<doCatch>
<exception>java.lang.Throwable</exception>
<to
uri="log:dataDeliveryRetrieval" />
<to uri="log:dataDeliveryRetrieval" />
</doCatch>
</doTry>
</route>