cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1232636 - in /cxf/dosgi/trunk: distribution/sources/src/main/release/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/
Date Tue, 17 Jan 2012 23:11:34 GMT
Author: sergeyb
Date: Tue Jan 17 23:11:33 2012
New Revision: 1232636

URL: http://svn.apache.org/viewvc?rev=1232636&view=rev
Log:
Some more fixes to do with checking interceptors/features

Modified:
    cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ClassUtils.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
    cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
    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/distribution/sources/src/main/release/release_notes.txt
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt?rev=1232636&r1=1232635&r2=1232636&view=diff
==============================================================================
--- cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt (original)
+++ cxf/dosgi/trunk/distribution/sources/src/main/release/release_notes.txt Tue Jan 17 23:11:33
2012
@@ -16,7 +16,8 @@ Many dependencies have been updated, inc
 
 Additionally, a number of bugs has been fixed including:
 
-DOSGI-107   Better support for a wsdl configuration type 	
+DOSGI-82    Populate custom servicename, portname and targetnamespace for jax-ws
+DOSGI-107   Support for a 'wsdl' configuration type 	
 DOSGI-97    Automatically unregister HTTP servlets/resources if exported service goes down
	
 DOSGI-75    CXF Distributed OSGi isn't using org.apache.cxf.common.logging.LogUtils 
 DOSGI-102   DOSGI RI can not map invocation exceptions to custom exceptions on the client
side

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ClassUtils.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ClassUtils.java?rev=1232636&r1=1232635&r2=1232636&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ClassUtils.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/ClassUtils.java Tue
Jan 17 23:11:33 2012
@@ -93,7 +93,7 @@ public final class ClassUtils {
     	return null;
     }
     
