[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources/system/flows/saml2: sso-abstract-beans.xml sso-...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jan 15 12:47:09 2014
New Revision: 5203

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5203&view=rev
Log:
Change remaining "http:" schemaLocations to "classpath:". Add default-destroy-method.

Modified:
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-redirect-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-redirect-flow.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-unsolicited-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/saml2/sso-unsolicited-flow.xml

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml?rev=5203&r1=5202&r2=5203&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-beans.xml Wed Jan 15 12:47:09 2014
@@ -5,12 +5,11 @@
        xmlns:p="http://www.springframework.org/schema/p"
        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/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
-       "
-       default-init-method="initialize">
+       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/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"
+       default-destroy-method="destroy">
 
     <context:property-placeholder location="file://${idp.home}/conf/idp.properties" />
     

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml?rev=5203&r1=5202&r2=5203&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-abstract-flow.xml Wed Jan 15 12:47:09 2014
@@ -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/xml/spring-webflow-2.0.xsd"
       abstract="true">
 
     <on-start>

Modified: trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml?rev=5203&r1=5202&r2=5203&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/saml2/sso-post-beans.xml Wed Jan 15 12:47:09 2014
@@ -3,12 +3,11 @@
        xmlns:context="http://www.springframework.org/schema/context"
        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/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
-       "
-       default-init-method="initialize">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans classpath:/org/springframework/beans/factory/xml/spring-beans-3.2.xsd

[... 101 lines stripped ...]