[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 Feb 20 13:27:02 2017
New Revision: 8625

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

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

Modify distribution POM to eliminate dist/ and create it inside the copy-distribution ant task.
Add step to read-only the dist tree.

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/dist/

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=8625&r1=8624&r2=8625&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml	(original)
+++ trunk/idp-distribution/pom.xml	Mon Feb 20 13:27:02 2017
@@ -129,7 +129,7 @@
                                     <artifactId>idp-war</artifactId>
                                     <version>${project.version}</version>
                                     <type>war</type>
-                                    <outputDirectory>${idp.assemblyDirectory}/dist/webapp/</outputDirectory>
+                                    <outputDirectory>${idp.assemblyDirectory}/webapp/</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -209,7 +209,7 @@
                                     <artifactId>jcl-over-slf4j</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${idp.assemblyDirectory}/dist/webapp/WEB-INF/lib/</outputDirectory>
+                            <outputDirectory>${idp.assemblyDirectory}/webapp/WEB-INF/lib/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
@@ -228,25 +228,6 @@
                         <configuration>
                             <target>
                                 <chmod dir="${idp.assemblyDirectory}/bin" perm="755" includes="**/*.sh" />
-                            </target>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-dist-files</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <copy todir="${idp.assemblyDirectory}/dist">
-                                    <fileset dir="${idp.assemblyDirectory}">
-                                        <include name="conf/**/*.*" />
-                                        <include name="flows/**/*.*" />
-                                        <include name="messages/**/*.*" />
-                                        <include name="views/**/*.*" />
-                                    </fileset>
-                                </copy>
                             </target>
                         </configuration>
                     </execution>

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=8625&r1=8624&r2=8625&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.bat	(original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.bat	Mon Feb 20 13:27:02 2017
@@ -29,6 +29,6 @@
 )
 
 REM add in the dependency .jar files
-set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\dist\webapp\WEB-INF\lib\*;%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%CLASSPATH%
+set LOCALCLASSPATH=%ANT_HOME%\..\bin\lib\*;%ANT_HOME%\..\webapp\WEB-INF\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=8625&r1=8624&r2=8625&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant.sh	(original)
+++ trunk/idp-distribution/src/main/resources/bin/ant.sh	Mon Feb 20 13:27:02 2017
@@ -36,6 +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
 


[... 68 lines stripped ...]