You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gd...@apache.org on 2005/05/24 07:55:18 UTC
svn commit: r178083 -
/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
Author: gdamour
Date: Mon May 23 22:55:17 2005
New Revision: 178083
URL: http://svn.apache.org/viewcvs?rev=178083&view=rev
Log:
o additional QName to serializer pair mappings.
o it is more efficient to filter typeQName based on its namespace.
Modified:
geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java?rev=178083&r1=178082&r2=178083&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java (original)
+++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/HeavyweightTypeInfoBuilder.java Mon May 23 22:55:17 2005
@@ -71,6 +71,8 @@
*/
public class HeavyweightTypeInfoBuilder implements TypeInfoBuilder {
private static final String SOAP_ENCODING_NS = "http://schemas.xmlsoap.org/soap/encoding/";
+ private static final String XMLSchema_NS = "http://www.w3.org/2001/XMLSchema";
+
private final ClassLoader cl;
private final Map schemaTypeKeyToSchemaTypeMap;
private final Set wrapperElementQNames;
@@ -163,7 +165,7 @@
QName typeQName = parameterDesc.getTypeQName();
if (mappedTypeQNames.contains(typeQName)) {
continue;
- } else if (qnamesToFactoryPair.keySet().contains(typeQName)) {
+ } else if (typeQName.getNamespaceURI().equals(XMLSchema_NS)) {
continue;
}
@@ -206,6 +208,7 @@
}
// TODO: shall we fail there?
}
+
if (null == serializerFactoryClass) {
serializerFactoryClass = BeanSerializerFactory.class;
deserializerFactoryClass = BeanDeserializerFactory.class;
@@ -393,6 +396,8 @@
new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedByte"),
new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedLong"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "QName"),
new FactoryPair(QNameSerializerFactory.class, QNameDeserializerFactory.class));
qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "dateTime"),
@@ -408,6 +413,30 @@
qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "hexBinary"),
new FactoryPair(HexSerializerFactory.class, HexDeserializerFactory.class));
qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "anySimpleType"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "nonPositiveInteger"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "nonNegativeInteger"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "positiveInteger"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "negativeInteger"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "ID"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "NCName"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "language"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "normalizedString"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "token"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "Name"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "NMTOKEN"),
+ new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
+ qnamesToFactoryPair.put(new QName("http://www.w3.org/2001/XMLSchema", "NMTOKENS"),
new FactoryPair(SimpleSerializerFactory.class, SimpleDeserializerFactory.class));
}