Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 29608 invoked from network); 11 Apr 2007 02:01:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Apr 2007 02:01:31 -0000 Received: (qmail 4287 invoked by uid 500); 11 Apr 2007 02:01:37 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 4172 invoked by uid 500); 11 Apr 2007 02:01:37 -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 4161 invoked by uid 99); 11 Apr 2007 02:01:37 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2007 19:01:37 -0700 X-ASF-Spam-Status: No, hits=0.8 required=10.0 tests=INFO_TLD,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (herse.apache.org: domain of james.mao@iona.com designates 65.223.216.181 as permitted sender) Received: from [65.223.216.181] (HELO amereast-smg1.iona.com) (65.223.216.181) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 10 Apr 2007 19:01:28 -0700 Received: from amer-ems1.IONAGLOBAL.COM ([10.65.6.25]) by amereast-smg1.iona.com (Switch-3.1.7/Switch-3.1.7) with ESMTP id l3B1xSjq002464; Tue, 10 Apr 2007 21:59:28 -0400 (EDT) Received: from [127.0.0.1] ([10.129.9.175]) by amer-ems1.IONAGLOBAL.COM with Microsoft SMTPSVC(6.0.3790.1830); Tue, 10 Apr 2007 22:01:02 -0400 Message-ID: <461C416A.60504@iona.com> Date: Wed, 11 Apr 2007 10:01:14 +0800 From: James Mao User-Agent: Thunderbird 1.5.0.10 (Windows/20070221) MIME-Version: 1.0 To: cxf-dev@incubator.apache.org CC: cxf-commits@incubator.apache.org Subject: Re: svn commit: r527347 - in /incubator/cxf/trunk: rt/bindings/object/ rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ rt/bindings/object/src/main/resources/META-INF/cxf/ rt/bindings/object/src/test/java/org/apache/cxf/binding/object/ rt/co... References: <20070411001740.8DE551A9838@eris.apache.org> In-Reply-To: <20070411001740.8DE551A9838@eris.apache.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 11 Apr 2007 02:01:03.0208 (UTC) FILETIME=[42349680:01C77BDD] X-Virus-Checked: Checked by ClamAV on apache.org Hi Dan, > Log: > o Switch the tools plugin files to allow multiple plugins within a single > file. This makes it easier to combine mutliple tools.xml files for the > bundle jar which we are (hopefully) producing. > Tools people: please let me know if this is an OK thing to do! > You really don't need to do this! The plugin can contain frontend and databinding in it self You can write a plugin description file like this: ... So, Really is a redundant And i'm really not like to bundle the plugins in the one jar, I don't care you bundle other stuff, but i myself prefer the tools plugins being separated. If you don't mind, please revert tools part in this commit. If we really need to bundle, there already has a way to bundle it together, there is no need to have a Thanks James. > > Added: > incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java (with props) > incubator/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/LocalServerRegistrationTest.java (with props) > Modified: > incubator/cxf/trunk/rt/bindings/object/pom.xml > incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingConfiguration.java > incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java > incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java > incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainInterceptor.java > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/interceptor/OutgoingChainSetupInterceptor.java > incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/transport/ChainInitiationObserver.java > incubator/cxf/trunk/rt/core/src/test/java/org/apache/cxf/interceptor/OutgoingChainInterceptorTest.java > incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalConduit.java > incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalDestination.java > incubator/cxf/trunk/rt/transports/local/src/main/java/org/apache/cxf/transport/local/LocalTransportFactory.java > incubator/cxf/trunk/tools/wsdlto/core/src/main/java/org/apache/cxf/tools/wsdlto/core/PluginLoader.java > incubator/cxf/trunk/tools/wsdlto/core/src/main/resources/schemas/plugin.xsd > incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/java/org/apache/cxf/tools/wsdlto/databinding/jaxb/JAXBDataBinding.java > incubator/cxf/trunk/tools/wsdlto/databinding/jaxb/src/main/resources/META-INF/tools-plugin.xml > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/main/resources/META-INF/tools-plugin.xml > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/JAXWSProfileTest.java > incubator/cxf/trunk/tools/wsdlto/frontend/jaxws/src/test/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/jaxws-plugin.xml > incubator/cxf/trunk/tools/wsdlto/test/src/test/java/org/apache/cxf/tools/wsdlto/core/PluginLoaderTest.java > > Modified: incubator/cxf/trunk/rt/bindings/object/pom.xml > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/pom.xml?view=diff&rev=527347&r1=527346&r2=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/pom.xml (original) > +++ incubator/cxf/trunk/rt/bindings/object/pom.xml Tue Apr 10 17:17:37 2007 > @@ -61,6 +61,12 @@ > ${project.version} > > > + org.apache.cxf > + cxf-rt-transports-http-jetty > + ${project.version} > + test > + > + > junit > junit > test > > Added: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java?view=auto&rev=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java (added) > +++ incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java Tue Apr 10 17:17:37 2007 > @@ -0,0 +1,138 @@ > +/** > + * Licensed to the Apache Software Foundation (ASF) under one > + * or more contributor license agreements. See the NOTICE file > + * distributed with this work for additional information > + * regarding copyright ownership. The ASF licenses this file > + * to you under the Apache License, Version 2.0 (the > + * "License"); you may not use this file except in compliance > + * with the License. You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, > + * software distributed under the License is distributed on an > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + * KIND, either express or implied. See the License for the > + * specific language governing permissions and limitations > + * under the License. > + */ > +package org.apache.cxf.binding.object; > + > +import java.io.IOException; > +import java.util.logging.Level; > +import java.util.logging.Logger; > + > +import org.apache.cxf.Bus; > +import org.apache.cxf.BusException; > +import org.apache.cxf.binding.Binding; > +import org.apache.cxf.binding.BindingFactory; > +import org.apache.cxf.common.logging.LogUtils; > +import org.apache.cxf.endpoint.Endpoint; > +import org.apache.cxf.endpoint.Server; > +import org.apache.cxf.endpoint.ServerLifeCycleListener; > +import org.apache.cxf.service.Service; > +import org.apache.cxf.service.model.BindingInfo; > +import org.apache.cxf.service.model.EndpointInfo; > +import org.apache.cxf.transport.ChainInitiationObserver; > +import org.apache.cxf.transport.Destination; > +import org.apache.cxf.transport.DestinationFactory; > +import org.apache.cxf.transport.DestinationFactoryManager; > +import org.apache.cxf.transport.local.LocalTransportFactory; > + > +public class LocalServerListener implements ServerLifeCycleListener { > + private static final Logger LOG = LogUtils.getL7dLogger(LocalServerListener.class); > + > + private DestinationFactory destinationFactory; > + private BindingFactory bindingFactory; > + private ObjectBindingConfiguration configuration = new ObjectBindingConfiguration(); > + private Bus bus; > + > + public LocalServerListener(Bus bus, > + BindingFactory bindingFactory) { > + super(); > + this.bindingFactory = bindingFactory; > + this.bus = bus; > + } > + > + public void startServer(Server server) { > + Endpoint endpoint = server.getEndpoint(); > + Service service = endpoint.getService(); > + > + // synthesize a new binding > + BindingInfo bi = bindingFactory.createBindingInfo(service, > + ObjectBindingFactory.BINDING_ID, > + configuration); > + > + Binding binding = bindingFactory.createBinding(bi); > + > + String uri = "local://" + server.toString(); > + EndpointInfo ei = new EndpointInfo(); > + ei.setAddress(uri); > + > + try { > + // Register a new Destination locally for the Server > + Destination destination = getDestinationFactory().getDestination(ei); > + > + destination.setMessageObserver(new OverrideBindingObserver(endpoint, binding, bus)); > + } catch (IOException e1) { > + LOG.log(Level.WARNING, "Could not create local destination.", e1); > + } > + } > + > + public void stopServer(Server server) { > + String uri = "local://" + server.toString(); > + EndpointInfo ei = new EndpointInfo(); > + ei.setAddress(uri); > + > + try { > + Destination destination = getDestinationFactory().getDestination(ei); > + > + destination.shutdown(); > + } catch (IOException e) { > + LOG.log(Level.WARNING, "Could not shutdown local destination.", e); > + } > + > + } > + > + public DestinationFactory getDestinationFactory() { > + if (destinationFactory == null) { > + retrieveDF(); > + } > + return destinationFactory; > + } > + > + private synchronized void retrieveDF() { > + if (destinationFactory == null) { > + DestinationFactoryManager dfm = bus.getExtension(DestinationFactoryManager.class); > + try { > + destinationFactory = dfm.getDestinationFactory(LocalTransportFactory.TRANSPORT_ID); > + } catch (BusException e) { > + throw new RuntimeException(e); > + } > + } > + } > + > + public ObjectBindingConfiguration getConfiguration() { > + return configuration; > + } > + > + public void setConfiguration(ObjectBindingConfiguration configuration) { > + this.configuration = configuration; > + } > + > + public static class OverrideBindingObserver extends ChainInitiationObserver { > + > + private Binding binding; > + > + public OverrideBindingObserver(Endpoint endpoint, Binding binding, Bus bus) { > + super(endpoint, bus); > + this.binding = binding; > + } > + > + @Override > + protected Binding getBinding() { > + return binding; > + } > + > + } > +} > > Propchange: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java > ------------------------------------------------------------------------------ > svn:executable = * > > Propchange: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/LocalServerListener.java > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Modified: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingConfiguration.java > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingConfiguration.java?view=diff&rev=527347&r1=527346&r2=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingConfiguration.java (original) > +++ incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingConfiguration.java Tue Apr 10 17:17:37 2007 > @@ -23,7 +23,7 @@ > import org.apache.cxf.binding.BindingConfiguration; > > public class ObjectBindingConfiguration extends BindingConfiguration { > - private boolean stopAfterLogicalPhases = true; > + private boolean nonLogicalPhasesEnabled = true; > private Set skipPhases; > > @Override > @@ -39,12 +39,12 @@ > this.skipPhases = skipPhases; > } > > - public boolean isStopAfterLogicalPhases() { > - return stopAfterLogicalPhases; > + public boolean isNonLogicalPhasesEnabled() { > + return nonLogicalPhasesEnabled; > } > > - public void setStopAfterLogicalPhases(boolean stopAfterLogicalPhases) { > - this.stopAfterLogicalPhases = stopAfterLogicalPhases; > + public void setNonLogicalPhasesEnabled(boolean nonLogicalPhasesEnabled) { > + this.nonLogicalPhasesEnabled = nonLogicalPhasesEnabled; > } > > } > > Modified: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java?view=diff&rev=527347&r1=527346&r2=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java (original) > +++ incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectBindingFactory.java Tue Apr 10 17:17:37 2007 > @@ -20,11 +20,14 @@ > > import java.util.Collection; > > +import javax.annotation.PostConstruct; > import javax.annotation.Resource; > import javax.xml.namespace.QName; > > +import org.apache.cxf.Bus; > import org.apache.cxf.binding.AbstractBindingFactory; > import org.apache.cxf.binding.Binding; > +import org.apache.cxf.endpoint.ServerLifeCycleManager; > import org.apache.cxf.service.model.BindingInfo; > import org.apache.cxf.service.model.BindingOperationInfo; > import org.apache.cxf.service.model.OperationInfo; > @@ -32,10 +35,14 @@ > > public class ObjectBindingFactory extends AbstractBindingFactory { > public static final String BINDING_ID = "http://cxf.apache.org/binding/object"; > - public static final String STOP_AFTER_LOGICAL = "objectBinding.stopAfterLogical"; > + public static final String RUN_NON_LOGICAL = "objectBinding.stopAfterLogical"; > > private Collection activationNamespaces; > - > + private Bus bus; > + private boolean autoRegisterLocalEndpoint; > + private boolean initialized = true; > + private LocalServerListener listener; > + > public Collection getActivationNamespaces() { > return activationNamespaces; > } > @@ -44,7 +51,24 @@ > public void setActivationNamespaces(Collection ans) { > activationNamespaces = ans; > } > + > + @Resource(name = "bus") > + public void setBus(Bus bus) { > + this.bus = bus; > + } > > + @PostConstruct > + public void initialize() { > + if (autoRegisterLocalEndpoint) { > + ServerLifeCycleManager manager = bus.getExtension(ServerLifeCycleManager.class); > + if (manager != null) { > + listener = new LocalServerListener(bus, this); > + manager.registerListener(listener); > + } > + } > + initialized = true; > + } > + > public Binding createBinding(BindingInfo bi) { > ObjectBinding binding = new ObjectBinding(); > binding.getOutInterceptors().add(new ObjectDispatchOutInterceptor()); > @@ -59,7 +83,7 @@ > if (config instanceof ObjectBindingConfiguration) { > ObjectBindingConfiguration c = (ObjectBindingConfiguration) config; > > - info.setProperty(STOP_AFTER_LOGICAL, c.isStopAfterLogicalPhases()); > + info.setProperty(RUN_NON_LOGICAL, c.isNonLogicalPhasesEnabled()); > } > > info.setName(new QName(si.getName().getNamespaceURI(), > @@ -70,6 +94,19 @@ > info.addOperation(bop); > } > return info; > + } > + > + public boolean isAutoRegisterLocalEndpoint() { > + return autoRegisterLocalEndpoint; > + } > + > + public void setAutoRegisterLocalEndpoint(boolean autoRegisterLocalEndpoint) { > + this.autoRegisterLocalEndpoint = autoRegisterLocalEndpoint; > + > + if (initialized && listener == null) { > + // register the lifecycle listener > + initialize(); > + } > } > > } > > Modified: incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java?view=diff&rev=527347&r1=527346&r2=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java (original) > +++ incubator/cxf/trunk/rt/bindings/object/src/main/java/org/apache/cxf/binding/object/ObjectDispatchInInterceptor.java Tue Apr 10 17:17:37 2007 > @@ -50,14 +50,17 @@ > if (opName == null) { > throw new Fault(new org.apache.cxf.common.i18n.Message("NO_OPERATION", BUNDLE)); > } > + > + Endpoint ep = message.getExchange().get(Endpoint.class); > + > + BindingInfo binding = null; > > if (bindingName == null) { > - throw new Fault(new org.apache.cxf.common.i18n.Message("NO_BINDING", BUNDLE)); > + binding = ep.getEndpointInfo().getBinding(); > + } else { > + binding = ep.getService().getServiceInfo().getBinding(bindingName); > } > > - Endpoint ep = message.getExchange().get(Endpoint.class); > - > - BindingInfo binding = ep.getService().getServiceInfo().getBinding(bindingName); > BindingOperationInfo bop = binding.getOperation(opName); > > message.getExchange().put(BindingOperationInfo.class, bop); > > Modified: incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml?view=diff&rev=527347&r1=527346&r2=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml (original) > +++ incubator/cxf/trunk/rt/bindings/object/src/main/resources/META-INF/cxf/cxf-extension-object-binding.xml Tue Apr 10 17:17:37 2007 > @@ -25,7 +25,8 @@ > http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> > > - lazy-init="true"> > + lazy-init="true" depends-on="org.apache.cxf.endpoint.ServerLifeCycleManager" > > + > > > http://cxf.apache.org/binding/object > > Added: incubator/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/LocalServerRegistrationTest.java > URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/LocalServerRegistrationTest.java?view=auto&rev=527347 > ============================================================================== > --- incubator/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/LocalServerRegistrationTest.java (added) > +++ incubator/cxf/trunk/rt/bindings/object/src/test/java/org/apache/cxf/binding/object/LocalServerRegistrationTest.java Tue Apr 10 17:17:37 2007 > @@ -0,0 +1,109 @@ > +/** > + * Licensed to the Apache Software Foundation (ASF) under one > + * or more contributor license agreements. See the NOTICE file > + * distributed with this work for additional information > + * regarding copyright ownership. The ASF licenses this file > + * to you under the Apache License, Version 2.0 (the > + * "License"); you may not use this file except in compliance > + * with the License. You may obtain a copy of the License at > + * > + * http://www.apache.org/licenses/LICENSE-2.0 > + * > + * Unless required by applicable law or agreed to in writing, > + * software distributed under the License is distributed on an > + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY > + * KIND, either express or implied. See the License for the > + * specific language governing permissions and limitations > + * under the License. > + */ > +package org.apache.cxf.binding.object; > + > +import java.io.IOException; > +import java.util.ArrayList; > +import java.util.List; > + > +import org.apache.cxf.BusException; > +import org.apache.cxf.binding.BindingFactoryManager; > +import org.apache.cxf.endpoint.Server; > +import org.apache.cxf.frontend.ServerFactoryBean; > +import org.apache.cxf.helpers.CastUtils; > +import org.apache.cxf.message.ExchangeImpl; > +import org.apache.cxf.message.Message; > +import org.apache.cxf.message.MessageImpl; > +import org.apache.cxf.service.model.BindingInfo; > +import org.apache.cxf.service.model.BindingOperationInfo; > +import org.apache.cxf.service.model.EndpointInfo; > +import org.apache.cxf.service.model.ServiceInfo; > +import org.apache.cxf.test.AbstractCXFTest; > +import org.apache.cxf.transport.Conduit; > +import org.apache.cxf.transport.ConduitInitiator; > +import org.apache.cxf.transport.ConduitInitiatorManager; > +import org.apache.cxf.transport.MessageObserver; > +import org.apache.cxf.transport.local.LocalConduit; > +import org.apache.cxf.transport.local.LocalTransportFactory; > +import org.junit.Test; > + > +public class LocalServerRegistrationTest extends AbstractCXFTest { > + private Message response; > + > + @Test > + public void testServer() throws Exception { > + // Enable the auto registration of a default local endpoint when we use other transports > + BindingFactoryManager bfm = getBus().getExtension(BindingFactoryManager.class); > + ObjectBindingFactory obj = (ObjectBindingFactory) > + bfm.getBindingFactory(ObjectBindingFactory.BINDING_ID); > + obj.setAutoRegisterLocalEndpoint(true); > + > + // Create an HTTP endpoint > + ServerFactoryBean sfb = new ServerFactoryBean(); > + sfb.setServiceClass(EchoImpl.class); > + sfb.setAddress("http://localhost:9001/echo"); > + Server server = sfb.create(); > + > + List