From c9d8ef62dccacad8b6906ae98cd039e4e1c88459 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 8 Jul 2015 23:37:44 +0300 Subject: [PATCH] web.xml validity fixes --- .../dup-send/src/main/webapp/WEB-INF/web.xml | 26 +++++++++---------- .../src/main/webapp/WEB-INF/web.xml | 24 ++++++++--------- .../src/main/webapp/WEB-INF/web.xml | 24 ++++++++--------- .../rest/push/src/main/webapp/WEB-INF/web.xml | 24 ++++++++--------- 4 files changed, 48 insertions(+), 50 deletions(-) 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 cc75fc06ed..ffb38b5832 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,20 +28,6 @@ under the License. activemq-rest.xml - - - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - - - - - org.apache.activemq.rest.integration.ActiveMQBootstrapListener - - - - org.apache.activemq.rest.integration.RestMessagingBootstrapListener - - Rest-Messaging @@ -54,4 +40,16 @@ under the License. /* + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + org.apache.activemq.rest.integration.ActiveMQBootstrapListener + + + + org.apache.activemq.rest.integration.RestMessagingBootstrapListener + + 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 d3ceb423b3..e82738a7ad 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"> - - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - - - - - org.apache.activemq.rest.integration.ActiveMQBootstrapListener - - - - org.apache.activemq.rest.integration.RestMessagingBootstrapListener - Rest-Messaging @@ -48,4 +36,16 @@ under the License. /* + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + org.apache.activemq.rest.integration.ActiveMQBootstrapListener + + + + org.apache.activemq.rest.integration.RestMessagingBootstrapListener + + 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 d3ceb423b3..e82738a7ad 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"> - - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - - - - - org.apache.activemq.rest.integration.ActiveMQBootstrapListener - - - - org.apache.activemq.rest.integration.RestMessagingBootstrapListener - Rest-Messaging @@ -48,4 +36,16 @@ under the License. /* + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + org.apache.activemq.rest.integration.ActiveMQBootstrapListener + + + + org.apache.activemq.rest.integration.RestMessagingBootstrapListener + + 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 e851072855..d4ba92b5a7 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"> - - org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap - - - - - org.apache.activemq.rest.integration.ActiveMQBootstrapListener - - - - org.apache.activemq.rest.integration.RestMessagingBootstrapListener - Rest-Messaging @@ -48,6 +36,18 @@ under the License. /* + + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + + + + org.apache.activemq.rest.integration.ActiveMQBootstrapListener + + + + org.apache.activemq.rest.integration.RestMessagingBootstrapListener + + Resteasy