You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/11/02 03:20:28 UTC
svn commit: r591193 - in /incubator/cxf/trunk/rt:
databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/
frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/
frontend/simple/src/main/java/org/apache/cxf/service/factory/
Author: dkulp
Date: Thu Nov 1 19:20:27 2007
New Revision: 591193
URL: http://svn.apache.org/viewvc?rev=591193&view=rev
Log:
[CXF-1145] First part to try and be able to set the service namespace from spring config
Modified:
incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java?rev=591193&r1=591192&r2=591193&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/AegisServiceConfiguration.java Thu Nov 1 19:20:27 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/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java?rev=591193&r1=591192&r2=591193&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsServiceConfiguration.java Thu Nov 1 19:20:27 2007
@@ -76,6 +76,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/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?rev=591193&r1=591192&r2=591193&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java Thu Nov 1 19:20:27 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/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java?rev=591193&r1=591192&r2=591193&view=diff
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java Thu Nov 1 19:20:27 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