Synch'ed from Rel_1_3.

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

diff --git a/bin/extkeytool b/bin/extkeytool
index 2a070e2..7c2b3d5 100755 (executable)
--- a/bin/extkeytool
+++ b/bin/extkeytool
@@ -18,15 +18,15 @@ fi
 
 
 ##Find the shibboleth components
-if [ ! -n "$SHIB_HOME" ] ; then
-  echo "Error: SHIB_HOME is not defined."
+if [ ! -n "$IDP_HOME" ] ; then
+  echo "Error: IDP_HOME is not defined."
   exit
 fi
 
 ## Where log4j config file is
-LOG_CONFIG=$SHIB_HOME/conf/log4j.properties
+LOG_CONFIG=$IDP_HOME/etc/log4j.properties
 
-if [ ! \( -f "$SHIB_HOME/lib/shib-util.jar" -a -r "$SHIB_HOME/lib/shib-util.jar" \) ] ; then
+if [ ! \( -f "$IDP_HOME/lib/shib-util.jar" -a -r "$IDP_HOME/lib/shib-util.jar" \) ] ; then
   echo "Error: Cannot find the shibboleth jar (shib-util.jar)."
   echo "       If you downloaded the shibboleth source, you need to run \"ant build-util\""
   exit
@@ -38,7 +38,7 @@ if [ -n "$CLASSPATH" ] ; then
   SHIB_UTIL_CLASSPATH=$CLASSPATH
 fi
 
