Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 71026 invoked from network); 11 Mar 2008 15:06:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Mar 2008 15:06:20 -0000 Received: (qmail 45723 invoked by uid 500); 11 Mar 2008 15:06:17 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 45683 invoked by uid 500); 11 Mar 2008 15:06:17 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 45674 invoked by uid 99); 11 Mar 2008 15:06:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2008 08:06:17 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Mar 2008 15:05:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 86C871A983A; Tue, 11 Mar 2008 08:05:59 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Tue, 11 Mar 2008 15:05:57 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080311150559.86C871A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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; }