Remove xsd version number from spring bean definition file for test

kazuki43zoo · kazuki43zoo · commit 743edfb8319e · 2016-12-24T11:43:01.000+09:00
fix gh-178
diff --git a/src/test/java/org/mybatis/spring/batch/applicationContext.xml b/src/test/java/org/mybatis/spring/batch/applicationContext.xml
@@ -25,9 +25,9 @@
      xmlns:tx="http://www.springframework.org/schema/tx"
      xmlns:jdbc="http://www.springframework.org/schema/jdbc"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans 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-3.0.xsd
-     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
     <!-- in-memory database and a datasource -->
     <jdbc:embedded-database id="dataSource">
diff --git a/src/test/java/org/mybatis/spring/config/annotation.xml b/src/test/java/org/mybatis/spring/config/annotation.xml
@@ -26,7 +26,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- Scan for mappers and let them be autowired; notice there is no
diff --git a/src/test/java/org/mybatis/spring/config/base-package.xml b/src/test/java/org/mybatis/spring/config/base-package.xml
@@ -26,7 +26,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- Scan for mappers and let them be autowired; notice there is no
diff --git a/src/test/java/org/mybatis/spring/config/factory-ref.xml b/src/test/java/org/mybatis/spring/config/factory-ref.xml
@@ -26,7 +26,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- Scan for mappers and let them be autowired; notice there is no
diff --git a/src/test/java/org/mybatis/spring/config/marker-and-annotation.xml b/src/test/java/org/mybatis/spring/config/marker-and-annotation.xml
@@ -26,7 +26,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- Scan for mappers and let them be autowired; notice there is no
diff --git a/src/test/java/org/mybatis/spring/config/marker-interface.xml b/src/test/java/org/mybatis/spring/config/marker-interface.xml
@@ -26,7 +26,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- Scan for mappers and let them be autowired; notice there is no
diff --git a/src/test/java/org/mybatis/spring/config/name-generator.xml b/src/test/java/org/mybatis/spring/config/name-generator.xml
@@ -20,7 +20,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <mybatis:scan base-package="org.mybatis.spring.mapper" name-generator="org.mybatis.spring.config.NamespaceTest$BeanNameGenerator"/>
diff --git a/src/test/java/org/mybatis/spring/config/template-ref.xml b/src/test/java/org/mybatis/spring/config/template-ref.xml
@@ -26,7 +26,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- Scan for mappers and let them be autowired; notice there is no
diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-batch.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-batch.xml
@@ -23,7 +23,7 @@
 <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-3.0.xsd">
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<import resource="classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml"/>
 
diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-infrastructure.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-infrastructure.xml
@@ -25,9 +25,9 @@
      xmlns:tx="http://www.springframework.org/schema/tx"
      xmlns:jdbc="http://www.springframework.org/schema/jdbc"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans 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-3.0.xsd
-     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd">
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
     <!-- in-memory database and a datasource -->
     <jdbc:embedded-database id="dataSource">
diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-mapper.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-mapper.xml
@@ -25,7 +25,7 @@
 <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-3.0.xsd">
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- import datasource and transaction manager -->
 	<import	resource="classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml" />
diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-namespace.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-namespace.xml
@@ -25,7 +25,7 @@
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
      http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
 
     <!-- import datasource and transaction manager  -->
diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-scanner.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-scanner.xml
@@ -24,7 +24,7 @@
 <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-3.0.xsd">
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- import datasource and transaction manager  -->
     <import resource="classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml"/>
diff --git a/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml b/src/test/java/org/mybatis/spring/sample/config/applicationContext-sqlsession.xml
@@ -23,7 +23,7 @@
 <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-3.0.xsd">
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- import common beans  -->
     <import resource="classpath:org/mybatis/spring/sample/config/applicationContext-infrastructure.xml"/>
diff --git a/src/test/java/org/mybatis/spring/submitted/autowire/spring.xml b/src/test/java/org/mybatis/spring/submitted/autowire/spring.xml
@@ -17,14 +17,11 @@
 
 -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:context="http://www.springframework.org/schema/context"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
 	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/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd"
+       					http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd"
 	default-lazy-init="false">
 	
 <!-- 	<bean id="dataSource" class="org.hsqldb.jdbc.JDBCDataSource"> -->
diff --git a/src/test/java/org/mybatis/spring/submitted/webapp_placeholder/spring.xml b/src/test/java/org/mybatis/spring/submitted/webapp_placeholder/spring.xml
@@ -19,18 +19,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:mvc="http://www.springframework.org/schema/mvc"
   xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-  xmlns:mybatis="http://mybatis.org/schema/mybatis-spring"
   xsi:schemaLocation="http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+  http://www.springframework.org/schema/beans/spring-beans.xsd
   http://www.springframework.org/schema/context
-  http://www.springframework.org/schema/context/spring-context-3.1.xsd
-  http://www.springframework.org/schema/mvc
-  http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
+  http://www.springframework.org/schema/context/spring-context.xsd
   http://www.springframework.org/schema/jdbc
-  http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
-  http://mybatis.org/schema/mybatis-spring http://mybatis.org/schema/mybatis-spring.xsd">
+  http://www.springframework.org/schema/jdbc/spring-jdbc.xsd">
 
   <context:property-placeholder location="classpath:/org/mybatis/spring/submitted/webapp_placeholder/conf.properties"/>
 
diff --git a/src/test/java/org/mybatis/spring/submitted/xa/applicationContext.xml b/src/test/java/org/mybatis/spring/submitted/xa/applicationContext.xml
@@ -22,10 +22,10 @@
      xmlns:jdbc="http://www.springframework.org/schema/jdbc"
      xmlns:context="http://www.springframework.org/schema/context"
      xsi:schemaLocation="
-     http://www.springframework.org/schema/beans 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-3.0.xsd
-     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"
+     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
+     http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc.xsd
+     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"
      default-autowire="byName">
 
 	<bean id="userTransactionService" class="com.atomikos.icatch.config.UserTransactionServiceImp"
