set endorsed directory via command line so that users don't have to endorse for the...

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

diff --git a/tools/aacli.bat b/tools/aacli.bat
index e880e34..2e6b627 100644 (file)
--- a/tools/aacli.bat
+++ b/tools/aacli.bat
@@ -37,4 +37,4 @@ if exist %JAVA_HOME%\lib\classes.zip (
 
 REM Go to it !
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Djava.endorsed.dirs=%IDP_HOME%\lib edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI %*

diff --git a/tools/aacli.sh b/tools/aacli.sh
index 81a7790..82b45d0 100755 (executable)
--- a/tools/aacli.sh
+++ b/tools/aacli.sh
@@ -30,7 +30,8 @@ fi
 LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
 
 # add in the dependency .jar files from the lib directory
-LIBS=$LOCATION/../lib/*.jar
+LIBDIR=$LOCATION/../lib
+LIBS=$LIBDIR/*.jar
 for i in $LIBS
 do
     # if the directory is empty, then it will return the input string
@@ -40,4 +41,4 @@ do
     fi
 done
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" '-Djava.endorsed.dirs='"$LIBDIR" 'edu.internet2.middleware.shibboleth.common.attribute.AttributeAuthorityCLI' "$@"
\ No newline at end of file

diff --git a/tools/version.bat b/tools/version.bat
index 2d0ac21..5f56bb7 100644 (file)
--- a/tools/version.bat
+++ b/tools/version.bat
@@ -37,4 +37,4 @@ if exist %JAVA_HOME%\lib\classes.zip (
 
 REM Go to it !
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" edu.internet2.middleware.shibboleth.idp.Version
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Djava.endorsed.dirs=%IDP_HOME%\lib edu.internet2.middleware.shibboleth.idp.Version

diff --git a/tools/version.sh b/tools/version.sh
index 6cba483..68c4c6b 100644 (file)
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -30,7 +30,8 @@ fi
 LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
 
 # add in the dependency .jar files from the lib directory
-LIBS=$LOCATION/../lib/*.jar
+LIBDIR=$LOCATION/../lib
+LIBS=$LIBDIR/*.jar
 for i in $LIBS
 do
     # if the directory is empty, then it will return the input string
@@ -40,4 +41,4 @@ do
     fi
 done
 
-"$JAVACMD" '-classpath' "$LOCALCLASSPATH" 'edu.internet2.middleware.shibboleth.idp.Version'
\ No newline at end of file
+"$JAVACMD" '-classpath' "$LOCALCLASSPATH" '-Djava.endorsed.dirs='"$LIBDIR" 'edu.internet2.middleware.shibboleth.idp.Version'
\ No newline at end of file