Adjusted script to use expanded Tomcat webapp

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@263 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/bin/ArpUtil b/bin/ArpUtil
index 2f4fda7..091ba91 100755 (executable)
--- a/bin/ArpUtil
+++ b/bin/ArpUtil
@@ -1,14 +1,20 @@
 #!/bin/sh
 
+#The Shibboleth webapp root
+if [ -z SHIB_ROOT ]
+       then
+               SHIB_ROOT=/usr/local/tomcat/webapps/shibboleth
+fi
+
 #Where log4j config file is
-LOG_CONFIG=../webApplication/WEB-INF/conf/log4j.properties
+LOG_CONFIG=$SHIB_ROOT/WEB-INF/conf/log4j.properties
 
 #Where ARPs directory is
-ARP_DIR=../webApplication/arps
+ARP_DIR=$SHIB_ROOT/arps
 
 if [ -n JAVA_HOME ]
        then
-               $JAVA_HOME/bin/java -Dlog.config=$LOG_CONFIG -Darp.dir=$ARP_DIR -cp ../dist/shib-util.jar:../lib/log4j-1.2.5.jar edu.internet2.middleware.shibboleth.aa.arpUtil.ArpUtil $@
+               $JAVA_HOME/bin/java -Dlog.config=$LOG_CONFIG -Darp.dir=$ARP_DIR -cp $SHIB_ROOT/WEB-INF/classes:$SHIB_ROOT/WEB-INF/lib/log4j-1.2.5.jar edu.internet2.middleware.shibboleth.aa.arpUtil.ArpUtil $@
        else
                echo "JAVA_HOME not set."
 fi