[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/authn-flow-descriptors.xml conf/global-be...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 14 23:02:27 2013
New Revision: 4861

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4861&view=rev
Log:
Corrections in the course of getting testbed running.

Modified:
    trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
    trunk/idp-conf/src/main/resources/conf/global-beans.xml
    trunk/idp-conf/src/main/resources/conf/mvc-beans.xml
    trunk/idp-conf/src/main/resources/conf/session-manager.xml
    trunk/idp-conf/src/main/resources/conf/webflow-config.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/authn-flow.xml
    trunk/idp-conf/src/main/resources/flows/authn/ipaddress-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-basic-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/jaas-form-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/remoteuser-authn-beans.xml
    trunk/idp-conf/src/main/resources/flows/authn/subject-c14n-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml?rev=4861&r1=4860&r2=4861&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/authn-flow-descriptors.xml Mon Oct 14 23:02:27 2013
@@ -6,7 +6,7 @@
        xmlns:c="http://www.springframework.org/schema/c"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
-                           http://www.springframework.org/schema/context classpath:/org/springframework/beans/factory/xml/spring-context-3.2.xsd
+                           http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd">
 
     <context:property-placeholder systemPropertiesMode="2" location="classpath:conf/idp.properties" />

Modified: trunk/idp-conf/src/main/resources/conf/global-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/global-beans.xml?rev=4861&r1=4860&r2=4861&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/global-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/global-beans.xml Mon Oct 14 23:02:27 2013
@@ -6,7 +6,7 @@
        xmlns:c="http://www.springframework.org/schema/c"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
-                           http://www.springframework.org/schema/context classpath:/org/springframework/beans/factory/xml/spring-context-3.2.xsd
+                           http://www.springframework.org/schema/context classpath:/org/springframework/context/config/spring-context-3.2.xsd
                            http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd"
 
        default-init-method="initialize"
@@ -14,13 +14,18 @@
 
     <context:property-placeholder systemPropertiesMode="2" location="classpath:conf/idp.properties" />
 
-    <bean id="shibboleth.ConversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
+    <!-- This bean MUST be called "conversionService" to work properly. -->
+    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
         <property name="converters">
             <list>
                 <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter"/>
             </list>
         </property>
     </bean>
+
+    <import resource="authn-comparison.xml" />
+    <import resource="authn-flow-descriptors.xml" />
+    <import resource="session-manager.xml" />
     
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
         <property name="id" value="shibboleth.LogbackLogging" />
@@ -70,7 +75,7 @@
                     <key>
                         <value>http://apache.org/xml/properties/security-manager</value>
                     </key>
-                    <bean id="shibboleth.XercesSecurityManager" class=${idp.xml.securityManager}/>
+                    <bean id="shibboleth.XercesSecurityManager" class="${idp.xml.securityManager}" />
                 </entry>
             </map>
         </property>
@@ -104,4 +109,7 @@
         

[... 208 lines stripped ...]