Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 79627 invoked from network); 30 Jan 2007 09:26:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Jan 2007 09:26:55 -0000 Received: (qmail 70681 invoked by uid 500); 30 Jan 2007 09:27:01 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 70594 invoked by uid 500); 30 Jan 2007 09:27:00 -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 70570 invoked by uid 99); 30 Jan 2007 09:27:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jan 2007 01:27:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,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; Tue, 30 Jan 2007 01:26:53 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 496A51A981A; Tue, 30 Jan 2007 01:26:33 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r501354 - in /incubator/cxf/trunk: systests/src/test/java/org/apache/cxf/systest/jaxws/ testutils/ testutils/src/main/java/org/apache/cxf/ordered_param_holder/ testutils/src/main/resources/wsdl/ Date: Tue, 30 Jan 2007 09:26:32 -0000 To: cxf-commits@incubator.apache.org From: tli@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070130092633.496A51A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tli Date: Tue Jan 30 01:26:31 2007 New Revision: 501354 URL: http://svn.apache.org/viewvc?view=rev&rev=501354 Log: CXF-367 add systest for this jira bug Added: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java (with props) incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl (with props) Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java incubator/cxf/trunk/testutils/pom.xml Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java?view=diff&rev=501354&r1=501353&r2=501354 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ClientServerMiscTest.java Tue Jan 30 01:26:31 2007 @@ -22,6 +22,7 @@ import java.lang.reflect.UndeclaredThrowableException; import javax.xml.namespace.QName; +import javax.xml.ws.Holder; import junit.framework.Test; import junit.framework.TestSuite; @@ -33,6 +34,9 @@ import org.apache.cxf.anonymous_complex_type.SplitNameResponse.Names; import org.apache.cxf.jaxb_element_test.JaxbElementTest; import org.apache.cxf.jaxb_element_test.JaxbElementTest_Service; +import org.apache.cxf.ordered_param_holder.ComplexStruct; +import org.apache.cxf.ordered_param_holder.OrderedParamHolder; +import org.apache.cxf.ordered_param_holder.OrderedParamHolder_Service; import org.apache.cxf.systest.common.ClientServerSetupBase; import org.apache.cxf.systest.common.ClientServerTestBase; @@ -100,6 +104,37 @@ assertNotNull(response); assertEquals("in=null", response); + } catch (UndeclaredThrowableException ex) { + throw (Exception) ex.getCause(); + } + } + + public void testOrderedParamHolder() throws Exception { + OrderedParamHolder_Service service = new OrderedParamHolder_Service(); + OrderedParamHolder port = service.getOrderedParamHolderSOAP(); + + try { + Holder part3 = new Holder(); + part3.value = new ComplexStruct(); + part3.value.setElem1("elem1"); + part3.value.setElem2("elem2"); + part3.value.setElem3(0); + Holder part2 = new Holder(); + part2.value = 0; + Holder part1 = new Holder(); + part1.value = "part1"; + + port.orderedParamHolder(part3, part2, part1); + + assertNotNull(part3.value); + assertEquals("check value", "return elem1", part3.value.getElem1()); + assertEquals("check value", "return elem2", part3.value.getElem2()); + assertEquals("check value", 1, part3.value.getElem3()); + assertNotNull(part2.value); + assertEquals("check value", 1, part2.value.intValue()); + assertNotNull(part1.value); + assertEquals("check value", "return part1", part1.value); + } catch (UndeclaredThrowableException ex) { throw (Exception) ex.getCause(); } Modified: incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java?view=diff&rev=501354&r1=501353&r2=501354 ============================================================================== --- incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java (original) +++ incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/jaxws/ServerMisc.java Tue Jan 30 01:26:31 2007 @@ -23,6 +23,7 @@ import org.apache.cxf.anonymous_complex_type.AnonymousComplexTypeImpl; import org.apache.cxf.jaxb_element_test.JaxbElementTestImpl; +import org.apache.cxf.ordered_param_holder.OrderedParamHolderImpl; import org.apache.cxf.systest.common.TestServerBase; @@ -36,6 +37,11 @@ Object implementor2 = new JaxbElementTestImpl(); address = "http://localhost:9001/jaxb_element_test"; Endpoint.publish(address, implementor2); + + Object implementor3 = new OrderedParamHolderImpl(); + address = "http://localhost:9002/ordered_param_holder/"; + Endpoint.publish(address, implementor3); + } public static void main(String[] args) { Modified: incubator/cxf/trunk/testutils/pom.xml URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/pom.xml?view=diff&rev=501354&r1=501353&r2=501354 ============================================================================== --- incubator/cxf/trunk/testutils/pom.xml (original) +++ incubator/cxf/trunk/testutils/pom.xml Tue Jan 30 01:26:31 2007 @@ -329,7 +329,9 @@ ${basedir}/src/main/resources/wsdl/jaxb_element_test.wsdl - + + ${basedir}/src/main/resources/wsdl/ordered_param_holder.wsdl + Added: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java?view=auto&rev=501354 ============================================================================== --- incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java (added) +++ incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java Tue Jan 30 01:26:31 2007 @@ -0,0 +1,41 @@ +/** + * 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.ordered_param_holder; + +import javax.jws.WebService; +import javax.xml.ws.Holder; + +@WebService(serviceName = "ordered_param_holder", + portName = "ordered_param_holderSOAP", + targetNamespace = "http://cxf.apache.org/ordered_param_holder/", + endpointInterface = "org.apache.cxf.ordered_param_holder.OrderedParamHolder") + +public class OrderedParamHolderImpl implements OrderedParamHolder { + + public void orderedParamHolder(Holder part3, Holder part2, Holder part1) { + // TODO Auto-generated method stub + part2.value = new Integer(part2.value.intValue() + 1); + part1.value = "return " + part1.value; + part3.value.elem1 = "return " + part3.value.elem1; + part3.value.elem2 = "return " + part3.value.elem2; + part3.value.elem3++; + } + +} Propchange: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/testutils/src/main/java/org/apache/cxf/ordered_param_holder/OrderedParamHolderImpl.java ------------------------------------------------------------------------------ svn:keywords = Rev Date Added: incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl?view=auto&rev=501354 ============================================================================== --- incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl (added) +++ incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl Tue Jan 30 01:26:31 2007 @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Propchange: incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl ------------------------------------------------------------------------------ svn:keywords = Rev Date Propchange: incubator/cxf/trunk/testutils/src/main/resources/wsdl/ordered_param_holder.wsdl ------------------------------------------------------------------------------ svn:mime-type = text/xml