svn commit: r1415291 - in /cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers: JaxRSPojoConfigurationTypeHandler.java PojoConfigurationTypeHandler.java WsdlConfigurationTypeHandler.java

[cschneider]

Author: cschneider
Date: Thu Nov 29 17:36:49 2012
New Revision: 1415291

URL: http://svn.apache.org/viewvc?rev=1415291&view=rev
Log:
DOSGI-127 Restoring the 1.3.1 behaviour for jaxrs addresses

Modified:
    
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
    
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
    
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java

Modified: 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java?rev=1415291&r1=1415290&r2=1415291&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSPojoConfigurationTypeHandler.java
 Thu Nov 29 17:36:49 2012
@@ -51,7 +51,6 @@ public class JaxRSPojoConfigurationTypeH
         super(dswBC, intentManager, httpServiceManager);
     }
 
-    @Override
     public String[] getSupportedTypes() {
         return new String[] {Constants.WSDL_CONFIG_TYPE, 
Constants.WS_CONFIG_TYPE_OLD};
     }
@@ -117,11 +116,16 @@ public class JaxRSPojoConfigurationTypeH
     public ExportResult createServer(ServiceReference sref, BundleContext 
dswContext,
                              BundleContext callingContext, Map<String, Object> 
sd, Class<?> iClass, Object serviceBean) throws IntentUnsatifiedException {
 
-        String address = getClientAddress(sd, iClass);
-        if (address == null) {
-            address = "";
-        }
         String contextRoot = httpServiceManager.getServletContextRoot(sd, 
iClass);
+        String address;
+        if (contextRoot == null) {
+            address = getServerAddress(sd, iClass);
+        } else {
+            address = getClientAddress(sd, iClass);
+            if (address == null) {
+                address = "/";
+            }
+        }
 
         Bus bus = contextRoot != null ? 
httpServiceManager.registerServletAndGetBus(contextRoot, dswContext, sref) : 
null;
 

Modified: 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java?rev=1415291&r1=1415290&r2=1415291&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/PojoConfigurationTypeHandler.java
 Thu Nov 29 17:36:49 2012
@@ -39,7 +39,6 @@ public class PojoConfigurationTypeHandle
         super(dswBC, intentManager, httpServiceManager);
     }
     
-    @Override
     public String[] getSupportedTypes() {
         return new String[] {Constants.WS_CONFIG_TYPE, 
Constants.WS_CONFIG_TYPE_OLD};
     }

Modified: 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
URL: 
http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java?rev=1415291&r1=1415290&r2=1415291&view=diff
==============================================================================
--- 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
 (original)
+++ 
cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/WsdlConfigurationTypeHandler.java
 Thu Nov 29 17:36:49 2012
@@ -48,7 +48,6 @@ public class WsdlConfigurationTypeHandle
         super(dswBC, intentManager, httpServiceManager);
     }
     
-    @Override
     public String[] getSupportedTypes() {
         return new String[] {Constants.WSDL_CONFIG_TYPE};
     }