svn commit: r635962 - in /incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf: frontend/AbstractWSDLBasedEndpointFactory.java service/factory/DefaultServiceConfiguration.java service/factory/ReflectionServiceFactoryBean.java

[dkulp]

Author: dkulp
Date: Tue Mar 11 08:05:53 2008
New Revision: 635962

URL: http://svn.apache.org/viewvc?rev=635962&view=rev
Log:
[CXF-1081] Grab values from the factory to use as defaults in consructor.

Modified:
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/DefaultServiceConfiguration.java
    
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java

Modified: 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?rev=635962&r1=635961&r2=635962&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java
 Tue Mar 11 08:05:53 2008
@@ -55,7 +55,9 @@
     
     protected AbstractWSDLBasedEndpointFactory(ReflectionServiceFactoryBean 
sbean) {
         serviceFactory = sbean;
-        //serviceFactory.setFeatures(getFeatures());
+        serviceClass = sbean.getServiceClass();
+        serviceName = sbean.getServiceQName(false);
+        endpointName = sbean.getEndpointName(false);
     }
     protected AbstractWSDLBasedEndpointFactory() {
     }

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=635962&r1=635961&r2=635962&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
 Tue Mar 11 08:05:53 2008
@@ -164,7 +164,9 @@
     @Override
     public String getServiceNamespace() {
         String ret = super.getServiceNamespace();
-        if (ret == null) {
+        if (ret == null 
+            && getServiceFactory() != null
+            && getServiceFactory().getServiceClass() != null) {
             ret = 
ServiceUtils.makeNamespaceFromClassName(getServiceFactory().getServiceClass().getName(),
                 "http");
         }

Modified: 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=635962&r1=635961&r2=635962&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 (original)
+++ 
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java
 Tue Mar 11 08:05:53 2008
@@ -1459,7 +1459,10 @@
 
 
     public QName getServiceQName() {
-        if (serviceName == null) {
+        return getServiceQName(true);
+    }
+    public QName getServiceQName(boolean lookup) {
+        if (serviceName == null && lookup) {
             serviceName = new QName(getServiceNamespace(), getServiceName());
         }
 
@@ -1467,7 +1470,10 @@
     }
 
     public QName getEndpointName() {
-        if (endpointName != null) {
+        return getEndpointName(true);
+    }
+    public QName getEndpointName(boolean lookup) {
+        if (endpointName != null || !lookup) {
             return endpointName;
         }