Hey Freeman, I'm wondering if we really need to keep the 3.2.2 branch and maintain it until the release. I think it would be easiest to just delete it and re-create it at the time we actually do the release. Else, there's chances we miss some bug fixes. Thoughts ?
On Mon, Apr 21, 2008 at 6:19 AM, <[EMAIL PROTECTED]> wrote: > Author: ffang > Date: Sun Apr 20 21:19:23 2008 > New Revision: 650017 > > URL: http://svn.apache.org/viewvc?rev=650017&view=rev > Log: > sync up changes to 3.2.2 release branch > > Added: > > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java > (with props) > > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java > (with props) > > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > (with props) > > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > (with props) > > Added: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java > URL: > http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java?rev=650017&view=auto > > ============================================================================== > --- > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java > (added) > +++ > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java > Sun Apr 20 21:19:23 2008 > @@ -0,0 +1,55 @@ > +/* > + * 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.servicemix.cxfbc; > + > +import java.io.InputStream; > + > +import javax.xml.soap.MessageFactory; > +import javax.xml.soap.SOAPMessage; > +import javax.xml.ws.Provider; > +import javax.xml.ws.Service; > +import javax.xml.ws.ServiceMode; > +import javax.xml.ws.WebServiceProvider; > + > + > + > [EMAIL PROTECTED](serviceName = "CalculatorService", > + portName = "CalculatorPort", > + targetNamespace = "http://apache.org/cxf/calculator";, > + wsdlLocation = "testutils/calculator.wsdl") > [EMAIL PROTECTED](value = Service.Mode.MESSAGE) > [EMAIL PROTECTED](value = "http://www.w3.org/2003/05/soap/bindings/HTTP/";) > +public class CalculatorSoapMessageProvider implements Provider<SOAPMessage> > { > + > + public CalculatorSoapMessageProvider() { > + // > + } > + > + public SOAPMessage invoke(SOAPMessage request) { > + SOAPMessage response = null; > + try { > + System.out.println("Incoming Client Request as a SOAPMessage"); > + MessageFactory factory = MessageFactory.newInstance(); > + InputStream is = > getClass().getResourceAsStream("provider_rep.xml"); > + response = factory.createMessage(null, is); > + is.close(); > + } catch (Exception ex) { > + ex.printStackTrace(); > + } > + return response; > + } > +} > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java > > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CalculatorSoapMessageProvider.java > > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Added: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java > URL: > http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java?rev=650017&view=auto > > ============================================================================== > --- > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java > (added) > +++ > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java > Sun Apr 20 21:19:23 2008 > @@ -0,0 +1,60 @@ > +/* > + * 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.servicemix.cxfbc; > + > +import java.net.URL; > + > +import javax.xml.namespace.QName; > + > +import org.apache.cxf.calculator.AddNumbersFault; > +import org.apache.cxf.calculator.CalculatorPortType; > +import org.apache.cxf.calculator.CalculatorService; > +import org.apache.cxf.frontend.ClientProxy; > +import org.apache.cxf.interceptor.LoggingInInterceptor; > +import org.apache.servicemix.tck.SpringTestSupport; > +import org.apache.xbean.spring.context.ClassPathXmlApplicationContext; > +import org.springframework.context.support.AbstractXmlApplicationContext; > + > +/* > + * this test demostrate how the jaxws provider is invoked through cxf bc > and cxf se > + */ > +public class CxfBcJaxwsProviderTest extends SpringTestSupport { > + > + @Override > + protected AbstractXmlApplicationContext createBeanFactory() { > + return new ClassPathXmlApplicationContext( > + "org/apache/servicemix/cxfbc/xbean_provider.xml"); > + } > + > + public void testProvider() throws Exception { > + URL wsdl = getClass().getResource("/wsdl/calculator.wsdl"); > + assertNotNull(wsdl); > + CalculatorService service = new CalculatorService(wsdl, new QName( > + "http://apache.org/cxf/calculator";, "CalculatorService")); > + CalculatorPortType port = service.getCalculatorPort(); > + ClientProxy.getClient(port).getInFaultInterceptors().add(new > LoggingInInterceptor()); > + ClientProxy.getClient(port).getInInterceptors().add(new > LoggingInInterceptor()); > + > + try { > + port.add(1, -2); > + fail("should get exception since there is a negative arg"); > + } catch (AddNumbersFault e) { > + assertEquals(e.getFaultInfo().getMessage(), > + "Negative number cant be added!"); > + } > + } > +} > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java > > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/java/org/apache/servicemix/cxfbc/CxfBcJaxwsProviderTest.java > > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Added: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > URL: > http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml?rev=650017&view=auto > > ============================================================================== > --- > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > (added) > +++ > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > Sun Apr 20 21:19:23 2008 > @@ -0,0 +1,20 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + > + 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. > + > +--> > +<soap:Envelope > xmlns:soap="http://www.w3.org/2003/05/soap-envelope";><soap:Body><soap:Fault><soap:Code><soap:Value>soap:Receiver</soap:Value></soap:Code><soap:Reason><soap:Text > xml:lang ="en">Fault > occured</soap:Text></soap:Reason><soap:Detail><CalculatorFault > xmlns="http://apache.org/cxf/calculator/types";><faultInfo>Numbers: 1, > -2</faultInfo><message>Negative number cant be > added!</message></CalculatorFault></soap:Detail></soap:Fault></soap:Body></soap:Envelope> > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/provider_rep.xml > > ------------------------------------------------------------------------------ > svn:mime-type = text/xml > > Added: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > URL: > http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml?rev=650017&view=auto > > ============================================================================== > --- > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > (added) > +++ > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > Sun Apr 20 21:19:23 2008 > @@ -0,0 +1,70 @@ > +<?xml version="1.0" encoding="UTF-8"?> > +<!-- > + > + 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. > + > +--> > +<beans xmlns:sm="http://servicemix.apache.org/config/1.0"; > + xmlns:cxfse="http://servicemix.apache.org/cxfse/1.0"; > + xmlns:cxfbc="http://servicemix.apache.org/cxfbc/1.0"; > + xmlns:test="urn:test" > + xmlns:calculator="http://apache.org/cxf/calculator"; > + xmlns:provider="http://cxfbc.servicemix.apache.org/";> > + > + <sm:container id="jbi" embedded="true"> > + > + <sm:endpoints> > + <cxfse:endpoint useJBIWrapper="false"> > + <cxfse:pojo> > + <bean > class="org.apache.servicemix.cxfbc.CalculatorSoapMessageProvider" /> > + </cxfse:pojo> > + <cxfse:inInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> > + </cxfse:inInterceptors> > + <cxfse:outInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> > + </cxfse:outInterceptors> > + <cxfse:inFaultInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> > + </cxfse:inFaultInterceptors> > + <cxfse:outFaultInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> > + </cxfse:outFaultInterceptors> > + </cxfse:endpoint> > + <cxfbc:consumer wsdl="/wsdl/calculator.wsdl" > + targetEndpoint="CalculatorPort" > + targetService="calculator:CalculatorService" > + > targetInterface="provider:CalculatorSoapMessageProvider" > + useJBIWrapper="false" > + > > + <cxfbc:inInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> > + </cxfbc:inInterceptors> > + <cxfbc:outInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> > + </cxfbc:outInterceptors> > + <cxfbc:inFaultInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingInInterceptor"/> > + </cxfbc:inFaultInterceptors> > + <cxfbc:outFaultInterceptors> > + <bean class="org.apache.cxf.interceptor.LoggingOutInterceptor"/> > + </cxfbc:outFaultInterceptors> > + </cxfbc:consumer> > + </sm:endpoints> > + > + </sm:container> > + > +</beans> > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > > ------------------------------------------------------------------------------ > svn:eol-style = native > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > > ------------------------------------------------------------------------------ > svn:keywords = Rev Date > > Propchange: > servicemix/smx3/branches/servicemix-3.2.2/deployables/bindingcomponents/servicemix-cxf-bc/src/test/resources/org/apache/servicemix/cxfbc/xbean_provider.xml > > ------------------------------------------------------------------------------ > svn:mime-type = text/xml > > > -- Cheers, Guillaume Nodet ------------------------ Blog: http://gnodet.blogspot.com/
