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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Sep  3 04:32:24 2014
New Revision: 6500

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6500&view=rev
Log:
IDP-469 Installer

- Move utils-lib back to bin/lib
- Better default choices for the targer dir (/opt/shibboleth/idp if this is
  an install/upgrade, otherwise the current directory (for build-war)
- Group all user input to the beginning.
- Fix some wrong dependencies

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

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6500&r1=6499&r2=6500&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Wed Sep  3 04:32:24 2014
@@ -173,7 +173,7 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- Copy runtime dependencies to utils-lib directory. -->
+                    <!-- Copy runtime dependencies to bin\lib directory. -->
                     <execution>
                         <id>copy-runtime-dependencies</id>
                         <phase>prepare-package</phase>
@@ -203,7 +203,7 @@
                                     <artifactId>ant-launcher</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${assembly-directory}/utils-lib/</outputDirectory>
+                            <outputDirectory>${assembly-directory}/bin/lib/</outputDirectory>
                         </configuration>
                     </execution>
                     <!-- Copy logging dependencies to WEB-INF/lib directory. -->

Modified: trunk/idp-distribution/src/main/resources/bin/ant.bat
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant.bat?rev=6500&r1=6499&r2=6500&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Wed Sep  3 04:32:24 2014
@@ -25,7 +25,7 @@
 )
 
 REM add in the dependency .jar files
-for %%i in (%ANT_HOME%\..\utils-lib\*.jar) do (
+for %%i in (%ANT_HOME%\..\bin/lib\*.jar) do (
 	call %ANT_HOME%\cpappend.bat %%i
 )
 

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=6500&r1=6499&r2=6500&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Wed Sep  3 04:32:24 2014
@@ -35,7 +35,7 @@
 fi
 
 # add in the dependency .jar files
-DIRLIBS=${ANT_HOME}/../utils-lib/*.jar
+DIRLIBS=${ANT_HOME}/../bin/lib/*.jar
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string

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=6500&r1=6499&r2=6500&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Wed Sep  3 04:32:24 2014
@@ -36,17 +36,20 @@
 
   <target name="init">
     <tstamp/>
-  </target>
-
-  <target name="install" depends="init, gettarget, copy-distribution, install-nocopy"/>
-  <target name="install-nocopy" depends="init, gettarget, genkeys, upgrade, build-war"/>
-  <target name="v2upgrade" depends="init, gettarget, v2v3prepopulate, copy-distribution, install-nocopy"/>
-  <target name="v2upgrade-nocopy" depends="init, gettarget, v2v3prepopulate, install-nocopy"/>
+    <hostinfo/>
+  </target>
+
+  <target name="install" depends="init, getsource, allinput, copy-distribution, install-nocopy"/>
+  <target name="install-nocopy" depends="init, allinput, genkeys, upgrade, build-war"/>
+  <target name="v2upgrade" depends="init, getsource, allinput, v2v3prepopulate, copy-distribution, install-nocopy"/>
+  <target name="v2upgrade-nocopy" depends="init, allinput, v2v3prepopulate, install-nocopy"/>
 
   <!-- USER INPUT -->
+  <target name="allinput" depends="gettarget, checkproperties, gethostname, geturisubjectaltname, getkeystorepassword, getsealerpassword, getsealeralias, getentityid" />
+
   <target name="gethostname" if="idp.ask.hostname" depends="checkproperties">

[... 173 lines stripped ...]