svn commit: r1226912 - /openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java

[rmannibucau]

Author: rmannibucau
Date: Tue Jan  3 18:54:13 2012
New Revision: 1226912

URL: http://svn.apache.org/viewvc?rev=1226912&view=rev
Log:
fixing webservices deployment in tomee since until now only one could be 
deployed

Modified:
    
openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java

Modified: 
openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java?rev=1226912&r1=1226911&r2=1226912&view=diff
==============================================================================
--- 
openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
 (original)
+++ 
openejb/trunk/openejb/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java
 Tue Jan  3 18:54:13 2012
@@ -163,7 +163,7 @@ public class TomcatWsRegistry implements
                 root = '/' + root;
             }
             Context webAppContext = (Context) host.findChild(root);
-            addServlet(host, webAppContext, "/webservices/*", httpListener, 
path, addresses);
+            addServlet(host, webAppContext, "/webservices" + path +  "*", 
httpListener, path, addresses);
         }
         return addresses;
     }
@@ -247,13 +247,13 @@ public class TomcatWsRegistry implements
     private void addServlet(Container host, Context context, String mapping, 
HttpListener httpListener, String path, List<String> addresses) {
         // build the servlet
         Wrapper wrapper = context.createWrapper();
-        wrapper.setName("webservice");
+        wrapper.setName("webservice" + path.substring(1));
         wrapper.setServletClass(WsServlet.class.getName());
 
         // add servlet to context
         context.addChild(wrapper);
         wrapper.addMapping(mapping);
-        context.addServletMapping(mapping, "webservice");
+        context.addServletMapping(mapping, wrapper.getName());
 
         String webServicecontainerID = wrapper.getName() + 
WsServlet.WEBSERVICE_CONTAINER + httpListener.hashCode();
         wrapper.addInitParameter(WsServlet.WEBSERVICE_CONTAINER, 
webServicecontainerID);