[jboss-cvs] JBossAS SVN: r68871 - in trunk: server/src/etc/conf/default and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2008-01-11 05:19:10 -0500 (Fri, 11 Jan 2008)
New Revision: 68871

Modified:
   trunk/build/build-distr.xml
   trunk/server/src/etc/conf/default/bootstrap-beans.xml
Log:
[JBAS-5126] Add stax impl (wstx.jar) to lib

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-01-11 09:47:56 UTC (rev 68870)
+++ trunk/build/build-distr.xml	2008-01-11 10:19:10 UTC (rev 68871)
@@ -1160,12 +1160,6 @@
       </fileset>
     </copy>
 
-    <copy todir="${install.server}/all/lib" filtering="no">
-      <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"/>
@@ -1816,7 +1810,9 @@
       <fileset dir="${sun.jaf.lib}">
         <include name="activation.jar"/>
       </fileset>
-
+      <fileset dir="${woodstox.woodstox.lib}">
+        <include name="wstx.jar"/>
+      </fileset>
     </copy>
 
     <!-- Copy the generated client libraries -->

Modified: trunk/server/src/etc/conf/default/bootstrap-beans.xml
===================================================================
--- trunk/server/src/etc/conf/default/bootstrap-beans.xml	2008-01-11 09:47:56 UTC (rev 68870)
+++ trunk/server/src/etc/conf/default/bootstrap-beans.xml	2008-01-11 10:19:10 UTC (rev 68871)
@@ -51,10 +51,11 @@
               <value>${jboss.lib.url}/jboss-aop-jboss5.jar</value>
               <value>${jboss.lib.url}/trove.jar</value>
               <!-- JAXB - shouldn't this be in endorsed? -->
+              <value>${jboss.lib.url}/activation.jar</value>
               <value>${jboss.lib.url}/jaxb-api.jar</value>
               <value>${jboss.lib.url}/jaxb-impl.jar</value>
               <value>${jboss.lib.url}/stax-api.jar</value>
-              <value>${jboss.lib.url}/activation.jar</value>
+              <value>${jboss.lib.url}/wstx.jar</value>
            </array>
         </parameter>
       </constructor>