[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/mvc-beans.xml idp-conf/src/main/re...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jun  9 12:58:28 2014
New Revision: 6061

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6061&view=rev
Log:
Clean up UI templates, reorg static content, add request/response to Velocity request scope

Added:
    trunk/idp-war/src/main/webapp/css/
    trunk/idp-war/src/main/webapp/css/main.css
      - copied, changed from r6060, trunk/idp-war/src/main/webapp/resources/login.css
    trunk/idp-war/src/main/webapp/images/
      - copied from r6060, trunk/idp-war/src/main/webapp/resources/
Modified:
    trunk/idp-conf/src/main/resources/system/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml-abstract-flow.xml
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-conf/src/main/resources/views/relying-party-error.vm
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/error.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/login.jsp
    trunk/idp-war/src/main/webapp/WEB-INF/jsp/logout.jsp
    trunk/idp-war/src/main/webapp/images/login.css
    trunk/idp-war/src/main/webapp/resources/

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=6061&r1=6060&r2=6061&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 Mon Jun  9 12:58:28 2014
@@ -20,7 +20,8 @@
 
     <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping" p:order="2" />
 
-    <mvc:resources mapping="/resources/**" location="/resources/" />
+    <mvc:resources mapping="/css/**" location="/css/" />
+    <mvc:resources mapping="/images/**" location="/images/" />
 
     <!-- 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. -->

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml?rev=6061&r1=6060&r2=6061&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/jaas-authn-flow.xml Mon Jun  9 12:58:28 2014
@@ -24,6 +24,8 @@
             <evaluate expression="opensamlProfileRequestContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationContext))" result="viewScope.authenticationContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationErrorContext))" result="viewScope.authenticationErrorContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>

Modified: trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml?rev=6061&r1=6060&r2=6061&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/authn/ldap-authn-flow.xml Mon Jun  9 12:58:28 2014
@@ -26,6 +26,8 @@
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.AuthenticationWarningContext))" result="viewScope.authenticationWarningContext" />
             <evaluate expression="authenticationContext.getSubcontext(T(net.shibboleth.idp.authn.context.LDAPResponseContext))" result="viewScope.ldapResponseContext" />
             <evaluate expression="T(net.shibboleth.utilities.java.support.codec.HTMLEncoder)" result="viewScope.encoder" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeRequest()" result="viewScope.request" />
+            <evaluate expression="flowRequestContext.getExternalContext().getNativeResponse()" result="viewScope.response" />
         </on-render>
         <transition on="proceed" to="ExtractUsernamePasswordFromFormRequest" />
     </view-state>


[... 337 lines stripped ...]