-DIRLIBS=${SHIB_HOME}/lib/*.jar
+DIRLIBS=${IDP_HOME}/lib/*.jar
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string
@@ -51,7 +51,7 @@ do
       fi
     fi
 done
-SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:"$SHIB_HOME"
+SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:"$IDP_HOME"
 
 ##Here we go
 $JAVACMD -Dlog4j.configuration="$LOG_CONFIG" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.ExtKeyTool "$@"

diff --git a/bin/extkeytool.bat b/bin/extkeytool.bat
index 55199f7..4eb451c 100644 (file)
--- a/bin/extkeytool.bat
+++ b/bin/extkeytool.bat
@@ -18,16 +18,17 @@ if not exist %JAVACMD% (
 )
 
 REM The root of the Shibboleth package tree, relative to the run directory
-if not defined SHIB_HOME (
-  set SHIB_HOME=.
+if not defined IDP_HOME (
+  echo Error: IDP_HOME is not defined.
+  exit /b
 )
 
-set ENDORSED=%SHIB_HOME%\endorsed
+set ENDORSED=%IDP_HOME%\endorsed
 
 REM Where log4j config file is
-set LOG_CONFIG=%SHIB_HOME%\conf\log4j.properties
+set LOG_CONFIG=%IDP_HOME%\etc\log4j.properties
 
-if not exist %SHIB_HOME%\lib\shib-util.jar (
+if not exist %IDP_HOME%\lib\shib-util.jar (
   echo Error: Cannot find shib-util.jar
   echo                 If you downloaded the shibboleth source, you need to run "ant build-util"
   exit /b
@@ -39,8 +40,8 @@ if defined CLASSPATH (
 )
 
 REM add in the dependency .jar files
-for %%i in (%SHIB_HOME%\lib\*.jar) do (
-       call %SHIB_HOME%\bin\cpappend.bat %%i
+for %%i in (%IDP_HOME%\lib\*.jar) do (
+       call %IDP_HOME%\bin\cpappend.bat %%i
 )
 
 REM Here we go

diff --git a/bin/metadatatool b/bin/metadatatool
index 66ea7cc..57e3cd6 100755 (executable)
--- a/bin/metadatatool
+++ b/bin/metadatatool
@@ -18,9 +18,17 @@ fi
 
 
 ##Find the shibboleth components
+if [ -n "$IDP_HOME" ] ; then
+       SHIB_HOME=$IDP_HOME
+fi
+if [ -n "$SP_HOME" ] ; then
+       SHIB_HOME=$SP_HOME
+fi
 if [ ! -n "$SHIB_HOME" ] ; then
-  SHIB_HOME=.
+       echo "Error: Neither IDP_HOME nor SP_HOME is defined."
+       exit
 fi
+
 ENDORSED=$SHIB_HOME/endorsed
 
 if [ ! \( -f "$SHIB_HOME/lib/shib-util.jar" -a -r "$SHIB_HOME/lib/shib-util.jar" \) ] ; then

diff --git a/bin/metadatatool.bat b/bin/metadatatool.bat
index f0902ce..7c551d9 100755 (executable)
--- a/bin/metadatatool.bat
+++ b/bin/metadatatool.bat
@@ -17,8 +17,15 @@ if not exist %JAVACMD% (
   exit /b
 )
 
-REM The root of the Shibboleth package tree, relative to the run directory
+if defined IDP_HOME (
+  set SHIB_HOME=%IDP_HOME%
+)
+if defined SP_HOME (
+  set SHIB_HOME=%SP_HOME%
+)
 if not defined SHIB_HOME (
+  echo Error: Neither IDP_HOME nor SP_HOME is defined.
+  exit /b
   set SHIB_HOME=.
 )
 

diff --git a/bin/resolvertest b/bin/resolvertest
index 355cb1f..367f412 100755 (executable)
--- a/bin/resolvertest
+++ b/bin/resolvertest
@@ -18,25 +18,25 @@ fi
 
 
 ##Find the shibboleth components
-if [ ! -n "$SHIB_HOME" ] ; then
-  echo "Error: SHIB_HOME is not defined."
+if [ ! -n "$IDP_HOME" ] ; then
+  echo "Error: IDP_HOME is not defined."
   exit
 fi
 
-if [ ! \( -f "$SHIB_HOME/lib/shib-util.jar" -a -r "$SHIB_HOME/lib/shib-util.jar" \) ] ; then
+if [ ! \( -f "$IDP_HOME/lib/shib-util.jar" -a -r "$IDP_HOME/lib/shib-util.jar" \) ] ; then
   echo "Error: Cannot find the shibboleth jar (shib-util.jar)."
   echo "       If you downloaded the shibboleth source, you need to run \"ant build-util\""
   exit
 fi
 
-ENDORSED=$SHIB_HOME/endorsed/
+ENDORSED=$IDP_HOME/endorsed/
 
 ##Grab all the dependencies
 if [ -n "$CLASSPATH" ] ; then
   SHIB_UTIL_CLASSPATH=$CLASSPATH
 fi
 
-DIRLIBS=${SHIB_HOME}/lib/*.jar
+DIRLIBS=${IDP_HOME}/lib/*.jar
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string
@@ -50,7 +50,7 @@ do
     fi
 done
 
-DIRLIBS=${SHIB_HOME}/webApplication/WEB-INF/lib/*.jar
+DIRLIBS=${IDP_HOME}/webApplication/WEB-INF/lib/*.jar
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string
@@ -64,7 +64,7 @@ do
     fi
 done
 
-SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:"$SHIB_HOME"
+SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:"$IDP_HOME"
 
 ##Here we go
 $JAVACMD -Djava.endorsed.dirs="$ENDORSED" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.ResolverTest "$@"

diff --git a/bin/resolvertest.bat b/bin/resolvertest.bat
index b3759c6..9b4a420 100644 (file)
--- a/bin/resolvertest.bat
+++ b/bin/resolvertest.bat
@@ -18,13 +18,14 @@ if not exist %JAVACMD% (
 )
 
 REM The root of the Shibboleth package tree, relative to the run directory
-if not defined SHIB_HOME (
-  set SHIB_HOME=.
+if not defined IDP_HOME (
+  echo Error: IDP_HOME is not defined.
+  exit /b
 )
 
-set ENDORSED=%SHIB_HOME%\endorsed
+set ENDORSED=%IDP_HOME%\endorsed
 
-if not exist %SHIB_HOME%\lib\shib-util.jar (
+if not exist %IDP_HOME%\lib\shib-util.jar (
   echo Error: Cannot find shib-util.jar
   echo                 If you downloaded the shibboleth source, you need to run "ant build-util"
   exit /b
@@ -36,11 +37,11 @@ if defined CLASSPATH (
 )
 
 REM add in the dependency .jar files
-for %%i in (%SHIB_HOME%\lib\*.jar) do (
-       call %SHIB_HOME%\bin\cpappend.bat %%i
+for %%i in (%IDP_HOME%\lib\*.jar) do (
+       call %IDP_HOME%\bin\cpappend.bat %%i
 )
-for %%i in (%SHIB_HOME%\webApplication\WEB-INF\lib\*.jar) do (
-       call %SHIB_HOME%\bin\cpappend.bat %%i
+for %%i in (%IDP_HOME%\webApplication\WEB-INF\lib\*.jar) do (
+       call %IDP_HOME%\bin\cpappend.bat %%i
 )
 
 REM Here we go