[java-idp-testbed COMMIT] in /trunk: idp-testbed logback.launch idp-testbed-logback.launch idp-testbed.launch pom.xml...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Dec 12 17:44:48 2013
New Revision: 79

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=79&view=rev
Log:
Produce a distribution artifact with an executable war. Move resources in src/test/config to src/main/config/test. Change LDAP suffix to dc=example,dc=org.

Added:
    trunk/idp-testbed-logback.launch
    trunk/src/main/assembly/
    trunk/src/main/assembly/idp-testbed-assembly.xml   (with props)
    trunk/src/main/config/test/
    trunk/src/main/config/test/jetty-realm.properties
      - copied unchanged from r76, trunk/src/test/config/jetty-realm.properties
    trunk/src/main/config/test/jetty.jks
      - copied unchanged from r76, trunk/src/test/config/jetty.jks
    trunk/src/main/config/test/ldap.ldif
    trunk/src/main/config/test/override-web.xml
      - copied unchanged from r76, trunk/src/test/config/override-web.xml
    trunk/src/main/java/Main.java
      - copied, changed from r77, trunk/src/main/java/common/Main.java
Modified:
    trunk/idp-testbed logback.launch
    trunk/idp-testbed.launch
    trunk/pom.xml
    trunk/src/main/config/conf/ldap-authn-config.xml
    trunk/src/main/config/system/conf/testbed-beans.xml
    trunk/src/main/java/common/InMemoryDirectory.java
    trunk/src/main/java/common/Main.java
    trunk/src/test/config/

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=79&r1=78&r2=79&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Dec 12 17:44:48 2013
@@ -17,6 +17,8 @@
         <idp.version>3.0-SNAPSHOT</idp.version>
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>3.0-SNAPSHOT</opensaml.version>
+        <!-- The assembly-directory is where the testbed is built before being archived. -->
+        <assembly-directory>${project.build.directory}/${project.artifactId}-${project.version}-distribution</assembly-directory>
     </properties>
 
     <repositories>
@@ -220,8 +222,8 @@
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}</finalName>
         <plugins>
+            <!-- Set Logback configuration file system property. -->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>properties-maven-plugin</artifactId>
@@ -242,6 +244,7 @@
                     </execution>
                 </executions>
             </plugin>
+            <!-- mvn:jetty run -->
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -267,16 +270,119 @@
                     <loginServices>
                         <loginService implementation="org.eclipse.jetty.security.HashLoginService">
                             <name>Shib Testbed Web Authentication</name>
-                            <config>src/test/config/jetty-realm.properties</config>
+                            <config>src/main/config/test/jetty-realm.properties</config>
                         </loginService>
                     </loginServices>
                 </configuration>
             </plugin>
+            <!-- Copy src/main/config to assembly directory. -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-base-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <includeEmptyDirs>true</includeEmptyDirs>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/config</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${assembly-directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Copy Main.class to war build directory before war is built. -->
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>main-class-placement</id>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <tasks>
+                                <move todir="${project.build.directory}/${project.artifactId}-${project.version}/">
+                                    <fileset dir="${project.build.directory}/classes/">
+                                        <include name="Main.class" />
+                                    </fileset>
+                                </move>

[... 141 lines stripped ...]