New scripts for utility

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

diff --git a/bin/SiteSigner b/bin/SiteSigner
deleted file mode 100755 (executable)
index 9e2e1f4..0000000
--- a/bin/SiteSigner
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-SHIB_HOME=/usr/local/tomcat/webapps/shibboleth
-
-#Where log4j config file is
-LOG_CONFIG=$SHIB_HOME/WEB-INF/classes/conf/log4j.properties
-
-#Where to find jar files...
-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
-
-if [ -n JAVA_HOME ]
-       then
-               $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

diff --git a/bin/metadatatool b/bin/metadatatool
new file mode 100755 (executable)
index 0000000..9962a78
--- /dev/null
+++ b/bin/metadatatool
@@ -0,0 +1,46 @@
+##We need a JVM\r
+if [ ! -n "$JAVA_HOME" ] ; then\r
+  echo "Error: JAVA_HOME is not defined."\r
+  exit\r
+fi\r
+\r
+if [ ! -n "$JAVACMD" ] ; then\r
+  JAVACMD=$JAVA_HOME/bin/java\r
+fi\r
+\r
+if [ ! -x "$JAVACMD" ] ; then\r
+  echo "Error: JAVA_HOME is not defined correctly."\r
+  echo "Cannot execute $JAVACMD"\r
+  exit\r
+fi\r
+\r
+\r
+##Find the shibboleth components\r
+if [ ! -n "$SHIB_HOME" ] ; then\r
+  SHIB_HOME=.\r
+fi\r
+ENDORSED=$SHIB_HOME/endorsed\r
+\r
+##Grab all the dependencies\r
+if [ -n "$CLASSPATH" ] ; then\r
+  SHIB_UTIL_CLASSPATH=$CLASSPATH\r
+fi\r
+SHIB_UTIL_CLASSPATH=$SHIB_UTIL_CLASSPATH:$SHIB_HOME/webApplication/WEB-INF/classes\r
+\r
+DIRLIBS=${SHIB_HOME}/lib/*.jar\r
+for i in ${DIRLIBS}\r
+do\r
+    # if the directory is empty, then it will return the input string\r
+    # this is stupid, so case for it\r
+    if [ "$i" != "${DIRLIBS}" ] ; then\r
+      if [ -z "$SHIB_UTIL_CLASSPATH" ] ; then\r
+        SHIB_UTIL_CLASSPATH=$i\r
+      else\r
+        SHIB_UTIL_CLASSPATH="$i":$SHIB_UTIL_CLASSPATH\r
+      fi\r
+    fi\r
+done\r
+\r
+\r
+##Here we go\r
+$JAVACMD -Djava.endorsed.dirs="$ENDORSED" -Dlog.config="$LOG_CONFIG" -cp $SHIB_UTIL_CLASSPATH  edu.internet2.middleware.shibboleth.utils.MetadataTool "$@"\r

diff --git a/bin/metadatatool.bat b/bin/metadatatool.bat
new file mode 100755 (executable)
index 0000000..45ce1eb
--- /dev/null
+++ b/bin/metadatatool.bat
@@ -0,0 +1,55 @@
+@echo off
+setlocal
+
+REM We need a JVM
+if not defined JAVA_HOME  (
+  echo Error: JAVA_HOME is not defined.
+  exit /b
+)
+
+if not defined JAVACMD (
+  set JAVACMD=%JAVA_HOME\bin\java.exe
+)
+
+if not exist %JAVACMD (
+  echo Error: JAVA_HOME is not defined correctly.
+  echo Cannot execute %JAVACMD
+  exit /b
+)
+
+REM The root of the Shibboleth package tree, relative to the run directory
+if not exist %SHIB_HOME (
+  set SHIB_HOME=.
+)
+set ENDORSED=%SHIB_HOME\endorsed
+
+REM Where log4j config file is
+set LOG_CONFIG=%SHIB_HOME\webApplication\WEB-INF\classes\conf\log4j.properties
+
+REM Grab all the dependencies
+if defined CLASSPATH (
+  set SHIB_UTIL_CLASSPATH=%CLASSPATH
+)
+set SHIB_UTIL_CLASSPATH="%SHIB_HOME\webApplication\WEB-INF\classes";%SHIB_UTIL_CLASSPATH
+
+set DIRLIBS=%SHIB_HOME\lib\*.jar
+for %%i in (%DIRLIBS) do (
+  if defined SHIB_UTIL_CLASSPATH (
+    set SHIB_UTIL_CLASSPATH="%i";%SHIB_UTIL_CLASSPATH
+  ) else (
+    set SHIB_UTIL_CLASSPATH=%i
+  )
+)
+
+set DIRLIBS=%SHIB_HOME\webApplication\WEB-INF\lib\*.jar
+for %%i in (%DIRLIBS) do (
+  if defined SHIB_UTIL_CLASSPATH (
+    set SHIB_UTIL_CLASSPATH="%i";%SHIB_UTIL_CLASSPATH
+  ) else (
+    set SHIB_UTIL_CLASSPATH=%i
+  )
+)
+
+REM Here we go
+%JAVACMD -Djava.endorsed.dirs="%ENDORSED" -Dlog.config="%LOG_CONFIG" -cp "%SHIB_UTIL_CLASSPATH" edu.internet2.middleware.shibboleth.utils.MetadataTool %*
+