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/05 22:18:59 UTC
svn commit: r1442749 - in /incubator/streams/trunk: ./
streams-osgi-components/streams-components-all/
streams-osgi-components/streams-components-all/src/main/resources/META-INF/
streams-web/ streams-web/src/main/resources/META-INF/ streams-web/src/mai...
Author: letourneau
Date: Tue Feb 5 21:18:59 2013
New Revision: 1442749
URL: http://svn.apache.org/viewvc?rev=1442749&view=rev
Log:
war is deployable...need to work out the servlet endpoints though
Added:
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml
Removed:
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/lib/streams-components-all-0.1-SNAPSHOT.jar
Modified:
incubator/streams/trunk/pom.xml
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-osgi-components/streams-components-all/src/main/resources/META-INF/DISCLAIMER
incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/NOTICE
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/webapp/WEB-INF/applicationContext.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml
incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/web.xml
Modified: incubator/streams/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/pom.xml?rev=1442749&r1=1442748&r2=1442749&view=diff
==============================================================================
--- incubator/streams/trunk/pom.xml (original)
+++ incubator/streams/trunk/pom.xml Tue Feb 5 21:18:59 2013
@@ -4,7 +4,7 @@
<parent>
<groupId>org.apache.streams</groupId>
<artifactId>streams-master</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.1-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
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=1442749&r1=1442748&r2=1442749&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:18:59 2013
@@ -2,22 +2,34 @@
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <groupId>org.apache.streams.osgi-components</groupId>
+ <groupId>org.apache.streams.osgi.components</groupId>
<artifactId>streams-osgi-components</artifactId>
<version>0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.osgi.components</groupId>
<artifactId>streams-components-all</artifactId>
<version>0.1-SNAPSHOT</version>
- <name>Apache Streams Components</name>
+ <name>Apache Streams Components All</name>
<dependencies>
<dependency>
- <groupId>org.apache.streams.osgi-components</groupId>
- <artifactId>activity-publisher-registration</artifactId>
+ <groupId>org.apache.streams.osgi.components</groupId>
+ <artifactId>activity-registration</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.streams.osgi.components</groupId>
+ <artifactId>activity-subscriber</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.streams.osgi.components</groupId>
+ <artifactId>activity-consumer</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
</dependencies>
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=1442749&r1=1442748&r2=1442749&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:18:59 2013
@@ -3,12 +3,24 @@
// maven pom organized by organization.
// ------------------------------------------------------------------
-Apache Streams Components
+Apache Streams Components All
From: 'an unknown organization'
- - activity-publisher-registration-bundle [org.apache.streams.osgi.components] org.apache.streams.osgi-components:activity-publisher-registration: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
+
+
+From: 'FasterXML' (http://fasterxml.com)
+ - Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-core-asl:jar:1.9.11
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Data Mapper for Jackson (http://jackson.codehaus.org) org.codehaus.jackson:jackson-mapper-asl:jar:1.9.11
+ License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - 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)
Modified: incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DISCLAIMER
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DISCLAIMER?rev=1442749&r1=1442748&r2=1442749&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DISCLAIMER (original)
+++ incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/DISCLAIMER Tue Feb 5 21:18:59 2013
@@ -1,4 +1,4 @@
-Apache Streams Components is an effort undergoing incubation at the Apache Software
+Apache Streams Components All 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-osgi-components/streams-components-all/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/NOTICE?rev=1442749&r1=1442748&r2=1442749&view=diff
==============================================================================
--- incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/NOTICE (original)
+++ incubator/streams/trunk/streams-osgi-components/streams-components-all/src/main/resources/META-INF/NOTICE Tue Feb 5 21:18:59 2013
@@ -1,5 +1,5 @@
-Apache Streams Components
+Apache Streams Components All
Copyright 2012-2013 The Apache Software Foundation
This product includes software developed at
Modified: incubator/streams/trunk/streams-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/pom.xml?rev=1442749&r1=1442748&r2=1442749&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/pom.xml (original)
+++ incubator/streams/trunk/streams-web/pom.xml Tue Feb 5 21:18:59 2013
@@ -34,7 +34,7 @@
</dependency>
<dependency>
- <groupId>org.apache.streams</groupId>
+ <groupId>org.apache.streams.osgi.components</groupId>
<artifactId>streams-components-all</artifactId>
<version>0.1-SNAPSHOT</version>
</dependency>
@@ -69,6 +69,12 @@
<version>2.9.0</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <version>2.9.0</version>
+ </dependency>
+
<!-- Dependencies for stream processing in Camel
http://camel.apache.org/stream.html -->
<dependency>
@@ -164,6 +170,8 @@
<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>
</excludes>
</resource>
</resources>
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=1442749&r1=1442748&r2=1442749&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 Tue Feb 5 21:18:59 2013
@@ -9,6 +9,8 @@ streams-web Maven Webapp
From: 'an unknown organization'
- AOP alliance (http://aopalliance.sourceforge.net) aopalliance:aopalliance:jar:1.0
License: Public Domain
+ - Codec commons-codec:commons-codec:jar:1.2
+
- Logging (http://jakarta.apache.org/commons/logging/) commons-logging:commons-logging:jar:1.0.3
- streams-eip-routes [org.apache.streams] org.apache.streams:streams-eip-routes:bundle:0.1-SNAPSHOT
@@ -38,6 +40,10 @@ From: 'an unknown organization'
- spring-webmvc org.springframework:spring-webmvc:jar:3.0.5.RELEASE
+From: 'Apache Software Foundation' (http://jakarta.apache.org/)
+ - HttpClient (http://jakarta.apache.org/httpcomponents/httpclient-3.x/) commons-httpclient:commons-httpclient:jar:3.1
+ License: Apache License (http://www.apache.org/licenses/LICENSE-2.0)
+
From: 'Apache Software Foundation' (http://www.apache.org)
- Apache Log4j (http://logging.apache.org/log4j/1.2/) log4j:log4j:bundle:1.2.16
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
@@ -75,15 +81,19 @@ From: 'The Apache Software Foundation' (
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.9.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Camel :: HTTP (http://camel.apache.org/camel-parent/camel-http) org.apache.camel:camel-http:bundle:2.9.0
+ 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.9.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+ - Camel :: Servlet (http://camel.apache.org/camel-parent/camel-servlet) org.apache.camel:camel-servlet:bundle:2.9.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.9.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Camel :: Stream (http://camel.apache.org/camel-parent/camel-stream) org.apache.camel:camel-stream:bundle:2.9.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Camel :: Web (http://camel.apache.org/camel-parent/components/camel-web) org.apache.camel:camel-web:war:2.9.0
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- - Apache Streams Components (http://incubator.apache.org/streams/streams-project/streams-osgi-components/streams-components-all) org.apache.streams:streams-components-all:jar:0.1-SNAPSHOT
+ - Apache Streams Components All (http://incubator.apache.org/streams/streams-project/streams-osgi-components/streams-components-all) org.apache.streams.osgi.components:streams-components-all:jar:0.1-SNAPSHOT
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
- Apache XBean :: Spring (http://geronimo.apache.org/xbean/xbean-spring) org.apache.xbean:xbean-spring:bundle:3.5
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/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml?rev=1442749&r1=1442748&r2=1442749&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/applicationContext.xml Tue Feb 5 21:18:59 2013
@@ -1,20 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context-2.5.xsd
- http://camel.apache.org/schema/spring
- http://camel.apache.org/schema/spring/camel-spring.xsd">
+<!--
+ ~ 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/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"/>
+
+
+ <bean id="activityStreamsSubscriberRouter" class="org.apache.streams.messaging.routers.impl.ActivityStreamsSubscriberRouter">
+ <property name="activityStreamsSubscriberWarehouse" ref="activityStreamsSubscriberWarehouse"/>
+ <property name="camelContext" ref="context"/>
+ </bean>
+ <bean id="subscriberRegistrationProcessor" class="org.apache.streams.messaging.processors.ActivityStreamsSubscriberRegistrationProcessor"/>
+
+ <bean id="activityWarehouseDistributor" class="org.apache.streams.messaging.aggregation.ActivityAggregator">
+ <property name="activityStreamsSubscriberWarehouse" ref="activityStreamsSubscriberWarehouse"/>
+ </bean>
+
+
+ <bean id="jmsConnectionFactory"
+ class="org.apache.activemq.ActiveMQConnectionFactory">
+ <property name="brokerURL" value="tcp://localhost:61616" />
+ </bean>
+
+ <bean id="pooledConnectionFactory"
+ class="org.apache.activemq.pool.PooledConnectionFactory" init-method="start" destroy-method="stop">
+ <property name="maxConnections" value="8" />
+ <property name="connectionFactory" ref="jmsConnectionFactory" />
+ </bean>
+
+ <bean id="jmsConfig"
+ class="org.apache.camel.component.jms.JmsConfiguration">
+ <property name="connectionFactory" ref="pooledConnectionFactory"/>
+ <property name="concurrentConsumers" value="10"/>
+ </bean>
+
+ <bean id="activemq"
+ class="org.apache.activemq.camel.component.ActiveMQComponent">
+ <property name="configuration" ref="jmsConfig"/>
+ </bean>
- <bean id="activityPublisherRegistration" class="org.apache.streams.osgi.components.impl.ActivityPublisherRegistrationImpl" />
- <bean id="activityConsumerWarehouse" class="org.apache.streams.osgi.components.activityconsumer.impl.ActivityConsumerWarehouseImpl" />
- <bean id="activityStreamsSubscriberRegistration" class="org.apache.streams.osgi.components.impl.ActivityStreamsSubscriberRegistrationImpl" />
- <bean id="activityStreamsSubscriberWarehouse" class="org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberWarehouseImpl" />
Added: 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=1442749&view=auto
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml (added)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/camelContextWeb.xml Tue Feb 5 21:18:59 2013
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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-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">
+
+
+
+
+ <camelContext id="context" xmlns="http://camel.apache.org/schema/spring">
+
+ <!--publisher registration route setup todo: get this from the properties file (host and port)-->
+ <route>
+ <from uri="servlet://publisher/register?servletName=CamelServlet"/>
+ <bean ref="activityRegistrationProcessor" />
+ <to uri="direct:publisher-register"/>
+ </route>
+
+ <route>
+ <from uri="direct:publisher-register"/>
+ <bean ref="activityPublisherRegistration" method="register"/>
+ <to uri="direct:add-publisher-route"/>
+ </route>
+
+ <route>
+ <from uri="direct:add-publisher-route"/>
+ <bean ref="activityConsumerRouter" method="createNewRouteForConsumer"/>
+ <to uri="log:ExampleLog"/>
+ </route>
+
+ <!--split activities on Q, waiting for aggregation -->
+ <route>
+ <from uri="direct:activityQ"/>
+ <inOnly uri="activemq:queue:activities"/>
+ </route>
+
+ <route>
+ <from uri="activemq:queue:activities"/>
+ <aggregate completionTimeout="500" groupExchanges="true">
+ <correlationExpression>
+ <constant>true</constant>
+ </correlationExpression>
+ <bean ref="activityWarehouseDistributor" method="distributeToSubscribers"/>
+ </aggregate>
+ </route>
+
+
+ <!-- register as a subscriber - returned the endpoint to poll and add to subscription sources - GET/POST -->
+ <route>
+ <from uri="servlet://subscriber/register?servletName=CamelServlet"/>
+ <bean ref="subscriberRegistrationProcessor" />
+ <to uri="direct:subscriber-register"/>
+ </route>
+
+ <route>
+ <from uri="direct:subscriber-register"/>
+ <bean ref="activityStreamsSubscriberRegistration" method="register"/>
+ <to uri="direct:add-subscriber-route"/>
+ </route>
+
+ <route>
+ <from uri="direct:add-subscriber-route"/>
+ <bean ref="activityStreamsSubscriberRouter" method="createNewRouteForSubscriber"/>
+ <to uri="log:ExampleLog"/>
+ </route>
+
+
+ </camelContext>
+
+</beans>
\ No newline at end of file
Modified: incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml?rev=1442749&r1=1442748&r2=1442749&view=diff
==============================================================================
--- incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml (original)
+++ incubator/streams/trunk/streams-web/src/main/webapp/WEB-INF/spring-web-servlet.xml Tue Feb 5 21:18:59 2013
@@ -19,4 +19,13 @@
</property>
</bean>
+
+ <bean id="activityPublisherRegistration" class="org.apache.streams.osgi.components.impl.ActivityPublisherRegistrationImpl" />
+ <bean id="activityConsumerWarehouse" class="org.apache.streams.osgi.components.activityconsumer.impl.ActivityConsumerWarehouseImpl" />
+
+ <bean id="activityStreamsSubscriberRegistration" class="org.apache.streams.osgi.components.impl.ActivityStreamsSubscriberRegistrationImpl" />
+ <bean id="activityStreamsSubscriberWarehouse" class="org.apache.streams.osgi.components.activitysubscriber.impl.ActivityStreamsSubscriberWarehouseImpl" />
+
+
+
</beans>
\ 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=1442749&r1=1442748&r2=1442749&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:18:59 2013
@@ -6,101 +6,36 @@
version="2.5">
<display-name>Streams</display-name>
- <servlet>
- <servlet-name>spring-web</servlet-name>
- <servlet-class>
- org.springframework.web.servlet.DispatcherServlet
- </servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>spring-web</servlet-name>
- <url-pattern>/</url-pattern>
- </servlet-mapping>
-
+ <!-- tell Spring where it should load the XML file -->
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
+ /WEB-INF/spring/*.xml
/WEB-INF/spring-web-servlet.xml
- /WEB-INF/spring/camelContext.xml
</param-value>
</context-param>
-
+ <!-- spring context listener which loads the XML file -->
<listener>
<listener-class>
org.springframework.web.context.ContextLoaderListener
</listener-class>
</listener>
-
- <filter>
- <filter-name>Jersey Filter</filter-name>
-
- <filter-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</filter-class>
- <init-param>
-
- <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
- <param-value>org.apache.camel.web.util.CamelResourceConfig</param-value>
- </init-param>
- <init-param>
- <param-name>com.sun.jersey.config.feature.FilterForwardOn404</param-name>
- <param-value>true</param-value>
- </init-param>
-
- <init-param>
-
- <param-name>com.sun.jersey.config.property.WebPageContentRegex</param-name>
- <param-value>/(images|css|js)/.*</param-value>
- </init-param>
- <init-param>
- <param-name>com.sun.jersey.config.feature.ImplicitViewables</param-name>
- <param-value>true</param-value>
- </init-param>
- <init-param>
- <param-name>com.sun.jersey.config.feature.Trace</param-name>
- <param-value>true</param-value>
- </init-param>
+ <!-- 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>com.sun.jersey.config.feature.Redirect</param-name>
+ <param-name>matchOnUriPrefix</param-name>
<param-value>true</param-value>
</init-param>
- <init-param>
- <param-name>com.sun.jersey.config.property.packages</param-name>
- <param-value>org.apache.camel.web:</param-value>
- </init-param>
- <init-param>
- <param-name>com.sun.jersey.config.property.WadlResourceUri</param-name>
- <param-value>/api</param-value>
- </init-param>
- </filter>
-
- <filter-mapping>
- <filter-name>Jersey Filter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <servlet>
- <servlet-name>TemplateEngineServlet</servlet-name>
-
- <servlet-class>org.fusesource.scalate.servlet.TemplateEngineServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
</servlet>
-
- <servlet-mapping>
- <servlet-name>TemplateEngineServlet</servlet-name>
- <url-pattern>*.mustache</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>TemplateEngineServlet</servlet-name>
- <url-pattern>*.scaml</url-pattern>
- </servlet-mapping>
+ <!-- Camel Servlet mappings -->
<servlet-mapping>
- <servlet-name>TemplateEngineServlet</servlet-name>
- <url-pattern>*.ssp</url-pattern>
+ <servlet-name>CamelServlet</servlet-name>
+ <url-pattern>/streams/*</url-pattern>
</servlet-mapping>
- <error-page>
- <error-code>500</error-code>
- <location>/WEB-INF/scalate/errors/500.scaml</location>
- </error-page>
</web-app>
\ No newline at end of file