Configured the 5.2.18-tutorials as integration-tests for the plugin

diff --git a/src/it/tutorials-5.2.18/annotations/pom.xml b/src/it/tutorials-5.2.18/annotations/pom.xml
index effd4b7..505432c 100644 (file)
--- a/src/it/tutorials-5.2.18/annotations/pom.xml
+++ b/src/it/tutorials-5.2.18/annotations/pom.xml
@@ -23,6 +23,30 @@
     <properties>
         <!-- Skip artifact deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
     </properties>
 
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>de.juplo</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scanTestClasses>true</scanTestClasses>
+                    <format>true</format>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/src/it/tutorials-5.2.18/annotations/src/test/resources/hibernate.cfg.xml b/src/it/tutorials-5.2.18/annotations/src/test/resources/hibernate.cfg.xml
index a9590c1..df29d83 100644 (file)
--- a/src/it/tutorials-5.2.18/annotations/src/test/resources/hibernate.cfg.xml
+++ b/src/it/tutorials-5.2.18/annotations/src/test/resources/hibernate.cfg.xml
@@ -15,7 +15,7 @@
 
         <!-- Database connection settings -->
         <property name="connection.driver_class">org.h2.Driver</property>
-        <property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
+        <property name="connection.url">jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE</property>
         <property name="connection.username">sa</property>
         <property name="connection.password"></property>
 
@@ -31,9 +31,6 @@
         <!-- Echo all executed SQL to stdout -->
         <property name="show_sql">true</property>
 
-        <!-- Drop and re-create the database schema on startup -->
-        <property name="hbm2ddl.auto">create</property>
-
         <!-- Names the annotated entity class -->
         <mapping class="org.hibernate.tutorial.annotations.Event"/>
 

diff --git a/src/it/tutorials-5.2.18/basic/pom.xml b/src/it/tutorials-5.2.18/basic/pom.xml
index 783ac6b..032919a 100644 (file)
--- a/src/it/tutorials-5.2.18/basic/pom.xml
+++ b/src/it/tutorials-5.2.18/basic/pom.xml
@@ -23,6 +23,29 @@
     <properties>
         <!-- Skip artifact deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>de.juplo</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scanTestClasses>true</scanTestClasses>
+                    <format>true</format>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/src/it/tutorials-5.2.18/basic/src/test/resources/hibernate.cfg.xml b/src/it/tutorials-5.2.18/basic/src/test/resources/hibernate.cfg.xml
index 03d3937..df55e96 100644 (file)
--- a/src/it/tutorials-5.2.18/basic/src/test/resources/hibernate.cfg.xml
+++ b/src/it/tutorials-5.2.18/basic/src/test/resources/hibernate.cfg.xml
@@ -15,7 +15,7 @@
 
         <!-- Database connection settings -->
         <property name="connection.driver_class">org.h2.Driver</property>
-        <property name="connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
+        <property name="connection.url">jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE</property>
         <property name="connection.username">sa</property>
         <property name="connection.password"/>
 

diff --git a/src/it/tutorials-5.2.18/entitymanager/pom.xml b/src/it/tutorials-5.2.18/entitymanager/pom.xml
index d928fb6..8c13cf8 100644 (file)
--- a/src/it/tutorials-5.2.18/entitymanager/pom.xml
+++ b/src/it/tutorials-5.2.18/entitymanager/pom.xml
@@ -23,6 +23,7 @@
     <properties>
         <!-- Skip artifact deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -33,4 +34,27 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>de.juplo</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scanTestClasses>true</scanTestClasses>
+                    <dialect>org.hibernate.dialect.H2Dialect</dialect>
+                    <format>true</format>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/src/it/tutorials-5.2.18/entitymanager/src/test/resources/META-INF/persistence.xml b/src/it/tutorials-5.2.18/entitymanager/src/test/resources/META-INF/persistence.xml
index 0fc9523..edf7005 100644 (file)
--- a/src/it/tutorials-5.2.18/entitymanager/src/test/resources/META-INF/persistence.xml
+++ b/src/it/tutorials-5.2.18/entitymanager/src/test/resources/META-INF/persistence.xml
@@ -18,7 +18,7 @@
 
         <properties>
             <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE" />
             <property name="javax.persistence.jdbc.user" value="sa" />
             <property name="javax.persistence.jdbc.password" value="" />
 

