cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r591209 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/ rt/frontend/simple/src/main/java/org/apache/cxf/service/...
Date Fri, 02 Nov 2007 03:15:36 GMT
Author: dkulp
Date: Thu Nov  1 20:15:36 2007
New Revision: 591209

URL: http://svn.apache.org/viewvc?rev=591209&view=rev
Log:
Merged revisions 591193 via svnmerge from 
https://svn.apache.org/repos/asf/incubator/cxf/trunk

........
  r591193 | dkulp | 2007-11-01 22:20:27 -0400 (Thu, 01 Nov 2007) | 2 lines
  
  [CXF-1145] First part to try and be able to set the service namespace from spring config
........

Modified:
    incubator/cxf/branches/2.0.x-fixes/   (props changed)
    incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
    incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java

Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java?rev=591209&r1=591208&r2=591209&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
Thu Nov  1 20:15:36 2007
@@ -25,8 +25,12 @@
 
     @Override
     public String getServiceNamespace() {
-        return NamespaceHelper.makeNamespaceFromClassName(getServiceFactory().getServiceClass().getName(),
+        String ret = super.getServiceNamespace();
+        if (ret == null) {
+            ret = NamespaceHelper.makeNamespaceFromClassName(getServiceFactory().getServiceClass().getName(),
                                                           "http");
+        }
+        return ret;
     }
 
 }

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=591209&r1=591208&r2=591209&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
Thu Nov  1 20:15:36 2007
@@ -77,6 +77,10 @@
 
     @Override
     public String getServiceNamespace() {
+        String ret = super.getServiceNamespace();
+        if (ret != null) {
+            return ret;
+        }
         QName service = implInfo.getServiceName();
         if (service == null) {
             return null;

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?rev=591209&r1=591208&r2=591209&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
Thu Nov  1 20:15:36 2007
@@ -27,6 +27,8 @@
 import org.apache.cxf.service.model.OperationInfo;
 
 public abstract class AbstractServiceConfiguration {
+    protected String serviceNamespace;
+    
     private ReflectionServiceFactoryBean serviceFactory;
     
     public ReflectionServiceFactoryBean getServiceFactory() {
@@ -46,7 +48,10 @@
     }
     
     public String getServiceNamespace() {
-        return null;
+        return serviceNamespace;
+    }
+    public void setServiceNamespace(String s) {
+        serviceNamespace = s;
     }
     
     public Boolean isOperation(final Method method) {

Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?rev=591209&r1=591208&r2=591209&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
(original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
Thu Nov  1 20:15:36 2007
@@ -33,6 +33,10 @@
 
 public class DefaultServiceConfiguration extends AbstractServiceConfiguration {
 
+    public DefaultServiceConfiguration() {
+        
+    }
+    
     @Override
     public QName getOperationName(InterfaceInfo service, Method method) {
         String ns = service.getName().getNamespaceURI();
@@ -147,8 +151,12 @@
 
     @Override
     public String getServiceNamespace() {
-        return ServiceUtils.makeNamespaceFromClassName(getServiceFactory().getServiceClass().getName(),
-                                                       "http");
+        String ret = super.getServiceNamespace();
+        if (ret == null) {
+            ret = ServiceUtils.makeNamespaceFromClassName(getServiceFactory().getServiceClass().getName(),
+                "http");
+        }
+        return ret;
     }
 
     @Override



Mime
View raw message