[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: Tue Feb 14 16:11:48 2017
New Revision: 8619

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8619&view=rev
Log:
IDP-1116 - Rework handling of webapp customization

https://issues.shibboleth.net/jira/browse/IDP-1116

Remove globbing of dist/ files and move webapp/ into dist/webapp/

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

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=8619&r1=8618&r2=8619&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml	(original)
+++ trunk/idp-distribution/pom.xml	Tue Feb 14 16:11:48 2017
@@ -129,7 +129,7 @@
                                     <artifactId>idp-war</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
-                                    <outputDirectory>${idp.assemblyDirectory}/webapp/</outputDirectory>
+                                    <outputDirectory>${idp.assemblyDirectory}/dist/webapp/</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -209,7 +209,7 @@
                                     <artifactId>jcl-over-slf4j</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${idp.assemblyDirectory}/webapp/WEB-INF/lib/</outputDirectory>
+                            <outputDirectory>${idp.assemblyDirectory}/dist/webapp/WEB-INF/lib/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -246,7 +246,6 @@
                                         <include name="messages/**/*.*" />
                                         <include name="views/**/*.*" />
                                     </fileset>
-                                    <globmapper from="*" to="*.dist" />
                                 </copy>
                             </target>
                         </configuration>

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=8619&r1=8618&r2=8619&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat	(original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat	Tue Feb 14 16:11:48 2017
@@ -29,6 +29,6 @@
 )
 
 REM add in the dependency .jar files
-set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
+set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\dist\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
 
 %JAVACMD% -cp "%LOCALCLASSPATH%" -Dant.home="%ANT_HOME%" %ANT_OPTS% org.apache.tools.ant.Main -e -q -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=8619&r1=8618&r2=8619&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh	(original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh	Tue Feb 14 16:11:48 2017
@@ -36,7 +36,7 @@
 fi
 
 # add in the dependency .jar files
-LOCALCLASSPATH="${ANT_HOME}/../webapp/WEB-INF/lib/*":$LOCALCLASSPATH
+LOCALCLASSPATH="${ANT_HOME}/../dist/webapp/WEB-INF/lib/*":$LOCALCLASSPATH
 LOCALCLASSPATH="${ANT_HOME}/../bin/lib/*":$LOCALCLASSPATH
 
 if [ -n "$JAVA_HOME" ] ; then

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=8619&r1=8618&r2=8619&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml	(original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml	Tue Feb 14 16:11:48 2017
@@ -246,7 +246,7 @@
         </condition>
 
         <condition property="idp.ask.scope">
-            <!-- We ask for scope if there is no scope and we allow user input and there is no idp properties file -->
+            <!-- We ask for scope if there is no scope and we allow user input and there is no idp.properties file -->
             <and>
                 <not>
                     <isset property="idp.scope" />
@@ -259,7 +259,7 @@
         </condition>
 

[... 198 lines stripped ...]