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

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 22 13:21:53 2013
New Revision: 4711

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4711&view=rev
Log:
Convert locations to classpaths until we fix this.

Modified:
    trunk/idp-attribute-cli/src/main/resources/conf/cli-flow-beans.xml
    trunk/idp-attribute-cli/src/main/resources/conf/cli-flow.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=4711&r1=4710&r2=4711&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 13:21:53 2013
@@ -2,10 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        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"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
+                           http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd"
        default-init-method="initialize">
 
     <!-- BeanPostProcessor auto-wraps OpenSAML ProfileActions in WebFlowProfileActionAdaptor. -->

Modified: trunk/idp-attribute-cli/src/main/resources/conf/cli-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/cli-flow.xml?rev=4711&r1=4710&r2=4711&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/cli-flow.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/cli-flow.xml Thu Aug 22 13:21:53 2013
@@ -1,7 +1,6 @@
 <flow xmlns="http://www.springframework.org/schema/webflow"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.springframework.org/schema/webflow
-                          http://www.springframework.org/schema/webflow/spring-webflow-2.0.xsd">
+      xsi:schemaLocation="http://www.springframework.org/schema/webflow classpath:/org/springframework/webflow/engine/model/builder/spring-webflow-2.0.xsd">
     
     <on-start>
         <evaluate expression="InitializeProfileRequestContext" />

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=4711&r1=4710&r2=4711&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 13:21:53 2013
@@ -2,8 +2,8 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        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">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd
+                           http://www.springframework.org/schema/util classpath:/org/springframework/beans/factory/xml/spring-util-3.2.xsd">
 
     <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
         <property name="id" value="shibboleth.LogbackLogging"/>

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=4711&r1=4710&r2=4711&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 13:21:53 2013
@@ -1,9 +1,9 @@
 <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"

[... 10 lines stripped ...]