-public static List<Object> loadProviderClasses(BundleContext callingContext, Map sd,
String propName) {
+    public static List<Object> loadProviderClasses(BundleContext callingContext, Map
sd, String propName) {
     	
     	Object serviceProviders = sd.get(propName);
         if (serviceProviders != null) {
@@ -103,9 +103,11 @@ public static List<Object> loadProviderC
                 } else {
                     return Arrays.asList((Object[])serviceProviders);
                 }
-            } else {
+            } else if (serviceProviders.getClass() == String.class) {
                 String[] classNames = serviceProviders.toString().split(",");
                 return loadProviders(callingContext, classNames);
+            } else {
+            	return Arrays.asList(serviceProviders);
             }
         } else {
         	return Collections.emptyList();

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java?rev=1232636&r1=1232635&r2=1232636&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java (original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/Constants.java Tue
Jan 17 23:11:33 2012
@@ -54,6 +54,8 @@ public class Constants {
     public static final String WS_FRONTEND_PROP_KEY = WS_CONFIG_TYPE + ".frontend";
     public static final String WS_IN_INTERCEPTORS_PROP_KEY = WS_CONFIG_TYPE + ".in.interceptors";
     public static final String WS_OUT_INTERCEPTORS_PROP_KEY = WS_CONFIG_TYPE + ".out.interceptors";
+    public static final String WS_OUT_FAULT_INTERCEPTORS_PROP_KEY = WS_CONFIG_TYPE + ".out.fault.interceptors";
+    public static final String WS_IN_FAULT_INTERCEPTORS_PROP_KEY = WS_CONFIG_TYPE + ".in.fault.interceptors";
     public static final String WS_CONTEXT_PROPS_PROP_KEY = WS_CONFIG_TYPE + ".context.properties";
     public static final String WS_FEATURES_PROP_KEY = WS_CONFIG_TYPE + ".features";
     public static final String WS_DATABINDING_PROP_KEY = WS_CONFIG_TYPE + ".databinding";
@@ -68,6 +70,8 @@ public class Constants {
     public static final String RS_DATABINDING_PROP_KEY = RS_CONFIG_TYPE + ".databinding";
     public static final String RS_IN_INTERCEPTORS_PROP_KEY = RS_CONFIG_TYPE + ".in.interceptors";
     public static final String RS_OUT_INTERCEPTORS_PROP_KEY = RS_CONFIG_TYPE + ".out.interceptors";
+    public static final String RS_IN_FAULT_INTERCEPTORS_PROP_KEY = RS_CONFIG_TYPE + ".in.fault.interceptors";
+    public static final String RS_OUT_FAULT_INTERCEPTORS_PROP_KEY = RS_CONFIG_TYPE + ".out.fault.interceptors";
     public static final String RS_CONTEXT_PROPS_PROP_KEY = RS_CONFIG_TYPE + ".context.properties";
     public static final String RS_FEATURES_PROP_KEY = RS_CONFIG_TYPE + ".features";
     public static final String RS_PROVIDER_PROP_KEY = RS_CONFIG_TYPE + ".provider";

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java?rev=1232636&r1=1232635&r2=1232636&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
(original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/AbstractPojoConfigurationTypeHandler.java
Tue Jan 17 23:11:33 2012
@@ -41,6 +41,7 @@ import org.apache.cxf.dosgi.dsw.OsgiUtil
 import org.apache.cxf.dosgi.dsw.qos.IntentMap;
 import org.apache.cxf.endpoint.AbstractEndpointFactory;
 import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.frontend.ClientFactoryBean;
 import org.apache.cxf.frontend.ClientProxyFactoryBean;
 import org.apache.cxf.frontend.ServerFactoryBean;
 import org.apache.cxf.helpers.CastUtils;
@@ -110,18 +111,63 @@ public abstract class AbstractPojoConfig
     }
 
     protected void setWsdlProperties(ServerFactoryBean factory, BundleContext dswContext,

-    		Map sd) {
-    	String location = OsgiUtils.getProperty(sd, Constants.WS_WSDL_LOCATION);
+    		Map sd, boolean wsdlType) {
+    	String location = OsgiUtils.getProperty(sd, wsdlType ? Constants.WSDL_LOCATION : Constants.WS_WSDL_LOCATION);
     	if (location != null) {
     		URL wsdlURL = dswContext.getBundle().getResource(location);
 	        if (wsdlURL != null) {
 	            factory.setWsdlURL(wsdlURL.toString());
 	        }
 	        QName serviceName = getServiceQName(null, sd, 
-	        		Constants.WS_WSDL_SERVICE_NAMESPACE, Constants.WS_WSDL_SERVICE_NAME);
+	        		wsdlType ? Constants.WSDL_SERVICE_NAMESPACE : Constants.WS_WSDL_SERVICE_NAMESPACE,

+	        		wsdlType ? Constants.WSDL_SERVICE_NAME : Constants.WS_WSDL_SERVICE_NAME);
 	        if (serviceName != null) {
 	        	factory.setServiceName(serviceName);
-	            QName portName = getPortQName(serviceName.getNamespaceURI(), sd, Constants.WS_WSDL_PORT_NAME);
+	            QName portName = getPortQName(serviceName.getNamespaceURI(), sd, 
+	            		wsdlType ? Constants.WSDL_PORT_NAME : Constants.WS_WSDL_PORT_NAME);
+	            if (portName != null) {
+	            	factory.setEndpointName(portName);
+	            }
+	        }
+    	}
+    }
+    
+    protected void addWsInterceptorsFeaturesProps(
+    		AbstractEndpointFactory factory, BundleContext callingContext, Map sd) {
+    	addInterceptors(factory, callingContext, sd, Constants.WS_IN_INTERCEPTORS_PROP_KEY);
+        addInterceptors(factory, callingContext, sd, Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
+        addInterceptors(factory, callingContext, sd, Constants.WS_OUT_FAULT_INTERCEPTORS_PROP_KEY);
+        addInterceptors(factory, callingContext, sd, Constants.WS_IN_FAULT_INTERCEPTORS_PROP_KEY);
+        addFeatures(factory, callingContext, sd, Constants.WS_FEATURES_PROP_KEY);
+        addContextProperties(factory, callingContext, sd, Constants.WS_CONTEXT_PROPS_PROP_KEY);
+    }
+    
+    protected void addRsInterceptorsFeaturesProps(
+    		AbstractEndpointFactory factory, BundleContext callingContext, Map sd) {
+    	addInterceptors(factory, callingContext, sd, Constants.RS_IN_INTERCEPTORS_PROP_KEY);
+        addInterceptors(factory, callingContext, sd, Constants.RS_OUT_INTERCEPTORS_PROP_KEY);
+        addInterceptors(factory, callingContext, sd, Constants.RS_OUT_FAULT_INTERCEPTORS_PROP_KEY);
+        addInterceptors(factory, callingContext, sd, Constants.RS_IN_FAULT_INTERCEPTORS_PROP_KEY);
+        addFeatures(factory, callingContext, sd, Constants.RS_FEATURES_PROP_KEY);
+        addContextProperties(factory, callingContext, sd, Constants.RS_CONTEXT_PROPS_PROP_KEY);
+    }
+        
+    
+    protected void setClientWsdlProperties(ClientFactoryBean factory, BundleContext dswContext,

+    		Map sd, boolean wsdlType) {
+    	String location = OsgiUtils.getProperty(sd, wsdlType ? Constants.WSDL_LOCATION : Constants.WS_WSDL_LOCATION);
+    	if (location != null) {
+    		URL wsdlURL = dswContext.getBundle().getResource(location);
+	        if (wsdlURL != null) {
+	            factory.setWsdlURL(wsdlURL.toString());
+	        }
+	        QName serviceName = getServiceQName(null, sd, 
+	        		wsdlType ? Constants.WSDL_SERVICE_NAMESPACE : Constants.WS_WSDL_SERVICE_NAMESPACE,

+	        		wsdlType ? Constants.WSDL_SERVICE_NAME : Constants.WS_WSDL_SERVICE_NAME);
+	        if (serviceName != null) {
+	        	factory.setServiceName(serviceName);
+	            QName portName = getPortQName(serviceName.getNamespaceURI(), sd, 
+	            		wsdlType ? Constants.WSDL_PORT_NAME : Constants.WS_WSDL_PORT_NAME);
 	            if (portName != null) {
 	            	factory.setEndpointName(portName);
 	            }
@@ -158,16 +204,24 @@ public abstract class AbstractPojoConfig
 
         List<Object> providers = ClassUtils.loadProviderClasses(callingContext, sd,
propName); 
         boolean in = propName.contains("in.interceptors");
+        boolean out = propName.contains("out.interceptors");
+        boolean in_fault = propName.contains("in.fault.interceptors");
+        boolean out_fault = propName.contains("out.fault.interceptors");
         for (int i = 0; i < providers.size(); i++) {
         	Interceptor<?> interceptor = (Interceptor<?>)providers.get(i);  
 	        if (in) {
 	        	factory.getInInterceptors().add(interceptor);
-	        } else {
+	        } else if (out) {
 	        	factory.getOutInterceptors().add(interceptor);
+	        } else if (in_fault) {
+	        	factory.getInFaultInterceptors().add(interceptor);
+	        } else if (out_fault) {
+	        	factory.getOutFaultInterceptors().add(interceptor);
 	        }
         }
     }
     
+       
     protected void addFeatures(AbstractEndpointFactory factory, BundleContext callingContext,

     		Map sd, String propName) {
 

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java?rev=1232636&r1=1232635&r2=1232636&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
(original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/HttpServiceConfigurationTypeHandler.java
Tue Jan 17 23:11:33 2012
@@ -102,10 +102,9 @@ public class HttpServiceConfigurationTyp
             }
             String frontEndImpl = (String)serviceReference.getProperty(Constants.WS_FRONTEND_PROP_KEY);
             ClientProxyFactoryBean factory = createClientProxyFactoryBean(frontEndImpl);
-            addInterceptors(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_IN_INTERCEPTORS_PROP_KEY);
-            addInterceptors(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
-            addFeatures(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_FEATURES_PROP_KEY);
-            addContextProperties(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_CONTEXT_PROPS_PROP_KEY);
+            addWsInterceptorsFeaturesProps(factory.getClientFactoryBean(), callingContext,
sd.getProperties());
+            setClientWsdlProperties(factory.getClientFactoryBean(), dswContext, sd.getProperties(),
false);
+            
             factory.setServiceClass(iClass);
             factory.setAddress(address);
             factory.getServiceFactory().setDataBinding(databinding);
@@ -155,12 +154,10 @@ public class HttpServiceConfigurationTyp
         factory.setAddress("/");
         factory.getServiceFactory().setDataBinding(databinding);
         factory.setServiceBean(serviceBean);
-
-        addInterceptors(factory, callingContext, sd, Constants.WS_IN_INTERCEPTORS_PROP_KEY);
-        addInterceptors(factory, callingContext, sd, Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
-        addFeatures(factory, callingContext, sd, Constants.WS_FEATURES_PROP_KEY);
-        addContextProperties(factory, callingContext, sd, Constants.WS_CONTEXT_PROPS_PROP_KEY);
-        setWsdlProperties(factory, dswContext, sd);
+        
+        addWsInterceptorsFeaturesProps(factory, callingContext, sd);
+        
+        setWsdlProperties(factory, dswContext, sd, false);
         
         ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         try {

Modified: cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java?rev=1232636&r1=1232635&r2=1232636&view=diff
==============================================================================
--- cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
(original)
+++ cxf/dosgi/trunk/dsw/cxf-dsw/src/main/java/org/apache/cxf/dosgi/dsw/handlers/JaxRSHttpServiceConfigurationTypeHandler.java
Tue Jan 17 23:11:33 2012
@@ -71,10 +71,7 @@ public class JaxRSHttpServiceConfigurati
         if (providers != null && providers.size() > 0) {
             factory.setProviders(providers);
         }
-        addInterceptors(factory, callingContext, sd, Constants.RS_IN_INTERCEPTORS_PROP_KEY);
-        addInterceptors(factory, callingContext, sd, Constants.RS_OUT_INTERCEPTORS_PROP_KEY);
-        addFeatures(factory, callingContext, sd, Constants.RS_FEATURES_PROP_KEY);
-        addContextProperties(factory, callingContext, sd, Constants.RS_CONTEXT_PROPS_PROP_KEY);
+        addRsInterceptorsFeaturesProps(factory, callingContext, sd);
         
         String address = constructAddress(dswContext, contextRoot);
 

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=1232636&r1=1232635&r2=1232636&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
Tue Jan 17 23:11:33 2012
@@ -65,10 +65,7 @@ public class JaxRSPojoConfigurationTypeH
             JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
             bean.setAddress(address);
 
-            addInterceptors(bean, callingContext, sd.getProperties(), Constants.RS_IN_INTERCEPTORS_PROP_KEY);
-            addInterceptors(bean, callingContext, sd.getProperties(), Constants.RS_OUT_INTERCEPTORS_PROP_KEY);
-            addFeatures(bean, callingContext, sd.getProperties(), Constants.RS_FEATURES_PROP_KEY);
-            addContextProperties(bean, callingContext, sd.getProperties(), Constants.RS_CONTEXT_PROPS_PROP_KEY);
+            addRsInterceptorsFeaturesProps(bean, callingContext, sd.getProperties());
             
             List<UserResource> resources = JaxRSUtils.getModel(callingContext, iClass);
             if (resources != null) {
@@ -124,10 +121,7 @@ public class JaxRSPojoConfigurationTypeH
             factory.setProviders(providers);
         }
 
-        addInterceptors(factory, callingContext, sd, Constants.RS_IN_INTERCEPTORS_PROP_KEY);
-        addInterceptors(factory, callingContext, sd, Constants.RS_OUT_INTERCEPTORS_PROP_KEY);
-        addFeatures(factory, callingContext, sd, Constants.RS_FEATURES_PROP_KEY);
-        addContextProperties(factory, callingContext, sd, Constants.RS_CONTEXT_PROPS_PROP_KEY);
+        addRsInterceptorsFeaturesProps(factory, callingContext, sd);
 
         String location = OsgiUtils.getProperty(sd, Constants.RS_WADL_LOCATION);
     	if (location != 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=1232636&r1=1232635&r2=1232636&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
Tue Jan 17 23:11:33 2012
@@ -72,10 +72,8 @@ public class PojoConfigurationTypeHandle
             factory.setAddress(address);
             factory.getServiceFactory().setDataBinding(databinding);
 
-            addInterceptors(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_IN_INTERCEPTORS_PROP_KEY);
-            addInterceptors(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
-            addFeatures(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
-            addContextProperties(factory.getClientFactoryBean(), callingContext, sd.getProperties(),
Constants.WS_FEATURES_PROP_KEY);
+            addWsInterceptorsFeaturesProps(factory.getClientFactoryBean(), callingContext,
sd.getProperties());
+            setClientWsdlProperties(factory.getClientFactoryBean(), dswContext, sd.getProperties(),
false);
             
             applyIntents(dswContext, callingContext, factory.getFeatures(), factory.getClientFactoryBean(),
                          sd.getProperties());
@@ -120,11 +118,8 @@ public class PojoConfigurationTypeHandle
         factory.getServiceFactory().setDataBinding(databinding);
         factory.setServiceBean(serviceBean);
 
-        addInterceptors(factory, callingContext, sd, Constants.WS_IN_INTERCEPTORS_PROP_KEY);
-        addInterceptors(factory, callingContext, sd, Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
-        addFeatures(factory, callingContext, sd, Constants.WS_FEATURES_PROP_KEY);
-        addContextProperties(factory, callingContext, sd, Constants.WS_CONTEXT_PROPS_PROP_KEY);
-        setWsdlProperties(factory, dswContext, sd);
+        addWsInterceptorsFeaturesProps(factory, callingContext, sd);
+        setWsdlProperties(factory, dswContext, sd, false);
         ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
         try {
             String[] intents = applyIntents(dswContext, callingContext, factory.getFeatures(),
factory, sd);

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=1232636&r1=1232635&r2=1232636&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
Tue Jan 17 23:11:33 2012
@@ -150,21 +150,9 @@ public class WsdlConfigurationTypeHandle
         factory.getServiceFactory().setDataBinding(databinding);
         factory.setServiceBean(serviceBean);
 
-        addInterceptors(factory, callingContext, sd, Constants.WS_IN_INTERCEPTORS_PROP_KEY);
-        addInterceptors(factory, callingContext, sd, Constants.WS_OUT_INTERCEPTORS_PROP_KEY);
-        addFeatures(factory, callingContext, sd, Constants.WS_FEATURES_PROP_KEY);
-        addContextProperties(factory, callingContext, sd, Constants.WS_CONTEXT_PROPS_PROP_KEY);
+        addWsInterceptorsFeaturesProps(factory, callingContext, sd);
         
-        QName serviceQname = getServiceQName(iClass, sd,
-        		Constants.WSDL_SERVICE_NAMESPACE, Constants.WSDL_SERVICE_NAME);
-        factory.setServiceName(serviceQname);
-        
-        QName portQname = getPortQName(serviceQname.getNamespaceURI(), sd, Constants.WSDL_PORT_NAME);
-        if (portQname != null) {
-        	factory.setEndpointName(portQname);
-        }
-        
-        factory.setWsdlURL(wsdlURL.toString());
+        setWsdlProperties(factory, dswContext, sd, true);
         if (bus != null) {
         	factory.setBus(bus);
         }



Mime
View raw message