You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by le...@apache.org on 2013/02/06 16:34:35 UTC
svn commit: r1443018 - in /incubator/streams/trunk:
streams-eip-routes/src/main/java/org/apache/streams/messaging/configuration/
streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/
streams-eip-routes/src/main/resources/META-INF/...
Author: letourneau
Date: Wed Feb 6 15:34:35 2013
New Revision: 1443018
URL: http://svn.apache.org/viewvc?rev=1443018&view=rev
Log:
fixed up properties loading and DRY'ed up the context between web and OSGI deployment
Added:
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/propertiesLoader.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml
- copied, changed from r1442764, incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml
- copied, changed from r1442764, incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/camelContext.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties
Removed:
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/camelContext.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/routing.properties
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml
Modified:
incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java
incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java
incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
incubator/streams/trunk/streams-web/pom.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml
Modified: incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java?rev=1443018&r1=1443017&r2=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/configuration/EipConfigurator.java Wed Feb 6 15:34:35 2013
@@ -24,14 +24,36 @@ public class EipConfigurator {
@Value("${consumer.activityQUri}")
private String consumerActivityQUri;
- public static String CONSUMER_URL_RESOURCE = "/streams/publish";
- public static String CONSUMER_RECIEVE_METHOD = "receive";
- public static String CONSUMER_SPLIT_METHOD = "split";
-
- public static String SUBSCRIBER_URL_RESOURCE = "/streams/subscriber";
- public static String SUBSCRIBER_RECEIVE_METHOD = "receive";
- public static String SUBSCRIBER_POST_METHOD = "updateActivityStreamsSubscriberConfiguration";
- public static String SUBSCRIBER_GET_METHOD = "getStream";
+ @Value("${consumer.publisherEndpointProtocol}")
+ private String publisherEndpointProtocol;
+
+ @Value("${consumer.publisherEndpointUrlResource}")
+ private String publisherEndpointUrlResource;
+
+ @Value("${consumer.receiveMethod}")
+ private String consumerReceiveMethod;
+
+ @Value("${consumer.splitMethod}")
+ private String consumerSplitMethod;
+
+ @Value("${subscriber.subscriberEndpointProtocol}")
+ private String subscriberEndpointProtocol;
+
+ @Value("${subscriber.subscriberEndpointUrlResource}")
+ private String subscriberEndpointUrlResource;
+
+ @Value("${subscriber.receiveMethod}")
+ private String subscriberReceiveMethod;
+
+ @Value("${subscriber.postMethod}")
+ private String subscriberPostMethod;
+
+ @Value("${subscriber.getMethod}")
+ private String subscriberGetMethod;
+
+
+ public static String ENDPOINT_PROTOCOL_JETTY="jetty:http://";
+ public static String ENDPOINT_PROTOCOL_SERVLET="servlet:///";
public String getConsumerInRouteHost() {
return consumerInRouteHost;
@@ -73,6 +95,78 @@ public class EipConfigurator {
this.subscriberInRoutePort = subscriberInRoutePort;
}
+ public String getPublisherEndpointProtocol() {
+ return publisherEndpointProtocol;
+ }
+
+ public void setPublisherEndpointProtocol(String publisherEndpointProtocol) {
+ this.publisherEndpointProtocol = publisherEndpointProtocol;
+ }
+
+ public String getPublisherEndpointUrlResource() {
+ return publisherEndpointUrlResource;
+ }
+
+ public void setPublisherEndpointUrlResource(String publisherEndpointUrlResource) {
+ this.publisherEndpointUrlResource = publisherEndpointUrlResource;
+ }
+
+ public String getConsumerReceiveMethod() {
+ return consumerReceiveMethod;
+ }
+
+ public void setConsumerReceiveMethod(String consumerReceiveMethod) {
+ this.consumerReceiveMethod = consumerReceiveMethod;
+ }
+
+ public String getConsumerSplitMethod() {
+ return consumerSplitMethod;
+ }
+
+ public void setConsumerSplitMethod(String consumerSplitMethod) {
+ this.consumerSplitMethod = consumerSplitMethod;
+ }
+
+ public String getSubscriberEndpointProtocol() {
+ return subscriberEndpointProtocol;
+ }
+
+ public void setSubscriberEndpointProtocol(String subscriberEndpointProtocol) {
+ this.subscriberEndpointProtocol = subscriberEndpointProtocol;
+ }
+
+ public String getSubscriberEndpointUrlResource() {
+ return subscriberEndpointUrlResource;
+ }
+
+ public void setSubscriberEndpointUrlResource(String subscriberEndpointUrlResource) {
+ this.subscriberEndpointUrlResource = subscriberEndpointUrlResource;
+ }
+
+ public String getSubscriberReceiveMethod() {
+ return subscriberReceiveMethod;
+ }
+
+ public void setSubscriberReceiveMethod(String subscriberReceiveMethod) {
+ this.subscriberReceiveMethod = subscriberReceiveMethod;
+ }
+
+ public String getSubscriberPostMethod() {
+ return subscriberPostMethod;
+ }
+
+ public void setSubscriberPostMethod(String subscriberPostMethod) {
+ this.subscriberPostMethod = subscriberPostMethod;
+ }
+
+ public String getSubscriberGetMethod() {
+ return subscriberGetMethod;
+ }
+
+ public void setSubscriberGetMethod(String subscriberGetMethod) {
+ this.subscriberGetMethod = subscriberGetMethod;
+ }
+
}
Modified: incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java?rev=1443018&r1=1443017&r2=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityConsumerRouter.java Wed Feb 6 15:34:35 2013
@@ -14,6 +14,8 @@ import org.apache.camel.CamelContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import java.util.UUID;
+
public class ActivityConsumerRouter extends RouteBuilder implements ActivityConsumerRouteBuilder {
private static final transient Log LOG = LogFactory.getLog(ActivityConsumerRouter.class);
@@ -43,12 +45,19 @@ public class ActivityConsumerRouter exte
if (existingConsumer==null){
- activityConsumer.setInRoute("http://" + configuration.getConsumerInRouteHost()+ ":" + configuration.getConsumerInRoutePort() + EipConfigurator.CONSUMER_URL_RESOURCE + "/" + activityConsumerWarehouse.getConsumersCount());
+ try{
+
+ if (configuration.getPublisherEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_JETTY)){
+ activityConsumer.setInRoute(configuration.getConsumerInRouteHost()+ ":" + configuration.getConsumerInRoutePort() +"/" + configuration.getPublisherEndpointUrlResource() + "/" + UUID.randomUUID());
+ }else if (configuration.getPublisherEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_SERVLET)){
+ activityConsumer.setInRoute( configuration.getPublisherEndpointUrlResource() + "/" + UUID.randomUUID());
+ } else{
+ throw new Exception("No supported endpoint protocol is configured.");
+ }
- try{
//setup a message queue for this consumer.getInRoute()
- camelContext.addRoutes(new DynamicConsumerRouteBuilder(configuration,camelContext, "jetty:" + activityConsumer.getInRoute(), activityConsumer));
+ camelContext.addRoutes(new DynamicConsumerRouteBuilder(configuration,camelContext, configuration.getPublisherEndpointProtocol() + activityConsumer.getInRoute(), activityConsumer));
//set the body to the url the producer should post to
exchange.getOut().setBody(activityConsumer.getInRoute());
LOG.info("all messages sent from " + activityConsumer.getSrc() + " must be posted to " + activityConsumer.getInRoute());
@@ -101,9 +110,9 @@ public class ActivityConsumerRouter exte
from(from)
- .bean(activityConsumer, EipConfigurator.CONSUMER_RECIEVE_METHOD).setBody(body())
+ .bean(activityConsumer, configuration.getConsumerReceiveMethod()).setBody(body())
.split()
- .method(activityConsumer, EipConfigurator.CONSUMER_SPLIT_METHOD)
+ .method(activityConsumer, configuration.getConsumerSplitMethod())
.to(configuration.getConsumerActivityQUri());
Modified: incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java?rev=1443018&r1=1443017&r2=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/java/org/apache/streams/messaging/routers/impl/ActivityStreamsSubscriberRouter.java Wed Feb 6 15:34:35 2013
@@ -40,12 +40,19 @@ public class ActivityStreamsSubscriberRo
//todo: add some better scheme then getCount for URL...
//todo: make the route again if subscriber exists...and context doesn't have route
if (activityStreamsSubscriber.isAuthenticated()){
- activityStreamsSubscriber.setInRoute("http://" + configuration.getSubscriberInRouteHost()+ ":" + configuration.getSubscriberInRoutePort() + EipConfigurator.SUBSCRIBER_URL_RESOURCE + "/" + UUID.randomUUID());
try{
+ if (configuration.getSubscriberEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_JETTY)){
+ activityStreamsSubscriber.setInRoute(configuration.getSubscriberInRouteHost()+ ":" + configuration.getSubscriberInRoutePort() +"/" + configuration.getSubscriberEndpointUrlResource() + "/" + UUID.randomUUID());
+ }else if (configuration.getSubscriberEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_SERVLET)){
+ activityStreamsSubscriber.setInRoute( configuration.getSubscriberEndpointUrlResource() + "/" + UUID.randomUUID());
+ } else{
+ throw new Exception("No supported endpoint protocol is configured.");
+ }
+
//setup a message queue for this consumer.getInRoute()
- camelContext.addRoutes(new DynamicSubscriberRouteBuilder(configuration,camelContext, "jetty:" + activityStreamsSubscriber.getInRoute(), activityStreamsSubscriber));
+ camelContext.addRoutes(new DynamicSubscriberRouteBuilder(configuration,camelContext, configuration.getSubscriberEndpointProtocol() + activityStreamsSubscriber.getInRoute(), activityStreamsSubscriber));
//set the body to the url the producer should post to
exchange.getOut().setBody(activityStreamsSubscriber.getInRoute());
activityStreamsSubscriberWarehouse.register(activityStreamsSubscriber);
@@ -96,10 +103,10 @@ public class ActivityStreamsSubscriberRo
.choice()
.when(header("CamelHttpMethod").isEqualTo("POST"))
//when its a post...it goes to adding a new src
- .bean(activityStreamsSubscriber, EipConfigurator.SUBSCRIBER_POST_METHOD).setBody(body())
+ .bean(activityStreamsSubscriber, configuration.getSubscriberPostMethod()).setBody(body())
.when(header("CamelHttpMethod").isEqualTo("GET"))
// when its a GET it goes to getStream()
- .bean(activityStreamsSubscriber, EipConfigurator.SUBSCRIBER_GET_METHOD) ;
+ .bean(activityStreamsSubscriber, configuration.getSubscriberGetMethod()) ;
Added: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/propertiesLoader.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/propertiesLoader.xml?rev=1443018&view=auto
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/propertiesLoader.xml (added)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/propertiesLoader.xml Wed Feb 6 15:34:35 2013
@@ -0,0 +1,36 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+
+
+ <context:component-scan base-package="org.apache.streams.messaging" annotation-config="true"/>
+
+ <context:property-placeholder location="/META-INF/streams.properties"/>
+
+ <bean id="configuration" class="org.apache.streams.messaging.configuration.EipConfigurator" />
+
+
+</beans>
\ No newline at end of file
Modified: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml?rev=1443018&r1=1443017&r2=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-applicationContext.xml Wed Feb 6 15:34:35 2013
@@ -25,18 +25,11 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
-
- <context:component-scan base-package="org.apache.streams.messaging" annotation-config="true"/>
-
- <context:property-placeholder location="/META-INF/spring/routing.properties"/>
-
-
- <bean id="configuration" class="org.apache.streams.messaging.configuration.EipConfigurator" />
-
<bean id="activityConsumerRouter" class="org.apache.streams.messaging.routers.impl.ActivityConsumerRouter">
<property name="activityConsumerWarehouse" ref="activityConsumerWarehouse"/>
<property name="camelContext" ref="context"/>
</bean>
+
<bean id="activityRegistrationProcessor" class="org.apache.streams.messaging.processors.ActivityPublisherRegistrationProcessor"/>
@@ -53,7 +46,7 @@
<bean id="jmsConnectionFactory"
class="org.apache.activemq.ActiveMQConnectionFactory">
- <property name="brokerURL" value="tcp://localhost:61616" />
+ <property name="brokerURL" value="${activemq.jmsConnectionFactoryUrl}" />
</bean>
<bean id="pooledConnectionFactory"
Copied: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml (from r1442764, incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml)
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml?p2=incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streams-eip-osgi-component-import.xml&p1=incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/osgi-component-import.xml&r1=1442764&r2=1443018&rev=1443018&view=diff
==============================================================================
(empty)
Copied: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml (from r1442764, incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/camelContext.xml)
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml?p2=incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml&p1=incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/camelContext.xml&r1=1442764&r2=1443018&rev=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/camelContext.xml (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml Wed Feb 6 15:34:35 2013
@@ -15,9 +15,11 @@
<camelContext id="context" xmlns="http://camel.apache.org/schema/spring">
- <!--publisher registration route setup todo: get this from the properties file (host and port)-->
+ <endpoint id="consumerRegistrationEndpoint" uri="${consumer.registrationEndpoint}"/>
+ <endpoint id="subscriberRegistrationEndpoint" uri="${subscriber.registrationEndpoint}"/>
+ <!--publisher registration route setup -->
<route>
- <from uri="jetty:http://localhost:8000/streams/publisher/register"/>
+ <from uri="ref:consumerRegistrationEndpoint"/>
<bean ref="activityRegistrationProcessor" />
<to uri="direct:publisher-register"/>
</route>
@@ -53,7 +55,7 @@
<!-- register as a subscriber - returned the endpoint to poll and add to subscription sources - GET/POST -->
<route>
- <from uri="jetty:http://localhost:8000/streams/subscriber/register"/>
+ <from uri="ref:subscriberRegistrationEndpoint"/>
<bean ref="subscriberRegistrationProcessor" />
<to uri="direct:subscriber-register"/>
</route>
Added: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties?rev=1443018&view=auto
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties (added)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties Wed Feb 6 15:34:35 2013
@@ -0,0 +1,21 @@
+consumer.inRouteHost=localhost
+consumer.inRoutePort=8000
+consumer.activityQUri = direct:activityQ
+
+consumer.publisherEndpointProtocol=jetty:http://
+consumer.publisherEndpointUrlResource=streams/publish
+consumer.receiveMethod=receive
+consumer.splitMethod=split
+
+consumer.registrationEndpoint=jetty:http://localhost:8000/streams/publisher/register
+
+subscriber.inRouteHost=localhost
+subscriber.inRoutePort=8000
+subscriber.subscriberEndpointUrlResource=streams/subscriber
+subscriber.receiveMethod=receive
+subscriber.postMethod=updateActivityStreamsSubscriberConfiguration
+subscriber.getMethod=getStream
+subscriber.registrationEndpoint=jetty:http://localhost:8000/streams/subscriber/register
+subscriber.subscriberEndpointProtocol=jetty:http://
+
+activemq.jmsConnectionFactoryUrl=tcp://localhost:61616
\ No newline at end of file
Modified: incubator/streams/trunk/streams-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/pom.xml?rev=1443018&r1=1443017&r2=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/pom.xml (original)
+++ incubator/streams/trunk/streams-web/pom.xml Wed Feb 6 15:34:35 2013
@@ -169,9 +169,9 @@
<resource>
<directory>${project.parent.basedir}/streams-eip-routes/src/main/resources/META-INF/spring</directory>
<excludes>
- <exclude>osgi-component-import.xml</exclude>
- <exclude>camelContext.xml</exclude>
- <exclude>streams-eip-applicationContext.xml</exclude>
+ <exclude>streams-eip-osgi-component-import.xml</exclude>
+ <exclude>propertiesLoader.xml</exclude>
+ <exclude>streams.properties</exclude>
</excludes>
</resource>
</resources>
Added: incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml?rev=1443018&view=auto
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml (added)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/propertiesLoader.xml Wed Feb 6 15:34:35 2013
@@ -0,0 +1,35 @@
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<beans
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.springframework.org/schema/beans"
+ xmlns:context="http://www.springframework.org/schema/context"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+
+
+
+ <context:component-scan base-package="org.apache.streams.messaging" annotation-config="true"/>
+
+ <context:property-placeholder location="/WEB-INF/streams.properties"/>
+ <bean id="configuration" class="org.apache.streams.messaging.configuration.EipConfigurator" />
+
+
+</beans>
\ No newline at end of file
Added: incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties?rev=1443018&view=auto
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties (added)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties Wed Feb 6 15:34:35 2013
@@ -0,0 +1,21 @@
+consumer.inRouteHost=localhost
+consumer.inRoutePort=8000
+consumer.activityQUri = direct:activityQ
+
+consumer.publisherEndpointProtocol=servlet:///
+consumer.publisherEndpointUrlResource=streams/publish
+consumer.receiveMethod=receive
+consumer.splitMethod=split
+
+consumer.registrationEndpoint=servlet:///publisher/register
+
+subscriber.inRouteHost=localhost
+subscriber.inRoutePort=8000
+subscriber.subscriberEndpointUrlResource=streams/subscriber
+subscriber.receiveMethod=receive
+subscriber.postMethod=updateActivityStreamsSubscriberConfiguration
+subscriber.getMethod=getStream
+subscriber.registrationEndpoint=servlet:///subscriber/register
+subscriber.subscriberEndpointProtocol=servlet:///
+
+activemq.jmsConnectionFactoryUrl=tcp://localhost:61616
\ No newline at end of file
Modified: incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml?rev=1443018&r1=1443017&r2=1443018&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml Wed Feb 6 15:34:35 2013
@@ -10,10 +10,9 @@
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
+ /WEB-INF/propertiesLoader.xml
/WEB-INF/spring/*.xml
- /WEB-INF/applicationContext.xml
/WEB-INF/spring-web-servlet.xml
- /WEB-INF/camelContextWeb.xml
</param-value>
</context-param>
<!-- the listener that kick-starts Spring -->