Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 70089 invoked from network); 1 Sep 2009 01:13:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Sep 2009 01:13:38 -0000 Received: (qmail 61709 invoked by uid 500); 1 Sep 2009 01:13:38 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 61625 invoked by uid 500); 1 Sep 2009 01:13:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 61616 invoked by uid 99); 1 Sep 2009 01:13:37 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2009 01:13:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2009 01:13:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 25C9623888DC; Tue, 1 Sep 2009 01:13:14 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r809790 [2/3] - in /cxf/trunk/rt: databinding/aegis/src/main/java/org/apache/cxf/aegis/ databinding/aegis/src/main/java/org/apache/cxf/aegis/databinding/ databinding/aegis/src/main/java/org/apache/cxf/aegis/type/ databinding/aegis/src/main/... Date: Tue, 01 Sep 2009 01:13:10 -0000 To: commits@cxf.apache.org From: bimargulies@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090901011314.25C9623888DC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigIntegerType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigIntegerType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigIntegerType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BigIntegerType.java Tue Sep 1 01:13:06 2009 @@ -21,16 +21,16 @@ import java.math.BigInteger; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for a BigInteger + * AegisType for a BigInteger * * @author peter royal */ -public class BigIntegerType extends Type { +public class BigIntegerType extends AegisType { public BigIntegerType() { super(); } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/BooleanType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * Aegis type for {@link java.lang.Boolean}. These can be null. */ -public class BooleanType extends Type { +public class BooleanType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { if (reader.isXsiNil()) { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ByteType.java Tue Sep 1 01:13:06 2009 @@ -19,7 +19,7 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -28,7 +28,7 @@ * * @author Dan Diephouse */ -public class ByteType extends Type { +public class ByteType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { return new Byte(reader.getValue().trim()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CalendarType.java Tue Sep 1 01:13:06 2009 @@ -22,17 +22,17 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.date.XsDateTimeFormat; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the Calendar class. + * AegisType for the Calendar class. * * @author Dan Diephouse */ -public class CalendarType extends Type { +public class CalendarType extends AegisType { private static XsDateTimeFormat format = new XsDateTimeFormat(); @Override Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterAsStringType.java Tue Sep 1 01:13:06 2009 @@ -23,14 +23,14 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * */ -public class CharacterAsStringType extends Type { +public class CharacterAsStringType extends AegisType { public static final QName CHARACTER_AS_STRING_TYPE_QNAME = new QName("http://cxf.apache.org/aegisTypes", "char"); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/CharacterType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Sean Truman */ -public class CharacterType extends Type { +public class CharacterType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { return new Character(reader.getValueAsCharacter()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateTimeType.java Tue Sep 1 01:13:06 2009 @@ -24,17 +24,17 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.date.XsDateTimeFormat; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the Date class which serializes as an xsd:dateTime. + * AegisType for the Date class which serializes as an xsd:dateTime. * * @author Dan Diephouse */ -public class DateTimeType extends Type { +public class DateTimeType extends AegisType { private static XsDateTimeFormat format = new XsDateTimeFormat(); public DateTimeType() { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DateType.java Tue Sep 1 01:13:06 2009 @@ -24,18 +24,18 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.date.XsDateFormat; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the Date class which serializes as an xsd:date (no time + * AegisType for the Date class which serializes as an xsd:date (no time * information). * * @author Dan Diephouse */ -public class DateType extends Type { +public class DateType extends AegisType { private static XsDateFormat format = new XsDateFormat(); @Override Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/DoubleType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class DoubleType extends Type { +public class DoubleType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { return new Double(reader.getValueAsDouble()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/FloatType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class FloatType extends Type { +public class FloatType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/IntType.java Tue Sep 1 01:13:06 2009 @@ -19,7 +19,7 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -28,7 +28,7 @@ * * @author Dan Diephouse */ -public class IntType extends Type { +public class IntType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { return new Integer(reader.getValueAsInt()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/LongType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class LongType extends Type { +public class LongType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { return new Long(reader.getValueAsLong()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ObjectType.java Tue Sep 1 01:13:06 2009 @@ -29,7 +29,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -41,21 +41,21 @@ import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction; /** - * Type for runtime inspection of types. Looks as the class to be written, and + * AegisType for runtime inspection of types. Looks as the class to be written, and * looks to see if there is a type for that class. If there is, it writes out * the value and inserts a xsi:type attribute to signal what the type - * of the value is. Can specify an optional set of dependent Type's + * of the value is. Can specify an optional set of dependent AegisType's * in the constructor, in the case that the type is a custom type that may not * have its schema in the WSDL. Can specify whether or not unknown objects * should be serialized as a byte stream. * * @author peter royal */ -public class ObjectType extends Type { +public class ObjectType extends AegisType { private static final QName XSI_TYPE = new QName(SOAPConstants.XSI_NS, "type"); private static final QName XSI_NIL = new QName(SOAPConstants.XSI_NS, "nil"); - private Set dependencies; + private Set dependencies; private boolean serializedWhenUnknown; private boolean readToDocument; @@ -65,7 +65,7 @@ readToDocument = true; } - public ObjectType(Set dependencies) { + public ObjectType(Set dependencies) { this(dependencies, false); } @@ -74,7 +74,7 @@ this(Collections.EMPTY_SET, serializeWhenUnknown); } - public ObjectType(Set dependencies, boolean serializeWhenUnknown) { + public ObjectType(Set dependencies, boolean serializeWhenUnknown) { this.dependencies = dependencies; this.serializedWhenUnknown = serializeWhenUnknown; } @@ -102,7 +102,7 @@ } typeName = typeName.trim(); - Type type = null; + AegisType type = null; QName typeQName = null; if (typeName != null) { typeQName = extractQName(reader, typeName); @@ -177,7 +177,7 @@ nilWriter.close(); } else { - Type type = determineType(context, object.getClass()); + AegisType type = determineType(context, object.getClass()); if (null == type) { TypeMapping tm = context.getTypeMapping(); @@ -199,12 +199,12 @@ } } - public Type determineType(Context context, Class clazz) { + public AegisType determineType(Context context, Class clazz) { TypeMapping tm = context.getTypeMapping(); if (tm == null) { tm = getTypeMapping(); } - Type type = tm.getType(clazz); + AegisType type = tm.getType(clazz); if (null != type) { return type; @@ -247,12 +247,12 @@ this.serializedWhenUnknown = serializedWhenUnknown; } - public void setDependencies(Set dependencies) { + public void setDependencies(Set dependencies) { this.dependencies = dependencies; } @Override - public Set getDependencies() { + public Set getDependencies() { return dependencies; } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/ShortType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class ShortType extends Type { +public class ShortType extends AegisType { @Override public Object readObject(MessageReader reader, Context context) { return new Short(reader.getValue().trim()); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/SqlDateType.java Tue Sep 1 01:13:06 2009 @@ -26,7 +26,7 @@ import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the java.sql.Date class which serializes as an xsd:date (no time + * AegisType for the java.sql.Date class which serializes as an xsd:date (no time * information). * * @author Dan Diephouse Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/StringType.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,14 @@ package org.apache.cxf.aegis.type.basic; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class StringType extends Type { +public class StringType extends AegisType { public StringType() { } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimeType.java Tue Sep 1 01:13:06 2009 @@ -24,17 +24,17 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.date.XsTimeFormat; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the Time class which serializes to an xs:time. + * AegisType for the Time class which serializes to an xs:time. * * @author Dan Diephouse */ -public class TimeType extends Type { +public class TimeType extends AegisType { private static XsTimeFormat format = new XsTimeFormat(); @Override Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimestampType.java Tue Sep 1 01:13:06 2009 @@ -24,17 +24,17 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.date.XsDateTimeFormat; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the Time class which serializes to an xs:time. + * AegisType for the Time class which serializes to an xs:time. * * @author Dan Diephouse */ -public class TimestampType extends Type { +public class TimestampType extends AegisType { private static XsDateTimeFormat format = new XsDateTimeFormat(); @Override Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/TimezoneLessDateType.java Tue Sep 1 01:13:06 2009 @@ -29,7 +29,7 @@ import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for the Date class which serializes as an xsd:date (no time + * AegisType for the Date class which serializes as an xsd:date (no time * and timezone information). * * @author Dennis Kieselhorst Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/URIType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/URIType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/URIType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/URIType.java Tue Sep 1 01:13:06 2009 @@ -21,16 +21,16 @@ import java.net.URI; import org.apache.cxf.aegis.Context; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** - * Type for a URI + * AegisType for a URI * * @author peter royal */ -public class URIType extends Type { +public class URIType extends AegisType { @Override public Object readObject(final MessageReader reader, final Context context) { final String value = reader.getValue(); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/basic/XMLBeanTypeInfo.java Tue Sep 1 01:13:06 2009 @@ -30,7 +30,7 @@ import org.w3c.dom.Element; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.NamespaceHelper; import org.apache.cxf.common.classloader.ClassLoaderUtils; import org.apache.cxf.common.logging.LogUtils; @@ -127,7 +127,7 @@ try { Class typeClass = ClassLoaderUtils.loadClass(explicitTypeName, XMLBeanTypeInfo.class); - Type customTypeObject = (Type) typeClass.newInstance(); + AegisType customTypeObject = (AegisType) typeClass.newInstance(); mapType(mappedName, customTypeObject); QName schemaType = mappedType; if (schemaType == null) { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/CollectionType.java Tue Sep 1 01:13:06 2009 @@ -32,15 +32,15 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.basic.ArrayType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; public class CollectionType extends ArrayType { - private Type componentType; + private AegisType componentType; - public CollectionType(Type componentType) { + public CollectionType(AegisType componentType) { super(); this.componentType = componentType; @@ -104,7 +104,7 @@ try { Collection list = (Collection)object; - Type type = getComponentType(); + AegisType type = getComponentType(); if (type == null) { throw new DatabindingException("Couldn't find component type for Collection."); @@ -126,7 +126,7 @@ } @Override - public Type getComponentType() { + public AegisType getComponentType() { return componentType; } } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/collection/MapType.java Tue Sep 1 01:13:06 2009 @@ -29,7 +29,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeUtil; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -38,14 +38,14 @@ import org.apache.ws.commons.schema.XmlSchemaElement; import org.apache.ws.commons.schema.XmlSchemaSequence; -public class MapType extends Type { - private Type keyType; - private Type valueType; +public class MapType extends AegisType { + private AegisType keyType; + private AegisType valueType; private QName keyName; private QName valueName; private QName entryName; - public MapType(QName schemaType, Type keyType, Type valueType) { + public MapType(QName schemaType, AegisType keyType, AegisType valueType) { super(); this.keyType = keyType; @@ -61,8 +61,8 @@ public Object readObject(MessageReader reader, Context context) throws DatabindingException { Map map = instantiateMap(); try { - Type kType = getKeyType(); - Type vType = getValueType(); + AegisType kType = getKeyType(); + AegisType vType = getValueType(); while (reader.hasMoreElementReaders()) { MessageReader entryReader = reader.getNextElementReader(); @@ -143,8 +143,8 @@ try { Map map = (Map)object; - Type kType = getKeyType(); - Type vType = getValueType(); + AegisType kType = getKeyType(); + AegisType vType = getValueType(); for (Iterator itr = map.entrySet().iterator(); itr.hasNext();) { Map.Entry entry = (Map.Entry)itr.next(); @@ -157,7 +157,7 @@ } private void writeEntry(MessageWriter writer, Context context, - Type kType, Type vType, + AegisType kType, AegisType vType, Map.Entry entry) throws DatabindingException { kType = TypeUtil.getWriteType(context.getGlobalContext(), entry.getKey(), kType); vType = TypeUtil.getWriteType(context.getGlobalContext(), entry.getValue(), vType); @@ -184,8 +184,8 @@ XmlSchemaSequence sequence = new XmlSchemaSequence(); complex.setParticle(sequence); - Type kType = getKeyType(); - Type vType = getValueType(); + AegisType kType = getKeyType(); + AegisType vType = getValueType(); XmlSchemaElement element = new XmlSchemaElement(); sequence.getItems().add(element); @@ -206,7 +206,7 @@ /** * Creates a element in a sequence for the key type and the value type. */ - private void createElement(XmlSchemaSequence seq, QName name, Type type) { + private void createElement(XmlSchemaSequence seq, QName name, AegisType type) { XmlSchemaElement element = new XmlSchemaElement(); seq.getItems().add(element); element.setName(name.getLocalPart()); @@ -216,18 +216,18 @@ } @Override - public Set getDependencies() { - Set deps = new HashSet(); + public Set getDependencies() { + Set deps = new HashSet(); deps.add(getKeyType()); deps.add(getValueType()); return deps; } - public Type getKeyType() { + public AegisType getKeyType() { return keyType; } - public Type getValueType() { + public AegisType getValueType() { return valueType; } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/ArrayTypeInfo.java Tue Sep 1 01:13:06 2009 @@ -29,7 +29,7 @@ import javax.xml.namespace.QName; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -45,7 +45,7 @@ private static final QName SOAP_ARRAY_TYPE = new QName(SOAP_ENCODING_NS_1_1, "arrayType"); private static final QName SOAP_ARRAY_OFFSET = new QName(SOAP_ENCODING_NS_1_1, "offset"); - private Type type; + private AegisType type; private QName typeName; private int ranks; private final List dimensions = new ArrayList(); @@ -195,7 +195,7 @@ return typeName; } - public Type getType() { + public AegisType getType() { return type; } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapArrayType.java Tue Sep 1 01:13:06 2009 @@ -31,7 +31,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.type.TypeUtil; import org.apache.cxf.aegis.type.basic.BeanType; @@ -44,7 +44,7 @@ import static org.apache.cxf.aegis.type.encoded.SoapEncodingUtil.readAttributeValue; -public class SoapArrayType extends Type { +public class SoapArrayType extends AegisType { private static final Logger LOG = LogUtils.getL7dLogger(SoapArrayType.class); private static final String SOAP_ENCODING_NS_1_1 = Soap11.getInstance().getSoapEncodingStyle(); private static final QName SOAP_ARRAY_POSITION = new QName(SOAP_ENCODING_NS_1_1, "position"); @@ -137,7 +137,7 @@ } // nested element names can specify a type - Type compType = getTypeMapping().getType(creader.getName()); + AegisType compType = getTypeMapping().getType(creader.getName()); if (compType == null) { // use the type declared in the arrayType attribute compType = arrayTypeInfo.getType(); @@ -283,7 +283,7 @@ } // ComponentType - Type type = getComponentType(); + AegisType type = getComponentType(); if (type == null) { throw new DatabindingException("Couldn't find component type for array."); } @@ -315,7 +315,7 @@ protected void writeValue(Object value, MessageWriter writer, Context context, - Type type) throws DatabindingException { + AegisType type) throws DatabindingException { type = TypeUtil.getWriteType(context.getGlobalContext(), value, type); @@ -347,7 +347,7 @@ /** * We need to write a complex type schema for Beans, so return true. * - * @see org.apache.cxf.aegis.type.Type#isComplex() + * @see org.apache.cxf.aegis.type.AegisType#isComplex() */ @Override public boolean isComplex() { @@ -371,8 +371,8 @@ } @Override - public Set getDependencies() { - Set deps = new HashSet(); + public Set getDependencies() { + Set deps = new HashSet(); deps.add(getComponentType()); @@ -380,13 +380,13 @@ } /** - * Get the Type of the elements in the array. This is only used for writing an array. + * Get the AegisType of the elements in the array. This is only used for writing an array. * When reading the type is solely determined by the required arrayType soap attribute. */ - public Type getComponentType() { + public AegisType getComponentType() { Class compType = getTypeClass().getComponentType(); - Type type; + AegisType type; if (componentName == null) { type = getTypeMapping().getType(compType); } else { @@ -413,7 +413,7 @@ * @return the QName of the root component type of this array */ protected QName getRootType() { - Type componentType = getComponentType(); + AegisType componentType = getComponentType(); if (componentType instanceof SoapArrayType) { SoapArrayType arrayType = (SoapArrayType) componentType; return arrayType.getRootType(); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/SoapRefType.java Tue Sep 1 01:13:06 2009 @@ -24,7 +24,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -42,10 +42,10 @@ * instance is registered with the MarshalRegistry, and is written at the end of the message body by the * TrailingBlocks class. */ -public class SoapRefType extends Type { - private final Type baseType; +public class SoapRefType extends AegisType { + private final AegisType baseType; - public SoapRefType(Type baseType) { + public SoapRefType(AegisType baseType) { if (baseType == null) { throw new NullPointerException("baseType is null"); } @@ -119,7 +119,7 @@ baseType.setNillable(nillable); } - public Set getDependencies() { + public Set getDependencies() { return baseType.getDependencies(); } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/StructType.java Tue Sep 1 01:13:06 2009 @@ -22,7 +22,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.basic.BeanType; import org.apache.cxf.aegis.type.basic.BeanTypeInfo; import org.apache.cxf.aegis.xml.MessageReader; @@ -68,7 +68,7 @@ * Returns a SoapRefType wrapping the actual type. */ @Override - protected Type getElementType(QName name, + protected AegisType getElementType(QName name, BeanTypeInfo beanTypeInfo, MessageReader reader, Context context) { @@ -76,7 +76,7 @@ // nested elements use unqualified names name = qualifyName(name); - Type type = super.getElementType(name, beanTypeInfo, reader, context); + AegisType type = super.getElementType(name, beanTypeInfo, reader, context); if (type != null) { type = new SoapRefType(type); } @@ -113,7 +113,8 @@ * Writes a nested element with an unqualified name. */ @Override - protected void writeElement(QName name, Object value, Type type, MessageWriter writer, Context context) { + protected void writeElement(QName name, Object value, + AegisType type, MessageWriter writer, Context context) { // Nested elements are unqualified name = new QName("", name.getLocalPart()); @@ -151,10 +152,10 @@ return name; } - private BeanType superBeanType(Type t) { + private BeanType superBeanType(AegisType t) { if (t instanceof BeanType) { BeanType bt = (BeanType)t; - Type supertype = bt.getSuperType(); + AegisType supertype = bt.getSuperType(); if (supertype instanceof BeanType) { return (BeanType)supertype; } Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/encoded/TrailingBlocks.java Tue Sep 1 01:13:06 2009 @@ -23,7 +23,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.type.basic.ObjectType; import org.apache.cxf.aegis.xml.MessageReader; @@ -125,7 +125,7 @@ for (Object instance : MarshalRegistry.get(context)) { // determine instance type - Type type = objectType.determineType(context, instance.getClass()); + AegisType type = objectType.determineType(context, instance.getClass()); if (type == null) { TypeMapping tm = context.getTypeMapping(); if (tm == null) { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/AnnotationReader.java Tue Sep 1 01:13:06 2009 @@ -22,7 +22,7 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Method; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; public class AnnotationReader { private static final Class WEB_PARAM = load("javax.jws.WebParam"); @@ -91,7 +91,7 @@ public Class getType(AnnotatedElement element) { Class value = (Class) getAnnotationValue("type", element, - Type.class, + AegisType.class, XmlAttribute.class, XmlElement.class, XFIRE_XML_ATTRIBUTE, @@ -112,7 +112,7 @@ return (Class) getAnnotationValue("type", method, index, - Type.class, + AegisType.class, XmlParamType.class, XFIRE_XML_PARAM_TYPE); } @@ -121,7 +121,7 @@ public Class getReturnType(AnnotatedElement element) { return (Class) getAnnotationValue("type", element, - Type.class, + AegisType.class, XmlReturnType.class, XFIRE_XML_RETURN_TYPE); } @@ -155,7 +155,7 @@ return (String) getAnnotationValue("name", method, index, - Type.class, + AegisType.class, XmlParamType.class, XFIRE_XML_PARAM_TYPE, WEB_PARAM); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/DurationType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/DurationType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/DurationType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/DurationType.java Tue Sep 1 01:13:06 2009 @@ -24,14 +24,14 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class DurationType extends Type { +public class DurationType extends AegisType { private DatatypeFactory dtFactory; public DurationType() { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/EnumType.java Tue Sep 1 01:13:06 2009 @@ -20,7 +20,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; import org.apache.cxf.common.xmlschema.XmlSchemaConstants; @@ -30,7 +30,7 @@ import org.apache.ws.commons.schema.XmlSchemaSimpleType; import org.apache.ws.commons.schema.XmlSchemaSimpleTypeRestriction; -public class EnumType extends Type { +public class EnumType extends AegisType { @SuppressWarnings("unchecked") @Override public Object readObject(MessageReader reader, Context context) { @@ -48,7 +48,7 @@ @Override public void setTypeClass(Class typeClass) { if (!typeClass.isEnum()) { - throw new DatabindingException("Type class must be an enum."); + throw new DatabindingException("AegisType class must be an enum."); } super.setTypeClass(typeClass); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/Java5TypeCreator.java Tue Sep 1 01:13:06 2009 @@ -28,7 +28,7 @@ import javax.xml.namespace.QName; import org.apache.cxf.aegis.type.AbstractTypeCreator; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeClassInfo; import org.apache.cxf.aegis.type.basic.BeanType; import org.apache.cxf.aegis.util.NamespaceHelper; @@ -110,7 +110,7 @@ } @Override - public Type createCollectionType(TypeClassInfo info) { + public AegisType createCollectionType(TypeClassInfo info) { Object genericType = info.getGenericType(); Class paramClass = getComponentType(genericType, 0); @@ -121,19 +121,19 @@ } } - protected Type getOrCreateGenericType(TypeClassInfo info) { + protected AegisType getOrCreateGenericType(TypeClassInfo info) { return getOrCreateParameterizedType(info.getGenericType(), 0); } - protected Type getOrCreateMapKeyType(TypeClassInfo info) { + protected AegisType getOrCreateMapKeyType(TypeClassInfo info) { return getOrCreateParameterizedType(info.getGenericType(), 0); } - protected Type getOrCreateMapValueType(TypeClassInfo info) { + protected AegisType getOrCreateMapValueType(TypeClassInfo info) { return getOrCreateParameterizedType(info.getGenericType(), 1); } - protected Type getOrCreateParameterizedType(Object generic, int index) { + protected AegisType getOrCreateParameterizedType(Object generic, int index) { Class clazz = getComponentType(generic, index); if (clazz == null) { @@ -150,7 +150,7 @@ info.setDescription(clazz.toString()); info.setGenericType(component); - Type type = createTypeForClass(info); + AegisType type = createTypeForClass(info); return type; } @@ -197,7 +197,7 @@ } @Override - public Type createDefaultType(TypeClassInfo info) { + public AegisType createDefaultType(TypeClassInfo info) { QName typeName = info.getTypeName(); if (typeName == null) { typeName = createQName(info.getTypeClass()); @@ -227,7 +227,7 @@ } @Override - public Type createEnumType(TypeClassInfo info) { + public AegisType createEnumType(TypeClassInfo info) { EnumType type = new EnumType(); type.setSchemaType(createQName(info.getTypeClass())); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XMLGregorianCalendarType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XMLGregorianCalendarType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XMLGregorianCalendarType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XMLGregorianCalendarType.java Tue Sep 1 01:13:06 2009 @@ -24,14 +24,14 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; /** * @author Dan Diephouse */ -public class XMLGregorianCalendarType extends Type { +public class XMLGregorianCalendarType extends AegisType { private DatatypeFactory dtFactory; public XMLGregorianCalendarType() { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlAttribute.java Tue Sep 1 01:13:06 2009 @@ -23,12 +23,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface XmlAttribute { - Class type() default Type.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlElement.java Tue Sep 1 01:13:06 2009 @@ -23,12 +23,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface XmlElement { - Class type() default Type.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlParamType.java Tue Sep 1 01:13:06 2009 @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; /** * Annotates services method parameters to provide information about how they @@ -34,7 +34,7 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.PARAMETER) public @interface XmlParamType { - Class type() default Type.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlReturnType.java Tue Sep 1 01:13:06 2009 @@ -23,7 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; /** * Annotates a service's return type to provide information about how it is to @@ -34,7 +34,7 @@ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface XmlReturnType { - Class type() default Type.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/java5/XmlType.java Tue Sep 1 01:13:06 2009 @@ -23,12 +23,12 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface XmlType { - Class type() default Type.class; + Class type() default AegisType.class; String name() default ""; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/mtom/AbstractXOPType.java Tue Sep 1 01:13:06 2009 @@ -32,7 +32,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.basic.Base64Type; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; @@ -45,7 +45,7 @@ * Base class for MtoM types. * @author Dan Diephouse */ -public abstract class AbstractXOPType extends Type { +public abstract class AbstractXOPType extends AegisType { public static final String XOP_NS = "http://www.w3.org/2004/08/xop/include"; public static final String XML_MIME_NS = "http://www.w3.org/2005/05/xmlmime"; public static final String XML_MIME_ATTR_LOCAL_NAME = "expectedContentTypes"; Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/DocumentType.java Tue Sep 1 01:13:06 2009 @@ -29,7 +29,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; import org.apache.cxf.aegis.xml.stax.ElementReader; @@ -42,7 +42,7 @@ * * @author Dan Diephouse */ -public class DocumentType extends Type { +public class DocumentType extends AegisType { private DocumentBuilder builder; public DocumentType() { Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMDocumentType.java Tue Sep 1 01:13:06 2009 @@ -23,7 +23,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.jdom.StaxBuilder; import org.apache.cxf.aegis.util.jdom.StaxSerializer; import org.apache.cxf.aegis.util.stax.JDOMStreamReader; @@ -38,7 +38,7 @@ * * @author Dan Diephouse */ -public class JDOMDocumentType extends Type { +public class JDOMDocumentType extends AegisType { // private static final StaxBuilder builder = new StaxBuilder(); private static final StaxSerializer SERIALIZER = new StaxSerializer(); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/JDOMElementType.java Tue Sep 1 01:13:06 2009 @@ -23,7 +23,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.util.jdom.StaxBuilder; import org.apache.cxf.aegis.util.jdom.StaxSerializer; import org.apache.cxf.aegis.util.stax.JDOMStreamReader; @@ -38,7 +38,7 @@ * * @author Dan Diephouse */ -public class JDOMElementType extends Type { +public class JDOMElementType extends AegisType { // private static final StaxBuilder builder = new StaxBuilder(); private static final StaxSerializer SERIALIZER = new StaxSerializer(); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java Tue Sep 1 01:13:06 2009 @@ -33,7 +33,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; import org.apache.cxf.aegis.xml.stax.ElementWriter; @@ -49,7 +49,7 @@ * @see javax.xml.stream.XMLInputFactory * @see org.apache.cxf.aegis.util.STAXUtils */ -public class SourceType extends Type { +public class SourceType extends AegisType { public SourceType() { setTypeClass(Source.class); setWriteOuter(false); Modified: cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/XMLStreamReaderType.java Tue Sep 1 01:13:06 2009 @@ -23,7 +23,7 @@ import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.DatabindingException; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.MessageReader; import org.apache.cxf.aegis.xml.MessageWriter; import org.apache.cxf.aegis.xml.stax.ElementReader; @@ -35,7 +35,7 @@ * * @author Dan Diephouse */ -public class XMLStreamReaderType extends Type { +public class XMLStreamReaderType extends AegisType { public XMLStreamReaderType() { setWriteOuter(false); } Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/AbstractAegisTest.java Tue Sep 1 01:13:06 2009 @@ -40,7 +40,7 @@ import org.apache.cxf.BusException; import org.apache.cxf.BusFactory; import org.apache.cxf.aegis.databinding.AegisDatabinding; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.xml.stax.ElementWriter; import org.apache.cxf.binding.BindingFactoryManager; import org.apache.cxf.binding.soap.SoapBindingConstants; @@ -315,11 +315,11 @@ return new ElementWriter(writer); } - protected Element writeObjectToElement(Type type, Object bean) { + protected Element writeObjectToElement(AegisType type, Object bean) { return writeObjectToElement(type, bean, getContext()); } - protected Element writeObjectToElement(Type type, Object bean, Context context) { + protected Element writeObjectToElement(AegisType type, Object bean, Context context) { Element element = createElement("urn:Bean", "root", "b"); ElementWriter writer = getElementWriter(element, new MapNamespaceContext()); type.writeObject(bean, writer, getContext()); Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanKeyType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanKeyType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanKeyType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanKeyType.java Tue Sep 1 01:13:06 2009 @@ -27,7 +27,7 @@ import org.apache.cxf.aegis.DatabindingException; import org.apache.cxf.aegis.custom.service.NoDefaultConstructorBeanKey; import org.apache.cxf.aegis.custom.service.NoDefaultConstructorBeanKeyImpl; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeUtil; import org.apache.cxf.aegis.type.basic.BeanType; import org.apache.cxf.aegis.type.basic.BeanTypeInfo; @@ -61,8 +61,8 @@ continue; } QName name = childReader.getName(); - Type defaultType = inf.getType(name); - Type type = TypeUtil.getReadType(childReader.getXMLStreamReader(), + AegisType defaultType = inf.getType(name); + AegisType type = TypeUtil.getReadType(childReader.getXMLStreamReader(), context.getGlobalContext(), defaultType); if (type != null) { String value = (String)type.readObject(childReader, context); @@ -81,9 +81,9 @@ } @Override - public Set getDependencies() { + public Set getDependencies() { // The string type is provided by aegis, so it should always be there. - Type stringType = getTypeMapping().getType(String.class); + AegisType stringType = getTypeMapping().getType(String.class); return Collections.singleton(stringType); } } Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanType.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanType.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanType.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/custom/types/NoDefaultConstructorBeanType.java Tue Sep 1 01:13:06 2009 @@ -27,7 +27,7 @@ import org.apache.cxf.aegis.DatabindingException; import org.apache.cxf.aegis.custom.service.NoDefaultConstructorBean; import org.apache.cxf.aegis.custom.service.NoDefaultConstructorBeanImpl; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeUtil; import org.apache.cxf.aegis.type.basic.BeanType; import org.apache.cxf.aegis.type.basic.BeanTypeInfo; @@ -62,8 +62,8 @@ continue; } QName qName = childReader.getName(); - Type defaultType = inf.getType(qName); - Type type = TypeUtil.getReadType(childReader.getXMLStreamReader(), + AegisType defaultType = inf.getType(qName); + AegisType type = TypeUtil.getReadType(childReader.getXMLStreamReader(), context.getGlobalContext(), defaultType); if (type != null) { String value = (String)type.readObject(childReader, context); @@ -84,8 +84,8 @@ } @Override - public Set getDependencies() { - Type stringType = getTypeMapping().getType(String.class); + public Set getDependencies() { + AegisType stringType = getTypeMapping().getType(String.class); return Collections.singleton(stringType); } } Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/namespaces/NamespaceConfusionTest.java Tue Sep 1 01:13:06 2009 @@ -33,7 +33,7 @@ import org.apache.cxf.aegis.databinding.AegisDatabinding; import org.apache.cxf.aegis.namespaces.data.Name; import org.apache.cxf.aegis.namespaces.impl.NameServiceImpl; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.endpoint.Server; import org.apache.cxf.service.Service; @@ -113,7 +113,7 @@ String uri = getNamespaceForPrefix(rootElement, arrayOfNameElement, prefix); assertNotNull(uri); - Type nameType = tm.getTypeCreator().createType(Name.class); + AegisType nameType = tm.getTypeCreator().createType(Name.class); QName tmQname = nameType.getSchemaType(); assertEquals(tmQname.getNamespaceURI(), uri); Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneReadTest.java Tue Sep 1 01:13:06 2009 @@ -19,14 +19,18 @@ package org.apache.cxf.aegis.standalone; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; +import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamReader; import org.apache.cxf.aegis.AegisContext; import org.apache.cxf.aegis.AegisReader; import org.apache.cxf.aegis.services.SimpleBean; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.test.TestUtilities; import org.junit.Before; import org.junit.Test; @@ -40,6 +44,10 @@ private AegisContext context; private TestUtilities testUtilities; + private interface ListStringInterface { + List method(); + } + @Before public void before() { testUtilities = new TestUtilities(getClass()); @@ -55,11 +63,58 @@ assertTrue("ball-of-yarn".equals(something)); } + @Test + public void testCollectionReadNoXsiType() throws Exception { + context = new AegisContext(); + Set roots = new HashSet(); + java.lang.reflect.Type listStringType + = ListStringInterface.class.getMethods()[0].getGenericReturnType(); + roots.add(listStringType); + context.setRootClasses(roots); + context.initialize(); + XMLStreamReader streamReader + = testUtilities.getResourceAsXMLStreamReader("topLevelList.xml"); + AegisReader reader = context.createXMLStreamReader(); + // until I fix type mapping to use java.lang.reflect.Type instead of + // Class, I need to do the following + QName magicTypeQName = new QName("urn:org.apache.cxf.aegis.types", "ArrayOfString"); + AegisType aegisRegisteredType = context.getTypeMapping().getType(magicTypeQName); + + Object something = reader.read(streamReader, aegisRegisteredType); + List correctAnswer = new ArrayList(); + correctAnswer.add("cat"); + correctAnswer.add("dog"); + correctAnswer.add("hailstorm"); + assertEquals(correctAnswer, something); + } + + @Test + public void testCollectionReadXsiType() throws Exception { + context = new AegisContext(); + Set roots = new HashSet(); + java.lang.reflect.Type listStringType + = ListStringInterface.class.getMethods()[0].getGenericReturnType(); + roots.add(listStringType); + context.setRootClasses(roots); + context.initialize(); + XMLStreamReader streamReader + = testUtilities.getResourceAsXMLStreamReader("topLevelListWithXsiType.xml"); + AegisReader reader = context.createXMLStreamReader(); + + Object something = reader.read(streamReader); + List correctAnswer = new ArrayList(); + correctAnswer.add("cat"); + correctAnswer.add("dog"); + correctAnswer.add("hailstorm"); + assertEquals(correctAnswer, something); + } + + // test using a .aegis.xml @Test public void testSimpleBeanRead() throws Exception { context = new AegisContext(); - Set> rootClasses = new HashSet>(); + Set rootClasses = new HashSet(); rootClasses.add(SimpleBean.class); context.setRootClasses(rootClasses); context.initialize(); Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/StandaloneWriteTest.java Tue Sep 1 01:13:06 2009 @@ -21,7 +21,9 @@ import java.io.StringReader; import java.io.StringWriter; +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; import javax.xml.XMLConstants; @@ -34,7 +36,7 @@ import org.apache.cxf.aegis.AegisContext; import org.apache.cxf.aegis.AegisWriter; import org.apache.cxf.aegis.services.SimpleBean; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.basic.StringType; import org.apache.cxf.test.TestUtilities; @@ -51,6 +53,10 @@ private XMLOutputFactory xmlOutputFactory; private XMLInputFactory xmlInputFactory; + private interface ListStringInterface { + List method(); + } + @Before public void before() { testUtilities = new TestUtilities(getClass()); @@ -63,7 +69,7 @@ public void testTypeLookup() throws Exception { context = new AegisContext(); context.initialize(); - Type st = context.getTypeMapping().getType(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, + AegisType st = context.getTypeMapping().getType(new QName(XMLConstants.W3C_XML_SCHEMA_NS_URI, "string")); assertNotNull(st); assertEquals(st.getClass(), StringType.class); @@ -91,16 +97,55 @@ } @Test + public void testWriteCollection() throws Exception { + context = new AegisContext(); + context.setWriteXsiTypes(true); + context.initialize(); + List strings = new ArrayList(); + strings.add("cat"); + strings.add("dog"); + strings.add("hailstorm"); + AegisWriter writer = context.createXMLStreamWriter(); + StringWriter stringWriter = new StringWriter(); + XMLStreamWriter xmlWriter = xmlOutputFactory.createXMLStreamWriter(stringWriter); + java.lang.reflect.Type listStringType + = ListStringInterface.class.getMethods()[0].getGenericReturnType(); + writer.write(strings, new QName("urn:borghes", "items"), + false, xmlWriter, listStringType); + xmlWriter.close(); + String xml = stringWriter.toString(); + XMLStreamReader reader = xmlInputFactory.createXMLStreamReader(new StringReader(xml)); + reader.nextTag(); + assertEquals("urn:borghes", reader.getNamespaceURI()); + assertEquals("items", reader.getLocalName()); + reader.nextTag(); + assertEquals(reader.getNamespaceURI(), "urn:org.apache.cxf.aegis.types"); + assertEquals("string", reader.getLocalName()); + String text = reader.getElementText(); + assertEquals("cat", text); + reader.nextTag(); + assertEquals(reader.getNamespaceURI(), "urn:org.apache.cxf.aegis.types"); + assertEquals("string", reader.getLocalName()); + text = reader.getElementText(); + assertEquals("dog", text); + reader.nextTag(); + assertEquals(reader.getNamespaceURI(), "urn:org.apache.cxf.aegis.types"); + assertEquals("string", reader.getLocalName()); + text = reader.getElementText(); + assertEquals("hailstorm", text); + } + + @Test public void testBean() throws Exception { context = new AegisContext(); - Set> rootClasses = new HashSet>(); + Set rootClasses = new HashSet(); rootClasses.add(SimpleBean.class); context.setRootClasses(rootClasses); context.initialize(); SimpleBean sb = new SimpleBean(); sb.setCharacter('\u4000'); sb.setHowdy("doody"); - Type sbType = context.getTypeMapping().getType(sb.getClass()); + AegisType sbType = context.getTypeMapping().getType(sb.getClass()); AegisWriter writer = context.createXMLStreamWriter(); StringWriter stringWriter = new StringWriter(); XMLStreamWriter xmlWriter = xmlOutputFactory.createXMLStreamWriter(stringWriter); Added: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelList.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelList.xml?rev=809790&view=auto ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelList.xml (added) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelList.xml Tue Sep 1 01:13:06 2009 @@ -0,0 +1,24 @@ + + + +cat +dog +hailstorm + \ No newline at end of file Propchange: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelList.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelList.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelListWithXsiType.xml URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelListWithXsiType.xml?rev=809790&view=auto ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelListWithXsiType.xml (added) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelListWithXsiType.xml Tue Sep 1 01:13:06 2009 @@ -0,0 +1,24 @@ + + + +cat +dog +hailstorm + \ No newline at end of file Propchange: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelListWithXsiType.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/standalone/topLevelListWithXsiType.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java URL: http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java?rev=809790&r1=809789&r2=809790&view=diff ============================================================================== --- cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java (original) +++ cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/basic/BeanTest.java Tue Sep 1 01:13:06 2009 @@ -34,7 +34,7 @@ import org.apache.cxf.aegis.AegisContext; import org.apache.cxf.aegis.Context; import org.apache.cxf.aegis.services.SimpleBean; -import org.apache.cxf.aegis.type.Type; +import org.apache.cxf.aegis.type.AegisType; import org.apache.cxf.aegis.type.TypeCreationOptions; import org.apache.cxf.aegis.type.TypeMapping; import org.apache.cxf.aegis.xml.stax.ElementReader; @@ -559,7 +559,7 @@ type.setSchemaType(new QName("urn:Bean", "bean")); QName name = new QName("urn:Bean", "data"); - Type dataType = type.getTypeInfo().getType(name); + AegisType dataType = type.getTypeInfo().getType(name); assertNotNull(dataType); assertTrue(type.getTypeInfo().isNillable(name));