[jboss-cvs] JBossAS SVN: r100911 - in trunk: security/src/etc/bin and 1 other directory.

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

Author: richard.opalka at jboss.com
Date: 2010-02-12 06:19:55 -0500 (Fri, 12 Feb 2010)
New Revision: 100911

Modified:
   trunk/build/build.xml
   trunk/security/src/etc/bin/password_tool.sh
Log:
[JBAS-2073] removing xalan.jar and serializer.jar from endorsed directory. Now they live in both client/ and common/lib/ folders

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2010-02-12 10:15:17 UTC (rev 100910)
+++ trunk/build/build.xml	2010-02-12 11:19:55 UTC (rev 100911)
@@ -1878,6 +1878,8 @@
 
     <mkdir dir="${install.common.lib}"/>
     <copy todir="${install.common.lib}" filtering="no">
+      <fileset refid="apache-xalan:xalan:jar"/>
+      <fileset refid="apache-xalan:serializer:jar"/>
       <fileset refid="org.jboss.threads:jboss-threads:jar"/>
       <fileset refid="org.jboss.xnio:xnio-api:jar"/>
       <fileset refid="javax.xml.ws:jaxws-api:jar"/>
@@ -2067,6 +2069,8 @@
     <mkdir dir="${install.client}"/>
     <copy todir="${install.client}" filtering="no">
       <fileset refid="antlr:antlr:jar"/>
+      <fileset refid="apache-xalan:xalan:jar"/>
+      <fileset refid="apache-xalan:serializer:jar"/>
       <fileset refid="org.apache:xmlsec:jar"/>
       <fileset refid="wsdl4j:wsdl4j:jar"/>
       <fileset refid="javassist:javassist:jar"/>
@@ -2166,8 +2170,6 @@
     <copy todir="${install.lib}/endorsed" filtering="no">
       <fileset refid="xerces:xercesImpl:jar"/>
       <fileset refid="apache-xerces:resolver:jar"/>
-      <fileset refid="apache-xalan:xalan:jar"/>
-      <fileset refid="apache-xalan:serializer:jar"/>
       <fileset refid="sun-jaxb:jaxb-api:jar"/>
       <fileset refid="javax.activation:activation:jar"/>
       <fileset refid="stax:stax-api:jar"/>

Modified: trunk/security/src/etc/bin/password_tool.sh
===================================================================
--- trunk/security/src/etc/bin/password_tool.sh	2010-02-12 10:15:17 UTC (rev 100910)
+++ trunk/security/src/etc/bin/password_tool.sh	2010-02-12 11:19:55 UTC (rev 100911)
@@ -56,7 +56,8 @@
 JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JAVA_HOME/lib/tools.jar"
 JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/commons-logging.jar"
 JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/jboss-logging-spi.jar"
-JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/lib/endorsed/xalan.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/serializer.jar"
+JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/xalan.jar"
 
 # Shared jaxb libs
 JBOSSPASS_CLASSPATH="$JBOSSPASS_CLASSPATH:$JBOSS_HOME/client/activation.jar"