From 268f04aac824df309c4c168f484ee2ce5f6c0015 Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Tue, 9 Jun 2009 23:39:37 +0000 Subject: [PATCH] updated xxx-2.5.xsd references to 3.0 --- spring-framework-reference/src/aop.xml | 16 ++++---- spring-framework-reference/src/beans.xml | 4 +- .../src/dynamic-languages.xml | 8 ++-- spring-framework-reference/src/jdbc.xml | 8 ++-- spring-framework-reference/src/jms.xml | 4 +- spring-framework-reference/src/mail.xml | 2 +- spring-framework-reference/src/mvc.xml | 6 +-- spring-framework-reference/src/portlet.xml | 6 +-- spring-framework-reference/src/remoting.xml | 6 +-- spring-framework-reference/src/testing.xml | 2 +- .../src/transaction.xml | 40 +++++++++---------- spring-framework-reference/src/xml-custom.xml | 4 +- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/spring-framework-reference/src/aop.xml b/spring-framework-reference/src/aop.xml index 736eb2bd706..f90114c2bfc 100644 --- a/spring-framework-reference/src/aop.xml +++ b/spring-framework-reference/src/aop.xml @@ -2052,8 +2052,8 @@ public class SimpleProfiler { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd -http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> <!-- this is the object that will be proxied by Spring's AOP infrastructure --> <bean id="fooService" class="x.y.service.DefaultFooService"/> @@ -3183,8 +3183,8 @@ public class ProfilingAspect { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <!-- a service object; we will be profiling its methods --> <bean id="entitlementCalculationService" @@ -3408,8 +3408,8 @@ public final class Main { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <context:load-time-weaver/> @@ -3501,8 +3501,8 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd -http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd"> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <context:load-time-weaver weaver-class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"/> diff --git a/spring-framework-reference/src/beans.xml b/spring-framework-reference/src/beans.xml index 699bb587110..333fd0b2a80 100644 --- a/spring-framework-reference/src/beans.xml +++ b/spring-framework-reference/src/beans.xml @@ -209,7 +209,7 @@ + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> @@ -2815,7 +2815,7 @@ public class ReplacementComputeValue implements MethodReplacer { file. If you are using the "scope" attribute then you must be referencing either the 'spring-beans-2.0.dtd' DTD or the - 'spring-beans-2.5.xsd' XSD in that + 'spring-beans-3.0.xsd' XSD in that file. diff --git a/spring-framework-reference/src/dynamic-languages.xml b/spring-framework-reference/src/dynamic-languages.xml index 8c5c2a4e9da..e622556b230 100644 --- a/spring-framework-reference/src/dynamic-languages.xml +++ b/spring-framework-reference/src/dynamic-languages.xml @@ -126,8 +126,8 @@ class GroovyMessenger implements Messenger { +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"> ]]><!-- this is the bean definition for the Groovy-backed Messenger implementation --> @@ -1044,8 +1044,8 @@ class TestBeanValidator implements Validator { +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"> scope="prototype" diff --git a/spring-framework-reference/src/jdbc.xml b/spring-framework-reference/src/jdbc.xml index fd98290bb59..2339442953f 100644 --- a/spring-framework-reference/src/jdbc.xml +++ b/spring-framework-reference/src/jdbc.xml @@ -379,9 +379,9 @@ private static final class ActorMapper implements RowMapper { xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> @@ -425,9 +425,9 @@ private static final class ActorMapper implements RowMapper { xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> diff --git a/spring-framework-reference/src/jms.xml b/spring-framework-reference/src/jms.xml index 8e05ce3c4d8..ae5c55d08b7 100644 --- a/spring-framework-reference/src/jms.xml +++ b/spring-framework-reference/src/jms.xml @@ -930,8 +930,8 @@ public interface SessionAwareMessageListener { xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jms="http://www.springframework.org/schema/jms" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd -http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-2.5.xsd"> +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd +http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd"> <!-- <bean/> definitions here --> diff --git a/spring-framework-reference/src/mail.xml b/spring-framework-reference/src/mail.xml index 87a74ada9e3..ed21909febf 100644 --- a/spring-framework-reference/src/mail.xml +++ b/spring-framework-reference/src/mail.xml @@ -378,7 +378,7 @@ public class SimpleRegistrationService implements RegistrationService { + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> diff --git a/spring-framework-reference/src/mvc.xml b/spring-framework-reference/src/mvc.xml index 0d5cd7eb0e7..37609f7e64f 100644 --- a/spring-framework-reference/src/mvc.xml +++ b/spring-framework-reference/src/mvc.xml @@ -2741,7 +2741,7 @@ public class FileUploadBean { <beans xmlns="http://www.springframework.org/schema/beans" 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-2.5.xsd"> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> <bean class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping"/> @@ -2794,9 +2794,9 @@ public class FileUploadBean { xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <context:component-scan base-package="org.springframework.samples.petclinic.web"/> diff --git a/spring-framework-reference/src/portlet.xml b/spring-framework-reference/src/portlet.xml index 901faa82660..be0c6e49350 100644 --- a/spring-framework-reference/src/portlet.xml +++ b/spring-framework-reference/src/portlet.xml @@ -1280,7 +1280,7 @@ public class FileUploadBean { <beans xmlns="http://www.springframework.org/schema/beans" 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-2.5.xsd"> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> <bean class="org.springframework.web.portlet.mvc.annotation.DefaultAnnotationHandlerMapping"/> @@ -1332,9 +1332,9 @@ public class FileUploadBean { xmlns:context="http://www.springframework.org/schema/context" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/context - http://www.springframework.org/schema/context/spring-context-2.5.xsd"> + http://www.springframework.org/schema/context/spring-context-3.0.xsd"> <context:component-scan base-package="org.springframework.samples.petportal.portlet"/> diff --git a/spring-framework-reference/src/remoting.xml b/spring-framework-reference/src/remoting.xml index 5f0be3158e9..6570e28d35e 100644 --- a/spring-framework-reference/src/remoting.xml +++ b/spring-framework-reference/src/remoting.xml @@ -1094,7 +1094,7 @@ public class SimpleCheckingAccountService implements CheckingAccountService { + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> @@ -1116,7 +1116,7 @@ public class SimpleCheckingAccountService implements CheckingAccountService { + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> @@ -1161,7 +1161,7 @@ public class Server { + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> diff --git a/spring-framework-reference/src/testing.xml b/spring-framework-reference/src/testing.xml index 03ea6fbb9ad..25c56976099 100644 --- a/spring-framework-reference/src/testing.xml +++ b/spring-framework-reference/src/testing.xml @@ -1185,7 +1185,7 @@ public final class HibernateTitleDaoTests { <beans xmlns="http://www.springframework.org/schema/beans" 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-2.5.xsd"> + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> <!-- this bean will be injected into the HibernateTitleDaoTests class --> <bean id="titleDao" class=" + http://www.springframework.org/schema/jee/spring-jee-3.0.xsd"> @@ -614,11 +614,11 @@ public class DefaultFooService implements FooService { ]]>xmlns:tx="http://www.springframework.org/schema/tx"http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> ]]><!-- this is the service object that we want to make transactional --> @@ -844,11 +844,11 @@ Exception in thread "main" java.lang.UnsupportedOperationException xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> @@ -888,11 +888,11 @@ Exception in thread "main" java.lang.UnsupportedOperationException xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> @@ -1078,11 +1078,11 @@ public class DefaultFooService implements FooService { xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> ]]><!-- this is the service object that we want to make transactional --> @@ -1533,11 +1533,11 @@ public class SimpleProfiler implements Ordered { xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> @@ -1583,11 +1583,11 @@ public class SimpleProfiler implements Ordered { xmlns:tx="http://www.springframework.org/schema/tx" xsi:schemaLocation=" http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.5.xsd + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.springframework.org/schema/tx - http://www.springframework.org/schema/tx/spring-tx-2.5.xsd + http://www.springframework.org/schema/tx/spring-tx-3.0.xsd http://www.springframework.org/schema/aop - http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"> diff --git a/spring-framework-reference/src/xml-custom.xml b/spring-framework-reference/src/xml-custom.xml index 0e5fb454229..c19b42d948d 100644 --- a/spring-framework-reference/src/xml-custom.xml +++ b/spring-framework-reference/src/xml-custom.xml @@ -266,7 +266,7 @@ public class SimpleDateFormatBeanDefinitionParser extends AbstractSingleBeanDefi xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:myns="http://www.mycompany.com/schema/myns" xsi:schemaLocation=" -http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd +http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd http://www.mycompany.com/schema/myns http://www.mycompany.com/schema/myns/myns.xsd"> ]]><!-- as a top-level bean --> ]]>