Author: dblevins
Date: Sun Jan 13 22:33:08 2013
New Revision: 1432755
URL: http://svn.apache.org/viewvc?rev=1432755&view=rev
Log:
use jvm impl of javax.xml.stream.XMLOutputFactory and
javax.xml.stream.XMLInputFactory
Modified:
openejb/trunk/openejb/container/openejb-jee-accessors/pom.xml
openejb/trunk/openejb/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/Sxc.java
openejb/trunk/openejb/container/openejb-jee-accessors/src/test/resources/ejb-jar-example1.xml
Modified: openejb/trunk/openejb/container/openejb-jee-accessors/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee-accessors/pom.xml?rev=1432755&r1=1432754&r2=1432755&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-jee-accessors/pom.xml (original)
+++ openejb/trunk/openejb/container/openejb-jee-accessors/pom.xml Sun Jan 13
22:33:08 2013
@@ -71,17 +71,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>woodstox-core-asl</artifactId>
- <version>4.0.8</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
Modified:
openejb/trunk/openejb/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/Sxc.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/Sxc.java?rev=1432755&r1=1432754&r2=1432755&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/Sxc.java
(original)
+++
openejb/trunk/openejb/container/openejb-jee-accessors/src/main/java/org/apache/openejb/sxc/Sxc.java
Sun Jan 13 22:33:08 2013
@@ -31,6 +31,7 @@ import com.envoisolutions.sxc.util.XoXML
import javax.xml.bind.JAXBException;
import javax.xml.bind.MarshalException;
import javax.xml.namespace.QName;
+import javax.xml.stream.XMLOutputFactory;
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -56,12 +57,16 @@ public class Sxc {
public static void marshal(JAXBObject objectType, Object object, Result
result) throws JAXBException {
if (result == null) throw new IllegalArgumentException("result is
null");
+ if (!(result instanceof StreamResult)) throw new
IllegalArgumentException("result is null");
if (object == null) throw new IllegalArgumentException("object is
null");
if (objectType == null) throw new IllegalArgumentException("jaxbObject
is null");
+ StreamResult streamResult = (StreamResult) result;
+
XMLStreamWriter writer = null;
try {
- writer = XmlFactories.getXof().createXMLStreamWriter(result);
+ final XMLOutputFactory xof = XmlFactories.getXof();
+ writer = xof.createXMLStreamWriter(streamResult.getOutputStream(),
"UTF-8");
writer = new PrettyPrintXMLStreamWriter(writer);
XoXMLStreamWriter w = new XoXMLStreamWriterImpl(writer);
Modified:
openejb/trunk/openejb/container/openejb-jee-accessors/src/test/resources/ejb-jar-example1.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-jee-accessors/src/test/resources/ejb-jar-example1.xml?rev=1432755&r1=1432754&r2=1432755&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-jee-accessors/src/test/resources/ejb-jar-example1.xml
(original)
+++
openejb/trunk/openejb/container/openejb-jee-accessors/src/test/resources/ejb-jar-example1.xml
Sun Jan 13 22:33:08 2013
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; metadata-complete="true"
version="3.0">
<description>String</description>
<display-name>token</display-name>
@@ -30,7 +30,7 @@
<primkey-field>pk</primkey-field>
<security-identity>
<description>identity</description>
- <use-caller-identity/>
+ <use-caller-identity></use-caller-identity>
</security-identity>
<query>
<description>queryWithParam</description>
@@ -307,7 +307,7 @@
</security-role-ref>
<security-identity>
<description>String</description>
- <use-caller-identity/>
+ <use-caller-identity></use-caller-identity>
</security-identity>
</session>
</enterprise-beans>
@@ -485,7 +485,7 @@
<description>String</description>
<ejb-relationship-role-name>token</ejb-relationship-role-name>
<multiplicity>One</multiplicity>
- <cascade-delete/>
+ <cascade-delete></cascade-delete>
<relationship-role-source>
<description>String</description>
<ejb-name>A</ejb-name>
