[java-identity-provider COMMIT] in /trunk/idp-attribute-cli/src/main/resources/conf: cli-flow-beans.xml internal.xml ...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 22 12:55:16 2013
New Revision: 4710

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4710&view=rev
Log:
Add schema locations to fix Spring parsing.

Modified:
    trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml
    trunk/idp-attribute-cli/src/main/resources/conf/internal.xml
    trunk/idp-attribute-cli/src/main/resources/conf/webflow-config.xml

Modified: trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml?rev=4710&r1=4709&r2=4710&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml Thu Aug 22 12:55:16 2013
@@ -8,6 +8,7 @@
                            http://www.springframework.org/schema/util/spring-util.xsd"
        default-init-method="initialize">
 
+    <!-- BeanPostProcessor auto-wraps OpenSAML ProfileActions in WebFlowProfileActionAdaptor. -->
     <bean class="net.shibboleth.idp.profile.impl.ProfileActionBeanPostProcessor" />
 
     <!-- Spring-aware action that bootstraps us. We need *something* to create a profile context. -->

Modified: trunk/idp-attribute-cli/src/main/resources/conf/internal.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/internal.xml?rev=4710&r1=4709&r2=4710&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/internal.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/internal.xml Thu Aug 22 12:55:16 2013
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:util="http://www.springframework.org/schema/util">
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
         <property name="id" value="shibboleth.LogbackLogging"/>
@@ -50,9 +53,9 @@
                         <value>http://apache.org/xml/properties/security-manager</value>
                     </key>
                     <!-- Works for Xerces. -->
-                    <bean id="shibboleth.XercesSecurityManager" class="org.apache.xerces.util.SecurityManager"/>
+                    <!-- <bean id="shibboleth.XercesSecurityManager" class="org.apache.xerces.util.SecurityManager"/> -->
                     <!-- Sun's version. -->
-                    <!-- <bean id="shibboleth.XercesSecurityManager" class="com.sun.org.apache.xerces.internal.util.SecurityManager"/> -->
+                    <bean id="shibboleth.XercesSecurityManager" class="com.sun.org.apache.xerces.internal.util.SecurityManager"/>
                 </entry>
             </map>
         </property>

Modified: trunk/idp-attribute-cli/src/main/resources/conf/webflow-config.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/webflow-config.xml?rev=4710&r1=4709&r2=4710&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/webflow-config.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/webflow-config.xml Thu Aug 22 12:55:16 2013
@@ -1,9 +1,12 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:webflow="http://www.springframework.org/schema/webflow-config"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:webflow="http://www.springframework.org/schema/webflow-config">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+                           http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
+                           http://www.springframework.org/schema/webflow-config http://www.springframework.org/schema/webflow-config/spring-webflow-config-2.4.xsd">
 
     <webflow:flow-registry id="flowRegistry">
-        <webflow:flow-location path="conf/cli-flow.xml" />
+        <webflow:flow-location path="/conf/cli-flow.xml" />
     </webflow:flow-registry>
 
     <webflow:flow-executor id="flowExecutor" />