[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/intercept/messages.properties idp-conf/sr...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Nov 21 22:48:33 2014
New Revision: 6989

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6989&view=rev
Log:
IDP-517 -  Consent templates need to handle missing RPUI info
- Move message bundles into new messages directory
- Redo error view with simpler message lookup calls
- Try and fix sizing issue with consent logos using style sheet

Added:
    trunk/idp-conf/src/main/resources/messages/
    trunk/idp-conf/src/main/resources/messages/authn-messages.properties   (with props)
    trunk/idp-conf/src/main/resources/messages/consent-messages.properties
      - copied, changed from r6986, trunk/idp-conf/src/main/resources/conf/intercept/messages.properties
    trunk/idp-conf/src/main/resources/messages/error-messages.properties
      - copied unchanged from r6987, trunk/idp-conf/src/main/resources/conf/messages.properties
Modified:
    trunk/idp-conf/src/main/resources/conf/intercept/messages.properties
    trunk/idp-conf/src/main/resources/conf/messages.properties
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/views/error.vm
    trunk/idp-conf/src/main/resources/views/expiring-password.vm
    trunk/idp-conf/src/main/resources/views/intercept/attribute-release.vm
    trunk/idp-conf/src/main/resources/views/intercept/terms-of-use.vm
    trunk/idp-conf/src/main/resources/views/login.vm
    trunk/idp-conf/src/main/resources/views/logout-response.vm
    trunk/idp-conf/src/main/resources/views/logout.vm
    trunk/idp-distribution/src/main/resources/bin/build.xml
    trunk/idp-war/src/main/webapp/css/consent.css

Modified: trunk/idp-conf/src/main/resources/conf/services.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.xml?rev=6989&r1=6988&r2=6989&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services.xml Fri Nov 21 22:48:33 2014
@@ -100,8 +100,9 @@
     and fall back to one with a .properties extension.
     -->
     <util:list id="shibboleth.MessageSourceResources">
-        <value>%{idp.home}/conf/messages</value>
-        <value>%{idp.home}/conf/intercept/messages</value>
+        <value>%{idp.home}/messages/authn-messages</value>
+        <value>%{idp.home}/messages/consent-messages</value>
+        <value>%{idp.home}/messages/error-messages</value>
     </util:list>
     
 </beans>

Copied: trunk/idp-conf/src/main/resources/messages/consent-messages.properties (from r6986, trunk/idp-conf/src/main/resources/conf/intercept/messages.properties)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/messages/consent-messages.properties?p2=trunk/idp-conf/src/main/resources/messages/consent-messages.properties&p1=trunk/idp-conf/src/main/resources/conf/intercept/messages.properties&r1=6986&r2=6989&rev=6989&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/intercept/messages.properties (original)
+++ trunk/idp-conf/src/main/resources/messages/consent-messages.properties Fri Nov 21 22:48:33 2014
@@ -1,12 +1,3 @@
-# Intercept Event to error view key mappings
-
-ContextCheckDenied = context-check-denied
-
-# Error key to title and message mappings
-
-context-check-denied.title = Access Denied
-context-check-denied.message = You are not eligible for the service requested.
-
 # Messages related to terms of use consent.
 
 idp.terms-of-use.title      = Terms of Use
@@ -69,20 +60,14 @@
 idp.attribute-release.confirmationQuestion         = The information above would be shared with the service if you proceed. \
                                                      Do you agree to release this information to the service every time you access it?
 
-idp.attribute-release.consentMethod                = Select an information release consent duration :
+idp.attribute-release.consentMethod                = Select an information release consent duration:
 idp.attribute-release.consentMethodRevoke          = This setting can be revoked at any time with the checkbox on the login page.
 
 idp.attribute-release.doNotRememberConsent         = Ask me again at next login
-idp.attribute-release.doNotRememberConsentItem1    = I agree to send my information this time.
-idp.attribute-release.doNotRememberConsentItem2    =
-idp.attribute-release.doNotRememberConsentItem3    =
+idp.attribute-release.doNotRememberConsentItem     = I agree to send my information this time.
 
 idp.attribute-release.rememberConsent              = Ask me again if information changes
-idp.attribute-release.rememberConsentItem1         = I agree that the same information will be sent automatically to this service in the future.
-idp.attribute-release.rememberConsentItem2         = 
-idp.attribute-release.rememberConsentItem3         =

[... 494 lines stripped ...]