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

Issue #1543 Add ncfRegistry and wfoRegistry to runtime modes

Browse source 
Amend:
   Use ref syntax with uri.

Change-Id: Idab7b0e23909b8fb30defa5453fa52f37952d062

Former-commit-id: 116809346b [formerly 66fe560026848357ae165a675be9818da719675d]
Former-commit-id: cc598094fa
This commit is contained in:
Dustin Johnson 2013-02-18 12:31:46 -06:00
parent 83d12549bf
commit 2a588688b1
8 changed files with 101 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,6 +188,16 @@
<includeMode>statsTemplate</includeMode>
<includeMode>dataDeliveryTemplate</includeMode>
</mode>
<!-- Eventually these two modes will either become the production versions,
or the existing registry server will be migrated to one or the other. -->
<mode name="ncfRegistry">
<includeMode>registry</includeMode>
</mode>
<mode name="wfoRegistry">
<includeMode>registry</includeMode>
<exclude>harvester-*</exclude>
<exclude>crawler-*</exclude>
</mode>
<mode name="statsTemplate" template="true">
<include>event-common.xml</include>

33
edexOsgi/build.edex/esb/etc/ncfRegistry.sh Normal file
View file

@ -0,0 +1,33 @@
#!/bin/bash
##
# 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.
##
export MAX_MEM=1536 # in Meg
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5011
export EDEX_JMX_PORT=1622
export LOG4J_CONF=log4j-registry.xml
export MGMT_PORT=9607
# Registry specific ports
export EBXML_REGISTRY_WEBSERVER_PORT=8084
export EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT=8446
export EBXML_QUERY_SERVICE_SOAP_PORT=10146
export EBXML_THRIFT_SERVICE_PORT=9590

5
edexOsgi/build.edex/esb/etc/registry.sh
View file

@ -26,3 +26,8 @@ export EDEX_JMX_PORT=1620
export LOG4J_CONF=log4j-registry.xml
export MGMT_PORT=9605
# Registry specific ports
export EBXML_REGISTRY_WEBSERVER_PORT=8082
export EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT=8444
export EBXML_QUERY_SERVICE_SOAP_PORT=10144
export EBXML_THRIFT_SERVICE_PORT=9588

33
edexOsgi/build.edex/esb/etc/wfoRegistry.sh Normal file
View file

@ -0,0 +1,33 @@
#!/bin/bash
##
# 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.
##
export MAX_MEM=1536 # in Meg
export METADATA_POOL_MIN=10
export EDEX_DEBUG_PORT=5009
export EDEX_JMX_PORT=1620
export LOG4J_CONF=log4j-registry.xml
export MGMT_PORT=9605
# Registry specific ports
export EBXML_REGISTRY_WEBSERVER_PORT=8082
export EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT=8444
export EBXML_QUERY_SERVICE_SOAP_PORT=10144
export EBXML_THRIFT_SERVICE_PORT=9588

36
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/res/spring/thrift-bandwidth.xml
View file

@ -1,33 +1,15 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:amq="http://activemq.apache.org/schema/core" 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-2.0.xsd
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-2.0.xsd
http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
<bean id="bandwidthHandlerRegistry" class="com.raytheon.uf.edex.auth.HandlerRegistry" factory-method="getInstance"/>
<bean id="bandwidthSerializeServer" class="com.raytheon.uf.edex.auth.RemoteRequestServer" factory-method="getInstance">
<property name="registry" ref="bandwidthHandlerRegistry"/>
</bean>
<bean id="bandwidthRouteWrapper" class="com.raytheon.uf.edex.auth.RemoteRequestRouteWrapper">
<property name="server" ref="bandwidthSerializeServer"/>
</bean>
<bean id="binaryHttpBinding" class="com.raytheon.uf.edex.esb.camel.http.BinaryHttpBinding"/>
<camelContext id="bandwidth-thrift-service"
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<route id="bandwithThriftService">
<from uri="jetty:http://0.0.0.0:9589/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<bean ref="bandwidthRouteWrapper" method="executeThrift"/>
</route>
</camelContext>
<bean id="bandwidthHandlerRegistry" class="com.raytheon.uf.edex.auth.HandlerRegistry"
factory-method="getInstance" />
<bean factory-bean="bandwidthHandlerRegistry" factory-method="register">
<constructor-arg value="com.raytheon.uf.common.datadelivery.bandwidth.IBandwidthRequest"/>
<constructor-arg ref="bandwidthManager"/>
</bean>
<constructor-arg
value="com.raytheon.uf.common.datadelivery.bandwidth.IBandwidthRequest" />
<constructor-arg ref="bandwidthManager" />
</bean>
</beans>

