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

noreply at shibboleth.net noreply at shibboleth.net
Sun Apr 12 13:06:03 EDT 2015 

Author: rdw
Date: Sun Apr 12 13:06:03 2015
New Revision: 7479

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7479&view=rev
Log:
IDP-639 jetty-base gets distributed as embedded/jetty-base

Added:
    trunk/idp-distribution/src/main/resources/embedded/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/etc/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/etc/jetty-deploy.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/etc/jetty-requestlog.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-requestlog.xml
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/etc/jetty.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/resources/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/resources/logback-access.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/resources/logback-access.xml
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/resources/logback.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/resources/logback.xml
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/start.d/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/start.d/idp.ini
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/start.d/jsp.ini
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/start.d/jstl.ini
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/start.d/jstl.ini
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/start.ini
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/start.ini
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/webapps/
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/webapps/idp.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml
    trunk/idp-distribution/src/main/resources/embedded/jetty-base/webapps/static.xml
      - copied, changed from r7478, trunk/idp-distribution/src/main/resources/jetty-base/webapps/static.xml
Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-requestlog.xml
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
    trunk/idp-distribution/src/main/resources/jetty-base/resources/logback-access.xml
    trunk/idp-distribution/src/main/resources/jetty-base/resources/logback.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/jsp.ini
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/jstl.ini
    trunk/idp-distribution/src/main/resources/jetty-base/start.ini
    trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml
    trunk/idp-distribution/src/main/resources/jetty-base/webapps/static.xml
    trunk/idp-installer/src/main/wix/IdP.bat

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=7479&r1=7478&r2=7479&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Sun Apr 12 13:06:03 2015
@@ -153,7 +153,7 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- Copy Jetty DTA plugin to jetty-base/lib/ext directory. -->
+                    <!-- Copy Jetty DTA plugin to embedded/jetty-base/lib/ext directory. -->
                     <execution>
                         <id>copy-jetty-dta-ssl</id>
                         <phase>prepare-package</phase>
@@ -168,7 +168,7 @@
                                     <version>${jetty9-dta-ssl.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${idp.assemblyDirectory}/jetty-base/lib/ext</outputDirectory>
+                                    <outputDirectory>${idp.assemblyDirectory}/embedded/jetty-base/lib/ext</outputDirectory>
                                 </artifactItem>
                             </artifactItems>

[... 112 lines stripped ...]

More information about the commits mailing list