Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 33772 invoked from network); 30 Oct 2006 04:56:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Oct 2006 04:56:52 -0000 Received: (qmail 82286 invoked by uid 500); 30 Oct 2006 04:57:03 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 82238 invoked by uid 500); 30 Oct 2006 04:57:03 -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 82229 invoked by uid 99); 30 Oct 2006 04:57:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 29 Oct 2006 20:57:03 -0800 X-ASF-Spam-Status: No, hits=1.4 required=10.0 tests=INFO_TLD,NO_REAL_NAME 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; Sun, 29 Oct 2006 20:56:49 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 3E8CE1A9851; Sun, 29 Oct 2006 20:56:27 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r469066 [3/3] - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/databinding/ api/src/main/java/org/apache/cxf/service/model/ common/common/src/main/java/org/apache/cxf/configuration/spring/ common/common/src/test/java/org/apache/c... Date: Mon, 30 Oct 2006 04:56:24 -0000 To: cxf-commits@incubator.apache.org From: dandiep@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061030045627.3E8CE1A9851@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/JaxWsClientTest.java Sun Oct 29 20:56:21 2006 @@ -133,6 +133,7 @@ // test fault handling bop = ei.getBinding().getOperation(new QName(namespace, "testDocLitFault")); + bop = bop.getUnwrappedOperation(); responseMessage = "testDocLitFault.xml"; try { client.invoke(bop, new Object[] {"BadRecordLitFault"}, null); @@ -168,14 +169,15 @@ public void onMessage(Message message) { try { - Conduit backChannel = message.getDestination().getBackChannel(message, null, null); - - backChannel.send(message); InputStream in = message.getContent(InputStream.class); while (in.available() > 0) { in.read(); } + + Conduit backChannel = message.getDestination().getBackChannel(message, null, null); + + backChannel.send(message); OutputStream out = message.getContent(OutputStream.class); assertNotNull(out); Added: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java?view=auto&rev=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java (added) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java Sun Oct 29 20:56:21 2006 @@ -0,0 +1,25 @@ +/** + * 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.jaxws; + +public class ServiceImplTest extends AbstractJaxWsTest { + public void testServiceImpl() throws Exception { + // new ServiceImpl(getBus(), ) + } +} Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ServiceImplTest.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml?view=auto&rev=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml (added) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml Sun Oct 29 20:56:21 2006 @@ -0,0 +1,23 @@ + + + + + + Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml ------------------------------------------------------------------------------ svn:executable = * Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/getGreetings.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/sayHi.xml Sun Oct 29 20:56:21 2006 @@ -23,4 +23,4 @@ - + \ No newline at end of file Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/service/Hello.java Sun Oct 29 20:56:21 2006 @@ -18,6 +18,9 @@ */ package org.apache.cxf.jaxws.service; +import java.util.ArrayList; +import java.util.List; + import javax.jws.WebMethod; import javax.jws.WebService; @@ -27,5 +30,13 @@ @WebMethod public String sayHi(String text) { return text; + } + + @WebMethod + public List getGreetings() { + List strings = new ArrayList(); + strings.add("Hello"); + strings.add("Bonjour"); + return strings; } } Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/support/JaxWsServiceFactoryBeanTest.java Sun Oct 29 20:56:21 2006 @@ -26,7 +26,6 @@ import javax.xml.namespace.QName; import org.apache.cxf.Bus; -import org.apache.cxf.interceptor.WrappedInInterceptor; import org.apache.cxf.jaxws.AbstractJaxWsTest; import org.apache.cxf.mtom_xop.HelloImpl; import org.apache.cxf.service.Service; @@ -61,12 +60,10 @@ OperationInfo op = intf.getOperation(new QName(ns, "sayHi")); - Class wrapper = (Class) - op.getUnwrappedOperation().getInput().getProperty(WrappedInInterceptor.WRAPPER_CLASS); + Class wrapper = (Class) op.getInput().getMessageParts().get(0).getTypeClass(); assertNotNull(wrapper); - wrapper = (Class) - op.getUnwrappedOperation().getOutput().getProperty(WrappedInInterceptor.WRAPPER_CLASS); + wrapper = (Class) op.getOutput().getMessageParts().get(0).getTypeClass(); assertNotNull(wrapper); assertEquals(invoker, service.getInvoker()); @@ -82,8 +79,7 @@ assertEquals(1, f.getMessageParts().size()); MessagePartInfo mpi = f.getMessagePartByIndex(0); - c = mpi.getProperty(Class.class.getName(), Class.class); - assertNotNull(c); + assertNotNull(mpi.getTypeClass()); } public void testHolder() throws Exception { @@ -105,12 +101,12 @@ assertTrue(itr.hasNext()); MessagePartInfo part = itr.next(); assertEquals("body", part.getName().getLocalPart()); - assertEquals(String.class, part.getProperty(Class.class.getName(), Class.class)); + assertEquals(String.class, part.getTypeClass()); assertTrue(itr.hasNext()); part = itr.next(); assertEquals(Boolean.TRUE, part.getProperty(JaxWsServiceFactoryBean.MODE_INOUT)); - assertEquals(byte[].class, part.getProperty(Class.class.getName(), Class.class)); + assertEquals(byte[].class, part.getTypeClass()); assertFalse(itr.hasNext()); Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/AbstractServiceConfiguration.java Sun Oct 29 20:56:21 2006 @@ -122,6 +122,14 @@ return null; } + public QName getInPartName(final OperationInfo op, final Method method, final int paramNumber) { + return null; + } + + public QName getOutPartName(final OperationInfo op, final Method method, final int paramNumber) { + return null; + } + public QName getInterfaceName() { return null; } 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?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- 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 Sun Oct 29 20:56:21 2006 @@ -44,9 +44,19 @@ } @Override + public QName getInPartName(OperationInfo op, Method method, int paramNumber) { + return getInParameterName(op, method, paramNumber); + } + + @Override + public QName getOutPartName(OperationInfo op, Method method, int paramNumber) { + return getOutParameterName(op, method, paramNumber); + } + + @Override public QName getInParameterName(OperationInfo op, Method method, int paramNumber) { - return new QName(op.getName().getNamespaceURI(), createName(method, paramNumber, op.getInput() - .getMessageParts().size(), false, "in")); + return new QName(op.getName().getNamespaceURI(), + getDefaultLocalName(op, method, paramNumber, "in")); } @Override @@ -56,11 +66,26 @@ @Override public QName getOutParameterName(OperationInfo op, Method method, int paramNumber) { - return new QName(op.getName().getNamespaceURI(), createName(method, paramNumber, op.getOutput() - .getMessageParts().size(), false, "out")); + return new QName(op.getName().getNamespaceURI(), + getDefaultLocalName(op, method, paramNumber, "out")); + } + + private String getDefaultLocalName(OperationInfo op, Method method, int paramNumber, String prefix) { + Class impl = getServiceFactory().getServiceClass(); + // try to grab the implementation class so we can read the debug symbols from it + if (impl == null) { + try { + method = impl.getMethod(method.getName(), method.getParameterTypes()); + } catch (Exception e) { + throw new ServiceConstructionException(e); + } + } + + return DefaultServiceConfiguration.createName(method, paramNumber, op.getInput() + .getMessageParts().size(), false, prefix); } - private String createName(final Method method, final int paramNumber, final int currentSize, + public static String createName(final Method method, final int paramNumber, final int currentSize, boolean addMethodName, final String flow) { String paramName = ""; 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?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- 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 Sun Oct 29 20:56:21 2006 @@ -43,6 +43,7 @@ import org.apache.cxf.endpoint.EndpointImpl; import org.apache.cxf.helpers.MethodComparator; import org.apache.cxf.interceptor.Fault; +import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.service.Service; import org.apache.cxf.service.ServiceImpl; import org.apache.cxf.service.invoker.ApplicationScopePolicy; @@ -77,6 +78,7 @@ */ public class ReflectionServiceFactoryBean extends AbstractServiceFactoryBean { + public static final String GENERIC_TYPE = "generic.type"; private static final Logger LOG = Logger.getLogger(ReflectionServiceFactoryBean.class.getName()); private static final ResourceBundle BUNDLE = BundleUtils.getBundle(ReflectionServiceFactoryBean.class); @@ -96,7 +98,8 @@ public ReflectionServiceFactoryBean() { getServiceConfigurations().add(0, new DefaultServiceConfiguration()); - + setDataBinding(new JAXBDataBinding()); + ignoredClasses.add("java.lang.Object"); ignoredClasses.add("java.lang.Throwable"); ignoredClasses.add("org.omg.CORBA_2_3.portable.ObjectImpl"); @@ -172,6 +175,10 @@ setService(factory.create()); initializeWSDLOperations(); + + if (getDataBinding() != null) { + getDataBinding().initialize(getService().getServiceInfo()); + } } else { LOG.info("Creating Service " + getServiceQName() + " from class " + getServiceClass().getName()); // If we can't find the wsdlLocation, then we should build a service model ufrom the class. @@ -400,7 +407,8 @@ if (!isHeader(method, j) && isInParam(method, j)) { final QName q = getInParameterName(op, method, j); MessagePartInfo part = inMsg.addMessagePart(q); - part.setProperty(Class.class.getName(), paramClasses[j]); + part.setTypeClass(paramClasses[j]); + part.setProperty(GENERIC_TYPE, method.getGenericParameterTypes()[j]); } } @@ -413,7 +421,8 @@ if (!returnType.isAssignableFrom(void.class) && !isHeader(method, -1)) { final QName q = getOutParameterName(op, method, -1); MessagePartInfo part = outMsg.addMessagePart(q); - part.setProperty(Class.class.getName(), method.getReturnType()); + part.setTypeClass(method.getReturnType()); + part.setProperty(GENERIC_TYPE, method.getGenericReturnType()); } for (int j = 0; j < paramClasses.length; j++) { @@ -421,7 +430,8 @@ && isOutParam(method, j)) { final QName q = getInParameterName(op, method, j); MessagePartInfo part = outMsg.addMessagePart(q); - part.setProperty(Class.class.getName(), paramClasses[j]); + part.setTypeClass(paramClasses[j]); + part.setProperty(GENERIC_TYPE, method.getGenericParameterTypes()[j]); } } } @@ -593,7 +603,7 @@ fi.setProperty(Class.class.getName(), exClass); MessagePartInfo mpi = fi.addMessagePart(faultName); - mpi.setProperty(Class.class.getName(), beanClass); + mpi.setTypeClass(beanClass); return fi; } @@ -667,11 +677,32 @@ return true; } + protected QName getInPartName(final OperationInfo op, + final Method method, + final int paramNumber) { + if (paramNumber == -1) { + return null; + } + + if (isWrapped(method)) { + return getInParameterName(op, method, paramNumber); + } + + for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) { + AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next(); + QName q = c.getInPartName(op, method, paramNumber); + if (q != null) { + return q; + } + } + throw new IllegalStateException("ServiceConfiguration must provide a value!"); + } + protected QName getInParameterName(final OperationInfo op, final Method method, final int paramNumber) { if (paramNumber == -1) { - throw new RuntimeException(); + return null; } for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) { AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next(); @@ -696,7 +727,23 @@ throw new IllegalStateException("ServiceConfiguration must provide a value!"); } - + protected QName getOutPartName(final OperationInfo op, + final Method method, + final int paramNumber) { + if (isWrapped(method)) { + return getOutParameterName(op, method, paramNumber); + } + + for (Iterator itr = serviceConfigurations.iterator(); itr.hasNext();) { + AbstractServiceConfiguration c = (AbstractServiceConfiguration)itr.next(); + QName q = c.getOutPartName(op, method, paramNumber); + if (q != null) { + return q; + } + } + throw new IllegalStateException("ServiceConfiguration must provide a value!"); + } + protected Class getResponseWrapper(Method selected) { for (AbstractServiceConfiguration c : serviceConfigurations) { Class cls = c.getResponseWrapper(selected); Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/SimpleMethodDispatcher.java Sun Oct 29 20:56:21 2006 @@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.interceptor.WrappedInInterceptor; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.BindingOperationInfo; import org.apache.cxf.service.model.OperationInfo; @@ -84,8 +83,8 @@ BindingOperationInfo unwrappedOp = bop.getUnwrappedOperation(); if (unwrappedOp != null && unwrappedOp.getOperationInfo().equals(o.getUnwrappedOperation()) - && unwrappedOp.getOperationInfo().getInput() - .getProperty(WrappedInInterceptor.WRAPPER_CLASS) != null) { + && unwrappedOp.getWrappedOperation().getInput().getMessageInfo() + .getMessagePartByIndex(0).getTypeClass() != null) { bop = unwrappedOp; } return bop; Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ClientFactoryBeanTest.java Sun Oct 29 20:56:21 2006 @@ -27,7 +27,6 @@ import org.apache.cxf.binding.soap.model.SoapOperationInfo; import org.apache.cxf.endpoint.Client; import org.apache.cxf.endpoint.Endpoint; -import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.BindingOperationInfo; @@ -42,7 +41,6 @@ cfBean.setTransportId("http://schemas.xmlsoap.org/soap/http"); cfBean.setBus(getBus()); cfBean.setServiceClass(HelloService.class); - cfBean.getServiceFactory().setDataBinding(new JAXBDataBinding(HelloService.class)); Client client = cfBean.create(); assertNotNull(client); Modified: incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java (original) +++ incubator/cxf/trunk/rt/frontend/simple/src/test/java/org/apache/cxf/service/factory/ReflectionServiceFactoryTest.java Sun Oct 29 20:56:21 2006 @@ -30,7 +30,6 @@ import org.apache.cxf.binding.soap.model.SoapOperationInfo; import org.apache.cxf.endpoint.Endpoint; import org.apache.cxf.endpoint.Server; -import org.apache.cxf.jaxb.JAXBDataBinding; import org.apache.cxf.service.Service; import org.apache.cxf.service.model.BindingInfo; import org.apache.cxf.service.model.BindingOperationInfo; @@ -67,7 +66,7 @@ MessagePartInfo mpi = messageParts.get(0); assertEquals("out", mpi.getName().getLocalPart()); - assertEquals(String.class, mpi.getProperty(Class.class.getName())); + assertEquals(String.class, mpi.getTypeClass()); OperationInfo op = si.getInterface().getOperation(new QName(ns, "echoWithExchange")); @@ -111,12 +110,11 @@ assertEquals(1, messageParts.size()); MessagePartInfo mpi = messageParts.get(0); assertEquals("out", mpi.getName().getLocalPart()); - assertEquals(String.class, mpi.getProperty(Class.class.getName())); + assertEquals(String.class, mpi.getTypeClass()); } private Service createService(boolean wrapped) throws JAXBException { serviceFactory = new ReflectionServiceFactoryBean(); - serviceFactory.setDataBinding(new JAXBDataBinding(HelloService.class)); serviceFactory.setBus(getBus()); serviceFactory.setServiceClass(HelloService.class); serviceFactory.setWrapped(wrapped); Modified: incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java (original) +++ incubator/cxf/trunk/rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/impl/Proxy.java Sun Oct 29 20:56:21 2006 @@ -38,8 +38,12 @@ import org.apache.cxf.service.model.ServiceInfo; import org.apache.cxf.ws.addressing.RelatesToType; import org.apache.cxf.ws.addressing.v200408.EndpointReferenceType; +import org.apache.cxf.ws.rm.CreateSequenceResponseType; +import org.apache.cxf.ws.rm.CreateSequenceType; import org.apache.cxf.ws.rm.DestinationSequence; import org.apache.cxf.ws.rm.RMConstants; +import org.apache.cxf.ws.rm.SequenceFaultType; +import org.apache.cxf.ws.rm.TerminateSequenceType; /** * @@ -92,7 +96,10 @@ service = new ServiceImpl(si); DataBinding dataBinding = null; try { - dataBinding = new JAXBDataBinding(SequenceService.class); + dataBinding = new JAXBDataBinding(CreateSequenceType.class, + CreateSequenceResponseType.class, + TerminateSequenceType.class, + SequenceFaultType.class); } catch (JAXBException e) { throw new ServiceConstructionException(e); } Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java?view=diff&rev=469066&r1=469065&r2=469066 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/mtom/ClientMtomXopTest.java Sun Oct 29 20:56:21 2006 @@ -132,6 +132,7 @@ DataHandler dhResp = hello.claimForm(dh); DataSource ds = dhResp.getDataSource(); InputStream in = ds.getInputStream(); + long count = 0; for (int i = in.read(); i != -1; i = in.read()) { count++; @@ -142,7 +143,7 @@ } } - public void testMtomXop() throws Exception { + public void xtestMtomXop() throws Exception { Hello hello = createPort(HELLO_SERVICE, HELLO_PORT, Hello.class); try { InputStream pre = this.getClass().getResourceAsStream("/wsdl/mtom_xop.wsdl");