4
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-thrift-client.xml
View file

@ -19,8 +19,10 @@
xmlns="http://camel.apache.org/schema/spring"
errorHandlerRef="errorHandler">
<endpoint id="ebxmlThriftService" uri="jetty:http://0.0.0.0:${EBXML_THRIFT_SERVICE_PORT}/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<route id="thriftService">
<from uri="jetty:http://0.0.0.0:9588/services/thrift?disableStreamCache=true&amp;chunked=false&amp;httpBindingRef=#binaryHttpBinding" />
<from ref="ebxmlThriftService" />
<bean ref="webservice" method="openSession"/>
<bean ref="routeWrapper" method="executeThrift"/>
<bean ref="webservice" method="closeSession"/>

4
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml-web.xml
View file

@ -18,10 +18,10 @@
<property name="connectors">
<list>
<bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector">
<property name="port" value="8082" />
<property name="port" value="${EBXML_REGISTRY_WEBSERVER_PORT}" />
<property name="maxIdleTime" value="30000" />
<property name="acceptors" value="2" />
<property name="confidentialPort" value="8444" />
<property name="confidentialPort" value="${EBXML_REGISTRY_WEBSERVER_CONFIDENTIAL_PORT}" />
</bean>
</list>
</property>

12
edexOsgi/com.raytheon.uf.edex.registry.ebxml/res/spring/ebxml.xml
View file

@ -53,7 +53,7 @@
<value>query</value>
</constructor-arg>
<constructor-arg type="java.lang.String">
<value>10144</value>
<value>${EBXML_QUERY_SERVICE_SOAP_PORT}</value>
</constructor-arg>
</bean>
@ -68,7 +68,7 @@
init-method="create">
<property name="serviceClass"
value="oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.QueryManager" /> <!-- Interface... -->
<property name="address" value="http://0.0.0.0:10144/query" />
<property name="address" value="http://0.0.0.0:${EBXML_QUERY_SERVICE_SOAP_PORT}/query" />
<property name="serviceBean" ref="queryServiceImpl" /> <!-- Reference concrete implementation -->
<property name="inInterceptors">
<list>
@ -88,7 +88,7 @@
init-method="create">
<property name="serviceClass"
value="oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.NotificationListener" /> <!-- Interface... -->
<property name="address" value="http://0.0.0.0:10144/notificationListener" />
<property name="address" value="http://0.0.0.0:${EBXML_QUERY_SERVICE_SOAP_PORT}/notificationListener" />
<property name="serviceBean" ref="notificationServiceImpl" /> <!-- Reference concrete implementation -->
</bean>
@ -97,7 +97,7 @@
init-method="create">
<property name="serviceClass"
value="oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.LifecycleManager" /> <!-- Interface... -->
<property name="address" value="http://0.0.0.0:10144/lcm" />
<property name="address" value="http://0.0.0.0:${EBXML_QUERY_SERVICE_SOAP_PORT}/lcm" />
<property name="serviceBean" ref="lcmServiceImpl" /> <!-- Reference concrete implementation -->
<property name="inInterceptors">
<list>
@ -117,7 +117,7 @@
init-method="create">
<property name="serviceClass"
value="oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.Validator" /> <!-- Interface... -->
<property name="address" value="http://0.0.0.0:10144/validator" />
<property name="address" value="http://0.0.0.0:${EBXML_QUERY_SERVICE_SOAP_PORT}/validator" />
<property name="serviceBean" ref="validatorServiceImpl" /> <!-- Reference concrete implementation -->
</bean>
@ -126,7 +126,7 @@
init-method="create">
<property name="serviceClass"
value="oasis.names.tc.ebxml.regrep.wsdl.registry.services.v4.Cataloger" /> <!-- Interface... -->
<property name="address" value="http://0.0.0.0:10144/getServiceAddress" />
<property name="address" value="http://0.0.0.0:${EBXML_QUERY_SERVICE_SOAP_PORT}/getServiceAddress" />
<property name="serviceBean" ref="catalogerServiceImpl" /> <!-- Reference concrete implementation -->
</bean>