Renaming to spring-configuration-h2-test

diff --git a/SpringJava/Gradle/spring-jpa-persistence/src/integTest/java/de/spring/example/persistence/repository/AdRespositoryShould.java b/SpringJava/Gradle/spring-jpa-persistence/src/integTest/java/de/spring/example/persistence/repository/AdRespositoryShould.java
index accbeaf..40ad661 100644 (file)
--- a/SpringJava/Gradle/spring-jpa-persistence/src/integTest/java/de/spring/example/persistence/repository/AdRespositoryShould.java
+++ b/SpringJava/Gradle/spring-jpa-persistence/src/integTest/java/de/spring/example/persistence/repository/AdRespositoryShould.java
@@ -17,7 +17,7 @@ import de.spring.example.persistence.domain.Ad;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration( {"classpath*:spring-configuration/*.xml",
-       "classpath*:spring-configuration-test/*.xml"} )
+       "classpath*:spring-configuration-h2-test/*.xml"} )
 @Transactional
 public class AdRespositoryShould {
        // Ad

diff --git a/SpringJava/Gradle/spring-jpa-persistence/src/integTest/resources/spring-configuration-h2-test/datasource-test-configuration.xml b/SpringJava/Gradle/spring-jpa-persistence/src/integTest/resources/spring-configuration-h2-test/datasource-test-configuration.xml
new file mode 100644 (file)
index 0000000..7ec6b17
--- /dev/null
+++ b/SpringJava/Gradle/spring-jpa-persistence/src/integTest/resources/spring-configuration-h2-test/datasource-test-configuration.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<beans xmlns="http://www.springframework.org/schema/beans"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xmlns:util="http://www.springframework.org/schema/util"\r
+       xmlns:tx="http://www.springframework.org/schema/tx"\r
+       xmlns:jee="http://www.springframework.org/schema/jee"\r
+       xsi:schemaLocation="http://www.springframework.org/schema/beans\r
+        http://www.springframework.org/schema/beans/spring-beans.xsd\r
+        http://www.springframework.org/schema/util\r
+        http://www.springframework.org/schema/util/spring-util.xsd\r
+        http://www.springframework.org/schema/tx \r
+        http://www.springframework.org/schema/tx/spring-tx.xsd\r
+        http://www.springframework.org/schema/jee\r
+        http://www.springframework.org/schema/jee/spring-jee.xsd">\r
+\r
+       \r
+       <!-- \r
+               In this way we can not use all the available options for H2.\r
+               \r
+               Because of that I will be using the dataSource bean where I can choose as many options\r
+               as I want for H2.\r
+    <jdbc:embedded-database id="dataSource" type="H2" />\r
+       -->\r
+       \r
+       <!-- \r
+               1. There are two beans with the same id "dataSource"\r
+                  One declared in datasource-configuration.xml\r
+                  Another one declared in datasource-test-configuration.xml\r
+               2. Both beans are declared in different XML files.\r
+               3. Because there are in different XML files Spring does not complain about having duplicate beans.\r
+               4. Because files in src/test will be loaded in class path after files in src/main this bean will\r
+                  override the one declared in datasource-configuration.xml when running JUnit Tests :)\r
+        -->\r
+       <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">\r
+               <property name="driverClassName" value="org.h2.Driver" />\r
+               <property name="url" value="jdbc:h2:mem:mybatis_example;INIT=create schema if not exists mybatis_example\;SET SCHEMA mybatis_example;MODE=MySQL;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE" />\r
+               <property name="username" value="mybatis" />\r
+               <property name="password" value="" />\r
+       </bean>\r
+       \r
+</beans>\r

diff --git a/SpringJava/Gradle/spring-jpa-persistence/src/integTest/resources/spring-configuration-test/datasource-test-configuration.xml b/SpringJava/Gradle/spring-jpa-persistence/src/integTest/resources/spring-configuration-test/datasource-test-configuration.xml
deleted file mode 100644 (file)
index 7ec6b17..0000000
--- a/SpringJava/Gradle/spring-jpa-persistence/src/integTest/resources/spring-configuration-test/datasource-test-configuration.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-       xmlns:util="http://www.springframework.org/schema/util"\r
-       xmlns:tx="http://www.springframework.org/schema/tx"\r
-       xmlns:jee="http://www.springframework.org/schema/jee"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans\r
-        http://www.springframework.org/schema/beans/spring-beans.xsd\r
-        http://www.springframework.org/schema/util\r
-        http://www.springframework.org/schema/util/spring-util.xsd\r
-        http://www.springframework.org/schema/tx \r
-        http://www.springframework.org/schema/tx/spring-tx.xsd\r
-        http://www.springframework.org/schema/jee\r
-        http://www.springframework.org/schema/jee/spring-jee.xsd">\r
-\r
-       \r
-       <!-- \r
-               In this way we can not use all the available options for H2.\r
-               \r
-               Because of that I will be using the dataSource bean where I can choose as many options\r
-               as I want for H2.\r
-    <jdbc:embedded-database id="dataSource" type="H2" />\r
-       -->\r
-       \r
-       <!-- \r
-               1. There are two beans with the same id "dataSource"\r
-                  One declared in datasource-configuration.xml\r
-                  Another one declared in datasource-test-configuration.xml\r
-               2. Both beans are declared in different XML files.\r
-               3. Because there are in different XML files Spring does not complain about having duplicate beans.\r
-               4. Because files in src/test will be loaded in class path after files in src/main this bean will\r
-                  override the one declared in datasource-configuration.xml when running JUnit Tests :)\r
-        -->\r
-       <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">\r
-               <property name="driverClassName" value="org.h2.Driver" />\r
-               <property name="url" value="jdbc:h2:mem:mybatis_example;INIT=create schema if not exists mybatis_example\;SET SCHEMA mybatis_example;MODE=MySQL;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE" />\r
-               <property name="username" value="mybatis" />\r
-               <property name="password" value="" />\r
-       </bean>\r
-       \r
-</beans>\r