diff --git a/src/it/tutorials-5.2.18/envers/pom.xml b/src/it/tutorials-5.2.18/envers/pom.xml
index 7fa8a48..1d740ea 100644 (file)
--- a/src/it/tutorials-5.2.18/envers/pom.xml
+++ b/src/it/tutorials-5.2.18/envers/pom.xml
@@ -23,6 +23,7 @@
     <properties>
         <!-- Skip artifact deployment -->
         <maven.deploy.skip>true</maven.deploy.skip>
+        <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -33,4 +34,27 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>de.juplo</groupId>
+                <artifactId>hibernate-maven-plugin</artifactId>
+                <version>${hibernate-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <phase>process-test-classes</phase>
+                        <goals>
+                            <goal>create</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <scanTestClasses>true</scanTestClasses>
+                    <dialect>org.hibernate.dialect.H2Dialect</dialect>
+                    <format>true</format>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

diff --git a/src/it/tutorials-5.2.18/envers/src/test/resources/META-INF/persistence.xml b/src/it/tutorials-5.2.18/envers/src/test/resources/META-INF/persistence.xml
index 45a7daf..fadc2a3 100644 (file)
--- a/src/it/tutorials-5.2.18/envers/src/test/resources/META-INF/persistence.xml
+++ b/src/it/tutorials-5.2.18/envers/src/test/resources/META-INF/persistence.xml
@@ -18,7 +18,7 @@
 
         <properties>
             <property name="javax.persistence.jdbc.driver" value="org.h2.Driver" />
-            <property name="javax.persistence.jdbc.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE" />
+            <property name="javax.persistence.jdbc.url" value="jdbc:h2:${project.build.directory}/db/test;MVCC=TRUE" />
             <property name="javax.persistence.jdbc.user" value="sa" />
             <property name="javax.persistence.jdbc.password" value="" />
 

diff --git a/src/it/tutorials-5.2.18/osgi/managed-jpa/pom.xml b/src/it/tutorials-5.2.18/osgi/managed-jpa/pom.xml
index 55ccacd..35ad150 100644 (file)
--- a/src/it/tutorials-5.2.18/osgi/managed-jpa/pom.xml
+++ b/src/it/tutorials-5.2.18/osgi/managed-jpa/pom.xml
@@ -12,6 +12,10 @@
   <version>1.0.0</version>
   <packaging>bundle</packaging>
 
+  <properties>
+    <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.hibernate.javax.persistence</groupId>
@@ -65,6 +69,23 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>de.juplo</groupId>
+        <artifactId>hibernate-maven-plugin</artifactId>
+        <version>${hibernate-maven-plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <url>jdbc:h2:mem:db_managed_jpa;MVCC=TRUE</url>
+          <format>true</format>
+          <execute>false</execute>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/pom.xml b/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/pom.xml
index e45aab5..2836c5e 100644 (file)
--- a/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/pom.xml
+++ b/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/pom.xml
@@ -12,6 +12,10 @@
   <version>1.0.0</version>
   <packaging>bundle</packaging>
 
+  <properties>
+    <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.hibernate.javax.persistence</groupId>
@@ -76,6 +80,21 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>de.juplo</groupId>
+        <artifactId>hibernate-maven-plugin</artifactId>
+        <version>${hibernate-maven-plugin.version}</version>
+        <configuration>
+          <format>true</format>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml b/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml
index b0ebfe7..788ccab 100644 (file)
--- a/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml
+++ b/src/it/tutorials-5.2.18/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml
@@ -15,10 +15,10 @@
         <properties>
             <property name="hibernate.connection.driver_class" value="org.h2.Driver"/>
             <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
-            <property name="hibernate.connection.url" value="jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
+            <property name="hibernate.connection.url" value="jdbc:h2:mem:db_unmanaged_jpa;DB_CLOSE_DELAY=-1;MVCC=TRUE"/>
             <property name="hibernate.connection.username" value="sa"/>
             <property name="hibernate.connection.password" value=""/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
         </properties>
     </persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>

diff --git a/src/it/tutorials-5.2.18/osgi/unmanaged-native/pom.xml b/src/it/tutorials-5.2.18/osgi/unmanaged-native/pom.xml
index d24f03d..b3e19de 100644 (file)
--- a/src/it/tutorials-5.2.18/osgi/unmanaged-native/pom.xml
+++ b/src/it/tutorials-5.2.18/osgi/unmanaged-native/pom.xml
@@ -12,6 +12,10 @@
   <version>1.0.0</version>
   <packaging>bundle</packaging>
 
+  <properties>
+    <hibernate-maven-plugin.version>@project.version@</hibernate-maven-plugin.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.hibernate.javax.persistence</groupId>
@@ -84,6 +88,21 @@
           </instructions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>de.juplo</groupId>
+        <artifactId>hibernate-maven-plugin</artifactId>
+        <version>${hibernate-maven-plugin.version}</version>
+        <configuration>
+          <format>true</format>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

diff --git a/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml b/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml
index 7f9f238..175a2bf 100644 (file)
--- a/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml
+++ b/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml
@@ -12,7 +12,7 @@
 <hibernate-configuration>
     <session-factory>
         <property name="hibernate.connection.driver_class">org.h2.Driver</property>
-        <property name="hibernate.connection.url">jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
+        <property name="hibernate.connection.url">jdbc:h2:mem:db_unmanaged_native;DB_CLOSE_DELAY=-1;MVCC=TRUE</property>
         <property name="hibernate.connection.username">sa</property>
         <property name="hibernate.connection.password"></property>
         <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>

diff --git a/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/pool-one.properties b/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/pool-one.properties
index 7e1c4cf..0085971 100644 (file)
--- a/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/pool-one.properties
+++ b/src/it/tutorials-5.2.18/osgi/unmanaged-native/src/main/resources/pool-one.properties
@@ -5,9 +5,9 @@
 # See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
 #
 jdbc-0.proxool.alias=pool-one
-jdbc-0.proxool.driver-url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
+jdbc-0.proxool.driver-url=jdbc:h2:mem:db_unmanaged_native;DB_CLOSE_DELAY=-1;MVCC=TRUE
 jdbc-0.proxool.driver-class=org.h2.Driver
 jdbc-0.user=sa
 jdbc-0.password=
 jdbc-0.proxool.maximum-connection-count=2
-jdbc-0.proxool.house-keeping-test-sql=select CURRENT_DATE
\ No newline at end of file
+jdbc-0.proxool.house-keeping-test-sql=select CURRENT_DATE

diff --git a/src/it/tutorials-5.2.18/pom.xml b/src/it/tutorials-5.2.18/pom.xml
index 26d0f89..a7e9b66 100644 (file)
--- a/src/it/tutorials-5.2.18/pom.xml
+++ b/src/it/tutorials-5.2.18/pom.xml
@@ -70,6 +70,7 @@
             </testResource>
             <testResource>
                 <directory>src/test/resources</directory>
+                <filtering>true</filtering>
             </testResource>
         </testResources>
     </build>

diff --git a/src/it/tutorials-5.2.18/schema-annotations.sql b/src/it/tutorials-5.2.18/schema-annotations.sql
new file mode 100644 (file)
index 0000000..48eb18e
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-annotations.sql
@@ -0,0 +1,7 @@
+
+    create table EVENTS (
+        id bigint not null,
+        EVENT_DATE timestamp,
+        title varchar(255),
+        primary key (id)
+    );

diff --git a/src/it/tutorials-5.2.18/schema-basic.sql b/src/it/tutorials-5.2.18/schema-basic.sql
new file mode 100644 (file)
index 0000000..c5e2c0e
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-basic.sql
@@ -0,0 +1,7 @@
+
+    create table EVENTS (
+        EVENT_ID bigint not null,
+        EVENT_DATE timestamp,
+        title varchar(255),
+        primary key (EVENT_ID)
+    );

diff --git a/src/it/tutorials-5.2.18/schema-entitymanager.sql b/src/it/tutorials-5.2.18/schema-entitymanager.sql
new file mode 100644 (file)
index 0000000..48eb18e
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-entitymanager.sql
@@ -0,0 +1,7 @@
+
+    create table EVENTS (
+        id bigint not null,
+        EVENT_DATE timestamp,
+        title varchar(255),
+        primary key (id)
+    );

diff --git a/src/it/tutorials-5.2.18/schema-envers.sql b/src/it/tutorials-5.2.18/schema-envers.sql
new file mode 100644 (file)
index 0000000..ecec80e
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-envers.sql
@@ -0,0 +1,27 @@
+
+    create table EVENTS (
+        id bigint not null,
+        EVENT_DATE timestamp,
+        title varchar(255),
+        primary key (id)
+    );
+
+    create table EVENTS_AUD (
+        id bigint not null,
+        REV integer not null,
+        REVTYPE tinyint,
+        EVENT_DATE timestamp,
+        title varchar(255),
+        primary key (id, REV)
+    );
+
+    create table REVINFO (
+        REV integer generated by default as identity,
+        REVTSTMP bigint,
+        primary key (REV)
+    );
+
+    alter table EVENTS_AUD 
+        add constraint FK5cembm6xahf542q8e4h0pq2t1 
+        foreign key (REV) 
+        references REVINFO;

diff --git a/src/it/tutorials-5.2.18/schema-osgi-managed-jpa.sql b/src/it/tutorials-5.2.18/schema-osgi-managed-jpa.sql
new file mode 100644 (file)
index 0000000..de92e46
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-osgi-managed-jpa.sql
@@ -0,0 +1,7 @@
+create sequence hibernate_sequence start with 1 increment by 1;
+
+    create table DataPoint (
+        id bigint not null,
+        name varchar(255),
+        primary key (id)
+    );

diff --git a/src/it/tutorials-5.2.18/schema-osgi-unmanaged-jpa.sql b/src/it/tutorials-5.2.18/schema-osgi-unmanaged-jpa.sql
new file mode 100644 (file)
index 0000000..de92e46
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-osgi-unmanaged-jpa.sql
@@ -0,0 +1,7 @@
+create sequence hibernate_sequence start with 1 increment by 1;
+
+    create table DataPoint (
+        id bigint not null,
+        name varchar(255),
+        primary key (id)
+    );

diff --git a/src/it/tutorials-5.2.18/schema-osgi-unmanaged-native.sql b/src/it/tutorials-5.2.18/schema-osgi-unmanaged-native.sql
new file mode 100644 (file)
index 0000000..d89e280
--- /dev/null
+++ b/src/it/tutorials-5.2.18/schema-osgi-unmanaged-native.sql
@@ -0,0 +1,26 @@
+create sequence hibernate_sequence start with 1 increment by 1;
+
+    create table DataPoint (
+        id bigint not null,
+        name varchar(255),
+        primary key (id)
+    );
+
+    create table DataPoint_AUD (
+        id bigint not null,
+        REV integer not null,
+        REVTYPE tinyint,
+        name varchar(255),
+        primary key (id, REV)
+    );
+
+    create table REVINFO (
+        REV integer generated by default as identity,
+        REVTSTMP bigint,
+        primary key (REV)
+    );
+
+    alter table DataPoint_AUD 
+        add constraint FK43jw6b5mtbfxur0xhyjxynbea 
+        foreign key (REV) 
+        references REVINFO;

diff --git a/src/it/tutorials-5.2.18/verify.bsh b/src/it/tutorials-5.2.18/verify.bsh
new file mode 100644 (file)
index 0000000..9156c4a
--- /dev/null
+++ b/src/it/tutorials-5.2.18/verify.bsh
@@ -0,0 +1,19 @@
+import de.juplo.test.FileComparator;
+
+
+FileComparator comparator = new FileComparator(basedir);
+
+if (!comparator.isEqual("schema-annotations.sql","annotations/target/create.sql"))
+  return false;
+if (!comparator.isEqual("schema-basic.sql","basic/target/create.sql"))
+  return false;
+if (!comparator.isEqual("schema-entitymanager.sql","entitymanager/target/create.sql"))
+  return false;
+if (!comparator.isEqual("schema-envers.sql","envers/target/create.sql"))
+  return false;
+if (!comparator.isEqual("schema-osgi-managed-jpa.sql","osgi/managed-jpa/target/create.sql"))
+  return false;
+if (!comparator.isEqual("schema-osgi-unmanaged-jpa.sql","osgi/unmanaged-jpa/target/create.sql"))
+  return false;
+if (!comparator.isEqual("schema-osgi-unmanaged-native.sql","osgi/unmanaged-native/target/create.sql"))
+  return false;