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

[noreply at shibboleth.net]

Author: rdw
Date: Wed May 18 09:47:21 2016
New Revision: 8244

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8244&view=rev
Log:
IDP-983 Merge back 9.3 Jetty support

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

Merge changes  r8241

- r8232: Populate the embedded/jetty-base-9.3 directory
- r8240: Put the jars we need for jetty into the jetty-base-9.3 folder.
- r8241: Move some ini file contents back into start.ini




Added:
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/jetty-backchannel.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/jetty-deploy.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/jetty-http.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/jetty-requestlog.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/jetty-ssl-context.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/etc/jetty-ssl.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/modules/
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/modules/backchannel.mod   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/resources/
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/resources/logback-access.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/resources/logback.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.d/idp.ini   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/start.ini   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/idp.xml   (with props)
    branches/3.2/idp-distribution/src/main/resources/embedded/jetty-base-9.3/webapps/static.xml   (with props)
Modified:
    branches/3.2/idp-distribution/pom.xml

Modified: branches/3.2/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/branches/3.2/idp-distribution/pom.xml?rev=8244&r1=8243&r2=8244&view=diff
==============================================================================
--- branches/3.2/idp-distribution/pom.xml	(original)
+++ branches/3.2/idp-distribution/pom.xml	Wed May 18 09:47:21 2016
@@ -155,7 +155,7 @@
                     </execution>
                     <!-- Copy Jetty DTA plugin to embedded/jetty-base/lib/ext directory. -->
                     <execution>
-                        <id>copy-jetty-dta-ssl</id>
+                        <id>copy-jetty-dta-ssl-92</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>copy</goal>
@@ -173,6 +173,25 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>copy-jetty-dta-ssl-93</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>net.shibboleth.utilities.jetty9</groupId>
+                                    <artifactId>jetty9-dta-ssl</artifactId>
+                                    <version>${jetty9-dta-ssl.version}</version>
+                                    <type>jar</type>
+                                    <overWrite>false</overWrite>
+                                    <outputDirectory>${idp.assemblyDirectory}/embedded/jetty-base-9.3/lib/ext</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                     <!-- Copy runtime dependencies to bin\lib directory. -->
                     <execution>
                         <id>copy-runtime-dependencies</id>
@@ -208,7 +227,7 @@
                     </execution>
                     <!-- Copy logging dependencies to embedded/jetty-base/lib directory. (for Jetty logging) -->
                     <execution>
-                        <id>copy-jetty-logging-dependencies</id>
+                        <id>copy-jetty-logging-dependencies-92</id>
                         <phase>prepare-package</phase>
                         <goals>

[... 37 lines stripped ...]