Author: rmannibucau
Date: Mon Dec 3 22:36:07 2012
New Revision: 1416708
URL: http://svn.apache.org/viewvc?rev=1416708&view=rev
Log:
TOMEE-624 need to remove webcontext for servlet backing rest service
Modified:
openejb/trunk/openejb/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java
Modified:
openejb/trunk/openejb/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java?rev=1416708&r1=1416707&r2=1416708&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-jaxrs/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java
Mon Dec 3 22:36:07 2012
@@ -90,7 +90,7 @@ public class TomcatRsRegistry implements
wrapper.setServletClass(RsServlet.class.getName());
context.addChild(wrapper);
- wrapper.addMapping(completePath);
+ wrapper.addMapping(removeWebContext(webContext, completePath));
context.addServletMapping(completePath, name);
final String listenerId = wrapper.getName() +
RsServlet.class.getName() + listener.hashCode();
@@ -104,6 +104,13 @@ public class TomcatRsRegistry implements
return new AddressInfo(path, key);
}
+ private static String removeWebContext(final String webContext, final
String completePath) {
+ if (webContext == null) {
+ return completePath;
+ }
+ return completePath.substring(webContext.length());
+ }
+
private static String address(final Collection<Connector> connectors,
final String host, final String path) {
List<String> addresses = new ArrayList<String>();
for (Connector connector : connectors) {
