You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/07/09 04:30:03 UTC
[1/2] activemq-artemis git commit: web.xml validity fixes
Repository: activemq-artemis
Updated Branches:
refs/heads/master e07c526f0 -> 077e9e266
web.xml validity fixes
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c9d8ef62
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c9d8ef62
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c9d8ef62
Branch: refs/heads/master
Commit: c9d8ef62dccacad8b6906ae98cd039e4e1c88459
Parents: e07c526
Author: Ville Skyttä <vi...@iki.fi>
Authored: Wed Jul 8 23:37:44 2015 +0300
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 8 22:29:55 2015 -0400
----------------------------------------------------------------------
.../dup-send/src/main/webapp/WEB-INF/web.xml | 24 +++++++++-----------
.../src/main/webapp/WEB-INF/web.xml | 24 ++++++++++----------
.../jms-to-rest/src/main/webapp/WEB-INF/web.xml | 24 ++++++++++----------
.../rest/push/src/main/webapp/WEB-INF/web.xml | 24 ++++++++++----------
4 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9d8ef62/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
index cc75fc0..ffb38b5 100644
--- a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
@@ -28,12 +28,22 @@ under the License.
<param-value>activemq-rest.xml</param-value>
</context-param>
+ <filter>
+ <filter-name>Rest-Messaging</filter-name>
+ <filter-class>
+ org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
+ </filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>Rest-Messaging</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
<listener>
<listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
</listener>
-
<listener>
<listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
</listener>
@@ -42,16 +52,4 @@ under the License.
<listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
</listener>
- <filter>
- <filter-name>Rest-Messaging</filter-name>
- <filter-class>
- org.jboss.resteasy.plugins.server.servlet.FilterDispatcher
- </filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>Rest-Messaging</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
</web-app>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9d8ef62/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
index d3ceb42..e82738a 100644
--- a/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/javascript-chat/src/main/webapp/WEB-INF/web.xml
@@ -23,18 +23,6 @@ under the License.
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
-
- <listener>
- <listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
- </listener>
<filter>
<filter-name>Rest-Messaging</filter-name>
@@ -48,4 +36,16 @@ under the License.
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <listener>
+ <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
+ </listener>
+
</web-app>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9d8ef62/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
index d3ceb42..e82738a 100644
--- a/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/jms-to-rest/src/main/webapp/WEB-INF/web.xml
@@ -23,18 +23,6 @@ under the License.
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
-
- <listener>
- <listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
- </listener>
<filter>
<filter-name>Rest-Messaging</filter-name>
@@ -48,4 +36,16 @@ under the License.
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <listener>
+ <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
+ </listener>
+
</web-app>
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c9d8ef62/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
index e851072..d4ba92b 100644
--- a/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/push/src/main/webapp/WEB-INF/web.xml
@@ -23,18 +23,6 @@ under the License.
"http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
- <listener>
- <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
- </listener>
-
-
- <listener>
- <listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
- </listener>
<filter>
<filter-name>Rest-Messaging</filter-name>
@@ -48,6 +36,18 @@ under the License.
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <listener>
+ <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.activemq.rest.integration.ActiveMQBootstrapListener</listener-class>
+ </listener>
+
+ <listener>
+ <listener-class>org.apache.activemq.rest.integration.RestMessagingBootstrapListener</listener-class>
+ </listener>
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Resteasy</web-resource-name>
[2/2] activemq-artemis git commit: This closes #63 web.xml fix
Posted by cl...@apache.org.
This closes #63 web.xml fix
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/077e9e26
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/077e9e26
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/077e9e26
Branch: refs/heads/master
Commit: 077e9e266bc56bf0d2f9630255736419cc730aa2
Parents: e07c526 c9d8ef6
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed Jul 8 22:29:56 2015 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed Jul 8 22:29:56 2015 -0400
----------------------------------------------------------------------
.../dup-send/src/main/webapp/WEB-INF/web.xml | 24 +++++++++-----------
.../src/main/webapp/WEB-INF/web.xml | 24 ++++++++++----------
.../jms-to-rest/src/main/webapp/WEB-INF/web.xml | 24 ++++++++++----------
.../rest/push/src/main/webapp/WEB-INF/web.xml | 24 ++++++++++----------
4 files changed, 47 insertions(+), 49 deletions(-)
----------------------------------------------------------------------