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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jul 29 22:03:25 2014
New Revision: 6360

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6360&view=rev
Log:
IDP-454 Include *.dist copies of user-modifiable configuration files in dist/.

Added:
    trunk/idp-distribution/src/main/resources/dist/
Modified:
    trunk/idp-distribution/pom.xml

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6360&r1=6359&r2=6360&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Tue Jul 29 22:03:25 2014
@@ -163,21 +163,39 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- Replace antrun plugin with something else ? -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.7</version>
                 <executions>
                     <execution>
+                        <id>make-files-in-bin-executable</id>
                         <phase>package</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
                         <configuration>
                             <target>
-                                <!-- Make files in bin executable. -->
                                 <chmod dir="${assembly-directory}/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="${assembly-directory}/dist">
+                                    <fileset dir="${assembly-directory}">
+                                        <include name="conf/**/*.*" />
+                                        <include name="flows/**/*.*" />
+                                        <include name="views/**/*.*" />
+                                    </fileset>
+                                    <globmapper from="*" to="*.dist" />
+                                </copy>
                             </target>
                         </configuration>
                     </execution>