svn commit: r1430174 - in /openejb/trunk/openejb/server: openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java

[rmannibucau]

Author: rmannibucau
Date: Tue Jan  8 08:53:24 2013
New Revision: 1430174

URL: http://svn.apache.org/viewvc?rev=1430174&view=rev
Log:
yes for a substring but in the right place

Modified:
    
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
    
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java

Modified: 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java?rev=1430174&r1=1430173&r2=1430174&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-cxf-rs/src/main/java/org/apache/openejb/server/cxf/rs/CxfRsHttpListener.java
 Tue Jan  8 08:53:24 2013
@@ -368,7 +368,7 @@ public class CxfRsHttpListener implement
         final JAXRSServerFactoryBean factory = new JAXRSServerFactoryBean();
         factory.setDestinationFactory(transportFactory);
         factory.setBus(transportFactory.getBus());
-        factory.setAddress(prefix.substring(0, prefix.length() - 
wildcard.length()));
+        factory.setAddress(prefix);
         return factory;
     }
 

Modified: 
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java?rev=1430174&r1=1430173&r2=1430174&view=diff
==============================================================================
--- 
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
 (original)
+++ 
openejb/trunk/openejb/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
 Tue Jan  8 08:53:24 2013
@@ -380,7 +380,7 @@ public abstract class RESTService implem
         final RsRegistry.AddressInfo address = 
rsRegistry.createRsHttpListener(contextRoot, listener, classLoader, 
nopath.substring(NOPATH_PREFIX.length() - 1), virtualHost);
 
         services.add(new DeployedService(address.complete, contextRoot, 
application.getClass().getName()));
-        listener.deployApplication(application, address.complete, 
nopath.substring(NOPATH_PREFIX.length(), nopath.length() - wildcard.length()), 
additionalProviders, restEjbs, // app config
+        listener.deployApplication(application, address.complete.substring(0, 
address.complete.length() - wildcard.length()), 
nopath.substring(NOPATH_PREFIX.length(), nopath.length() - wildcard.length()), 
additionalProviders, restEjbs, // app config
                 classLoader, injections, context, owbCtx, // injection/webapp 
context
                 new ServiceConfiguration(configuration, appInfo.services)); // 
deployment config
     }