Issue #3168 Move retrieval distribution to correct DD RPM
Former-commit-id:15366714ed[formerlyca644b93ee[formerly 228ef1ceb7337fa38c370c3218d1c32b4f1302fb]] Former-commit-id:ca644b93eeFormer-commit-id:40c24180cf
This commit is contained in:
Dave Hladky
parent
2441e29987
commit
6a80ab5dfb
12 changed files with 186 additions and 21 deletions
|
|
@ -77,6 +77,7 @@
|
|||
<exclude>purgeutil-request.xml</exclude>
|
||||
<!-- end of ncep excludes -->
|
||||
</mode>
|
||||
|
||||
<mode name="ingest">
|
||||
<exclude>webservices.xml</exclude>
|
||||
<exclude>ebxml.*\.xml</exclude>
|
||||
|
|
@ -111,6 +112,7 @@
|
|||
<exclude>cpgsrv-spring.xml</exclude>
|
||||
<exclude>.*sbn-simulator.*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="ingestHydro">
|
||||
<include>distribution-spring.xml</include>
|
||||
<include>manualIngest-common.xml</include>
|
||||
|
|
@ -147,6 +149,7 @@
|
|||
<exclude>fssobs-ingest.xml</exclude>
|
||||
<exclude>fssobs-common.xml</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="requestHydro">
|
||||
<include>ohd-common-database.xml</include>
|
||||
<include>ohd-common.xml</include>
|
||||
|
|
@ -174,6 +177,7 @@
|
|||
<include>eventbus-common.xml</include>
|
||||
<include>edex-request.xml</include>
|
||||
</mode>
|
||||
|
||||
<mode name="ingestGrib">
|
||||
<include>time-common.xml</include>
|
||||
<include>auth-common.xml</include>
|
||||
|
|
@ -198,6 +202,7 @@
|
|||
<includeMode>statsTemplate</includeMode>
|
||||
<includeMode>excludeDpaAndOgc</includeMode>
|
||||
</mode>
|
||||
|
||||
<!-- Runs separate now, not just high mem -->
|
||||
<mode name="ingestDat">
|
||||
<include>nwsauth-request.xml</include>
|
||||
|
|
@ -245,6 +250,7 @@
|
|||
<includeMode>excludeDpaAndOgc</includeMode>
|
||||
<includeMode>statsTemplate</includeMode>
|
||||
</mode>
|
||||
|
||||
<mode name="registry">
|
||||
<!-- Registry production mode -->
|
||||
<include>ebxml.*\.xml</include>
|
||||
|
|
@ -253,9 +259,9 @@
|
|||
<include>bandwidth-datadelivery-.*-wfo.xml</include>
|
||||
<exclude>.*datadelivery.*-ncf.*</exclude>
|
||||
<exclude>.*datadelivery.*-monolithic.*</exclude>
|
||||
<exclude>harvester-*</exclude>
|
||||
<exclude>crawler-*</exclude>
|
||||
<includeMode>excludeHarvester</includeMode>
|
||||
</mode>
|
||||
|
||||
<mode name="centralRegistry">
|
||||
<!-- Central Registry production mode -->
|
||||
<include>ebxml.*\.xml</include>
|
||||
|
|
@ -263,6 +269,7 @@
|
|||
<include>bandwidth-datadelivery-.*-ncf.xml</include>
|
||||
<exclude>.*datadelivery.*-wfo.*</exclude>
|
||||
<exclude>.*datadelivery.*-monolithic.*</exclude>
|
||||
<exclude>.*dpa*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="statsTemplate" template="true">
|
||||
|
|
@ -270,6 +277,7 @@
|
|||
<include>eventbus-common.xml</include>
|
||||
<include>stats-common.xml</include>
|
||||
</mode>
|
||||
|
||||
<mode name="dataDeliveryTemplate" template="true">
|
||||
<include>database-common.xml</include>
|
||||
<include>.*datadelivery.*</include>
|
||||
|
|
@ -301,17 +309,26 @@
|
|||
that should be loaded when running datadelivery with the registry in a separate JVM
|
||||
-->
|
||||
<exclude>.*datadelivery-standalone.*</exclude>
|
||||
|
||||
<includeMode>statsTemplate</includeMode>
|
||||
</mode>
|
||||
|
||||
<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>
|
||||
<exclude>wxsrv-dataset-urn.xml</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="excludeHarvester" template="true">
|
||||
<!-- exclude dpa services -->
|
||||
<exclude>.*dpa*</exclude>
|
||||
<!-- exclude crawler/harvester -->
|
||||
<exclude>.*harvester*</exclude>
|
||||
<exclude>.*crawler*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="inMemoryBandwidthManager">
|
||||
<!-- This is not an edex runtime mode -->
|
||||
<include>bandwidth-datadelivery-inmemory-impl.xml</include>
|
||||
|
|
@ -327,19 +344,23 @@
|
|||
<include>bandwidth-datadelivery-edex-impl-monolithic.xml</include>
|
||||
<include>bandwidth-datadelivery-wfo.xml</include>
|
||||
<exclude>.*datadelivery.*-ncf.*</exclude>
|
||||
<exclude>.*dpa*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="sbnSimulator">
|
||||
<include>.*sbn-simulator-wfo.*</include>
|
||||
<include>event-common.xml</include>
|
||||
<include>eventbus-common.xml</include>
|
||||
<exclude>.*sbn-simulator-ncf.*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="centralSbnSimulator">
|
||||
<include>.*sbn-simulator-ncf.*</include>
|
||||
<include>event-common.xml</include>
|
||||
<include>eventbus-common.xml</include>
|
||||
<exclude>.*sbn-simulator-wfo.*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="grib">
|
||||
<include>grib-decode.xml</include>
|
||||
<include>grid-staticdata-process.xml</include>
|
||||
|
|
@ -349,6 +370,7 @@
|
|||
<include>distribution-spring.xml</include>
|
||||
<include>manualIngest-spring.xml</include>
|
||||
</mode>
|
||||
|
||||
<mode name="text">
|
||||
<include>text-.*</include>
|
||||
<include>textdb-.*</include>
|
||||
|
|
@ -358,6 +380,7 @@
|
|||
<include>distribution-spring.xml</include>
|
||||
<include>manualIngest-spring.xml</include>
|
||||
</mode>
|
||||
|
||||
<mode name="gfe">
|
||||
<include>.*gfe.*</include>
|
||||
<include>serialize-request.xml</include>
|
||||
|
|
@ -365,6 +388,7 @@
|
|||
<include>distribution-spring.xml</include>
|
||||
<include>manualIngest-spring.xml</include>
|
||||
</mode>
|
||||
|
||||
<mode name="noHydro">
|
||||
<exclude>ebxml.*\.xml</exclude>
|
||||
<exclude>alarmWhfs-spring.xml</exclude>
|
||||
|
|
@ -385,15 +409,18 @@
|
|||
<exclude>satpre-spring.xml</exclude>
|
||||
<exclude>.*sbn-simulator.*</exclude>
|
||||
</mode>
|
||||
|
||||
<mode name="localization">
|
||||
<include>auth-request.xml</include>
|
||||
<include>utility-request.xml</include>
|
||||
</mode>
|
||||
|
||||
<mode name="datadeliveryonly">
|
||||
<include>.*datadelivery-standalone.*</include>
|
||||
<exclude>.*datadelivery-registry.*</exclude>
|
||||
<includeMode>datadeliverytemplate</includeMode>
|
||||
</mode>
|
||||
|
||||
<mode name="dataProviderAgentTemplate" template="true">
|
||||
<include>manualIngest*</include>
|
||||
<include>time-common.xml</include>
|
||||
|
|
@ -422,6 +449,7 @@
|
|||
<include>purge-spring-impl.xml</include>
|
||||
<include>purge-logs.xml</include>
|
||||
</mode>
|
||||
|
||||
<!-- This is MADIS implmentation of dataprovideragent -->
|
||||
<mode name="dataprovideragent">
|
||||
<includeMode>dataProviderAgentTemplate</includeMode>
|
||||
|
|
@ -435,10 +463,5 @@
|
|||
<include>pointdata-common.xml</include>
|
||||
<include>obs-dpa-ingest.xml</include>
|
||||
<include>obs-ogc.xml</include>-->
|
||||
<!-- grid specific services
|
||||
<include>gridcoverage-.*.xml</include>
|
||||
<include>grib-distribution.xml</include>
|
||||
<include>level-common.xml</include>
|
||||
<include>parameter-common.xml</include> -->
|
||||
</mode>
|
||||
</edexModes>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,31 @@
|
|||
</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"/>
|
||||
|
|
@ -51,4 +76,11 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="src" path="src"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="output" path="bin"/>
|
||||
</classpath>
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<projectDescription>
|
||||
<name>com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution</name>
|
||||
<comment></comment>
|
||||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.ManifestBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.SchemaBuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.pde.PluginNature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
@ -0,0 +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.problem.assertIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||
org.eclipse.jdt.core.compiler.source=1.7
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
Manifest-Version: 1.0
|
||||
Bundle-ManifestVersion: 2
|
||||
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
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
source.. = src/
|
||||
output.. = bin/
|
||||
bin.includes = META-INF/,\
|
||||
.,\
|
||||
res/,\
|
||||
utility/
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<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>
|
||||
<!-- Writes files that match pattern to DataDeliveryRetrieval process
|
||||
Queue -->
|
||||
<bean factory-bean="distributionSrv"
|
||||
factory-method="register">
|
||||
<constructor-arg ref="dataDeliveryRetrievalPluginName" />
|
||||
<constructor-arg
|
||||
value="jms-durable:queue:dataDeliveryRetrievalProcess" />
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
|
@ -0,0 +1,37 @@
|
|||
/**
|
||||
* This software was developed and / or modified by Raytheon Company,
|
||||
* pursuant to Contract DG133W-05-CQ-1067 with the US Government.
|
||||
*
|
||||
* U.S. EXPORT CONTROLLED TECHNICAL DATA
|
||||
* This software product contains export-restricted data whose
|
||||
* export/transfer/disclosure is restricted by U.S. law. Dissemination
|
||||
* to non-U.S. persons whether in the United States or abroad requires
|
||||
* an export license or other authorization.
|
||||
*
|
||||
* Contractor Name: Raytheon Company
|
||||
* Contractor Address: 6825 Pine Street, Suite 340
|
||||
* Mail Stop B8
|
||||
* Omaha, NE 68106
|
||||
* 402.291.0100
|
||||
*
|
||||
* See the AWIPS II Master Rights File ("Master Rights File.pdf") for
|
||||
* further licensing information.
|
||||
**/
|
||||
/**
|
||||
* Place holder
|
||||
*
|
||||
* <pre>
|
||||
*
|
||||
* SOFTWARE HISTORY
|
||||
*
|
||||
* Date Ticket# Engineer Description
|
||||
* ------------ ---------- ----------- --------------------------
|
||||
* May 14, 2014 dhladky Initial creation
|
||||
*
|
||||
* </pre>
|
||||
*
|
||||
* @author dhladky
|
||||
* @version 1.0
|
||||
*/
|
||||
|
||||
package com.raytheon.uf.edex.plugin.datadelivery.retrieval.distribution;
|
||||
|
|
@ -1,12 +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 factory-bean="distributionSrv" factory-method="register">
|
||||
<constructor-arg ref="dataDeliveryRetrievalPluginName" />
|
||||
<constructor-arg
|
||||
value="jms-durable:queue:dataDeliveryRetrievalProcess"/>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
Loading…
Add table
Reference in a new issue