[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/attribute-params-config.xml conf/global-u...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May  5 10:26:00 2014
New Revision: 5840

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5840&view=rev
Log:
Reorg service config, and add NameID service to the profiles.

Added:
    trunk/idp-conf/src/main/resources/conf/saml-nameid-gen.xml   (with props)
    trunk/idp-conf/src/main/resources/conf/services-user.xml
      - copied, changed from r5832, trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml
    trunk/idp-conf/src/main/resources/conf/global-user.xml
    trunk/idp-conf/src/main/resources/conf/idp.properties
    trunk/idp-conf/src/main/resources/conf/subject-config.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/subject-config-system.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml1/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml/saml2/sso-abstract-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/global-user.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-user.xml?rev=5840&r1=5839&r2=5840&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-user.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-user.xml Mon May  5 10:26:00 2014
@@ -11,10 +11,10 @@
 
 	<context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
 
+    <import resource="services-user.xml" />
 	<import resource="authn-comparison.xml" />
 	<import resource="general-authn-config.xml" />
     <import resource="subject-config.xml" />
-	<import resource="attribute-params-config.xml" />
 
     <!-- List of event/error codes during SSO to trap and handle without returning to SPs. -->
 
@@ -77,19 +77,4 @@
         <entry key="InvalidNameIDPolicy" value-ref="Shibboleth.SAML2Status.InvalidNameIDPolicy" />
     </util:map>
 
-    <!--  The (currently single) file which provides relying party configuration -->
-
-    <util:list id="shibboleth.MetadataResolverResources">
-        <value>file://${idp.home}/conf/metadata-providers.xml</value>
-        <value>file://${idp.home}/conf/property-placeholder.xml</value>
-    </util:list>
-
-    <!--  The (currently single) file which provides metdata configuration -->
-
-    <util:list id="shibboleth.RelyingPartyResolverResources">
-        <value>file://${idp.home}/conf/relying-party.xml</value>
-        <value>file://${idp.home}/conf/profile-defaults.xml</value>
-        <value>file://${idp.home}/conf/property-placeholder.xml</value>
-    </util:list>
-
 </beans>

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=5840&r1=5839&r2=5840&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/idp.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/idp.properties Mon May  5 10:26:00 2014
@@ -95,12 +95,15 @@
 idp.saml1.nameid.default = urn:mace:shibboleth:1.0:nameIdentifier
 idp.saml2.nameid.default = urn:oasis:names:tc:SAML:2.0:nameid-format:transient
 
+idp.service.nameidGeneration.checkInterval=PT5M
+
 # Reload "failfast" (stop the IdP if a configuration is bad)
-# and reload check interval (0 == never reload). Specified in milliseconds
+# and reload check interval (0 == never reload).
 idp.service.logging.failFast=true
 idp.service.logging.checkInterval=PT5M
 idp.service.attribute.resolver.failFast=false
 idp.service.attribute.resolver.checkInterval=PT5M
+
 # Failing the filter fast leaves no filters enabled.
 idp.service.attribute.filter.failFast=false
 idp.service.attribute.filter.checkInterval=PT5M

Copied: trunk/idp-conf/src/main/resources/conf/services-user.xml (from r5832, trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services-user.xml?p2=trunk/idp-conf/src/main/resources/conf/services-user.xml&p1=trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml&r1=5832&r2=5840&rev=5840&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/attribute-params-config.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/services-user.xml Mon May  5 10:26:00 2014
@@ -6,7 +6,7 @@
                            http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
                            
-    <!-- Advanced Configuration of Attribute Resolver and Filter definitions from SVN.

[... 236 lines stripped ...]