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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 13 14:10:29 2014
New Revision: 6683

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6683&view=rev
Log:
IDP-481 - rename war directory to webapp, fix ant scripts to be runnable from outside bin

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/runclass.bat
    trunk/idp-distribution/src/main/resources/bin/runclass.sh
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6683&r1=6682&r2=6683&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Mon Oct 13 14:10:29 2014
@@ -128,7 +128,7 @@
                                     <artifactId>idp-war</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
-                                    <outputDirectory>${assembly-directory}/war/</outputDirectory>
+                                    <outputDirectory>${assembly-directory}/webapp/</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -228,7 +228,7 @@
                                     <artifactId>jcl-over-slf4j</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${assembly-directory}/war/WEB-INF/lib/</outputDirectory>
+                            <outputDirectory>${assembly-directory}/webapp/WEB-INF/lib/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>

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=6683&r1=6682&r2=6683&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat Mon Oct 13 14:10:29 2014
@@ -2,7 +2,7 @@
 setlocal
 
 REM Find the necessary resources
-set ANT_HOME=.
+set ANT_HOME=%~dp0
 
 REM We need a JVM
 if not defined JAVA_HOME  (
@@ -26,7 +26,7 @@
 
 REM add in the dependency .jar files
 set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%LOCALCLASSPATH%
-set LOCALCLASSPATH=%ANT_HOME%\..\war\WEB-INF\lib\*;%LOCALCLASSPATH%
+set LOCALCLASSPATH=%ANT_HOME%\..\webapp\WEB-INF\lib\*;%LOCALCLASSPATH%
 
 if exist %JAVA_HOME%\lib\tools.jar (
     set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\tools.jar
@@ -36,4 +36,4 @@
     set LOCALCLASSPATH=%LOCALCLASSPATH%;%JAVA_HOME%\lib\classes.zip
 )
 
-%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f %ANT_home%/build.xml %*
+%JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -f %ANT_HOME%/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=6683&r1=6682&r2=6683&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh Mon Oct 13 14:10:29 2014
@@ -9,7 +9,8 @@
 esac
 
 #Find the necessary resources
-ANT_HOME=.
+ANT_HOME=$0
+ANT_HOME=${ANT_HOME%/*}
 
 if [ -z "$JAVACMD" ] ; then 
   if [ -n "$JAVA_HOME"  ] ; then
@@ -35,7 +36,7 @@
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${ANT_HOME}/../war/WEB-INF/lib/*":$LOCALCLASSPATH
+LOCALCLASSPATH="${ANT_HOME}/../webapp/WEB-INF/lib/*":$LOCALCLASSPATH
 LOCALCLASSPATH="${ANT_HOME}/../bin/lib/*":$LOCALCLASSPATH
 
 if [ -n "$JAVA_HOME" ] ; then
@@ -80,4 +81,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 build.xml "$@"
+$JAVACMD -classpath "$LOCALCLASSPATH" -Dant.home="${ANT_HOME}" $ANT_OPTS org.apache.tools.ant.Main -e -f "${ANT_HOME}/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=6683&r1=6682&r2=6683&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)

[... 96 lines stripped ...]