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

[noreply at shibboleth.net]

Author: rdw
Date: Wed Dec 10 06:12:45 2014
New Revision: 7058

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7058&view=rev
Log:
IDP-535 Jetty Logging and other changes from the jetty configuration documentation.

Added:
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-requestlog.xml   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/resources/
    trunk/idp-distribution/src/main/resources/jetty-base/resources/logback-access.xml   (with props)
    trunk/idp-distribution/src/main/resources/jetty-base/resources/logback.xml   (with props)
Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.ini
    trunk/idp-installer/src/main/wix/ShibbolethIdP-registry.wxs

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=7058&r1=7057&r2=7058&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Wed Dec 10 06:12:45 2014
@@ -204,6 +204,35 @@
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${idp.assemblyDirectory}/bin/lib/</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <!-- Copy logging dependencies to jetty-base/lib directory. (for Jetty logging) -->
+                    <execution>
+                        <id>copy-jetty-logging-dependencies</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>ch.qos.logback</groupId>
+                                    <artifactId>logback-classic</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>ch.qos.logback</groupId>
+                                    <artifactId>logback-core</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>ch.qos.logback</groupId>
+                                    <artifactId>logback-access</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>${slf4j.groupId}</groupId>
+                                    <artifactId>jcl-over-slf4j</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${idp.assemblyDirectory}/jetty-base/lib/logging/</outputDirectory>
                         </configuration>
                     </execution>
                     <!-- Copy logging dependencies to WEB-INF/lib directory. -->

Modified: trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml?rev=7058&r1=7057&r2=7058&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/ant-jetty.xml Wed Dec 10 06:12:45 2014
@@ -29,7 +29,7 @@
 
 	<taskdef resource="net/shibboleth/idp/installer/ant.xml" />
 
-	<target name="install" depends="init, properties, keystores, copyinis, reprotect, tidy" />
+	<target name="install" depends="init, properties, keystores, directories, copyinis, reprotect, tidy" />
 
 	<target name="init">
 		<tstamp />
@@ -71,14 +71,17 @@
 		<selfsignedcert hostname="${idp.host.name}" keystoreFile="${idp.target.dir}/credentials/idp-userfacing.p12" keystorePassword="${idp.keystore.password}" uriSubjectAltNames="${idp.uri.subject.alt.name}" />
 	</target>
 
-	<target name="copyinis" depends="copyidpini">
-		<mkdir dir="jetty-base/start.d" />
+    <target name="directories">
+        <mkdir dir="jetty-base/start.d" />
+        <mkdir dir="jetty-base/logs" />
+    </target>
+
+    <target name="copyinis" depends="directories, copyidpini">
 		<copy file="jetty-base/start.d.dist/jsp.ini" tofile="jetty-base/start.d/jsp.ini" overwrite="false" failonerror="false" />
 		<copy file="jetty-base/start.d.dist/jstl.ini" tofile="jetty-base/start.d/jstl.ini" overwrite="false" failonerror="false" />
 	</target>
 
-	<target name="copyidpini" unless="idp.ini.present">
-		<mkdir dir="jetty-base/start.d" />
+	<target name="copyidpini" depends="directories" unless="idp.ini.present">

[... 65 lines stripped ...]