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

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jul  9 23:39:15 2014
New Revision: 6266

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6266&view=rev
Log:
IDP-410 and IDP-411 Unpacked WAR file.

Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=6266&r1=6265&r2=6266&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Wed Jul  9 23:39:15 2014
@@ -59,12 +59,12 @@
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-                    <!-- Copy war to assembly directory. -->
+                    <!-- Unpack idp-war to assembly directory. -->
                     <execution>
                         <id>copy-idp-war</id>
                         <phase>prepare-package</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>unpack</goal>
                         </goals>
                         <configuration>
                             <artifactItems>
@@ -73,9 +73,7 @@
                                     <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>

Modified: trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini?rev=6266&r1=6265&r2=6266&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini Wed Jul  9 23:39:15 2014
@@ -25,8 +25,8 @@
 # The IdP webapp context path
 jetty.context.path=/idp
 
-# Path to IdP WAR file, relative to ${jetty.base} directory
-jetty.war.path=../war/idp.war
+# Path to expanded IdP WAR, relative to ${jetty.base} directory
+jetty.war.path=../war
 
 # Path to JAAS config
 jetty.jaas.path=conf/authn/jaas.config