Author: tli
Date: Mon Oct 9 20:07:55 2006
New Revision: 454588
URL: http://svn.apache.org/viewvc?view=rev&rev=454588
Log:
add rpc type_test, and turn on adding JAXB array class into JAXB context
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
(with props)
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
(with props)
Modified:
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Modified:
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java?view=diff&rev=454588&r1=454587&r2=454588
==============================================================================
---
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
(original)
+++
incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
Mon Oct 9 20:07:55 2006
@@ -156,7 +156,8 @@
GenericArrayType gt = (GenericArrayType)cls;
Class ct = (Class) gt.getGenericComponentType();
ct = Array.newInstance(ct, 0).getClass();
- addType(ct, classes);
+ //addType(ct, classes);
+ classes.add(ct);
}
}
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java?view=auto&rev=454588
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
(added)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
Mon Oct 9 20:07:55 2006
@@ -0,0 +1,227 @@
+/**
+ * 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.systest.type_test.soap;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPFactory;
+import javax.xml.ws.Holder;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+import org.apache.cxf.systest.common.ClientServerSetupBase;
+import org.apache.cxf.systest.type_test.AbstractTypeTestClient5;
+import org.apache.type_test.types2.StructWithAnyArrayLax;
+import org.apache.type_test.types2.StructWithAnyStrict;
+
+public class SOAPRpcLitClientTypeTest extends AbstractTypeTestClient5 {
+ static final String WSDL_PATH =
"/wsdl/type_test/type_test_rpclit_soap.wsdl";
+
+ static final QName SERVICE_NAME = new
QName("http://apache.org/type_test/rpc";, "SOAPService");
+
+ static final QName PORT_NAME = new
QName("http://apache.org/type_test/rpc";, "SOAPPort");
+
+ public SOAPRpcLitClientTypeTest(String name) {
+ super(name, SERVICE_NAME, PORT_NAME, WSDL_PATH);
+ }
+
+ public static Test suite() throws Exception {
+ TestSuite suite = new TestSuite(SOAPRpcLitClientTypeTest.class);
+ return new ClientServerSetupBase(suite) {
+ public void startServers() throws Exception {
+ boolean ok = launchServer(SOAPRpcLitServerImpl.class);
+ assertTrue("failed to launch server", ok);
+ }
+ };
+ }
+
+ public void testStructWithAnyStrict() throws Exception {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement elem = factory.createElement("StringElementQualified",
"tns",
+ "http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ elem.addTextNode("This is the text of the node");
+
+ StructWithAnyStrict x = new StructWithAnyStrict();
+ x.setName("Name x");
+ x.setAddress("Some Address x");
+ x.setAny(elem);
+
+ elem = factory.createElement("StringElementQualified", "tns",
"http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ elem.addTextNode("This is the text of the second node");
+
+ StructWithAnyStrict yOrig = new StructWithAnyStrict();
+ yOrig.setName("Name y");
+ yOrig.setAddress("Some Address y");
+ yOrig.setAny(elem);
+
+ Holder<StructWithAnyStrict> y = new Holder<StructWithAnyStrict>(yOrig);
+ Holder<StructWithAnyStrict> z = new Holder<StructWithAnyStrict>();
+ StructWithAnyStrict ret = rpcClient.testStructWithAnyStrict(x, y, z);
+ if (!perfTestOnly) {
+ assertEqualsStructWithAnyStrict(x, y.value);
+ assertEqualsStructWithAnyStrict(yOrig, z.value);
+ assertEqualsStructWithAnyStrict(x, ret);
+ }
+ }
+
+ public void testStructWithAnyStrictComplex() throws Exception {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement elem = factory.createElement("AnonTypeElementQualified",
"tns",
+ "http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ SOAPElement floatElem = factory
+ .createElement("varFloat", "tns",
"http://apache.org/type_test/types1";);
+ floatElem.addTextNode("12.5");
+ elem.addChildElement(floatElem);
+ SOAPElement intElem = factory.createElement("varInt", "tns",
"http://apache.org/type_test/types1";);
+ intElem.addTextNode("34");
+ elem.addChildElement(intElem);
+ SOAPElement stringElem = factory.createElement("varString", "tns",
+ "http://apache.org/type_test/types1";);
+ stringElem.addTextNode("test string within any");
+ elem.addChildElement(stringElem);
+
+ StructWithAnyStrict x = new StructWithAnyStrict();
+ x.setName("Name x");
+ x.setAddress("Some Address x");
+ x.setAny(elem);
+
+ elem = factory.createElement("AnonTypeElementQualified", "tns",
"http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ floatElem = factory.createElement("varFloat", "tns",
"http://apache.org/type_test/types1";);
+ floatElem.addTextNode("12.76");
+ elem.addChildElement(floatElem);
+ intElem = factory.createElement("varInt", "tns",
"http://apache.org/type_test/types1";);
+ intElem.addTextNode("56");
+ elem.addChildElement(intElem);
+ stringElem = factory.createElement("varString", "tns",
"http://apache.org/type_test/types1";);
+ stringElem.addTextNode("test string");
+ elem.addChildElement(stringElem);
+
+ StructWithAnyStrict yOrig = new StructWithAnyStrict();
+ yOrig.setName("Name y");
+ yOrig.setAddress("Some Address y");
+ yOrig.setAny(elem);
+
+ Holder<StructWithAnyStrict> y = new Holder<StructWithAnyStrict>(yOrig);
+ Holder<StructWithAnyStrict> z = new Holder<StructWithAnyStrict>();
+ StructWithAnyStrict ret = rpcClient.testStructWithAnyStrict(x, y, z);
+ if (!perfTestOnly) {
+ assertEqualsStructWithAnyStrict(x, y.value);
+ assertEqualsStructWithAnyStrict(yOrig, z.value);
+ assertEqualsStructWithAnyStrict(x, ret);
+ }
+ }
+
+ public void testStructWithAnyArrayLax() throws Exception {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement elem = factory.createElement("StringElementQualified",
"tns",
+ "http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ elem.addTextNode("This is the text of the node");
+
+ StructWithAnyArrayLax x = new StructWithAnyArrayLax();
+ x.setName("Name x");
+ x.setAddress("Some Address x");
+ x.getAny().add(elem);
+
+ elem = factory.createElement("StringElementQualified", "tns",
"http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ elem.addTextNode("This is the text of the node for the second struct");
+
+ StructWithAnyArrayLax yOrig = new StructWithAnyArrayLax();
+ yOrig.setName("Name y");
+ yOrig.setAddress("Some Other Address y");
+ yOrig.getAny().add(elem);
+
+ Holder<StructWithAnyArrayLax> y = new
Holder<StructWithAnyArrayLax>(yOrig);
+ Holder<StructWithAnyArrayLax> z = new Holder<StructWithAnyArrayLax>();
+ StructWithAnyArrayLax ret = rpcClient.testStructWithAnyArrayLax(x, y,
z);
+ if (!perfTestOnly) {
+ assertEqualsStructWithAnyArrayLax(x, y.value);
+ assertEqualsStructWithAnyArrayLax(yOrig, z.value);
+ assertEqualsStructWithAnyArrayLax(x, ret);
+ }
+ }
+
+ public void testStructWithAnyArrayLaxComplex() throws Exception {
+ SOAPFactory factory = SOAPFactory.newInstance();
+ SOAPElement elem = factory.createElement("AnonTypeElementQualified",
"tns",
+ "http://apache.org/type_test/types1";);
+ elem.addNamespaceDeclaration("tns",
"http://apache.org/type_test/types1";);
+ SOAPElement floatElem = factory
+ .createElement("varFloat", "tns",
"http://apache.org/type_test/types1";);
+ floatElem.addTextNode("12.76");
+ elem.addChildElement(floatElem);
+ SOAPElement intElem = factory.createElement("varInt", "tns",
"http://apache.org/type_test/types1";);
+ intElem.addTextNode("56");
+ elem.addChildElement(intElem);
+ SOAPElement stringElem = factory.createElement("varString", "tns",
+ "http://apache.org/type_test/types1";);
+ stringElem.addTextNode("test string");
+ elem.addChildElement(stringElem);
+
+ StructWithAnyArrayLax x = new StructWithAnyArrayLax();
+ x.setName("Name x");
+ x.setAddress("Some Address x");
+ x.getAny().add(elem);
+ StructWithAnyArrayLax yOrig = new StructWithAnyArrayLax();
+ yOrig.setName("Name y");
+ yOrig.setAddress("Some Other Address y");
+ yOrig.getAny().add(elem);
+
+ Holder<StructWithAnyArrayLax> y = new
Holder<StructWithAnyArrayLax>(yOrig);
+ Holder<StructWithAnyArrayLax> z = new Holder<StructWithAnyArrayLax>();
+ StructWithAnyArrayLax ret = rpcClient.testStructWithAnyArrayLax(x, y,
z);
+ if (!perfTestOnly) {
+ assertEqualsStructWithAnyArrayLax(x, y.value);
+ assertEqualsStructWithAnyArrayLax(yOrig, z.value);
+ assertEqualsStructWithAnyArrayLax(x, ret);
+ }
+ }
+
+ public void assertEqualsStructWithAnyStrict(StructWithAnyStrict a,
StructWithAnyStrict b)
+ throws Exception {
+ assertEquals("StructWithAnyStrict names don't match", a.getName(),
b.getName());
+ assertEquals("StructWithAnyStrict addresses don't match",
a.getAddress(), b.getAddress());
+ if (a.getAny() instanceof SOAPElement && b.getAny() instanceof
SOAPElement) {
+ assertEquals((SOAPElement) a.getAny(), (SOAPElement) b.getAny());
+ }
+ }
+
+ public void assertEqualsStructWithAnyArrayLax(StructWithAnyArrayLax a,
StructWithAnyArrayLax b)
+ throws Exception {
+ assertEquals("StructWithAnyArrayLax names don't match", a.getName(),
b.getName());
+ assertEquals("StructWithAnyArrayLax addresses don't match",
a.getAddress(), b.getAddress());
+
+ List<Object> ae = a.getAny();
+ List<Object> be = b.getAny();
+ assertEquals("StructWithAnyArrayLax soap element lengths don't match",
ae.size(), be.size());
+ for (int i = 0; i < ae.size(); i++) {
+ if (ae.get(i) instanceof SOAPElement && be.get(i) instanceof
SOAPElement) {
+ assertEquals(ae.get(i), be.get(i));
+ }
+ }
+ }
+}
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java?view=auto&rev=454588
==============================================================================
---
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
(added)
+++
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
Mon Oct 9 20:07:55 2006
@@ -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.cxf.systest.type_test.soap;
+
+import javax.jws.WebService;
+import javax.xml.ws.Endpoint;
+
+import org.apache.cxf.systest.common.TestServerBase;
+import org.apache.cxf.systest.type_test.TypeTestImpl;
+import org.apache.type_test.rpc.TypeTestPortType;
+
+public class SOAPRpcLitServerImpl extends TestServerBase {
+
+ public void run() {
+
+ Object implementor = new SOAPTypeTestImpl();
+ String address = "http://localhost:9006/SOAPService/SOAPPort/";;
+ Endpoint.publish(address, implementor);
+ }
+
+ public static void main(String args[]) {
+ try {
+ SOAPRpcLitServerImpl s = new SOAPRpcLitServerImpl();
+ s.start();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ System.exit(-1);
+ } finally {
+ System.out.println("done!");
+ }
+ }
+
+ @WebService(serviceName = "SOAPService",
+ portName = "SOAPPort",
+ endpointInterface =
"org.apache.type_test.rpc.TypeTestPortType",
+ targetNamespace = "http://apache.org/type_test/rpc";)
+ class SOAPTypeTestImpl extends TypeTestImpl implements TypeTestPortType {
+ }
+}
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
