[jboss-svn-commits] JBossWS SVN: r597 - in trunk/src/test: java/org/jboss/test/ws java/org/jboss/test/ws/jaxb java/org/jboss/test/ws/jbossxb java/org/jboss/test/ws/jbossxb/array java/org/jboss/test/ws/jbossxb/complex java/org/jboss/test/ws/jbossxb/docstyle java/org/jboss/test/ws/jbossxb/holders java/org/jboss/test/ws/jbossxb/multixsd java/org/jboss/test/ws/jbossxb/multixsd/packa java/org/jboss/test/ws/jbossxb/multixsd/packb java/org/jboss/test/ws/jbossxb/simple java/org/jboss/test/ws/tools java/org/jboss/test/ws/tools/assertions/sei java/org/jboss/test/ws/tools/holders java/org/jboss/test/ws/tools/java2xsd java/org/jboss/test/ws/tools/jbws_161/multixsd resources resources/jbossxb
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 13 07:27:14 EDT 2006
Author: thomas.diesler at jboss.com
Date: 2006-07-13 07:26:52 -0400 (Thu, 13 Jul 2006)
New Revision: 597
Added:
trunk/src/test/java/org/jboss/test/ws/jbossxb/
trunk/src/test/java/org/jboss/test/ws/jbossxb/SerializerDeserializerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/
trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/
trunk/src/test/java/org/jboss/test/ws/jbossxb/holders/
trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/
trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/
trunk/src/test/resources/jbossxb/
Removed:
trunk/src/test/java/org/jboss/test/ws/jaxb/SerializerDeserializerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jaxb/array/
trunk/src/test/java/org/jboss/test/ws/jaxb/complex/
trunk/src/test/java/org/jboss/test/ws/jaxb/docstyle/
trunk/src/test/java/org/jboss/test/ws/jaxb/holders/
trunk/src/test/java/org/jboss/test/ws/jaxb/multixsd/
trunk/src/test/java/org/jboss/test/ws/jaxb/simple/
trunk/src/test/resources/jaxb/
Modified:
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArray.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArrayMarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/CalendarArrayMarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/CalendarArrayUnmarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/QNameArrayMarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/array/QNameArrayUnmarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Base.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeMarshallerGenTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeMarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeUnmarshallerGenTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypes.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Composite.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Derived.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/EchoString_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/EchoString_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/holders/HoldersServiceInterface.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/Order.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/packa/Person.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/packb/Item.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/EchoSimpleUserType_RequestStruct.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/EchoSimpleUserType_ResponseStruct.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserType.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java
trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java
trunk/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
trunk/src/test/java/org/jboss/test/ws/tools/assertions/sei/MultiXSDInvalidInterface.java
trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
trunk/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
trunk/src/test/java/org/jboss/test/ws/tools/jbws_161/multixsd/MultiXSDSEI.java
trunk/src/test/resources/jbossxb/ComplexTypesService_RPC.xml
trunk/src/test/resources/jbossxb/DocumentStyle.xml
trunk/src/test/resources/jbossxb/config.xml
trunk/src/test/resources/jbossxb/wstools-config.xml
Log:
move test package jaxb -> jbossxb
Deleted: trunk/src/test/java/org/jboss/test/ws/jaxb/SerializerDeserializerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/SerializerDeserializerTestCase.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/jaxb/SerializerDeserializerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -1,214 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.ws.jaxb;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import javax.xml.namespace.QName;
-import javax.xml.rpc.encoding.TypeMappingRegistry;
-
-import org.jboss.test.ws.JBossWSTest;
-import org.jboss.ws.Constants;
-import org.jboss.ws.binding.DeserializerSupport;
-import org.jboss.ws.binding.SerializationContext;
-import org.jboss.ws.binding.SerializerSupport;
-import org.jboss.ws.jaxrpc.JAXRPCSerializationContext;
-import org.jboss.ws.jaxrpc.TypeMappingImpl;
-import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
-import org.jboss.ws.jaxrpc.encoding.DeserializerFactoryBase;
-import org.jboss.ws.jaxrpc.encoding.SerializerFactoryBase;
-import org.jboss.xb.binding.NamespaceRegistry;
-
-/**
- * Test simple type serialization/deserialization
- *
- * [TODO] please provide additional tests as you add more types
- *
- * @author Thomas.Diesler at jboss.org
- * @since 18-Oct-2004
- */
-public class SerializerDeserializerTestCase extends JBossWSTest
-{
- private QName xmlName = new QName("http://org.jboss.ws", "root", "tns");
-
- private SerializationContext serContext;
- private NamespaceRegistry nsRegistry;
- private TypeMappingImpl typeMapping;
-
- protected void setUp() throws Exception
- {
- TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl();
- typeMapping = (TypeMappingImpl)tmRegistry.getDefaultTypeMapping();
-
- serContext = new JAXRPCSerializationContext();
- nsRegistry = new NamespaceRegistry();
-
- serContext.setTypeMapping(typeMapping);
- serContext.setNamespaceRegistry(nsRegistry);
- }
-
- public void testStringType() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_STRING;
- String value = "Hello World!";
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(String.class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(String.class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- String out = (String)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(value, out);
- }
-
- public void testDateTime() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_DATETIME;
- Calendar value = new GregorianCalendar(2004, 10, 20, 14, 53, 25);
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(Calendar.class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(Calendar.class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- Calendar out = (Calendar)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(value.getTime(), out.getTime());
- assertEquals(value.getTimeZone().getRawOffset(), out.getTimeZone().getRawOffset());
- }
-
- public void testInteger() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_INTEGER;
- BigInteger value = new BigInteger("12345678901234567890");
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(BigInteger.class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(BigInteger.class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- BigInteger out = (BigInteger)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(value, out);
- }
-
- public void testDecimal() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_DECIMAL;
- BigDecimal value = new BigDecimal("12345678901234567890");
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(BigDecimal.class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(BigDecimal.class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- BigDecimal out = (BigDecimal)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(value, out);
- }
-
- public void testQName() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_QNAME;
- QName value = new QName("http://some-ns", "localPart", "ns1");
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(QName.class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- // serialization registers the prefix
- assertEquals("ns1", nsRegistry.getPrefix("http://some-ns"));
- nsRegistry.unregisterURI("http://some-ns");
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(QName.class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- QName out = (QName)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(value, out);
- }
-
- public void testURI() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_ANYURI;
- URI value = new URI("http://someURI:that:has:more:parts");
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(URI.class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(URI.class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- URI out = (URI)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(value, out);
- }
-
- public void testBase64Binary() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_BASE64BINARY;
- byte[] value = new String("Some base64 binary string").getBytes();
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(byte[].class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(byte[].class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- byte[] out = (byte[])des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(new String(value), new String(out));
- }
-
- public void testHexBinary() throws Exception
- {
- QName xmlType = Constants.TYPE_LITERAL_HEXBINARY;
- byte[] value = new String("Some hex binary string").getBytes();
-
- SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(byte[].class, xmlType);
- SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
- String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
- assertNotNull(xmlFragment);
-
- DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(byte[].class, xmlType);
- DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
- byte[] out = (byte[])des.deserialize(xmlName, xmlType, xmlFragment, serContext);
-
- assertEquals(new String(value), new String(out));
- }
-
-}
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/SerializerDeserializerTestCase.java (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/SerializerDeserializerTestCase.java)
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/SerializerDeserializerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/SerializerDeserializerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -0,0 +1,214 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ws.jbossxb;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.net.URI;
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+import javax.xml.namespace.QName;
+import javax.xml.rpc.encoding.TypeMappingRegistry;
+
+import org.jboss.test.ws.JBossWSTest;
+import org.jboss.ws.Constants;
+import org.jboss.ws.binding.DeserializerSupport;
+import org.jboss.ws.binding.SerializationContext;
+import org.jboss.ws.binding.SerializerSupport;
+import org.jboss.ws.jaxrpc.JAXRPCSerializationContext;
+import org.jboss.ws.jaxrpc.TypeMappingImpl;
+import org.jboss.ws.jaxrpc.TypeMappingRegistryImpl;
+import org.jboss.ws.jaxrpc.encoding.DeserializerFactoryBase;
+import org.jboss.ws.jaxrpc.encoding.SerializerFactoryBase;
+import org.jboss.xb.binding.NamespaceRegistry;
+
+/**
+ * Test simple type serialization/deserialization
+ *
+ * [TODO] please provide additional tests as you add more types
+ *
+ * @author Thomas.Diesler at jboss.org
+ * @since 18-Oct-2004
+ */
+public class SerializerDeserializerTestCase extends JBossWSTest
+{
+ private QName xmlName = new QName("http://org.jboss.ws", "root", "tns");
+
+ private SerializationContext serContext;
+ private NamespaceRegistry nsRegistry;
+ private TypeMappingImpl typeMapping;
+
+ protected void setUp() throws Exception
+ {
+ TypeMappingRegistry tmRegistry = new TypeMappingRegistryImpl();
+ typeMapping = (TypeMappingImpl)tmRegistry.getDefaultTypeMapping();
+
+ serContext = new JAXRPCSerializationContext();
+ nsRegistry = new NamespaceRegistry();
+
+ serContext.setTypeMapping(typeMapping);
+ serContext.setNamespaceRegistry(nsRegistry);
+ }
+
+ public void testStringType() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_STRING;
+ String value = "Hello World!";
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(String.class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(String.class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ String out = (String)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(value, out);
+ }
+
+ public void testDateTime() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_DATETIME;
+ Calendar value = new GregorianCalendar(2004, 10, 20, 14, 53, 25);
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(Calendar.class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(Calendar.class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ Calendar out = (Calendar)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(value.getTime(), out.getTime());
+ assertEquals(value.getTimeZone().getRawOffset(), out.getTimeZone().getRawOffset());
+ }
+
+ public void testInteger() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_INTEGER;
+ BigInteger value = new BigInteger("12345678901234567890");
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(BigInteger.class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(BigInteger.class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ BigInteger out = (BigInteger)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(value, out);
+ }
+
+ public void testDecimal() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_DECIMAL;
+ BigDecimal value = new BigDecimal("12345678901234567890");
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(BigDecimal.class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(BigDecimal.class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ BigDecimal out = (BigDecimal)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(value, out);
+ }
+
+ public void testQName() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_QNAME;
+ QName value = new QName("http://some-ns", "localPart", "ns1");
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(QName.class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ // serialization registers the prefix
+ assertEquals("ns1", nsRegistry.getPrefix("http://some-ns"));
+ nsRegistry.unregisterURI("http://some-ns");
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(QName.class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ QName out = (QName)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(value, out);
+ }
+
+ public void testURI() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_ANYURI;
+ URI value = new URI("http://someURI:that:has:more:parts");
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(URI.class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(URI.class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ URI out = (URI)des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(value, out);
+ }
+
+ public void testBase64Binary() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_BASE64BINARY;
+ byte[] value = new String("Some base64 binary string").getBytes();
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(byte[].class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(byte[].class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ byte[] out = (byte[])des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(new String(value), new String(out));
+ }
+
+ public void testHexBinary() throws Exception
+ {
+ QName xmlType = Constants.TYPE_LITERAL_HEXBINARY;
+ byte[] value = new String("Some hex binary string").getBytes();
+
+ SerializerFactoryBase serializerFactory = (SerializerFactoryBase)typeMapping.getSerializer(byte[].class, xmlType);
+ SerializerSupport ser = (SerializerSupport)serializerFactory.getSerializer();
+ String xmlFragment = ser.serialize(xmlName, xmlType, value, serContext, null);
+ assertNotNull(xmlFragment);
+
+ DeserializerFactoryBase deserializerFactory = (DeserializerFactoryBase)typeMapping.getDeserializer(byte[].class, xmlType);
+ DeserializerSupport des = (DeserializerSupport)deserializerFactory.getDeserializer();
+ byte[] out = (byte[])des.deserialize(xmlName, xmlType, xmlFragment, serContext);
+
+ assertEquals(new String(value), new String(out));
+ }
+
+}
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/array (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/array)
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArray.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArray.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArray.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -23,7 +23,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.util.Arrays;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArrayMarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayMarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArrayMarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.io.StringWriter;
import java.math.BigDecimal;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/BigDecimalArrayUnmarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/BigDecimalArrayUnmarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.io.ByteArrayInputStream;
import java.math.BigDecimal;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/CalendarArrayMarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayMarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/CalendarArrayMarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.io.StringWriter;
import java.util.Calendar;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/CalendarArrayUnmarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/CalendarArrayUnmarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/CalendarArrayUnmarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.io.ByteArrayInputStream;
import java.util.Calendar;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/QNameArrayMarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayMarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/QNameArrayMarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.io.StringWriter;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/array/QNameArrayUnmarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/array/QNameArrayUnmarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/array/QNameArrayUnmarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.array;
+package org.jboss.test.ws.jbossxb.array;
import java.io.ByteArrayInputStream;
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/complex)
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Base.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/Base.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Base.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
/**
* 5.4 JAX-RPC Value Type
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeMarshallerGenTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeMarshallerGenTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeMarshallerGenTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeMarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeMarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeMarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
import java.io.File;
import java.io.StringWriter;
@@ -50,7 +50,7 @@
/** Get the URL to the defining schema */
protected XSModel getSchemaModel(QName xmlType, Class javaType) throws Exception
{
- File xsdFile = new File("resources/jaxb/ComplexTypesService_RPC.xsd");
+ File xsdFile = new File("resources/jbossxb/ComplexTypesService_RPC.xsd");
assertTrue(xsdFile.exists());
return parseSchema(xsdFile.toURL());
@@ -77,8 +77,12 @@
strwr = new StringWriter();
marshaller.marshal(obj, strwr);
- String exp = "<ns1:Base_1 xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>"
- + " <a>100</a>" + " <b>200</b>" + "</ns1:Base_1>";
+ String exp =
+ "<ns1:Base_1 xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
+ " <a>100</a>" +
+ " <b>200</b>" +
+ "</ns1:Base_1>";
+
String was = strwr.toString();
assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was));
}
@@ -105,8 +109,12 @@
strwr = new StringWriter();
marshaller.marshal(obj, strwr);
- String exp = "<ns1:Derived_1 xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>"
- + " <a>100</a>" + " <b>200</b>" + " <x>300</x>" + "</ns1:Derived_1>";
+ String exp =
+ "<ns1:Derived_1 xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
+ " <a>100</a>" +
+ " <b>200</b>" +
+ " <x>300</x>" +
+ "</ns1:Derived_1>";
String was = strwr.toString();
assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was));
@@ -145,11 +153,20 @@
strwr = new StringWriter();
marshaller.marshal(obj, strwr);
- String exp = "<ns1:CompositeType_1 xmlns:ns1='" + TARGET_NAMESPACE
- + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" + " <composite>" + " <composite xsi:nil='1'/>"
- + " <dateTime xsi:nil='1'/>" + " <integer>200</integer>" + " <qname xsi:nil='1'/>"
- + " <string>Hello Sub World!</string>" + " </composite>" + " <dateTime xsi:nil='1'/>" + " <integer>100</integer>"
- + " <qname xsi:nil='1'/>" + " <string>Hello World!</string>" + "</ns1:CompositeType_1>";
+ String exp =
+ "<ns1:CompositeType_1 xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
+ " <composite>" +
+ " <composite xsi:nil='1'/>" +
+ " <dateTime xsi:nil='1'/>" +
+ " <integer>200</integer>" +
+ " <qname xsi:nil='1'/>" +
+ " <string>Hello Sub World!</string>" +
+ " </composite>" +
+ " <dateTime xsi:nil='1'/>" +
+ " <integer>100</integer>" +
+ " <qname xsi:nil='1'/>" +
+ " <string>Hello World!</string>" +
+ "</ns1:CompositeType_1>";
String was = strwr.toString();
assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was));
@@ -161,7 +178,7 @@
private JavaWsdlMapping getJavaWSDLMapping() throws Exception
{
JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance();
- URL mappingURL = new File("resources/jaxb/ComplexTypesService_RPC.xml").toURL();
+ URL mappingURL = new File("resources/jbossxb/ComplexTypesService_RPC.xml").toURL();
JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL);
return javaWsdlMapping;
}
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeUnmarshallerGenTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeUnmarshallerGenTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeUnmarshallerGenTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
import org.apache.xerces.xs.XSModel;
import org.jboss.logging.Logger;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypeUnmarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypeUnmarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -50,7 +50,7 @@
/** Get the URL to the defining schema */
protected XSModel getSchemaModel(QName xmlType, Class javaType) throws Exception
{
- File xsdFile = new File("resources/jaxb/ComplexTypesService_RPC.xsd");
+ File xsdFile = new File("resources/jbossxb/ComplexTypesService_RPC.xsd");
assertTrue(xsdFile.exists());
return new JavaToXSD().parseSchema(xsdFile.toURL());
@@ -163,7 +163,7 @@
private JavaWsdlMapping getJavaWSDLMapping() throws Exception
{
JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance();
- URL mappingURL = new File("resources/jaxb/ComplexTypesService_RPC.xml").toURL();
+ URL mappingURL = new File("resources/jbossxb/ComplexTypesService_RPC.xml").toURL();
JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL);
return javaWsdlMapping;
}
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypes.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/ComplexTypes.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/ComplexTypes.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
import java.rmi.Remote;
import java.rmi.RemoteException;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Composite.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/Composite.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Composite.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
import javax.xml.namespace.QName;
import java.math.BigInteger;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Derived.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/complex/Derived.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/complex/Derived.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.complex;
+package org.jboss.test.ws.jbossxb.complex;
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/docstyle)
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/docstyle/DocumentStyleMarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/DocumentStyleMarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.docstyle;
+package org.jboss.test.ws.jbossxb.docstyle;
import java.io.File;
import java.io.StringWriter;
@@ -49,7 +49,7 @@
protected XSModel getSchemaModel() throws Exception
{
- File xsdFile = new File("resources/jaxb/DocumentStyle.xsd");
+ File xsdFile = new File("resources/jbossxb/DocumentStyle.xsd");
assertTrue(xsdFile.exists());
return parseSchema(xsdFile.toURL());
@@ -92,7 +92,7 @@
private JavaWsdlMapping getJavaWSDLMapping() throws Exception
{
JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance();
- URL mappingURL = new File("resources/jaxb/DocumentStyle.xml").toURL();
+ URL mappingURL = new File("resources/jbossxb/DocumentStyle.xml").toURL();
JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL);
return javaWsdlMapping;
}
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/DocumentStyleUnmarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.docstyle;
+package org.jboss.test.ws.jbossxb.docstyle;
import java.io.ByteArrayInputStream;
import java.io.File;
@@ -47,7 +47,7 @@
protected XSModel getSchemaModel() throws Exception
{
- File xsdFile = new File("resources/jaxb/DocumentStyle.xsd");
+ File xsdFile = new File("resources/jbossxb/DocumentStyle.xsd");
assertTrue(xsdFile.exists());
return parseSchema(xsdFile.toURL());
@@ -83,7 +83,7 @@
private JavaWsdlMapping getJavaWSDLMapping() throws Exception
{
JavaWsdlMappingFactory factory = JavaWsdlMappingFactory.newInstance();
- URL mappingURL = new File("resources/jaxb/DocumentStyle.xml").toURL();
+ URL mappingURL = new File("resources/jbossxb/DocumentStyle.xml").toURL();
JavaWsdlMapping javaWsdlMapping = factory.parse(mappingURL);
return javaWsdlMapping;
}
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/EchoString_RequestStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/docstyle/EchoString_RequestStruct.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/EchoString_RequestStruct.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -23,7 +23,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.docstyle;
+package org.jboss.test.ws.jbossxb.docstyle;
public class EchoString_RequestStruct
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/EchoString_ResponseStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/docstyle/EchoString_ResponseStruct.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/docstyle/EchoString_ResponseStruct.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -23,7 +23,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.docstyle;
+package org.jboss.test.ws.jbossxb.docstyle;
public class EchoString_ResponseStruct
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/holders (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/holders)
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/holders/HoldersServiceInterface.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/holders/HoldersServiceInterface.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/holders/HoldersServiceInterface.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.holders;
+package org.jboss.test.ws.jbossxb.holders;
import java.rmi.Remote;
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/multixsd)
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/Order.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/multixsd/Order.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/Order.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,10 +19,10 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.multixsd;
+package org.jboss.test.ws.jbossxb.multixsd;
-import org.jboss.test.ws.jaxb.multixsd.packa.Person;
-import org.jboss.test.ws.jaxb.multixsd.packb.Item;
+import org.jboss.test.ws.jbossxb.multixsd.packa.Person;
+import org.jboss.test.ws.jbossxb.multixsd.packb.Item;
public class Order
{
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/packa/Person.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/multixsd/packa/Person.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/packa/Person.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.multixsd.packa;
+package org.jboss.test.ws.jbossxb.multixsd.packa;
public class Person
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/packb/Item.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/multixsd/packb/Item.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/multixsd/packb/Item.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.multixsd.packb;
+package org.jboss.test.ws.jbossxb.multixsd.packb;
public class Item
Copied: trunk/src/test/java/org/jboss/test/ws/jbossxb/simple (from rev 594, trunk/src/test/java/org/jboss/test/ws/jaxb/simple)
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/EchoSimpleUserType_RequestStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/simple/EchoSimpleUserType_RequestStruct.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/EchoSimpleUserType_RequestStruct.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -23,7 +23,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.simple;
+package org.jboss.test.ws.jbossxb.simple;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/EchoSimpleUserType_ResponseStruct.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/simple/EchoSimpleUserType_ResponseStruct.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/EchoSimpleUserType_ResponseStruct.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -23,7 +23,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.simple;
+package org.jboss.test.ws.jbossxb.simple;
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserType.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserType.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserType.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.simple;
+package org.jboss.test.ws.jbossxb.simple;
/**
* @author Thomas.Diesler at jboss.org
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeMarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserTypeMarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.simple;
+package org.jboss.test.ws.jbossxb.simple;
import java.io.StringWriter;
@@ -50,15 +50,14 @@
String xsdSchema = generateSchema(xmlType, SimpleUserType.class);
String exp =
- "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES
- + " xmlns:tns='http://org.jboss.ws/types'>" +
- " <complexType name='SimpleUserType'>" +
- " <sequence>" +
- " <element name='a' type='int'/>" +
- " <element name='b' type='int'/>" +
- " </sequence>" +
- " </complexType>" +
- "</schema>";
+ "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>" +
+ " <complexType name='SimpleUserType'>" +
+ " <sequence>" +
+ " <element name='a' type='int'/>" +
+ " <element name='b' type='int'/>" +
+ " </sequence>" +
+ " </complexType>" +
+ "</schema>";
assertEquals(DOMUtils.parse(exp), DOMUtils.parse(xsdSchema));
}
@@ -85,8 +84,11 @@
assertNotNull("Resulting fragment cannot be null", was);
assertTrue("Resulting fragment cannot be empty", was.length() > 0);
- String exp = "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>"
- + " <a>0</a>" + " <b>0</b>" + "</ns1:SimpleUser>";
+ String exp =
+ "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>" +
+ " <a>0</a>" +
+ " <b>0</b>" +
+ "</ns1:SimpleUser>";
assertEquals(DOMUtils.parse(exp), DOMUtils.parse(was));
}
@@ -128,7 +130,7 @@
PackageMapping packageMapping = new PackageMapping(javaWsdlMapping);
javaWsdlMapping.addPackageMapping(packageMapping);
packageMapping.setNamespaceURI(TARGET_NAMESPACE);
- packageMapping.setPackageType("org.jboss.test.ws.jaxb");
+ packageMapping.setPackageType("org.jboss.test.ws.jbossxb");
return javaWsdlMapping;
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/jaxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/java/org/jboss/test/ws/jbossxb/simple/SimpleUserTypeUnmarshallerTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.ws.jaxb.simple;
+package org.jboss.test.ws.jbossxb.simple;
import java.io.ByteArrayInputStream;
@@ -49,9 +49,15 @@
QName xmlType = new QName(TARGET_NAMESPACE, "SimpleUserType", "ns1");
String xsdSchema = generateSchema(xmlType, SimpleUserType.class);
- String exp = "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>"
- + " <complexType name='SimpleUserType'>" + " <sequence>" + " <element name='a' type='int'/>" + " <element name='b' type='int'/>" + " </sequence>"
- + " </complexType>" + "</schema>";
+ String exp =
+ "<schema targetNamespace='http://org.jboss.ws/types' " + SCHEMA_NAMESPACES + " xmlns:tns='http://org.jboss.ws/types'>" +
+ " <complexType name='SimpleUserType'>" +
+ " <sequence>" +
+ " <element name='a' type='int'/>" +
+ " <element name='b' type='int'/>" +
+ " </sequence>" +
+ " </complexType>" +
+ "</schema>";
assertEquals(DOMUtils.parse(exp), DOMUtils.parse(xsdSchema));
}
@@ -70,7 +76,11 @@
unmarshaller.setProperty(JBossXBConstants.JBXB_TYPE_QNAME, xmlType);
unmarshaller.setProperty(JBossXBConstants.JBXB_JAVA_MAPPING, getJavaWSDLMapping());
- String xml = "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "'>" + " <a>0</a>" + " <b>0</b>" + "</ns1:SimpleUser>";
+ String xml =
+ "<ns1:SimpleUser xmlns:ns1='" + TARGET_NAMESPACE + "'>" +
+ " <a>0</a>" +
+ " <b>0</b>" +
+ "</ns1:SimpleUser>";
obj = (SimpleUserType)unmarshaller.unmarshal(new ByteArrayInputStream(xml.getBytes()));
@@ -111,7 +121,7 @@
PackageMapping packageMapping = new PackageMapping(javaWsdlMapping);
javaWsdlMapping.addPackageMapping(packageMapping);
packageMapping.setNamespaceURI(TARGET_NAMESPACE);
- packageMapping.setPackageType("org.jboss.test.ws.jaxb.simple");
+ packageMapping.setPackageType("org.jboss.test.ws.jbossxb.simple");
return javaWsdlMapping;
}
}
Modified: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL11TestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -25,7 +25,7 @@
import java.io.Writer;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxb.complex.ComplexTypes;
+import org.jboss.test.ws.jbossxb.complex.ComplexTypes;
import org.jboss.test.ws.tools.sei.ArrayInterface;
import org.jboss.test.ws.tools.sei.CustomInterface;
import org.jboss.test.ws.tools.sei.InheritenceChildInterface;
Modified: trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/JavaToWSDL20TestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -21,21 +21,7 @@
*/
package org.jboss.test.ws.tools;
-import java.io.File;
-import java.io.FileWriter;
-
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxb.complex.ComplexTypes;
-import org.jboss.test.ws.tools.sei.ArrayInterface;
-import org.jboss.test.ws.tools.sei.CustomInterface;
-import org.jboss.test.ws.tools.sei.PrimitiveTypes;
-import org.jboss.test.ws.tools.sei.ServiceException;
-import org.jboss.test.ws.tools.sei.StandardJavaTypes;
-import org.jboss.ws.Constants;
-import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
-import org.jboss.ws.metadata.wsdl.WSDLUtils;
-import org.jboss.ws.tools.JavaToWSDL;
-import org.jboss.ws.tools.WSToolsConstants;
/**
* Test jbossws Java -> WSDL20
Modified: trunk/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/SchemaGeneratorTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -25,9 +25,9 @@
import javax.xml.namespace.QName;
-import org.jboss.test.ws.jaxb.complex.Base;
-import org.jboss.test.ws.jaxb.complex.Composite;
-import org.jboss.test.ws.jaxb.complex.Derived;
+import org.jboss.test.ws.jbossxb.complex.Base;
+import org.jboss.test.ws.jbossxb.complex.Composite;
+import org.jboss.test.ws.jbossxb.complex.Derived;
import org.jboss.util.xml.DOMUtils;
import org.w3c.dom.Element;
Modified: trunk/src/test/java/org/jboss/test/ws/tools/assertions/sei/MultiXSDInvalidInterface.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/assertions/sei/MultiXSDInvalidInterface.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/assertions/sei/MultiXSDInvalidInterface.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -24,7 +24,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-import org.jboss.test.ws.jaxb.multixsd.Order;
+import org.jboss.test.ws.jbossxb.multixsd.Order;
/**
* Represents an invalid SEI that has a value type
Modified: trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/holders/StandardHoldersTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -24,7 +24,7 @@
import java.io.File;
import java.io.Writer;
-import org.jboss.test.ws.jaxb.holders.HoldersServiceInterface;
+import org.jboss.test.ws.jbossxb.holders.HoldersServiceInterface;
import org.jboss.test.ws.tools.WSToolsTest;
import org.jboss.test.ws.tools.fixture.JBossSourceComparator;
import org.jboss.test.ws.tools.validation.WSDL11Validator;
Modified: trunk/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/java2xsd/SchemaModelTestCase.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -28,8 +28,8 @@
import javax.xml.namespace.QName;
import org.jboss.test.ws.JBossWSTest;
-import org.jboss.test.ws.jaxb.complex.Derived;
-import org.jboss.test.ws.jaxb.simple.SimpleUserType;
+import org.jboss.test.ws.jbossxb.complex.Derived;
+import org.jboss.test.ws.jbossxb.simple.SimpleUserType;
import org.jboss.util.xml.DOMUtils;
import org.jboss.ws.Constants;
import org.jboss.ws.metadata.wsdl.xmlschema.JBossXSModel;
Modified: trunk/src/test/java/org/jboss/test/ws/tools/jbws_161/multixsd/MultiXSDSEI.java
===================================================================
--- trunk/src/test/java/org/jboss/test/ws/tools/jbws_161/multixsd/MultiXSDSEI.java 2006-07-13 10:03:14 UTC (rev 596)
+++ trunk/src/test/java/org/jboss/test/ws/tools/jbws_161/multixsd/MultiXSDSEI.java 2006-07-13 11:26:52 UTC (rev 597)
@@ -25,7 +25,7 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
-import org.jboss.test.ws.jaxb.complex.Derived;
+import org.jboss.test.ws.jbossxb.complex.Derived;
/**
* SEI that has types coming from different packages
Copied: trunk/src/test/resources/jbossxb (from rev 594, trunk/src/test/resources/jaxb)
Modified: trunk/src/test/resources/jbossxb/ComplexTypesService_RPC.xml
===================================================================
--- trunk/src/test/resources/jaxb/ComplexTypesService_RPC.xml 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/resources/jbossxb/ComplexTypesService_RPC.xml 2006-07-13 11:26:52 UTC (rev 597)
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
<package-mapping>
- <package-type>org.jboss.test.ws.jaxb</package-type>
+ <package-type>org.jboss.test.ws.jbossxb</package-type>
<namespaceURI>http://org.jboss.ws/types</namespaceURI>
</package-mapping>
<package-mapping>
- <package-type>org.jboss.test.ws.jaxb</package-type>
+ <package-type>org.jboss.test.ws.jbossxb</package-type>
<namespaceURI>http://org.jboss.ws</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.complex.Derived</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.complex.Derived</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/types">typeNS:Derived</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -28,7 +28,7 @@
</variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.complex.Composite</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.complex.Composite</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/types">typeNS:Composite</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -58,7 +58,7 @@
</variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.complex.Base</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.complex.Base</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/types">typeNS:Base</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -72,7 +72,7 @@
</variable-mapping>
</java-xml-type-mapping>
<service-interface-mapping>
- <service-interface>org.jboss.test.ws.jaxb.complex.ComplexTypesService</service-interface>
+ <service-interface>org.jboss.test.ws.jbossxb.complex.ComplexTypesService</service-interface>
<wsdl-service-name xmlns:serviceNS="http://org.jboss.ws">serviceNS:ComplexTypesService</wsdl-service-name>
<port-mapping>
<port-name>ComplexTypesPort</port-name>
@@ -80,7 +80,7 @@
</port-mapping>
</service-interface-mapping>
<service-endpoint-interface-mapping>
- <service-endpoint-interface>org.jboss.test.ws.jaxb.complex.ComplexTypes</service-endpoint-interface>
+ <service-endpoint-interface>org.jboss.test.ws.jbossxb.complex.ComplexTypes</service-endpoint-interface>
<wsdl-port-type xmlns:portTypeNS="http://org.jboss.ws">portTypeNS:ComplexTypes</wsdl-port-type>
<wsdl-binding xmlns:bindingNS="http://org.jboss.ws">bindingNS:ComplexTypesBinding</wsdl-binding>
<service-endpoint-method-mapping>
@@ -88,7 +88,7 @@
<wsdl-operation>echoBase</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxb.complex.Base</param-type>
+ <param-type>org.jboss.test.ws.jbossxb.complex.Base</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws">wsdlMsgNS:ComplexTypes_echoBase</wsdl-message>
<wsdl-message-part-name>Base_1</wsdl-message-part-name>
@@ -96,7 +96,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxb.complex.Base</method-return-value>
+ <method-return-value>org.jboss.test.ws.jbossxb.complex.Base</method-return-value>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws">wsdlMsgNS:ComplexTypes_echoBaseResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -106,7 +106,7 @@
<wsdl-operation>echoCompositeType</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxb.complex.Composite</param-type>
+ <param-type>org.jboss.test.ws.jbossxb.complex.Composite</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws">wsdlMsgNS:ComplexTypes_echoCompositeType</wsdl-message>
<wsdl-message-part-name>Composite_1</wsdl-message-part-name>
@@ -114,7 +114,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxb.complex.Composite</method-return-value>
+ <method-return-value>org.jboss.test.ws.jbossxb.complex.Composite</method-return-value>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws">wsdlMsgNS:ComplexTypes_echoCompositeTypeResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -124,7 +124,7 @@
<wsdl-operation>echoDerived</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxb.complex.Derived</param-type>
+ <param-type>org.jboss.test.ws.jbossxb.complex.Derived</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws">wsdlMsgNS:ComplexTypes_echoDerived</wsdl-message>
<wsdl-message-part-name>Derived_1</wsdl-message-part-name>
@@ -132,7 +132,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxb.complex.Derived</method-return-value>
+ <method-return-value>org.jboss.test.ws.jbossxb.complex.Derived</method-return-value>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws">wsdlMsgNS:ComplexTypes_echoDerivedResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
Modified: trunk/src/test/resources/jbossxb/DocumentStyle.xml
===================================================================
--- trunk/src/test/resources/jaxb/DocumentStyle.xml 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/resources/jbossxb/DocumentStyle.xml 2006-07-13 11:26:52 UTC (rev 597)
@@ -9,7 +9,7 @@
<namespaceURI>http://org.jboss.ws/jaxrpc</namespaceURI>
</package-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.simple.SimpleUserType</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.simple.SimpleUserType</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/jaxrpc/types">typeNS:SimpleUserType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -23,7 +23,7 @@
</variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.docstyle.EchoString_ResponseStruct</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.docstyle.EchoString_ResponseStruct</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/jaxrpc/types">typeNS:echoStringResponse</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -32,7 +32,7 @@
</variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.simple.EchoSimpleUserType_ResponseStruct</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.simple.EchoSimpleUserType_ResponseStruct</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/jaxrpc/types">typeNS:echoSimpleUserTypeResponse</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -41,7 +41,7 @@
</variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.simple.EchoSimpleUserType_RequestStruct</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.simple.EchoSimpleUserType_RequestStruct</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/jaxrpc/types">typeNS:echoSimpleUserType</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -54,7 +54,7 @@
</variable-mapping>
</java-xml-type-mapping>
<java-xml-type-mapping>
- <java-type>org.jboss.test.ws.jaxb.docstyle.EchoString_RequestStruct</java-type>
+ <java-type>org.jboss.test.ws.jbossxb.docstyle.EchoString_RequestStruct</java-type>
<root-type-qname xmlns:typeNS="http://org.jboss.ws/jaxrpc/types">typeNS:echoString</root-type-qname>
<qname-scope>complexType</qname-scope>
<variable-mapping>
@@ -84,7 +84,7 @@
<wsdl-operation>echoSimpleUserType</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxb.EchoSimpleUserType_RequestStruct</param-type>
+ <param-type>org.jboss.test.ws.jbossxb.EchoSimpleUserType_RequestStruct</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jaxrpc">wsdlMsgNS:JaxRpcTestService_echoSimpleUserType</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -92,7 +92,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxb.EchoSimpleUserType_ResponseStruct</method-return-value>
+ <method-return-value>org.jboss.test.ws.jbossxb.EchoSimpleUserType_ResponseStruct</method-return-value>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jaxrpc">wsdlMsgNS:JaxRpcTestService_echoSimpleUserTypeResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
@@ -102,7 +102,7 @@
<wsdl-operation>echoString</wsdl-operation>
<method-param-parts-mapping>
<param-position>0</param-position>
- <param-type>org.jboss.test.ws.jaxb.EchoString_RequestStruct</param-type>
+ <param-type>org.jboss.test.ws.jbossxb.EchoString_RequestStruct</param-type>
<wsdl-message-mapping>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jaxrpc">wsdlMsgNS:JaxRpcTestService_echoString</wsdl-message>
<wsdl-message-part-name>parameters</wsdl-message-part-name>
@@ -110,7 +110,7 @@
</wsdl-message-mapping>
</method-param-parts-mapping>
<wsdl-return-value-mapping>
- <method-return-value>org.jboss.test.ws.jaxb.EchoString_ResponseStruct</method-return-value>
+ <method-return-value>org.jboss.test.ws.jbossxb.EchoString_ResponseStruct</method-return-value>
<wsdl-message xmlns:wsdlMsgNS="http://org.jboss.ws/jaxrpc">wsdlMsgNS:JaxRpcTestService_echoStringResponse</wsdl-message>
<wsdl-message-part-name>result</wsdl-message-part-name>
</wsdl-return-value-mapping>
Modified: trunk/src/test/resources/jbossxb/config.xml
===================================================================
--- trunk/src/test/resources/jaxb/config.xml 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/resources/jbossxb/config.xml 2006-07-13 11:26:52 UTC (rev 597)
@@ -10,8 +10,8 @@
<service name="ComplexTypesService"
targetNamespace="http://org.jboss.ws"
typeNamespace="http://org.jboss.ws/types"
- packageName="org.jboss.test.ws.jaxb">
- <interface name="org.jboss.test.ws.jaxb.ComplexTypes"/>
+ packageName="org.jboss.test.ws.jbossxb">
+ <interface name="org.jboss.test.ws.jbossxb.ComplexTypes"/>
</service>
</configuration>
Modified: trunk/src/test/resources/jbossxb/wstools-config.xml
===================================================================
--- trunk/src/test/resources/jaxb/wstools-config.xml 2006-07-12 16:00:22 UTC (rev 594)
+++ trunk/src/test/resources/jbossxb/wstools-config.xml 2006-07-13 11:26:52 UTC (rev 597)
@@ -11,7 +11,7 @@
xsi:schemaLocation="http://www.jboss.org/jbossws-tools http://www.jboss.org/jbossws-tools/schema/jbossws-tool_1_0.xsd">
<java-wsdl>
<service name="TestService" style="rpc"
- endpoint="org.jboss.test.ws.jaxb.complex.ComplexTypes"/>
+ endpoint="org.jboss.test.ws.jbossxb.complex.ComplexTypes"/>
<namespaces target-namespace="http://org.jboss.ws"
type-namespace="http://org.jboss.ws/types"/>
</java-wsdl>
More information about the jboss-svn-commits
mailing list