Some corrections to handle endorsing jars

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

diff --git a/bin/SiteSigner b/bin/SiteSigner
index ae9b740..9e2e1f4 100755 (executable)
--- a/bin/SiteSigner
+++ b/bin/SiteSigner
@@ -1,21 +1,18 @@
 #!/bin/sh
 
-TOMCAT_HOME=/usr/local/tomcat
+SHIB_HOME=/usr/local/tomcat/webapps/shibboleth
 
 #Where log4j config file is
-LOG_CONFIG=$TOMCAT_HOME/webapps/shibboleth/WEB-INF/conf/log4j.properties
+LOG_CONFIG=$SHIB_HOME/WEB-INF/classes/conf/log4j.properties
 
 #Where to find jar files...
-LIB=$TOMCAT_HOME/webapps/shibboleth/WEB-INF/lib
+LIB=$SHIB_HOME/WEB-INF/lib
 CP=$LIB/../classes:$LIB/log4j-1.2.5.jar:$LIB/opensaml.jar:$LIB/xalan-2.4.1.jar:$LIB/dom3-xercesImpl-2.4.0.jar:$LIB/dom3-xml-apis-2.4.0.jar:$LIB/xmlsec-1.0.5.jar
 
-#Where Registry directory is
-REG_DIR=$TOMCAT_HOME/webapps/shibboleth
-
 if [ -n JAVA_HOME ]
        then
-               $JAVA_HOME/bin/java -Dlog.config=$LOG_CONFIG -cp $CP edu.internet2.middleware.shibboleth.common.SiteSigner -o $REG_DIR/sites.xml $@ $REG_DIR/sites_unsigned.xml
-               $JAVA_HOME/bin/java -Dlog.config=$LOG_CONFIG -cp $CP edu.internet2.middleware.shibboleth.common.SiteSigner -o $REG_DIR/trust.xml $@ $REG_DIR/trust_unsigned.xml
+               $JAVA_HOME/bin/java -Djava.endorsed.dirs="$LIB" -Dlog.config=$LOG_CONFIG -cp $CP edu.internet2.middleware.shibboleth.common.SiteSigner -o $SHIB_HOME/sites.xml $@ $SHIB_HOME/sites_unsigned.xml
+               $JAVA_HOME/bin/java -Djava.endorsed.dirs="$LIB" -Dlog.config=$LOG_CONFIG -cp $CP edu.internet2.middleware.shibboleth.common.SiteSigner -o $SHIB_HOME/trust.xml $@ $SHIB_HOME/trust_unsigned.xml
        else
                echo "JAVA_HOME not set."
 fi