[jboss-cvs] JBossAS SVN: r60137 - in trunk: j2ee/src/main/javax/xml/stream and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 31 10:26:30 EST 2007
Author: jason.greene at jboss.com
Date: 2007-01-31 10:26:30 -0500 (Wed, 31 Jan 2007)
New Revision: 60137
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/j2ee/src/main/javax/xml/stream/XMLEventFactory.java
trunk/j2ee/src/main/javax/xml/stream/XMLInputFactory.java
trunk/j2ee/src/main/javax/xml/stream/XMLOutputFactory.java
Log:
Switch StAX implementation to woodstox
Add jaxb-xjc.jar to client
Add jbossws-sun-wsimport.jar to client
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2007-01-31 13:20:31 UTC (rev 60136)
+++ trunk/build/build-distr.xml 2007-01-31 15:26:30 UTC (rev 60137)
@@ -1118,18 +1118,18 @@
</fileset>
</copy>
- <!-- Include StAX (JSR-173) -->
<copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${codehaus.stax.lib}">
- <include name="stax-1.1.1.jar"/>
+ <fileset dir="${wutka.dtdparser.lib}">
+ <include name="dtdparser121.jar"/>
</fileset>
</copy>
+
<copy todir="${install.server}/all/lib" filtering="no">
- <fileset dir="${wutka.dtdparser.lib}">
- <include name="dtdparser121.jar"/>
+ <fileset dir="${woodstox.woodstox.lib}">
+ <include name="wstx.jar"/>
</fileset>
</copy>
-
+
<!-- Include the HTTP invoker service unpacked -->
<mkdir dir="${install.server}/all/deploy/httpha-invoker.sar"/>
<unjar src="${_module.output}/lib/httpha-invoker.sar" dest="${install.server}/all/deploy/httpha-invoker.sar"/>
@@ -1796,6 +1796,7 @@
<fileset dir="${sun.jaxb.lib}">
<include name="jaxb-api.jar"/>
<include name="jaxb-impl.jar"/>
+ <include name="jaxb-xjc.jar"/>
</fileset>
<fileset dir="${jboss.jbossws.lib}">
<include name="jbossws-client.jar"/>
@@ -1803,6 +1804,12 @@
<include name="jboss-jaxws.jar"/>
<include name="jboss-saaj.jar"/>
</fileset>
+ <fileset dir="${woodstox.woodstox.lib}">
+ <include name="wstx.jar"/>
+ </fileset>
+ <fileset dir="${jboss.jbossws.sun.wsimport.lib}">
+ <include name="jbossws-sun-wsimport.jar"/>
+ </fileset>
</copy>
<!-- Copy thirdparty code to lib/endorsed -->
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-01-31 13:20:31 UTC (rev 60136)
+++ trunk/build/build-thirdparty.xml 2007-01-31 15:26:30 UTC (rev 60137)
@@ -69,7 +69,6 @@
<componentref name="asm" version="1.5.3"/>
<componentref name="beanshell" version="1.3.0"/>
<componentref name="cglib" version="2.1.3.nodep"/>
- <componentref name="codehaus-stax" version="1.1.1"/>
<componentref name="dom4j" version="1.6.1jboss"/>
<componentref name="easymock" version="1.1"/>
<componentref name="ehcache" version="1.2.0.GA"/>
@@ -93,6 +92,7 @@
<componentref name="jboss/common-logging-spi" version="2.0.2.GA"/>
<componentref name="jboss/jbossxb" version="snapshot"/>
<componentref name="jboss/jbossws" version="snapshot"/>
+ <componentref name="jboss/jbossws-sun-wsimport" version="2.0.0"/>
<componentref name="jboss/messaging" version="1.0.1.GA"/>
<componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/jboss-vfs" version="2.0.0.snapshot"/>
@@ -131,6 +131,7 @@
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-xacml" version="2.0"/>
<componentref name="trove" version="1.0.2"/>
+ <componentref name="woodstox" version="3.1.1"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
<componentref name="xdoclet" version="1.2b3"/>
<componentref name="xmlunit-xmlunit" version="1.0"/>
Modified: trunk/j2ee/src/main/javax/xml/stream/XMLEventFactory.java
===================================================================
--- trunk/j2ee/src/main/javax/xml/stream/XMLEventFactory.java 2007-01-31 13:20:31 UTC (rev 60136)
+++ trunk/j2ee/src/main/javax/xml/stream/XMLEventFactory.java 2007-01-31 15:26:30 UTC (rev 60137)
@@ -44,7 +44,7 @@
public abstract class XMLEventFactory
{
// This isn't part of the API, although it should be...
- private static final String XML_EVENT_FACTORY_KEY = "javax.xml.stream.XMLEventFactory";
+ private static final String XML_EVENT_FACTORY_KEY = "com.ctc.wstx.stax.WstxEventFactory";
// Private because it's implementation.
private static final String XML_EVENT_FACTORY_DEFAULT = "com.bea.xml.stream.EventFactory";
Modified: trunk/j2ee/src/main/javax/xml/stream/XMLInputFactory.java
===================================================================
--- trunk/j2ee/src/main/javax/xml/stream/XMLInputFactory.java 2007-01-31 13:20:31 UTC (rev 60136)
+++ trunk/j2ee/src/main/javax/xml/stream/XMLInputFactory.java 2007-01-31 15:26:30 UTC (rev 60137)
@@ -127,7 +127,7 @@
private static final String XML_INPUT_FACTORY_KEY = "javax.xml.stream.XMLInputFactory";
// Private because it's implementation.
- private static final String XML_INPUT_FACTORY_DEFAULT = "com.bea.xml.stream.MXParserFactory";
+ private static final String XML_INPUT_FACTORY_DEFAULT = "com.ctc.wstx.stax.WstxInputFactory";
/**
* The property used to turn on/off namespace support, this is to support XML
@@ -424,4 +424,4 @@
* Gets the allocator used by streams created with this factory
*/
public abstract XMLEventAllocator getEventAllocator();
-}
\ No newline at end of file
+}
Modified: trunk/j2ee/src/main/javax/xml/stream/XMLOutputFactory.java
===================================================================
--- trunk/j2ee/src/main/javax/xml/stream/XMLOutputFactory.java 2007-01-31 13:20:31 UTC (rev 60136)
+++ trunk/j2ee/src/main/javax/xml/stream/XMLOutputFactory.java 2007-01-31 15:26:30 UTC (rev 60137)
@@ -119,7 +119,7 @@
private static final String XML_OUTPUT_FACTORY_KEY = "javax.xml.stream.XMLOutputFactory";
// Private because it's implementation.
- private static final String XML_OUTPUT_FACTORY_DEFAULT = "com.bea.xml.stream.XMLOutputFactoryBase";
+ private static final String XML_OUTPUT_FACTORY_DEFAULT = "com.ctc.wstx.stax.WstxOutputFactory";
/**
* Property used to set prefix defaulting on the output side
More information about the jboss-cvs-commits
mailing list