[java-identity-provider COMMIT] in /trunk: idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relying...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 18 08:09:59 2014
New Revision: 5596

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5596&view=rev
Log:
IDP-277 Add "detailedErrors" to the schema for relying parties.  Add parser and test

Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java
    trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java?rev=5596&r1=5595&r2=5596&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/AbstractRelyingPartyParser.java Tue Mar 18 08:09:59 2014
@@ -68,7 +68,12 @@
 
         final String provider = StringSupport.trimOrNull(element.getAttributeNS(null, "provider"));
         builder.addPropertyValue("responderId", provider);
-
+        
+        final String detailedErrors = StringSupport.trimOrNull(element.getAttributeNS(null, "detailedErrors"));
+        if (null != detailedErrors) {
+            builder.addPropertyValue("detailedErrors", detailedErrors);
+        }
+        
         final List<BeanDefinition> profileConfigurations =
                 SpringSupport.parseCustomElements(ElementSupport.getChildElements(element, PROFILE_CONFIGURATION),
                         parserContext);

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java?rev=5596&r1=5595&r2=5596&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/RelyingPartyTest.java Tue Mar 18 08:09:59 2014
@@ -65,6 +65,7 @@
         RelyingPartyConfiguration rpConf = context.getBean(RelyingPartyConfiguration.class);
 
         Assert.assertEquals(rpConf.getId(), "the_RP");
+        Assert.assertTrue(rpConf.isDetailedErrors());
         Assert.assertEquals(rpConf.getProfileConfigurations().size(), 1);
 
         ProfileRequestContext ctx = new ProfileRequestContext<>();

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party.xsd?rev=5596&r1=5595&r2=5596&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-relying-party.xsd Tue Mar 18 08:09:59 2014
@@ -69,51 +69,69 @@
     </complexType>
 
     <complexType name="UnidentifiedRelyingParty">
-        <annotation>
-            <documentation>
-                Relying party configuration information that is not specific to an identified relying party.
-            </documentation>
-        </annotation>
-        <sequence>
-            <element ref="rp:ProfileConfiguration" minOccurs="0" maxOccurs="unbounded">
-                <annotation>
-                    <documentation>Profile specific configuration information.</documentation>
-                </annotation>
-            </element>
-        </sequence>
-        <attribute name="provider" type="string" use="required">
+    	<annotation>
+    		<documentation>
+    			Relying party configuration information that is not
+    			specific to an identified relying party.
+    		</documentation>
+    	</annotation>
+    	<sequence>
+    		<element ref="rp:ProfileConfiguration" minOccurs="0"
+    			maxOccurs="unbounded">
+    			<annotation>
+    				<documentation>
+    					Profile specific configuration information.
+    				</documentation>
+    			</annotation>
+    		</element>
+    	</sequence>
+    	<attribute name="provider" type="string" use="required">
+    		<annotation>
+    			<documentation>
+    				The entity ID the responder should use when
+    				communicating with the relying party.
+    			</documentation>
+    		</annotation>
+    	</attribute>
+    	<attribute name="defaultAuthenticationMethod" type="string">
+    		<annotation>
+    			<documentation>
+    				The authentication method to use to authenticate the

[... 67 lines stripped ...]