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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed May 14 11:19:18 2014
New Revision: 5925

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5925&view=rev
Log:
Checkpoint work to run Jetty.

Added:
    trunk/idp-distribution/src/main/resources/jetty-base/
    trunk/idp-distribution/src/main/resources/jetty-base/etc/
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/lib/
    trunk/idp-distribution/src/main/resources/jetty-base/lib/ext/
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/jstl.ini   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/start.ini   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/tmp/
    trunk/idp-distribution/src/main/resources/jetty-base/webapps/
    trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml   (with props)
    trunk/idp-distribution/src/main/resources/misc/
    trunk/idp-distribution/src/main/resources/misc/etc/
    trunk/idp-distribution/src/main/resources/misc/etc/default/
    trunk/idp-distribution/src/main/resources/misc/etc/default/jetty
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=5925&r1=5924&r2=5925&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Wed May 14 11:19:18 2014
@@ -17,6 +17,7 @@
 
     <properties>
         <assembly-directory>${project.build.directory}/${project.build.finalName}</assembly-directory>
+        <jetty9-dta-ssl.version>1.0-SNAPSHOT</jetty9-dta-ssl.version>
     </properties>
 
     <dependencies>
@@ -33,14 +34,37 @@
 
     <build>
         <plugins>
-
+            <!-- Copy src/main/resources to assembly directory. -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <includeEmptyDirs>true</includeEmptyDirs>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${assembly-directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <!-- Copy war to assembly directory. -->
                     <execution>
-                        <id>copy</id>
-                        <phase>package</phase>
+                        <id>copy-idp-war</id>
+                        <phase>
+                            package
+                        </phase>
                         <goals>
                             <goal>copy</goal>
                         </goals>
@@ -60,7 +84,7 @@
                     </execution>
                     <!-- Unpack idp-conf to assembly directory. -->
                     <execution>
-                        <id>unpack-dependencies</id>
+                        <id>unpack-idp-conf</id>
                         <phase>package</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -78,26 +102,24 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-            <!-- Copy src/main/resources to assembly directory. -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
+                    <!-- Copy Jetty DTA plugin to jetty-base/lib/ext directory. -->
                     <execution>
-                        <id>copy-base-resources</id>
-                        <phase>generate-resources</phase>
+                        <id>copy-jetty-dta-ssl</id>
+                        <phase>package</phase>
                         <goals>
-                            <goal>copy-resources</goal>
+                            <goal>copy</goal>
                         </goals>
                         <configuration>
-                            <includeEmptyDirs>true</includeEmptyDirs>

[... 20 lines stripped ...]