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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue May  6 14:23:30 2014
New Revision: 5855

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5855&view=rev
Log:
Cleanup idp-distribution so that it consists of the contents of idp-conf plus the war file.

Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/conf/
    trunk/idp-distribution/src/main/resources/credentials/
    trunk/idp-distribution/src/main/resources/flows/
    trunk/idp-distribution/src/main/resources/jetty/
    trunk/idp-distribution/src/main/resources/metadata/
    trunk/idp-distribution/src/main/resources/templates/

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=5855&r1=5854&r2=5855&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Tue May  6 14:23:30 2014
@@ -16,38 +16,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <assembly-directory>target/${project.artifactId}</assembly-directory>
-        <!-- TODO Remove Jetty version override later -->
-        <jetty.version>9.1.0-SNAPSHOT</jetty.version>
+        <assembly-directory>${project.build.directory}/${project.build.finalName}</assembly-directory>
     </properties>
-
-    <repositories>
-        <repository>
-            <id>shib-release</id>
-            <url>https://shibboleth.net/nexus/content/groups/public</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>shib-snapshot</id>
-            <url>https://shibboleth.net/nexus/content/repositories/snapshots</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-        <!-- TODO Jetty SNAPSHOT repository, to be removed later. -->
-        <repository>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-            <id>sonatype-snapshots</id>
-            <name>Sonatype Jetty Snapshots</name>
-            <url>http://oss.sonatype.org/content/groups/jetty</url>
-        </repository>
-
-    </repositories>
 
     <dependencies>
         <!-- Compile Dependencies -->
@@ -63,10 +33,32 @@
 
     <build>
         <plugins>
-            <!-- Unpack the IdP war and Jetty distribution to assembly directory. -->
+
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
+                    <!-- Copy war to assembly directory. -->
+                    <execution>
+                        <id>copy</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>${project.groupId}</groupId>
+                                    <artifactId>idp-war</artifactId>
+                                    <version>${project.version}</version>
+                                    <type>war</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${assembly-directory}/war/</outputDirectory>
+                                    <destFileName>idp.war</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                    <!-- Unpack idp-conf to assembly directory. -->
                     <execution>
                         <id>unpack-dependencies</id>
                         <phase>generate-resources</phase>
@@ -75,104 +67,15 @@
                         </goals>
                         <configuration>
                             <artifactItems>
-                                <!-- Expand the war to webapps/ -->
                                 <artifactItem>
-                                    <groupId>net.shibboleth.idp</groupId>
-                                    <artifactId>idp-war</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>war</type>
-                                    <outputDirectory>${assembly-directory}/webapps</outputDirectory>
-                                </artifactItem>
-                                <!-- Unpack Jetty distribution -->
-                                <artifactItem>
-                                    <groupId>${jetty.groupId}</groupId>
-                                    <artifactId>jetty-distribution</artifactId>
-                                    <!-- TODO Build against specific snapshot version until start.d/ directory stabilizes. -->
-                                    <version>9.1.0-20130823.093112-37</version>

[... 111 lines stripped ...]