[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system: conf/global-system.xml flows/c14n/saml1...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Feb 22 12:18:31 2014
New Revision: 5453

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5453&view=rev
Log:
JSPT-43 Better Error message for the duplicate ID log message.  Remove the (few) duplicates that we had, plus some over zealous inclusion of bean post processors

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-crypto-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-direct-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/c14n/saml2-transient-subject-c14n-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml1/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-unsolicited-beans.xml

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=5453&r1=5452&r2=5453&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Sat Feb 22 12:18:31 2014
@@ -35,7 +35,6 @@
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->
     
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop"
-          p:id="shibboleth.LogbackLogging"
           p:loggingConfiguration="file://${idp.home}/conf/logback.xml"
           p:reloadCheckDelay="${idp.service.logging.checkInterval}"
           p:reloadTaskTimer-ref="shibboleth.TaskTimer"

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml?rev=5453&r1=5452&r2=5453&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-crypto-transient-subject-c14n-beans.xml Sat Feb 22 12:18:31 2014
@@ -13,7 +13,7 @@
     <bean class="net.shibboleth.idp.spring.IdentifiableBeanPostProcessor" />
 
 	<bean id="SAML1CryptoTransientDecoder" class="net.shibboleth.idp.saml.impl.nameid.CryptoTransientNameIdentifierDecoder"
-		scope="prototype" p:id="SAML1CryptoTransientDecoder" p:dataSealer-ref="shibboleth.DataSealer" />
+		scope="prototype" p:dataSealer-ref="shibboleth.DataSealer" />
 
 	<bean id="SAML1CrypoTransientCanonicalization" class="net.shibboleth.idp.saml.impl.nameid.NameIdentifierCanonicalization"
 		scope="prototype" p:decoder-ref="SAML1CryptoTransientDecoder" />

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml?rev=5453&r1=5452&r2=5453&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-direct-subject-c14n-beans.xml Sat Feb 22 12:18:31 2014
@@ -13,7 +13,7 @@
     <bean class="net.shibboleth.idp.spring.IdentifiableBeanPostProcessor" />
 
 	<bean id="SAML1DirectDecoder" class="net.shibboleth.idp.saml.impl.nameid.DirectNameIdentifierDecoder"
-		scope="prototype" p:id="SAML1DirectDecoder"  />
+		scope="prototype" />
 
 	<bean id="SAML1DirectCanonicalization" class="net.shibboleth.idp.saml.impl.nameid.NameIdentifierCanonicalization"
 		scope="prototype" p:decoder-ref="SAML1DirectDecoder" />

Modified: trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml?rev=5453&r1=5452&r2=5453&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/c14n/saml1-transient-subject-c14n-beans.xml (original)

[... 136 lines stripped ...]