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

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

Author: scott.stark at jboss.org
Date: 2008-08-08 07:25:42 -0400 (Fri, 08 Aug 2008)
New Revision: 76820

Modified:
   trunk/build/build-distr.xml
   trunk/server/src/etc/conf/default/classloader.xml
   trunk/webservices/src/scripts/jbossws-deploy-macros.xml
Log:
Move jaxb-apis, stax-api, activation into endorsed.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2008-08-08 11:04:20 UTC (rev 76819)
+++ trunk/build/build-distr.xml	2008-08-08 11:25:42 UTC (rev 76820)
@@ -1827,12 +1827,6 @@
         <include name="jaxb-impl.jar"/>
         <include name="jaxb-xjc.jar"/>
       </fileset>
-      <fileset dir="${stax.api.lib}">
-        <include name="stax-api.jar"/>
-      </fileset>
-      <fileset dir="${sun.jaf.lib}">
-        <include name="activation.jar"/>
-      </fileset>
       <fileset dir="${woodstox.woodstox.lib}">
         <include name="wstx.jar"/>
       </fileset>
@@ -1918,9 +1912,6 @@
       <fileset dir="${jboss.jboss.ha.client.lib}">
         <include name="jboss-ha-client.jar"/>
       </fileset>
-      <fileset dir="${stax.api.lib}">
-        <include name="stax-api.jar"/>
-      </fileset>
       <fileset dir="${sun.jaf.lib}">
         <include name="activation.jar"/>
       </fileset>
@@ -1928,7 +1919,6 @@
         <include name="mail.jar"/>
       </fileset>
       <fileset dir="${sun.jaxb.lib}">
-        <include name="jaxb-api.jar"/>
         <include name="jaxb-impl.jar"/>
         <include name="jaxb-xjc.jar"/>
       </fileset>
@@ -1962,6 +1952,15 @@
         <include name="xalan.jar"/>
         <include name="serializer.jar"/>
       </fileset>
+      <fileset dir="${sun.jaxb.lib}">
+        <include name="jaxb-api.jar"/>
+      </fileset>
+      <fileset dir="${sun.jaf.lib}">
+        <include name="activation.jar"/>
+      </fileset>
+      <fileset dir="${stax.api.lib}">
+        <include name="stax-api.jar"/>
+      </fileset>
     </copy>
 
     <!-- Copy thirdparty code to server/all/lib -->

Modified: trunk/server/src/etc/conf/default/classloader.xml
===================================================================
--- trunk/server/src/etc/conf/default/classloader.xml	2008-08-08 11:04:20 UTC (rev 76819)
+++ trunk/server/src/etc/conf/default/classloader.xml	2008-08-08 11:25:42 UTC (rev 76820)
@@ -43,10 +43,9 @@
       <root>${jboss.lib.url}/jboss-jmx.jar</root>
       <root>${jboss.lib.url}/jboss-system-jmx.jar</root>
       <root>${jboss.lib.url}/dom4j.jar</root>
-      <!-- JAXB - shouldn't this be in endorsed? -->
-      <root>${jboss.lib.url}/activation.jar</root>
+      <!-- JAXB impl here, api is in endorsed -->
       <root>${jboss.lib.url}/jaxb-impl.jar</root>
-      <root>${jboss.lib.url}/stax-api.jar</root>
+      <!-- STAX2 impl here, api is in endorsed -->
       <root>${jboss.lib.url}/wstx.jar</root>
    </classloader>
    

Modified: trunk/webservices/src/scripts/jbossws-deploy-macros.xml
===================================================================
--- trunk/webservices/src/scripts/jbossws-deploy-macros.xml	2008-08-08 11:04:20 UTC (rev 76819)
+++ trunk/webservices/src/scripts/jbossws-deploy-macros.xml	2008-08-08 11:25:42 UTC (rev 76820)
@@ -31,7 +31,7 @@
   
   <patternset id="jbossws.client.patternset">
     <include name="**/FastInfoset.jar"/>
-    <include name="**/jaxb-api.jar"/>
+    <include name="**/sun-jaxb/lib/jaxb-api.jar"/>
     <include name="**/jaxb-impl.jar"/>
     <include name="**/jaxb-xjc.jar"/>
     <include name="**/jaxws-tools.jar"/>
@@ -47,7 +47,7 @@
     <include name="**/jbossws-spi.jar"/>
     <include name="**/jettison.jar"/>
     <include name="**/policy.jar"/>
-    <include name="**/stax-api.jar"/>
+    <include name="**/stax-api/lib/stax-api.jar"/>
     <include name="**/stax-ex.jar"/>
     <include name="**/streambuffer.jar"/>
     <include name="**/wsdl4j.jar"/>
@@ -128,9 +128,7 @@
       <copy todir="@{targetdir}" flatten="true" overwrite="true">
         <fileset dir="@{thirdpartydir}">
           <patternset refid="jbossws.lib.patternset"/>
-          <include name="**/jaxb-api.jar"/>
           <include name="**/jaxb-impl.jar"/>
-          <include name="**/stax-api.jar"/>
           <include name="**/wstx.jar"/>
         </fileset>
       </copy>