[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/metadata/example-metadata.xml idp-conf/src/mai...

[noreply at shibboleth.net]

Author: rdw
Date: Sat May 17 07:13:14 2014
New Revision: 5941

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5941&view=rev
Log:
IDP- 251
Add the jsp files and associated stuff (Css) into the war.  Error handling is still to be tested.  Logout and shibboleth are still TBC.
The login JSP file is the "responsive" login page, ported from V2

Added:
    trunk/idp-war/src/main/webapp/WEB-INF/idpui.tld
    trunk/idp-war/src/main/webapp/error-500.jsp
    trunk/idp-war/src/main/webapp/login.jsp
    trunk/idp-war/src/main/webapp/logout.jsp
    trunk/idp-war/src/main/webapp/resources/
      - copied from r5939, trunk/idp-war/src/main/webapp/images/
    trunk/idp-war/src/main/webapp/resources/login.css
Modified:
    trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-war/.project
    trunk/idp-war/src/main/webapp/WEB-INF/web.xml
    trunk/idp-war/src/main/webapp/images/
    trunk/idp-war/src/main/webapp/shibboleth.jsp

Modified: trunk/idp-conf/src/main/resources/metadata/example-metadata.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/metadata/example-metadata.xml?rev=5941&r1=5940&r2=5941&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/metadata/example-metadata.xml (original)
+++ trunk/idp-conf/src/main/resources/metadata/example-metadata.xml Sat May 17 07:13:14 2014
@@ -3,8 +3,12 @@
         <Extensions>
             <mdui:UIInfo>
                 <mdui:DisplayName xml:lang="en">TEST SP (display Name)</mdui:DisplayName>
-                <mdui:Description xml:lang="en">TEST SP (description)Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit.
+                <mdui:Description xml:lang="en">
+                TEST SP (description)Lorem ipsum dolor sit amet, consectetur adipiscing elit. 
+                Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit.
                 </mdui:Description>
+                <mdui:InformationURL xml:lang="en">https://www.example.org</mdui:InformationURL>
+                <mdui:PrivacyStatementURL xml:lang="en">https://www.example.org/privacy</mdui:PrivacyStatementURL>
                 <mdui:Logo height="65" width="150">https://shibboleth.net/images/shibboleth.png</mdui:Logo>
             </mdui:UIInfo>
         </Extensions>
@@ -72,4 +76,14 @@
         <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://localhost:8443/sp/SAML1/Artifact/ACS" index="11"/>
         
     </SPSSODescriptor>
+    <Organization>
+        <OrganizationName xml:lang="en">TSC</OrganizationName>
+        <OrganizationDisplayName xml:lang="en">The Shibboleth Consortium</OrganizationDisplayName>
+        <OrganizationURL xml:lang="en">http://shibboleth.net/</OrganizationURL>
+    </Organization>
+    <ContactPerson contactType="support">
+        <GivenName>J Random</GivenName>
+        <SurName>Engineer</SurName>
+        <EmailAddress>mailto:jre at example.org</EmailAddress>
+    </ContactPerson>
 </EntityDescriptor>

Modified: trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml?rev=5941&r1=5940&r2=5941&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml Sat May 17 07:13:14 2014
@@ -5,7 +5,9 @@
        xmlns:util="http://www.springframework.org/schema/util"
        xmlns:p="http://www.springframework.org/schema/p"
        xmlns:c="http://www.springframework.org/schema/c"
+       xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+       http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
@@ -18,6 +20,7 @@
 
     <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" p:order="2" />
 
+    <mvc:resources mapping="/resources/**" location="/resources/" />
 
     <!-- HandlerAdapters: These aren't ordered. Add the WebFlow one, then the standard Spring MVC default ones. 
          Have to enumerate them all explicitly b/c we're overriding the built-in defaults. -->
@@ -65,7 +68,7 @@
 

[... 91 lines stripped ...]