[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/credentials.xml conf/relying-party.xml co...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Aug  8 08:49:19 2014
New Revision: 6405

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6405&view=rev
Log:
IDP-466 remove redundant invocation of the IdentifiableBeanPostProcessor.

The visible files are always loaded (via service.xml) alongside a system bean file which defines the bean and service-system.xml is a straight bug (it is imported from global-system which already loads sets up the bean)

Modified:
    trunk/idp-conf/src/main/resources/conf/credentials.xml
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml

Modified: trunk/idp-conf/src/main/resources/conf/credentials.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/credentials.xml?rev=6405&r1=6404&r2=6405&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/credentials.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/credentials.xml Fri Aug  8 08:49:19 2014
@@ -14,9 +14,6 @@
 
     <bean class="org.springframework.context.support.PropertySourcesPlaceholderConfigurer"
         p:placeholderPrefix="%{" p:placeholderSuffix="}" />
-
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <!--
     This defines the signing and encryption key and certificate pairs referenced by your relying-party.xml

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=6405&r1=6404&r2=6405&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Fri Aug  8 08:49:19 2014
@@ -14,9 +14,6 @@
 
     <context:property-placeholder />
 
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
-    
     <!--
     Anonymous configuration, defaults to no support for any profiles. Add <ref> elements to the list
     to enable specific default profile settings (as below), or create new beans inline to override defaults. 

Modified: trunk/idp-conf/src/main/resources/conf/saml-nameid.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/saml-nameid.xml?rev=6405&r1=6404&r2=6405&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/saml-nameid.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/saml-nameid.xml Fri Aug  8 08:49:19 2014
@@ -13,9 +13,6 @@
        default-destroy-method="destroy">
 
     <context:property-placeholder />
-
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <!-- ========================= SAML NameID Generation ========================= -->
 

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=6405&r1=6404&r2=6405&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml Fri Aug  8 08:49:19 2014
@@ -11,9 +11,6 @@
 
        default-init-method="initialize"
        default-destroy-method="destroy">
-
-    <!-- This BeanPostProcessor auto-sets identifiable beans with the bean name (if not already set). -->
-    <bean class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
 
     <!--
     These are beans that define reloadable services. The actual Spring resources that configure the