[jboss-cvs] JBossAS SVN: r101024 - in trunk: main/src/main/java/org/jboss and 1 other directories.

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

Author: richard.opalka at jboss.com
Date: 2010-02-16 10:31:03 -0500 (Tue, 16 Feb 2010)
New Revision: 101024

Modified:
   trunk/build/build.xml
   trunk/main/src/main/java/org/jboss/Main.java
   trunk/messaging/src/etc/examples/web-service/build.xml
Log:
[JBAS-7738] refactoring resolver.jar and xercesImpl.jar from lib/endorsed/ to client/ and lib/ folders

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-02-16 15:30:28 UTC (rev 101023)
+++ trunk/build/build.xml	2010-02-16 15:31:03 UTC (rev 101024)
@@ -2061,6 +2061,8 @@
       <fileset refid="org.jboss.aop:jboss-aop-asintegration-mc:jar"/>
       <fileset refid="org.jboss.aop:jboss-aop-deployers:jar"/>
       <fileset refid="gnu-getopt:getopt:jar"/>
+      <fileset refid="xerces:xercesImpl:jar"/>
+      <fileset refid="apache-xerces:resolver:jar"/>
       <fileset refid="org.jboss:jbossxb:jar"/>
       <mapper refid="remove-versions" />
     </copy>
@@ -2071,6 +2073,8 @@
       <fileset refid="antlr:antlr:jar"/>
       <fileset refid="apache-xalan:xalan:jar"/>
       <fileset refid="apache-xalan:serializer:jar"/>
+      <fileset refid="xerces:xercesImpl:jar"/>
+      <fileset refid="apache-xerces:resolver:jar"/>
       <fileset refid="org.apache:xmlsec:jar"/>
       <fileset refid="wsdl4j:wsdl4j:jar"/>
       <fileset refid="javassist:javassist:jar"/>
@@ -2168,8 +2172,6 @@
     <!-- Copy thirdparty code to lib/endorsed -->
     <mkdir dir="${install.lib}/endorsed"/>
     <copy todir="${install.lib}/endorsed" filtering="no">
-      <fileset refid="xerces:xercesImpl:jar"/>
-      <fileset refid="apache-xerces:resolver:jar"/>
       <fileset refid="sun-jaxb:jaxb-api:jar"/>
       <fileset refid="javax.activation:activation:jar"/>
       <fileset refid="stax:stax-api:jar"/>

Modified: trunk/main/src/main/java/org/jboss/Main.java
===================================================================
--- trunk/main/src/main/java/org/jboss/Main.java	2010-02-16 15:30:28 UTC (rev 101023)
+++ trunk/main/src/main/java/org/jboss/Main.java	2010-02-16 15:31:03 UTC (rev 101024)
@@ -96,6 +96,8 @@
          "jboss-logging-logmanager.jar",
          // Common jars
          "jboss-common-core.jar",
+         "resolver.jar",
+         "xercesImpl.jar",
          "jbossxb.jar",
          // Bootstrap
          "jboss-bootstrap-spi.jar", "jboss-bootstrap-spi-as.jar", "jboss-bootstrap-spi-mc.jar",

Modified: trunk/messaging/src/etc/examples/web-service/build.xml
===================================================================
--- trunk/messaging/src/etc/examples/web-service/build.xml	2010-02-16 15:30:28 UTC (rev 101023)
+++ trunk/messaging/src/etc/examples/web-service/build.xml	2010-02-16 15:31:03 UTC (rev 101024)
@@ -35,7 +35,7 @@
       <pathelement location="${messaging.client.jar.path}/${messaging.client.jar.name}"/>
 
       <!-- all this stuff for WebServices -->
-      <pathelement location="${jboss.home}/lib/endorsed/xercesImpl.jar"/>
+      <pathelement location="${jboss.client}/xercesImpl.jar"/>
       <pathelement location="${jboss.client}/activation.jar"/>
       <pathelement location="${jboss.client}/commons-logging.jar"/>
       <pathelement location="${jboss.client}/javassist.jar"/>
@@ -72,7 +72,7 @@
       <pathelement location="${jboss.client}/jboss-saaj.jar"/>
       <pathelement location="${jboss.client}/wsdl4j.jar"/>
       <pathelement location="${jboss.client}/jaxb-api.jar"/>
-      <pathelement location="${jboss.home}/lib/endorsed/xercesImpl.jar"/>
+      <pathelement location="${jboss.client}/xercesImpl.jar"/>
 
 
       <pathelement location="${messaging.client.jar.name}"/>