You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2006/11/01 17:46:38 UTC
svn commit: r469976 - in /webservices/jaxme/branches: MAVEN/
MAVEN/projects/jm/
MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/impl/ b0_5/
b0_5/src/jaxme/org/apache/ws/jaxme/impl/
b0_5/src/jaxme/org/apache/ws/jaxme/junit/
Author: jochen
Date: Wed Nov 1 08:46:37 2006
New Revision: 469976
URL: http://svn.apache.org/viewvc?view=rev&rev=469976
Log:
The detection, whether the CharSetXMLWriter is available, failed on IBM JDK 1.3.1.
Submitted-by: Vincent Reviol, vincent.reviol@gmail.com
Modified:
webservices/jaxme/branches/MAVEN/projects/jm/project.xml
webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
webservices/jaxme/branches/MAVEN/status.xml
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java
webservices/jaxme/branches/b0_5/status.xml
Modified: webservices/jaxme/branches/MAVEN/projects/jm/project.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/project.xml?view=diff&rev=469976&r1=469975&r2=469976
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/project.xml Wed Nov 1 08:46:37 2006
@@ -80,6 +80,10 @@
<contributor>
<name>Andreas Arrgård</name>
<email>andreas.arrgard at octagroup.com</email>
+ </contributor>
+ <contributor>
+ <name>Vincent Reviol</name>
+ <email>vincent.reviol@gmail.com</email>
</contributor>
</contributors>
<build>
Modified: webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java?view=diff&rev=469976&r1=469975&r2=469976
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java (original)
+++ webservices/jaxme/branches/MAVEN/projects/jm/src/main/java/org/apache/ws/jaxme/impl/JMMarshallerImpl.java Wed Nov 1 08:46:37 2006
@@ -32,8 +32,6 @@
import javax.xml.transform.stream.StreamResult;
import org.apache.ws.jaxme.*;
-import org.apache.ws.jaxme.JMElement;
-import org.apache.ws.jaxme.JMMarshaller;
import org.apache.ws.jaxme.util.DOMBuilder;
import org.w3c.dom.Node;
import org.xml.sax.ContentHandler;
@@ -98,13 +96,14 @@
private static final Class xmlWriterClassDefault;
static {
- Class c;
- try {
- c = Class.forName("org.apache.ws.jaxme.impl.CharSetXMLWriter");
- } catch (Exception e) {
- c = XMLWriterImpl.class;
- }
- xmlWriterClassDefault = c;
+ Class c;
+ try {
+ c = Class.forName("org.apache.ws.jaxme.impl.CharSetXMLWriter");
+ c.newInstance();
+ } catch (Exception e) {
+ c = XMLWriterImpl.class;
+ }
+ xmlWriterClassDefault = c;
}
private String encoding = DEFAULT_JAXB_ENCODING;
Modified: webservices/jaxme/branches/MAVEN/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/MAVEN/status.xml?view=diff&rev=469976&r1=469975&r2=469976
==============================================================================
--- webservices/jaxme/branches/MAVEN/status.xml (original)
+++ webservices/jaxme/branches/MAVEN/status.xml Wed Nov 1 08:46:37 2006
@@ -46,7 +46,14 @@
Upgrade to the latest version of java15.g.
</action>
</release>
- <release version="0.5.2" date="Unpublished">
+ <release version="0.5.3" date="Unpublished">
+ <action dev="JW" type="fix" context="runtime">
+ The detection, whether the CharSetXMLWriter could be
+ used, failed on IBM JDK 1.3.1.
+ (Vincent Reviol, vincent.reviol@gmail.com)
+ </action>
+ </release>
+ <release version="0.5.2" date="25-Oct-2006">
<action dev="JW" type="enhancement" context="generator">
Added the "xmlCatalog" element to the JaxMe Ant task.
</action>
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java?view=diff&rev=469976&r1=469975&r2=469976
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/impl/JMMarshallerImpl.java Wed Nov 1 08:46:37 2006
@@ -99,13 +99,14 @@
private static final Class xmlWriterClassDefault;
static {
- Class c;
- try {
- c = Class.forName("org.apache.ws.jaxme.impl.CharSetXMLWriter");
- } catch (Exception e) {
- c = XMLWriterImpl.class;
- }
- xmlWriterClassDefault = c;
+ Class c;
+ try {
+ c = Class.forName("org.apache.ws.jaxme.impl.CharSetXMLWriter");
+ c.newInstance();
+ } catch (Exception e) {
+ c = XMLWriterImpl.class;
+ }
+ xmlWriterClassDefault = c;
}
private String encoding = DEFAULT_JAXB_ENCODING;
Modified: webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java?view=diff&rev=469976&r1=469975&r2=469976
==============================================================================
--- webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java (original)
+++ webservices/jaxme/branches/b0_5/src/jaxme/org/apache/ws/jaxme/junit/JiraTest.java Wed Nov 1 08:46:37 2006
@@ -290,4 +290,36 @@
+ "</xdws:xdwsResponse>";
unmarshalMarshalUnmarshal(XdwsResponse.class, xml);
}
+
+ public void testJAXME86() throws Exception {
+ final String xsd =
+ "<xs:schema\n"
+ + " xmlns:jaxb='http://java.sun.com/xml/ns/jaxb'\n"
+ + " xmlns:xs='http://www.w3.org/2001/XMLSchema'\n"
+ + " elementFormDefault='qualified'\n"
+ + " targetNamespace='http://www.twistedpair.nl/ta/protocol/xsd'\n"
+ + " xmlns='http://www.twistedpair.nl/ta/protocol/xsd'\n"
+ + " jaxb:version='2.0'>\n"
+ + " <xs:annotation>\n"
+ + " <xs:appinfo>\n"
+ + " <jaxb:globalBindings>\n"
+ + " <jaxb:javaType name='java.lang.Integer' xmlType='xs:int'/>\n"
+ + " </jaxb:globalBindings>\n"
+ + " </xs:appinfo>\n"
+ + " </xs:annotation>\n"
+ + "\n"
+ + " <xs:complexType name='InternetAddress'>\n"
+ + " <xs:attribute name='host' type='xs:string'/>\n"
+ + " <xs:attribute name='port' type='xs:int'/>\n"
+ + " </xs:complexType>\n"
+ + "</xs:schema>\n";
+
+ Generator g = new GeneratorImpl();
+ g.setTargetDirectory(new File("build/tests/jaxme86/src"));
+ g.setResourceTargetDirectory(new File("build/tests/jaxme86/src"));
+ SchemaReader sr = new JAXBSchemaReader();
+ sr.setGenerator(g);
+ g.setSchemaReader(sr);
+ g.generate(new InputSource(new StringReader(xsd)));
+ }
}
Modified: webservices/jaxme/branches/b0_5/status.xml
URL: http://svn.apache.org/viewvc/webservices/jaxme/branches/b0_5/status.xml?view=diff&rev=469976&r1=469975&r2=469976
==============================================================================
--- webservices/jaxme/branches/b0_5/status.xml (original)
+++ webservices/jaxme/branches/b0_5/status.xml Wed Nov 1 08:46:37 2006
@@ -30,6 +30,13 @@
</todo>
<changes>
+ <release version="0.5.3" date="Unpublished">
+ <action dev="JW" type="fix" context="runtime">
+ The detection, whether the CharSetXMLWriter could be
+ used, failed on IBM JDK 1.3.1.
+ (Vincent Reviol, vincent.reviol@gmail.com)
+ </action>
+ </release>
<release version="0.5.2" date="25-Oct-2006">
<action dev="JW" type="enhancement" context="generator">
Added the "xmlCatalog" element to the JaxMe Ant task.
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org