[jboss-cvs] JBossAS SVN: r111297 - branches/JBPAPP_5_1/console/src/bin.

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

Author: permaine
Date: 2011-05-04 11:47:34 -0400 (Wed, 04 May 2011)
New Revision: 111297

Modified:
   branches/JBPAPP_5_1/console/src/bin/twiddle.sh
Log:
JBPAPP-5871 JBoss EAP 5.1 RPM links cause CNF exceptions when using twiddle

Modified: branches/JBPAPP_5_1/console/src/bin/twiddle.sh
===================================================================
--- branches/JBPAPP_5_1/console/src/bin/twiddle.sh	2011-05-04 08:23:50 UTC (rev 111296)
+++ branches/JBPAPP_5_1/console/src/bin/twiddle.sh	2011-05-04 15:47:34 UTC (rev 111297)
@@ -56,7 +56,12 @@
 
 if [ "x$JBOSS_CLASSPATH" = "x" ]; then
     JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH"
-    JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+    if [ -f /usr/share/jbossas/client/jbossall-client.jar ]; then
+        #set classpath to the jar in the rpm if it exists and is a regular file
+        JBOSS_CLASSPATH="$JBOSS_CLASSPATH:/usr/share/jbossas/client/jbossall-client.jar"
+    else
+        JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_HOME/client/jbossall-client.jar"
+    fi
     JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_HOME/client/getopt.jar"
     JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_HOME/client/log4j.jar"
     JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_HOME/lib/jboss-jmx.jar"