Author: letourneau
Date: Tue Feb 5 21:43:25 2013
New Revision: 1442764
URL: http://svn.apache.org/viewvc?rev=1442764&view=rev
Log:
war deployment to tomcat working, need to improve configuration files and
resource copy to make it a bit more DRY
Modified:
incubator/streams/trunk/streams-osgi-components/streams-components-all/pom.xml
incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DEPENDENCIES
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml
Modified:
incubator/streams/trunk/streams-osgi-components/streams-components-all/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/streams-components-all/pom.xml?rev=1442764&r1=1442763&r2=1442764&view=diff
==============================================================================
---
incubator/streams/trunk/streams-osgi-components/streams-components-all/pom.xml
(original)
+++
incubator/streams/trunk/streams-osgi-components/streams-components-all/pom.xml
Tue Feb 5 21:43:25 2013
@@ -32,6 +32,12 @@
<artifactId>activity-consumer</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.streams</groupId>
+ <artifactId>streams-eip-routes</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
<packaging>jar</packaging>
Modified:
incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DEPENDENCIES
URL:
http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DEPENDENCIES?rev=1442764&r1=1442763&r2=1442764&view=diff
==============================================================================
---
incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DEPENDENCIES
(original)
+++
incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DEPENDENCIES
Tue Feb 5 21:43:25 2013
@@ -7,12 +7,44 @@ Apache Streams Components All
From: 'an unknown organization'
+ - AOP alliance (http://aopalliance.sourceforge.net)
aopalliance:aopalliance:jar:1.0
+ License: Public Domain
+ - streams-eip-routes [org.apache.streams]
org.apache.streams:streams-eip-routes:bundle:0.1-SNAPSHOT
+
- activity-consumer-bundle
[org.apache.streams.osgi.components.activityconsumer]
org.apache.streams.osgi.components:activity-consumer:bundle:0.1-SNAPSHOT
- activity-registration-bundle [org.apache.streams.osgi.components]
org.apache.streams.osgi.components:activity-registration:bundle:0.1-SNAPSHOT
- activity-subscriber-bundle
[org.apache.streams.osgi.components.activitysubscriber]
org.apache.streams.osgi.components:activity-subscriber:bundle:0.1-SNAPSHOT
+ - org.osgi.core org.osgi:org.osgi.core:jar:4.1.0
+
+ - spring-aop org.springframework:spring-aop:jar:3.0.6.RELEASE
+
+ - spring-asm org.springframework:spring-asm:jar:3.0.6.RELEASE
+
+ - spring-beans org.springframework:spring-beans:jar:3.0.6.RELEASE
+
+ - spring-context org.springframework:spring-context:jar:3.0.6.RELEASE
+
+ - spring-core org.springframework:spring-core:jar:3.0.6.RELEASE
+
+ - spring-expression org.springframework:spring-expression:jar:3.0.6.RELEASE
+
+ - spring-jms org.springframework:spring-jms:jar:3.0.5.RELEASE
+
+ - spring-tx org.springframework:spring-tx:jar:3.0.5.RELEASE
+
+
+From: 'Apache Software Foundation' (http://www.apache.org)
+ - J2EE Management 1.1
(http://geronimo.apache.org/specs/geronimo-j2ee-management_1.1_spec)
org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:jar:1.0.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - JMS 1.1 (http://geronimo.apache.org/specs/geronimo-jms_1.1_spec)
org.apache.geronimo.specs:geronimo-jms_1.1_spec:jar:1.1.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'Apache Software Foundation' (http://www.apache.org/)
+ - JTA (http://geronimo.apache.org/geronimo-jta_1.0.1B_spec)
org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:jar:1.0.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'FasterXML' (http://fasterxml.com)
- Jackson (http://jackson.codehaus.org)
org.codehaus.jackson:jackson-core-asl:jar:1.9.11
@@ -22,6 +54,44 @@ From: 'FasterXML' (http://fasterxml.com)
- Bean Materializer (http://jackson.codehaus.org)
org.codehaus.jackson:jackson-mrbean:jar:1.9.11
License: BSD (http://www.opensource.org/licenses/bsd-license.php)
+From: 'FuseSource' (http://www.fusesource.org)
+ - Commons Management (http://commonman.fusesource.org)
org.fusesource.commonman:commons-management:bundle:1.0
+ License: Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.html)
+
+From: 'QOS.ch' (http://www.qos.ch)
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.6.1
+ License: MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+From: 'The Apache Software Foundation' (http://www.apache.org/)
+ - Commons Logging (http://commons.apache.org/logging)
commons-logging:commons-logging:jar:1.1.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Commons Net (http://commons.apache.org/net/)
commons-net:commons-net:jar:2.0
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Commons Pool (http://commons.apache.org/pool/)
commons-pool:commons-pool:jar:1.5.4
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - ActiveIO :: Core (http://activemq.apache.org/activeio-core/)
org.apache.activemq:activeio-core:bundle:3.1.2
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - ActiveMQ :: Camel (http://activemq.apache.org/activemq-camel)
org.apache.activemq:activemq-camel:bundle:5.5.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - ActiveMQ :: Core (http://activemq.apache.org/activemq-core)
org.apache.activemq:activemq-core:bundle:5.5.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - ActiveMQ :: Pool (http://activemq.apache.org/activemq-pool)
org.apache.activemq:activemq-pool:bundle:5.5.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - ActiveMQ :: KahaDB (http://activemq.apache.org/kahadb)
org.apache.activemq:kahadb:bundle:5.5.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - ActiveMQ Protocol Buffers Implementation and Compiler
(http://activemq.apache.org/activemq-protobuf)
org.apache.activemq.protobuf:activemq-protobuf:maven-plugin:1.1
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Camel :: Core (http://camel.apache.org/camel-parent/camel-core)
org.apache.camel:camel-core:bundle:2.8.5
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Camel :: JMS (http://camel.apache.org/camel-parent/camel-jms)
org.apache.camel:camel-jms:bundle:2.7.0
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Camel :: Spring (http://camel.apache.org/camel-parent/camel-spring)
org.apache.camel:camel-spring:bundle:2.7.0
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
+From: 'The JASYPT team' (http://www.jasypt.org)
+ - JASYPT: Java Simplified Encryption (http://www.jasypt.org)
org.jasypt:jasypt:jar:1.7
+ License: The Apache Software License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0.txt)
+
Modified:
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml
URL:
http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml?rev=1442764&r1=1442763&r2=1442764&view=diff
==============================================================================
---
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml
(original)
+++
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml
Tue Feb 5 21:43:25 2013
@@ -6,8 +6,7 @@
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring-2.0.0.xsd
- http://www.springframework.org/schema/osgi";>
+ http://camel.apache.org/schema/spring/camel-spring-2.0.0.xsd";>
@@ -16,7 +15,7 @@
<!--publisher registration route setup todo: get this from the
properties file (host and port)-->
<route>
- <from uri="servlet://publisher/register?servletName=CamelServlet"/>
+ <from uri="servlet:///publisher/register"/>
<bean ref="activityRegistrationProcessor" />
<to uri="direct:publisher-register"/>
</route>
@@ -52,7 +51,7 @@
<!-- register as a subscriber - returned the endpoint to poll and add
to subscription sources - GET/POST -->
<route>
- <from
uri="servlet://subscriber/register?servletName=CamelServlet"/>
+ <from uri="servlet:///subscriber/register"/>
<bean ref="subscriberRegistrationProcessor" />
<to uri="direct:subscriber-register"/>
</route>
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=1442764&r1=1442763&r2=1442764&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 Tue Feb
5 21:43:25 2013
@@ -11,28 +11,24 @@
<param-name>contextConfigLocation</param-name>
<param-value>
/WEB-INF/spring/*.xml
+ /WEB-INF/applicationContext.xml
/WEB-INF/spring-web-servlet.xml
+ /WEB-INF/camelContextWeb.xml
</param-value>
</context-param>
- <!-- spring context listener which loads the XML file -->
+ <!-- the listener that kick-starts Spring -->
<listener>
- <listener-class>
- org.springframework.web.context.ContextLoaderListener
- </listener-class>
+
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
- <!-- Camel Servlet -->
+
+ <!-- Camel servlet -->
<servlet>
<servlet-name>CamelServlet</servlet-name>
- <display-name>Camel Http Transport Servlet</display-name>
- <servlet-class>
- org.apache.camel.component.servlet.CamelHttpTransportServlet
- </servlet-class>
- <init-param>
- <param-name>matchOnUriPrefix</param-name>
- <param-value>true</param-value>
- </init-param>
+
<servlet-class>org.apache.camel.component.servlet.CamelHttpTransportServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
</servlet>
- <!-- Camel Servlet mappings -->
+
+ <!-- Camel servlet mapping -->
<servlet-mapping>
<servlet-name>CamelServlet</servlet-name>
<url-pattern>/streams/*</url-pattern>
