jochen 2005/05/21 15:01:24
Modified: src/java/org/apache/xmlrpc/serializer Tag:
b20050512_streaming ObjectArraySerializer.java
MapSerializer.java XmlRpcWriter.java
. Tag: b20050512_streaming .classpath
src/java/org/apache/xmlrpc/common Tag: b20050512_streaming
TypeFactoryImpl.java
Added: src/java/org/apache/xmlrpc/jaxb Tag: b20050512_streaming
JaxbParser.java JaxbSerializer.java
JaxbTypeFactory.java
Log:
Added support for JAXB objects.
Revision Changes Path
No revision
No revision
1.1.2.2 +3 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/serializer/Attic/ObjectArraySerializer.java
Index: ObjectArraySerializer.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/serializer/Attic/ObjectArraySerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ObjectArraySerializer.java 12 May 2005 01:58:52 -0000 1.1.2.1
+++ ObjectArraySerializer.java 21 May 2005 22:01:24 -0000 1.1.2.2
@@ -44,6 +44,9 @@
}
protected void writeObject(ContentHandler pHandler, Object pObject)
throws SAXException {
TypeSerializer ts = typeFactory.getSerializer(config, pObject);
+ if (ts == null) {
+ throw new SAXException("Unsupported Java type: " +
pObject.getClass().getName());
+ }
ts.write(pHandler, pObject);
}
protected void writeData(ContentHandler pHandler, Object pObject)
throws SAXException {
1.1.2.2 +3 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/serializer/Attic/MapSerializer.java
Index: MapSerializer.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/serializer/Attic/MapSerializer.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- MapSerializer.java 12 May 2005 01:58:52 -0000 1.1.2.1
+++ MapSerializer.java 21 May 2005 22:01:24 -0000 1.1.2.2
@@ -52,6 +52,9 @@
pHandler.characters(pKey.toCharArray(), 0, pKey.length());
pHandler.endElement("", NAME_TAG, NAME_TAG);
TypeSerializer ts = typeFactory.getSerializer(config, pValue);
+ if (ts == null) {
+ throw new SAXException("Unsupported Java type: " +
pValue.getClass().getName());
+ }
ts.write(pHandler, pValue);
pHandler.endElement("", MEMBER_TAG, MEMBER_TAG);
}
1.1.2.4 +3 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/serializer/Attic/XmlRpcWriter.java
Index: XmlRpcWriter.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/serializer/Attic/XmlRpcWriter.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- XmlRpcWriter.java 13 May 2005 21:06:37 -0000 1.1.2.3
+++ XmlRpcWriter.java 21 May 2005 22:01:24 -0000 1.1.2.4
@@ -138,6 +138,9 @@
*/
protected void writeValue(Object pObject) throws SAXException {
TypeSerializer serializer = typeFactory.getSerializer(config,
pObject);
+ if (serializer == null) {
+ throw new SAXException("Unsupported Java type: " +
pObject.getClass().getName());
+ }
serializer.write(handler, pObject);
}
}
No revision
No revision
1.4.2.3 +9 -32 ws-xmlrpc/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/ws-xmlrpc/.classpath,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- .classpath 14 May 2005 21:17:49 -0000 1.4.2.2
+++ .classpath 21 May 2005 22:01:24 -0000 1.4.2.3
@@ -1,36 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/java">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry sourcepath="lib/ws-commons-java5-src.zip" kind="lib"
path="lib/ws-commons-java5.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry sourcepath="lib/ws-commons-util-src.zip" kind="lib"
path="lib/ws-commons-util.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="src/test">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="lib/junit-3.8.1.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar">
- <attributes>
- </attributes>
- </classpathentry>
- <classpathentry kind="lib" path="lib/commons-logging.jar">
- <attributes>
- </attributes>
- </classpathentry>
+ <classpathentry kind="src" path="src/java"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry sourcepath="lib/ws-commons-java5-src.zip" kind="lib"
path="lib/ws-commons-java5.jar"/>
+ <classpathentry sourcepath="lib/ws-commons-util-src.zip" kind="lib"
path="lib/ws-commons-util.jar"/>
+ <classpathentry kind="src" path="src/test"/>
+ <classpathentry kind="lib" path="lib/junit-3.8.1.jar"/>
+ <classpathentry kind="lib" path="lib/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="lib" path="lib/commons-logging.jar"/>
+ <classpathentry kind="lib" path="lib/jaxmeapi-0.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
No revision
No revision
1.1.2.1 +44 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/jaxb/Attic/JaxbParser.java
1.1.2.1 +92 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/jaxb/Attic/JaxbSerializer.java
1.1.2.1 +68 -0
ws-xmlrpc/src/java/org/apache/xmlrpc/jaxb/Attic/JaxbTypeFactory.java
No revision
No revision
1.1.2.5 +1 -1
ws-xmlrpc/src/java/org/apache/xmlrpc/common/Attic/TypeFactoryImpl.java
Index: TypeFactoryImpl.java
===================================================================
RCS file:
/home/cvs/ws-xmlrpc/src/java/org/apache/xmlrpc/common/Attic/TypeFactoryImpl.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- TypeFactoryImpl.java 21 May 2005 21:23:51 -0000 1.1.2.4
+++ TypeFactoryImpl.java 21 May 2005 22:01:24 -0000 1.1.2.5
@@ -144,7 +144,7 @@
throw new SAXException(new
XmlRpcExtensionException("DOM nodes aren't supported, if
isEnabledForExtensions() == false"));
}
} else {
- throw new SAXException("Unsupported Java type: " +
pObject.getClass().getName());
+ return null;
}
}
