[jboss-cvs] JBossAS SVN: r87819 - in projects/jboss-jca/trunk: standalone and 1 other directories.

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

Author: jesper.pedersen
Date: 2009-04-24 12:12:35 -0400 (Fri, 24 Apr 2009)
New Revision: 87819

Modified:
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/ivy.xml
   projects/jboss-jca/trunk/standalone/build.xml
   projects/jboss-jca/trunk/standalone/src/main/resources/run.sh
Log:
[JBJCA-92] Apache Xerces 2.9.1

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2009-04-24 15:59:05 UTC (rev 87818)
+++ projects/jboss-jca/trunk/build.xml	2009-04-24 16:12:35 UTC (rev 87819)
@@ -64,6 +64,7 @@
        ================================= -->
   <property name="version.apache-log4j" value="1.2.14"/>
   <property name="version.apache-logging" value="1.1.0.jboss"/>
+  <property name="version.apache-xerces" value="2.9.1"/>
   <property name="version.easymock" value="2.4"/>
   <property name="version.javassist" value="3.10.0.GA"/>
   <property name="version.jaxb.api" value="2.0"/>

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2009-04-24 15:59:05 UTC (rev 87818)
+++ projects/jboss-jca/trunk/ivy.xml	2009-04-24 16:12:35 UTC (rev 87819)
@@ -85,6 +85,7 @@
     <dependency org="org.jboss.microcontainer" name="jboss-kernel" rev="${version.jboss.mc.kernel}" conf="standalone->default"/>
     <dependency org="org.jboss.naming" name="jnpserver" rev="${version.jboss.naming}" conf="standalone->default"/>
     <dependency org="trove" name="trove" rev="${version.trove}" conf="standalone->default"/>
+    <dependency org="xerces" name="xercesImpl" rev="${version.apache-xerces}" conf="standalone->default"/>
   </dependencies>
 
 </ivy-module>

Modified: projects/jboss-jca/trunk/standalone/build.xml
===================================================================
--- projects/jboss-jca/trunk/standalone/build.xml	2009-04-24 15:59:05 UTC (rev 87818)
+++ projects/jboss-jca/trunk/standalone/build.xml	2009-04-24 16:12:35 UTC (rev 87819)
@@ -81,6 +81,7 @@
     <mkdir dir="${target.dir}/standalone"/>
     <mkdir dir="${target.dir}/standalone/bin"/>
     <mkdir dir="${target.dir}/standalone/lib"/>
+    <mkdir dir="${target.dir}/standalone/lib/endorsed"/>
     <mkdir dir="${target.dir}/standalone/server"/>
     <mkdir dir="${target.dir}/standalone/server/jca"/>
     <mkdir dir="${target.dir}/standalone/server/jca/conf"/>
@@ -113,9 +114,18 @@
     <copy todir="${target.dir}/standalone/lib">
       <fileset dir="${lib.dir}/standalone">
         <include name="*.jar"/>
+        <exclude name="jaxb-api.jar"/>
+        <exclude name="xercesImpl.jar"/>
       </fileset>
     </copy>
 
+    <copy todir="${target.dir}/standalone/lib/endorsed">
+      <fileset dir="${lib.dir}/standalone">
+        <include name="jaxb-api.jar"/>
+        <include name="xercesImpl.jar"/>
+      </fileset>
+    </copy>
+
     <chmod dir="${target.dir}/standalone/bin" perm="ugo+rx" includes="**/*.sh"/>
 
   </target>

Modified: projects/jboss-jca/trunk/standalone/src/main/resources/run.sh
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/resources/run.sh	2009-04-24 15:59:05 UTC (rev 87818)
+++ projects/jboss-jca/trunk/standalone/src/main/resources/run.sh	2009-04-24 16:12:35 UTC (rev 87819)
@@ -1 +1,51 @@
-java -Xmx512m -jar jboss-jca-standalone.jar
+#!/bin/sh
+### ====================================================================== ###
+##                                                                          ##
+##  JBoss JCA Script                                                        ##
+##                                                                          ##
+### ====================================================================== ###
+
+### $Id: $ ###
+
+DIRNAME=`dirname $0`
+
+# Setup JBOSS_JCA_HOME
+if [ "x$JBOSS_JCA_HOME" = "x" ]; then
+    # get the full path (without any relative bits)
+    JBOSS_JCA_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_JCA_HOME
+
+# Setup the java endorsed dirs
+JBOSS_JCA_ENDORSED_DIRS="$JBOSS_JCA_HOME/lib/endorsed"
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+    if [ "x$JAVA_HOME" != "x" ]; then
+        JAVA="$JAVA_HOME/bin/java"
+    else
+        JAVA="java"
+    fi
+fi
+
+# Setup the JVM options
+JAVA_OPTS="$JAVA_OPTS -Xmx512m"
+
+# Display the environment
+echo "========================================================================="
+echo ""
+echo "  JBoss JCA"
+echo ""
+echo "  JBOSS_JCA_HOME: $JBOSS_JCA_HOME"
+echo ""
+echo "  JAVA: $JAVA"
+echo ""
+echo "  JAVA_OPTS: $JAVA_OPTS"
+echo ""
+echo "========================================================================="
+echo ""
+
+# Start JBoss JCA
+"$JAVA" $JAVA_OPTS \
+    -Djava.endorsed.dirs="$JBOSS_JCA_ENDORSED_DIRS" \
+    -jar jboss-jca-standalone.jar