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

[noreply at shibboleth.net]

Author: tzeller
Date: Fri Aug 23 13:30:07 2013
New Revision: 4712

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4712&view=rev
Log:
More work on idp-distribution. Hardcode the home directory for the IdP to /opt/idp. Configure a dispatcher servlet in idp-war web.xml for the /profile/* path to be handled by web flow. Configure Velocity as the web flow view resolver. A very simple status flow prints "ok" for the old /idp/profile/Status URL.

Added:
    trunk/idp-distribution/src/main/resources/conf/profile-servlet.xml   (with props)
    trunk/idp-distribution/src/main/resources/conf/velocity-config.xml   (with props)
    trunk/idp-distribution/src/main/resources/conf/velocity.properties   (with props)
    trunk/idp-distribution/src/main/resources/conf/webflow-config.xml   (with props)
    trunk/idp-distribution/src/main/resources/flows/
      - copied from r4707, trunk/idp-distribution/src/main/resources/webflows/
    trunk/idp-distribution/src/main/resources/flows/status/
    trunk/idp-distribution/src/main/resources/flows/status/status-flow.xml   (with props)
    trunk/idp-distribution/src/main/resources/jetty/etc/jetty-idp-delegatessl.xml
      - copied unchanged from r4711, trunk/idp-distribution/src/main/resources/jetty/etc/jetty-shibboleth-delegatessl.xml
    trunk/idp-distribution/src/main/resources/jetty/etc/jetty-idp-ssl.xml
      - copied unchanged from r4711, trunk/idp-distribution/src/main/resources/jetty/etc/jetty-shibboleth-ssl.xml
    trunk/idp-distribution/src/main/resources/templates/ok.vm   (with props)
Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/conf/internal.xml
    trunk/idp-distribution/src/main/resources/jetty/etc/jetty-shibboleth-delegatessl.xml
    trunk/idp-distribution/src/main/resources/jetty/etc/jetty-shibboleth-ssl.xml
    trunk/idp-distribution/src/main/resources/jetty/start.d/700-shib.ini
    trunk/idp-distribution/src/main/resources/jetty/webapps/idp.xml
    trunk/idp-distribution/src/main/resources/webflows/
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=4712&r1=4711&r2=4712&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml (original)
+++ trunk/idp-distribution/pom.xml Fri Aug 23 13:30:07 2013
@@ -17,6 +17,8 @@
 
     <properties>
         <assembly-directory>target/${project.artifactId}</assembly-directory>
+        <!-- TODO Remove Jetty version override later -->
+        <jetty.version>9.1.0-SNAPSHOT</jetty.version>
     </properties>
 
     <repositories>
@@ -34,6 +36,17 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
+        
+        <!-- TODO Jetty SNAPSHOT repository, to be removed later. -->
+        <repository>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <id>sonatype-snapshots</id>
+            <name>Sonatype Jetty Snapshots</name>
+            <url>http://oss.sonatype.org/content/groups/jetty</url>
+        </repository>
+        
     </repositories>
 
     <dependencies>
@@ -129,7 +142,7 @@
                                 <artifactItem>
                                     <groupId>net.shibboleth.utilities.jetty9</groupId>
                                     <artifactId>jetty9-dta-ssl</artifactId>
-                                    <version>1.0.0-SNAPSHOT</version>
+                                    <version>1.0-SNAPSHOT</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${assembly-directory}/jetty/lib/shibboleth</outputDirectory>

Modified: trunk/idp-distribution/src/main/resources/conf/internal.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/conf/internal.xml?rev=4712&r1=4711&r2=4712&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/conf/internal.xml (original)
+++ trunk/idp-distribution/src/main/resources/conf/internal.xml Fri Aug 23 13:30:07 2013
@@ -9,9 +9,4 @@
 
     <!-- TODO incomplete -->
 
-    <!-- 
-    <import resource="webflow-config.xml" />
-    <import resource="velocity-config.xml" />
-    -->
-
 </beans>

Modified: trunk/idp-distribution/src/main/resources/jetty/start.d/700-shib.ini
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty/start.d/700-shib.ini?rev=4712&r1=4711&r2=4712&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty/start.d/700-shib.ini (original)
+++ trunk/idp-distribution/src/main/resources/jetty/start.d/700-shib.ini Fri Aug 23 13:30:07 2013
@@ -20,10 +20,10 @@
 # Set keystore password.
 # Set secure port.
 # Include SSL configuration file with absolute path to keystore.

[... 95 lines stripped ...]