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

[noreply at shibboleth.net]

Author: rdw
Date: Mon Sep  1 09:08:32 2014
New Revision: 6489

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6489&view=rev
Log:
IDP-469  Move bin\lib to utils\lib.  Fix a couple of missed checkins

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/creds.bat
    trunk/idp-distribution/src/main/resources/bin/creds.sh
    trunk/idp-installer/src/main/resources/net/shibboleth/idp/installer/ant.xml

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6489&r1=6488&r2=6489&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Mon Sep  1 09:08:32 2014
@@ -27,6 +27,12 @@
 
         <!-- Runtime Dependencies -->
         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-installer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
+        <dependency>
             <groupId>net.shibboleth.utilities.jetty9</groupId>
             <artifactId>jetty9-dta-ssl</artifactId>
             <version>${jetty9-dta-ssl.version}</version>
@@ -52,6 +58,13 @@
   		    <groupId>org.apache.ant</groupId>
 		    <artifactId>ant</artifactId>
 		    <version>1.9.4</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+  		    <groupId>org.apache.ant</groupId>
+		    <artifactId>ant-launcher</artifactId>
+		    <version>1.9.4</version>
+            <scope>runtime</scope>
         </dependency>
 
         <!-- Test Dependencies -->
@@ -145,7 +158,7 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- Copy runtime dependencies to bin/lib directory. -->
+                    <!-- Copy runtime dependencies to utils-lib directory. -->
                     <execution>
                         <id>copy-runtime-dependencies</id>
                         <phase>prepare-package</phase>
@@ -154,6 +167,10 @@
                         </goals>
                         <configuration>
                             <artifactItems>
+                                <artifactItem>
+						            <groupId>${project.groupId}</groupId>
+						            <artifactId>idp-installer</artifactId>
+                                </artifactItem>
                                 <artifactItem>
                                     <groupId>com.beust</groupId>
                                     <artifactId>jcommander</artifactId>
@@ -166,8 +183,12 @@
                                     <groupId>org.apache.ant</groupId>
                                     <artifactId>ant</artifactId>
                                 </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${assembly-directory}/bin/lib/</outputDirectory>
+                                <artifactItem>
+                                    <groupId>org.apache.ant</groupId>
+                                    <artifactId>ant-launcher</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${assembly-directory}/utils-lib/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -233,4 +254,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
+</project>

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=6489&r1=6488&r2=6489&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Mon Sep  1 09:08:32 2014
@@ -25,7 +25,7 @@
 )
 
 REM add in the dependency .jar files
-for %%i in (%ANT_HOME%\lib\*.jar) do (
+for %%i in (%ANT_HOME%\..\utils-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=6489&r1=6488&r2=6489&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Mon Sep  1 09:08:32 2014
@@ -35,7 +35,7 @@
 fi
 
 # add in the dependency .jar files
-DIRLIBS=${ANT_HOME}/lib/*.jar
+DIRLIBS=${ANT_HOME}/../utils-lib/*.jar
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string


[... 58 lines stripped ...]