[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/idp.properties conf/relying-party-legacy....

[noreply at shibboleth.net]

Author: scantor
Date: Wed Jun 18 14:16:15 2014
New Revision: 6111

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6111&view=rev
Log:
Various cleanup as docs get written.

Modified:
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/idp.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/idp.properties?rev=6111&r1=6110&r2=6111&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Wed Jun 18 14:16:15 2014
@@ -4,8 +4,8 @@
 #idp.xml.securityManager = org.apache.xerces.util.SecurityManager
 idp.xml.securityManager = com.sun.org.apache.xerces.internal.util.SecurityManager
 
-# Set the entityId of the IdP
-idp.entity.id = https://idp.example.org
+# Set the entityID of the IdP
+idp.entityID = https://idp.example.org
 
 # Settings for internal AES encryption key
 idp.sealer.storeType = JCEKS
@@ -35,7 +35,7 @@
 idp.session.enabled = true
 
 # Set to true to expose more detailed errors in responses to SPs
-idp.errors.detailed = false
+#idp.errors.detailed = true
 
 # Set to false to skip signing of SAML response messages that signal errors
 idp.errors.signed = true

Modified: trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml?rev=6111&r1=6110&r2=6111&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party-legacy.xml Wed Jun 18 14:16:15 2014
@@ -20,9 +20,9 @@
     <!-- ========================================== -->
     <!--      Relying Party Configurations          -->
     <!-- ========================================== -->
-    <rp:AnonymousRelyingParty provider="${idp.entity.id}" defaultSigningCredentialRef="IdPCredential"/>
+    <rp:AnonymousRelyingParty provider="${idp.entityID}" defaultSigningCredentialRef="IdPCredential"/>
     
-    <rp:DefaultRelyingParty provider="${idp.entity.id}" defaultSigningCredentialRef="IdPCredential">
+    <rp:DefaultRelyingParty provider="${idp.entityID}" defaultSigningCredentialRef="IdPCredential">
         <!-- 
             Each attribute in these profiles configuration is set to its default value,
             that is, the values that would be in effect if those attributes were not present.

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=6111&r1=6110&r2=6111&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Wed Jun 18 14:16:15 2014
@@ -42,7 +42,6 @@
                 <ref bean="SAML2.ECP" />
                 <ref bean="SAML2.AttributeQuery" />
                 <ref bean="SAML2.ArtifactResolution" />
-                <ref bean="Liberty.SSOS" />
             </util:list>
         </property>
     </bean>
@@ -59,7 +58,6 @@
                     <ref bean="SAML2.ECP" />
                     <ref bean="SAML2.AttributeQuery" />
                     <ref bean="SAML2.ArtifactResolution" />
-                    <ref bean="Liberty.SSOS" />
                 </util:list>
             </property>
         </bean>

Modified: trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml?rev=6111&r1=6110&r2=6111&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/relying-party-system.xml Wed Jun 18 14:16:15 2014
@@ -17,7 +17,7 @@
     <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
     <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
-    <bean id="entityID" class="java.lang.String" c:_0="${idp.entity.id}" />
+    <bean id="entityID" class="java.lang.String" c:_0="${idp.entityID}" />
 
     <!-- Pulls together the various components that feed the resolver. -->
     <bean class="net.shibboleth.idp.relyingparty.impl.DefaultRelyingPartyConfigurationResolver"
@@ -28,17 +28,17 @@
 
     <!-- Parent bean for generic RelyingParty overrides that establishes defaults. -->

[... 19 lines stripped ...]