[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/bin: ant.sh build.xml

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep 12 11:06:19 2014
New Revision: 6524

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6524&view=rev
Log:
IDP 469 Fix a bit of Unixery.  Add comments

Modified:
    trunk/idp-distribution/src/main/resources/bin/ant.sh
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/ant.sh
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.sh?rev=6524&r1=6523&r2=6524&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Fri Sep 12 11:06:19 2014
@@ -49,7 +49,7 @@
     fi
 done
 
-WEBINFLIBS=${ANT_HOME}/lib/*.jar
+WEBINFLIBS=${ANT_HOME}/../war/WEB-INF/lib/*.jar
 for i in ${WEBINFLIBS}
 do
     # if the directory is empty, then it will return the input string
@@ -105,4 +105,4 @@
   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 -e -f src/installer/resources/build.xml "$@"
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main -e -f build.xml "$@"

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=6524&r1=6523&r2=6524&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Fri Sep 12 11:06:19 2014
@@ -2,6 +2,12 @@
 <project name="Shibboleth Identity Provider V3" basedir=".." default="install">
 
   <taskdef resource="net/shibboleth/idp/installer/ant.xml"/>
+	
+  <!-- TODO 
+  
+    V2 to V3 upgrade
+    V3 to V3 , detect if it is V2
+    -->
 
   <!--  TARGETS:
 
@@ -108,8 +114,6 @@
 
      KEY MANAGEMENT
 
-     TODO: Passwords 
-
     -->
 
   <target name="genkeys" depends="init, checkproperties, signing-key, encryption-key, keystore, sealer"/>