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 19:28:59 UTC
svn commit: r1443116 - 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 18:28:59 2013
New Revision: 1443116
URL: http://svn.apache.org/viewvc?rev=1443116&view=rev
Log:
minor tweaks to make sure the endpoints return the fully qualified URL in both WAR and OSGI deployment
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/streamsCamelContext.xml
incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties
incubator/streams/trunk/streams-web/pom.xml
incubator/streams/trunk/streams-web/src/main/resources/META-INF/DEPENDENCIES
incubator/streams/trunk/streams-web/src/main/resources/META-INF/DISCLAIMER
incubator/streams/trunk/streams-web/src/main/resources/META-INF/NOTICE
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties
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=1443116&r1=1443115&r2=1443116&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 18:28:59 2013
@@ -52,6 +52,10 @@ public class EipConfigurator {
private String subscriberGetMethod;
+ @Value("${servlet.baseUrlPath}")
+ private String baseUrlPath;
+
+
public static String ENDPOINT_PROTOCOL_JETTY="jetty:http://";
public static String ENDPOINT_PROTOCOL_SERVLET="servlet:///";
@@ -167,6 +171,13 @@ public class EipConfigurator {
this.subscriberGetMethod = subscriberGetMethod;
}
+ public String getBaseUrlPath() {
+ return baseUrlPath;
+ }
+
+ public void setBaseUrlPath(String baseUrlPath) {
+ this.baseUrlPath = baseUrlPath;
+ }
}
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=1443116&r1=1443115&r2=1443116&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 18:28:59 2013
@@ -49,8 +49,12 @@ public class ActivityConsumerRouter exte
if (configuration.getPublisherEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_JETTY)){
activityConsumer.setInRoute(configuration.getConsumerInRouteHost()+ ":" + configuration.getConsumerInRoutePort() +"/" + configuration.getPublisherEndpointUrlResource() + "/" + UUID.randomUUID());
+ //set the body to the url the producer should post to
+ exchange.getOut().setBody("http://" + activityConsumer.getInRoute());
}else if (configuration.getPublisherEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_SERVLET)){
activityConsumer.setInRoute( configuration.getPublisherEndpointUrlResource() + "/" + UUID.randomUUID());
+ //set the body to the url the producer should post to
+ exchange.getOut().setBody(configuration.getBaseUrlPath() + activityConsumer.getInRoute());
} else{
throw new Exception("No supported endpoint protocol is configured.");
}
@@ -58,8 +62,8 @@ public class ActivityConsumerRouter exte
//setup a message queue for this consumer.getInRoute()
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());
//only add the route to the warehouse after its been created in messaging system...
activityConsumerWarehouse.register(activityConsumer);
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=1443116&r1=1443115&r2=1443116&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 18:28:59 2013
@@ -45,16 +45,19 @@ public class ActivityStreamsSubscriberRo
if (configuration.getSubscriberEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_JETTY)){
activityStreamsSubscriber.setInRoute(configuration.getSubscriberInRouteHost()+ ":" + configuration.getSubscriberInRoutePort() +"/" + configuration.getSubscriberEndpointUrlResource() + "/" + UUID.randomUUID());
+ //set the body to the url the producer should post to
+ exchange.getOut().setBody("http://" + activityStreamsSubscriber.getInRoute());
}else if (configuration.getSubscriberEndpointProtocol().equals(EipConfigurator.ENDPOINT_PROTOCOL_SERVLET)){
activityStreamsSubscriber.setInRoute( configuration.getSubscriberEndpointUrlResource() + "/" + UUID.randomUUID());
+ //set the body to the url the producer should post to
+ exchange.getOut().setBody(configuration.getBaseUrlPath() + activityStreamsSubscriber.getInRoute());
} else{
throw new Exception("No supported endpoint protocol is configured.");
}
//setup a message queue for this consumer.getInRoute()
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);
}catch (Exception e){
exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE,500);
Modified: incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml?rev=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/spring/streamsCamelContext.xml Wed Feb 6 18:28:59 2013
@@ -44,7 +44,7 @@
<route>
<from uri="activemq:queue:activities"/>
- <aggregate completionTimeout="500" groupExchanges="true">
+ <aggregate completionInterval="500" groupExchanges="true">
<correlationExpression>
<constant>true</constant>
</correlationExpression>
Modified: 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=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties (original)
+++ incubator/streams/trunk/streams-eip-routes/src/main/resources/META-INF/streams.properties Wed Feb 6 18:28:59 2013
@@ -1,3 +1,5 @@
+servlet.baseUrlPath=http://localhost:8080/streams-web/
+
consumer.inRouteHost=localhost
consumer.inRoutePort=8000
consumer.activityQUri = direct:activityQ
Modified: incubator/streams/trunk/streams-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/pom.xml?rev=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/pom.xml (original)
+++ incubator/streams/trunk/streams-web/pom.xml Wed Feb 6 18:28:59 2013
@@ -11,7 +11,7 @@
<artifactId>streams-web</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>war</packaging>
- <name>streams-web Maven Webapp</name>
+ <name>Apache Streams Web App</name>
<url>http://maven.apache.org</url>
<properties>
<spring.version>3.0.5.RELEASE</spring.version>
Modified: incubator/streams/trunk/streams-web/src/main/resources/META-INF/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/resources/META-INF/DEPENDENCIES?rev=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/resources/META-INF/DEPENDENCIES (original)
+++ incubator/streams/trunk/streams-web/src/main/resources/META-INF/DEPENDENCIES Wed Feb 6 18:28:59 2013
@@ -3,7 +3,7 @@
// maven pom organized by organization.
// ------------------------------------------------------------------
-streams-web Maven Webapp
+Apache Streams Web App
From: 'an unknown organization'
Modified: incubator/streams/trunk/streams-web/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/resources/META-INF/DISCLAIMER?rev=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/streams/trunk/streams-web/src/main/resources/META-INF/DISCLAIMER Wed Feb 6 18:28:59 2013
@@ -1,4 +1,4 @@
-streams-web Maven Webapp is an effort undergoing incubation at the Apache Software
+Apache Streams Web App is an effort undergoing incubation at the Apache Software
Foundation (ASF), sponsored by the Apache Incubator PMC.
Incubation is required of all newly accepted projects until a further review
Modified: incubator/streams/trunk/streams-web/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/resources/META-INF/NOTICE?rev=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/resources/META-INF/NOTICE (original)
+++ incubator/streams/trunk/streams-web/src/main/resources/META-INF/NOTICE Wed Feb 6 18:28:59 2013
@@ -1,5 +1,5 @@
-streams-web Maven Webapp
+Apache Streams Web App
Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
Modified: 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=1443116&r1=1443115&r2=1443116&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties (original)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/streams.properties Wed Feb 6 18:28:59 2013
@@ -1,9 +1,12 @@
+servlet.baseUrlPath=http://localhost:8080/streams-web/
+
consumer.inRouteHost=localhost
consumer.inRoutePort=8000
consumer.activityQUri = direct:activityQ
consumer.publisherEndpointProtocol=servlet:///
-consumer.publisherEndpointUrlResource=streams/publish
+consumer.publisherEndpointUrlResource=publish
+
consumer.receiveMethod=receive
consumer.splitMethod=split
@@ -11,11 +14,12 @@ consumer.registrationEndpoint=servlet://
subscriber.inRouteHost=localhost
subscriber.inRoutePort=8000
-subscriber.subscriberEndpointUrlResource=streams/subscriber
+subscriber.subscriberEndpointUrlResource=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=1443116&r1=1443115&r2=1443116&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 18:28:59 2013
@@ -20,6 +20,7 @@
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
+
<!-- Camel servlet -->
<servlet>
<servlet-name>CamelServlet</servlet-name>
@@ -30,7 +31,7 @@
<!-- Camel servlet mapping -->
<servlet-mapping>
<servlet-name>CamelServlet</servlet-name>
- <url-pattern>/streams/*</url-pattern>
+ <url-pattern>/*</url-pattern>
</servlet-mapping>
</web-app>
\ No newline at end of file