You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/04 10:37:26 UTC
svn commit: r1428770 - in /camel/trunk:
components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/
components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/
components/camel-servletlisten...
Author: davsclaus
Date: Fri Jan 4 09:37:26 2013
New Revision: 1428770
URL: http://svn.apache.org/viewvc?rev=1428770&view=rev
Log:
CAMEL-5906: Polsihed
Added:
camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
- copied, changed from r1428737, camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java
Removed:
camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java
Modified:
camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/ServletCamelTestSupport.java
camel/trunk/components/camel-servletlistener/src/test/resources/myweb.xml
camel/trunk/components/camel-servletlistener/src/test/resources/myweb2.xml
camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml
camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml
camel/trunk/components/camel-servletlistener/src/test/resources/myweb5.xml
camel/trunk/components/camel-servletlistener/src/test/resources/myweb6.xml
camel/trunk/components/camel-servletlistener/src/test/resources/myweb7.xml
camel/trunk/examples/camel-example-servlet-tomcat-no-spring/src/main/webapp/WEB-INF/web.xml
Copied: camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java (from r1428737, camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java)
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java?p2=camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java&p1=camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java&r1=1428737&r2=1428770&rev=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelContextServletListener.java (original)
+++ camel/trunk/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java Fri Jan 4 09:37:26 2013
@@ -55,14 +55,14 @@ import org.slf4j.LoggerFactory;
* A {@link ServletContextListener} which is used to bootstrap
* {@link org.apache.camel.CamelContext} in web applications.
*/
-public class CamelContextServletListener implements ServletContextListener {
+public class CamelServletContextListener implements ServletContextListener {
/**
* instance is used for testing purpose
*/
public static ServletCamelContext instance;
- private static final Logger LOG = LoggerFactory.getLogger(CamelContextServletListener.class);
+ private static final Logger LOG = LoggerFactory.getLogger(CamelServletContextListener.class);
private JndiContext jndiContext;
private ServletCamelContext camelContext;
private CamelContextLifecycle camelContextLifecycle;
Modified: camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/ServletCamelTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/ServletCamelTestSupport.java?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/ServletCamelTestSupport.java (original)
+++ camel/trunk/components/camel-servletlistener/src/test/java/org/apache/camel/component/servletlistener/ServletCamelTestSupport.java Fri Jan 4 09:37:26 2013
@@ -54,7 +54,7 @@ public abstract class ServletCamelTestSu
protected abstract String getConfiguration();
protected ServletCamelContext getCamelContext() {
- return CamelContextServletListener.instance;
+ return CamelServletContextListener.instance;
}
}
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb.xml Fri Jan 4 09:37:26 2013
@@ -45,7 +45,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb2.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb2.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb2.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb2.xml Fri Jan 4 09:37:26 2013
@@ -46,7 +46,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb3.xml Fri Jan 4 09:37:26 2013
@@ -46,7 +46,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb4.xml Fri Jan 4 09:37:26 2013
@@ -49,7 +49,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb5.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb5.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb5.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb5.xml Fri Jan 4 09:37:26 2013
@@ -50,7 +50,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb6.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb6.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb6.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb6.xml Fri Jan 4 09:37:26 2013
@@ -57,7 +57,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/components/camel-servletlistener/src/test/resources/myweb7.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-servletlistener/src/test/resources/myweb7.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/components/camel-servletlistener/src/test/resources/myweb7.xml (original)
+++ camel/trunk/components/camel-servletlistener/src/test/resources/myweb7.xml Fri Jan 4 09:37:26 2013
@@ -52,7 +52,7 @@
</context-param>
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
</web-app>
Modified: camel/trunk/examples/camel-example-servlet-tomcat-no-spring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-servlet-tomcat-no-spring/src/main/webapp/WEB-INF/web.xml?rev=1428770&r1=1428769&r2=1428770&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-servlet-tomcat-no-spring/src/main/webapp/WEB-INF/web.xml (original)
+++ camel/trunk/examples/camel-example-servlet-tomcat-no-spring/src/main/webapp/WEB-INF/web.xml Fri Jan 4 09:37:26 2013
@@ -39,7 +39,7 @@
<!-- the listener that kick-starts Camel -->
<listener>
- <listener-class>org.apache.camel.component.servletlistener.CamelContextServletListener</listener-class>
+ <listener-class>org.apache.camel.component.servletlistener.CamelServletContextListener</listener-class>
</listener>
<!-- Camel servlet used in the Camel application -->