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 2014/08/17 09:15:06 UTC
[1/4] git commit: CAMEL-7711: camel-servletlistener - Store created
CamelContext on ServletContext attribute
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 3bca492fc -> c12e76955
refs/heads/camel-2.13.x 3fe46305d -> 82b3e0785
refs/heads/master 75b2c0a24 -> 05a972ec2
CAMEL-7711: camel-servletlistener - Store created CamelContext on ServletContext attribute
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eed678ad
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eed678ad
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eed678ad
Branch: refs/heads/master
Commit: eed678adc8310f9a10b599b7e6375f236d954c3b
Parents: 75b2c0a
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 17 09:09:35 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 17 09:09:35 2014 +0200
----------------------------------------------------------------------
.../servletlistener/CamelServletContextListener.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/eed678ad/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java b/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
index 5ea3e82..efe1fdd 100644
--- a/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
+++ b/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
@@ -64,6 +64,11 @@ public abstract class CamelServletContextListener<R extends Registry> implements
*/
public static ServletCamelContext instance;
+ /**
+ * Key to store the created {@link org.apache.camel.CamelContext} as an attribute on the {@link javax.servlet.ServletContext}.
+ */
+ public static final String CAMEL_CONTEXT_KEY = "CamelContext";
+
protected static final Logger LOG = LoggerFactory.getLogger(CamelServletContextListener.class);
protected ServletCamelContext camelContext;
protected CamelContextLifecycle<R> camelContextLifecycle;
@@ -189,6 +194,9 @@ public abstract class CamelServletContextListener<R extends Registry> implements
instance = camelContext;
}
+ // store the CamelContext as an attribute
+ sce.getServletContext().setAttribute(CAMEL_CONTEXT_KEY, camelContext);
+
LOG.info("CamelContextServletListener initialized");
}
@@ -211,6 +219,10 @@ public abstract class CamelServletContextListener<R extends Registry> implements
camelContext = null;
registry = null;
instance = null;
+
+ // store the CamelContext as an attribute
+ sce.getServletContext().removeAttribute(CAMEL_CONTEXT_KEY);
+
LOG.info("CamelContextServletListener destroyed");
}
[2/4] git commit: Upgraded sshd
Posted by da...@apache.org.
Upgraded sshd
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05a972ec
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05a972ec
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05a972ec
Branch: refs/heads/master
Commit: 05a972ec2b351e30778b96e7a0236050af495780
Parents: eed678a
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 17 09:14:20 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 17 09:14:20 2014 +0200
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/05a972ec/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 2b765bb..5c9d4b5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -402,7 +402,7 @@
<spring-ws-version>2.1.4.RELEASE</spring-ws-version>
<spymemcached-bundle-version>2.5_2</spymemcached-bundle-version> <!-- FIXME cmueller: not in sync! -->
<spymemcached-version>2.8.4</spymemcached-version>
- <sshd-version>0.11.0</sshd-version>
+ <sshd-version>0.12.0</sshd-version>
<stompjms-version>1.19</stompjms-version>
<swagger-version>1.3.7</swagger-version>
<stax-api-version>1.0.1</stax-api-version>
[3/4] git commit: CAMEL-7711: camel-servletlistener - Store created
CamelContext on ServletContext attribute
Posted by da...@apache.org.
CAMEL-7711: camel-servletlistener - Store created CamelContext on ServletContext attribute
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82b3e078
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82b3e078
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82b3e078
Branch: refs/heads/camel-2.13.x
Commit: 82b3e07851ea7f0a51e70afa057b6b2796fed682
Parents: 3fe4630
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 17 09:09:35 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 17 09:14:44 2014 +0200
----------------------------------------------------------------------
.../servletlistener/CamelServletContextListener.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/82b3e078/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java b/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
index 5ea3e82..efe1fdd 100644
--- a/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
+++ b/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
@@ -64,6 +64,11 @@ public abstract class CamelServletContextListener<R extends Registry> implements
*/
public static ServletCamelContext instance;
+ /**
+ * Key to store the created {@link org.apache.camel.CamelContext} as an attribute on the {@link javax.servlet.ServletContext}.
+ */
+ public static final String CAMEL_CONTEXT_KEY = "CamelContext";
+
protected static final Logger LOG = LoggerFactory.getLogger(CamelServletContextListener.class);
protected ServletCamelContext camelContext;
protected CamelContextLifecycle<R> camelContextLifecycle;
@@ -189,6 +194,9 @@ public abstract class CamelServletContextListener<R extends Registry> implements
instance = camelContext;
}
+ // store the CamelContext as an attribute
+ sce.getServletContext().setAttribute(CAMEL_CONTEXT_KEY, camelContext);
+
LOG.info("CamelContextServletListener initialized");
}
@@ -211,6 +219,10 @@ public abstract class CamelServletContextListener<R extends Registry> implements
camelContext = null;
registry = null;
instance = null;
+
+ // store the CamelContext as an attribute
+ sce.getServletContext().removeAttribute(CAMEL_CONTEXT_KEY);
+
LOG.info("CamelContextServletListener destroyed");
}
[4/4] git commit: CAMEL-7711: camel-servletlistener - Store created
CamelContext on ServletContext attribute
Posted by da...@apache.org.
CAMEL-7711: camel-servletlistener - Store created CamelContext on ServletContext attribute
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c12e7695
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c12e7695
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c12e7695
Branch: refs/heads/camel-2.12.x
Commit: c12e76955e851d77a865c3e070da689f1f714abc
Parents: 3bca492
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Aug 17 09:09:35 2014 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Aug 17 09:14:54 2014 +0200
----------------------------------------------------------------------
.../servletlistener/CamelServletContextListener.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c12e7695/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
----------------------------------------------------------------------
diff --git a/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java b/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
index 6ffcf07..1e49afa 100644
--- a/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
+++ b/components/camel-servletlistener/src/main/java/org/apache/camel/component/servletlistener/CamelServletContextListener.java
@@ -64,6 +64,11 @@ public abstract class CamelServletContextListener<R extends Registry> implements
*/
public static ServletCamelContext instance;
+ /**
+ * Key to store the created {@link org.apache.camel.CamelContext} as an attribute on the {@link javax.servlet.ServletContext}.
+ */
+ public static final String CAMEL_CONTEXT_KEY = "CamelContext";
+
protected static final Logger LOG = LoggerFactory.getLogger(CamelServletContextListener.class);
protected ServletCamelContext camelContext;
protected CamelContextLifecycle<R> camelContextLifecycle;
@@ -172,6 +177,9 @@ public abstract class CamelServletContextListener<R extends Registry> implements
instance = camelContext;
}
+ // store the CamelContext as an attribute
+ sce.getServletContext().setAttribute(CAMEL_CONTEXT_KEY, camelContext);
+
LOG.info("CamelContextServletListener initialized");
}
@@ -194,6 +202,10 @@ public abstract class CamelServletContextListener<R extends Registry> implements
camelContext = null;
registry = null;
instance = null;
+
+ // store the CamelContext as an attribute
+ sce.getServletContext().removeAttribute(CAMEL_CONTEXT_KEY);
+
LOG.info("CamelContextServletListener destroyed");
}