Added ant shell script.

Build should be self-contained now.

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

diff --git a/ant b/ant
new file mode 100755 (executable)
index 0000000..3b5c48f
--- /dev/null
+++ b/ant
@@ -0,0 +1,98 @@
+#! /bin/sh
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  Darwin*) darwin=true ;;
+esac
+
+#Find the necessary resources
+if [ -n "$SHIB_HOME" ] ; then
+  ANT_HOME=$SHIB_HOME
+else
+  ANT_HOME=.
+fi
+
+if [ -z "$JAVACMD" ] ; then 
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then 
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+      JAVACMD=$JAVA_HOME/bin/java
+    fi
+  else
+    JAVACMD=java
+  fi
+fi
+ 
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly."
+  echo "  We cannot execute $JAVACMD"
+  exit
+fi
+
+if [ -n "$CLASSPATH" ] ; then
+  LOCALCLASSPATH=$CLASSPATH
+fi
+
+# add in the dependency .jar files
+DIRLIBS=${ANT_HOME}/lib/*.jar
+for i in ${DIRLIBS}
+do
+    # if the directory is empty, then it will return the input string
+    # this is stupid, so case for it
+    if [ "$i" != "${DIRLIBS}" ] ; then
+      if [ -z "$LOCALCLASSPATH" ] ; then
+        LOCALCLASSPATH=$i
+      else
+        LOCALCLASSPATH="$i":$LOCALCLASSPATH
+      fi
+    fi
+done
+
+if [ -n "$JAVA_HOME" ] ; then
+  if [ -f "$JAVA_HOME/lib/tools.jar" ] ; then
+    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/tools.jar
+  fi
+
+  if [ -f "$JAVA_HOME/lib/classes.zip" ] ; then
+    LOCALCLASSPATH=$LOCALCLASSPATH:$JAVA_HOME/lib/classes.zip
+  fi
+
+  # OSX hack to make Ant work with jikes
+  if $darwin ; then
+    OSXHACK="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes"
+    if [ -d ${OSXHACK} ] ; then
+      for i in ${OSXHACK}/*.jar
+      do
+        JIKESPATH=$JIKESPATH:$i
+      done
+    fi
+  fi
+
+else
+  echo "Warning: JAVA_HOME environment variable is not set."
+  echo "  If build fails because sun.* classes could not be found"
+  echo "  you will need to set the JAVA_HOME environment variable"
+  echo "  to the installation directory of java."
+fi
+
+# supply JIKESPATH to Ant as jikes.class.path
+if [ -n "$JIKESPATH" ] ; then
+  if [ -n "$ANT_OPTS" ] ; then
+    ANT_OPTS="$ANT_OPTS -Djikes.class.path=$JIKESPATH"
+  else
+    ANT_OPTS=-Djikes.class.path=$JIKESPATH
+  fi
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  ANT_HOME=`cygpath --path --windows "$ANT_HOME"`
+  JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  LOCALCLASSPATH=`cygpath --path --windows "$LOCALCLASSPATH"`
+fi
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main "$@"

diff --git a/src/conf/log4j.properties b/src/conf/log4j.properties
index 11d90a2..d1fed25 100755 (executable)
--- a/src/conf/log4j.properties
+++ b/src/conf/log4j.properties
@@ -7,21 +7,21 @@
 
 # Default configuration.  Sends logging output to STDOUT.
 
-log4j.rootCategory=WARN, stdout
-log4j.logger.org.apache.xml.security=OFF
-log4j.logger.org.opensaml=OFF
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} - %m%n
+#log4j.rootCategory=WARN, stdout
+#log4j.logger.org.apache.xml.security=OFF
+#log4j.logger.org.opensaml=OFF
+#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+#log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} - %m%n
 
 
 # The following block represents an example of how to enable very verbose logging.
 
-#log4j.rootCategory=DEBUG, stdout
-#log4j.logger.org.apache.xml.security=OFF
-#log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-#log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-#log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} (%c:%L) - %m%n
+log4j.rootCategory=DEBUG, stdout
+log4j.logger.org.apache.xml.security=OFF
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601} (%c:%L) - %m%n
 
 
 # The following block represents an example of how to direct logging output to a file.
@@ -39,4 +39,4 @@ log4j.appender.stdout.layout.ConversionPattern=%-5p %-41X{serviceId} %d{ISO8601}
 
 # Uncomment the following line to enable verbose debugging output concerning log4j initialization.
 
-#log4j.debug=TRUE
\ No newline at end of file
+#log4j.debug=TRUE

diff --git a/src/conf/origin.properties b/src/conf/origin.properties
index b32bb83..f5a0782 100755 (executable)
--- a/src/conf/origin.properties
+++ b/src/conf/origin.properties
@@ -7,32 +7,32 @@
 ##### General Configuration #####
 
  # [Required] Name of this Handle Service (usually a dns name)
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.issuer = shib2.internet2.edu
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.issuer = shib2.internet2.edu
 
  # [Required] Authentication scope (usually a dns domain)
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.authenticationDomain = shibdev.edu
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.authenticationDomain = shibdev.edu
 
  # [Required] URL at which the corresponding Attribute Authority can be reached
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.AAUrl = http://snc.cc.columbia.edu/shibboleth/AA
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.AAUrl = https://shib2.internet2.edu/shibboleth/AA
 
 
 ##### Assertion Signing #####
 
  # [Required] Location of a Java keystore containing an X509 certificate
  # and matching key.  Used to sign assertions made by this HS
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath = /conf/keystore.jks
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePath = /conf/keystore.jks
 
  # [Required] Password for the keystore
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePassword = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStorePassword = shibhs
 
  # [Required] Keystore alias for the private key
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyAlias = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyAlias = shibhs
 
  # [Required] Password for the private key
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyPassword = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.keyStoreKeyPassword = shibhs
 
  # [Optional] Keystore alias for the X509 certificate (Defaults to the private key alias)
- #edu.internet2.middleware.shibboleth.hs.HandleServlet.certAlias = shibhs
+ edu.internet2.middleware.shibboleth.hs.HandleServlet.certAlias = shibhs
 
 
 ###################################################################################
@@ -45,11 +45,11 @@
 ##### General Configuration #####
 
  # [Required] Name of this Attribute Authority (usually a dns name)
- #edu.internet2.middleware.shibboleth.aa.AAServlet.authorityName = shib2.internet2.edu
+ edu.internet2.middleware.shibboleth.aa.AAServlet.authorityName = shib2.internet2.edu
  
  # [Optional] Set to true if the Attribute Authority should pass internal error messages to 
  # the SHAR (for debugging purposes) (defaults to false)
- #edu.internet2.middleware.shibboleth.aa.AAServlet.passThruErrors = false
+ edu.internet2.middleware.shibboleth.aa.AAServlet.passThruErrors = true