Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 88839 invoked from network); 1 Nov 2007 07:11:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Nov 2007 07:11:04 -0000 Received: (qmail 5416 invoked by uid 500); 1 Nov 2007 07:10:52 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 5354 invoked by uid 500); 1 Nov 2007 07:10:51 -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 5345 invoked by uid 99); 1 Nov 2007 07:10:51 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Nov 2007 00:10:51 -0700 X-ASF-Spam-Status: No, hits=-100.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; Thu, 01 Nov 2007 07:10:40 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id B1AA81A9832; Thu, 1 Nov 2007 00:09:50 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590918 - in /incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend: AbstractEndpointFactory.java AbstractWSDLBasedEndpointFactory.java Date: Thu, 01 Nov 2007 07:09:50 -0000 To: cxf-commits@incubator.apache.org From: ningjiang@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071101070950.B1AA81A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ningjiang Date: Thu Nov 1 00:09:49 2007 New Revision: 590918 URL: http://svn.apache.org/viewvc?rev=590918&view=rev Log: Renamed the AbstractEndpointFactory to AbstractWSDLBasedEndpointFactory to keep the change log of AbstractEndpointFactory Added: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java - copied, changed from r590877, incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java Removed: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java Copied: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java (from r590877, incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java) URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java?p2=incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java&p1=incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java&r1=590877&r2=590918&rev=590918&view=diff ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractEndpointFactory.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/AbstractWSDLBasedEndpointFactory.java Thu Nov 1 00:09:49 2007 @@ -18,30 +18,20 @@ */ package org.apache.cxf.frontend; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; import java.util.logging.Logger; import javax.xml.namespace.QName; -import org.apache.cxf.Bus; import org.apache.cxf.BusException; -import org.apache.cxf.BusFactory; -import org.apache.cxf.binding.BindingConfiguration; -import org.apache.cxf.binding.BindingFactory; import org.apache.cxf.binding.BindingFactoryManager; import org.apache.cxf.binding.soap.SoapBindingConfiguration; import org.apache.cxf.binding.soap.model.SoapBindingInfo; import org.apache.cxf.common.i18n.Message; import org.apache.cxf.common.logging.LogUtils; -import org.apache.cxf.databinding.DataBinding; -import org.apache.cxf.endpoint.ConduitSelector; +import org.apache.cxf.endpoint.AbstractEndpointFactory; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.endpoint.EndpointException; import org.apache.cxf.endpoint.EndpointImpl; -import org.apache.cxf.feature.AbstractFeature; -import org.apache.cxf.interceptor.AbstractBasicInterceptorProvider; import org.apache.cxf.interceptor.AnnotationInterceptors; import org.apache.cxf.service.Service; import org.apache.cxf.service.factory.ReflectionServiceFactoryBean; @@ -54,31 +44,21 @@ import org.apache.cxf.transport.DestinationFactory; import org.apache.cxf.transport.DestinationFactoryManager; import org.apache.cxf.transport.local.LocalTransportFactory; -import org.apache.cxf.ws.addressing.EndpointReferenceType; import org.apache.cxf.wsdl11.WSDLEndpointFactory; -public abstract class AbstractEndpointFactory extends AbstractBasicInterceptorProvider { - private static final Logger LOG = LogUtils.getL7dLogger(AbstractEndpointFactory.class); +public abstract class AbstractWSDLBasedEndpointFactory extends AbstractEndpointFactory { + private static final Logger LOG = LogUtils.getL7dLogger(AbstractWSDLBasedEndpointFactory.class); - private Bus bus; - private String address; - private String transportId; - private String bindingId; private Class serviceClass; - private DataBinding dataBinding; - private BindingFactory bindingFactory; - private DestinationFactory destinationFactory; private ReflectionServiceFactoryBean serviceFactory; - private QName endpointName; - private QName serviceName; - private Map properties; - private List features; - private BindingConfiguration bindingConfig; - private EndpointReferenceType endpointReference; - private ConduitSelector conduitSelector; + + protected AbstractWSDLBasedEndpointFactory(ReflectionServiceFactoryBean sbean) { + serviceFactory = sbean; + } + protected AbstractWSDLBasedEndpointFactory() { + } protected Endpoint createEndpoint() throws BusException, EndpointException { - if (serviceName != null) { serviceFactory.setServiceName(serviceName); } @@ -94,7 +74,6 @@ service = serviceFactory.create(); } - if (endpointName == null) { endpointName = serviceFactory.getEndpointName(); } @@ -175,6 +154,7 @@ DestinationFactoryManager dfm = getBus().getExtension(DestinationFactoryManager.class); df = dfm.getDestinationFactoryForUri(getAddress()); } + if (df != null) { transportId = df.getTransportIds().get(0); } else { @@ -183,7 +163,7 @@ ConduitInitiator ci = cim.getConduitInitiatorForUri(getAddress()); if (ci != null) { transportId = ci.getTransportIds().get(0); - } + } } } @@ -318,46 +298,6 @@ } } - public String getAddress() { - return address; - } - - public void setAddress(String address) { - this.address = address; - } - - public Bus getBus() { - if (bus == null) { - bus = BusFactory.getThreadDefaultBus(); - } - return bus; - } - - public void setBus(Bus bus) { - this.bus = bus; - } - - public String getTransportId() { - return transportId; - } - - public void setTransportId(String transportId) { - this.transportId = transportId; - } - public void setBindingId(String bind) { - bindingId = bind; - } - public String getBindingId() { - return bindingId; - } - - public void setBindingConfig(BindingConfiguration obj) { - bindingConfig = obj; - } - public BindingConfiguration getBindingConfig() { - return bindingConfig; - } - public Class getServiceClass() { return serviceClass; } @@ -366,16 +306,6 @@ this.serviceClass = serviceClass; } - public DestinationFactory getDestinationFactory() { - return destinationFactory; - } - - - public void setDestinationFactory(DestinationFactory destinationFactory) { - this.destinationFactory = destinationFactory; - } - - public ReflectionServiceFactoryBean getServiceFactory() { return serviceFactory; } @@ -384,45 +314,6 @@ public void setServiceFactory(ReflectionServiceFactoryBean serviceFactory) { this.serviceFactory = serviceFactory; } - - public void setServiceName(QName name) { - serviceName = name; - } - - public QName getServiceName() { - return serviceName; - } - - public QName getEndpointName() { - return endpointName; - } - - public void setEndpointName(QName endpointName) { - this.endpointName = endpointName; - } - - public void setEndpointReference(EndpointReferenceType epr) { - endpointReference = epr; - } - - public Map getProperties() { - return properties; - } - - public void setProperties(Map properties) { - this.properties = properties; - } - - public List getFeatures() { - if (features == null) { - features = new ArrayList(); - } - return features; - } - - public void setFeatures(List features) { - this.features = features; - } public String getWsdlURL() { return getServiceFactory().getWsdlURL(); @@ -432,25 +323,5 @@ getServiceFactory().setWsdlURL(wsdlURL); } - public BindingFactory getBindingFactory() { - return bindingFactory; - } - - public ConduitSelector getConduitSelector() { - return conduitSelector; - } - - public void setConduitSelector(ConduitSelector selector) { - conduitSelector = selector; - } - - public DataBinding getDataBinding() { - return dataBinding; - } - - public void setDataBinding(DataBinding dataBinding) { - this.dataBinding = dataBinding; - } - - + }