diff --git a/maven-plugin/src/main/java/org/hibernate/mvn/AbstractHbm2xMojo.java b/maven-plugin/src/main/java/org/hibernate/mvn/AbstractHbm2xMojo.java index f38aced244..95b1e7b297 100644 --- a/maven-plugin/src/main/java/org/hibernate/mvn/AbstractHbm2xMojo.java +++ b/maven-plugin/src/main/java/org/hibernate/mvn/AbstractHbm2xMojo.java @@ -78,11 +78,7 @@ public void execute() throws MojoFailureException { Thread.currentThread().setContextClassLoader(createExporterClassLoader(original)); getLog().info("Starting " + this.getClass().getSimpleName() + "..."); ReverseEngineeringStrategy strategy = setupReverseEngineeringStrategy(); - if (propertyFile.exists()) { - executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile())); - } else { - getLog().info("Property file '" + propertyFile + "' cannot be found, aborting..."); - } + executeExporter(createJdbcDescriptor(strategy, loadPropertiesFile())); getLog().info("Finished " + this.getClass().getSimpleName() + "!"); } finally { Thread.currentThread().setContextClassLoader(original); @@ -122,8 +118,10 @@ private Properties loadPropertiesFile() throws MojoFailureException { result.load(is); return result; } catch (FileNotFoundException e) { + getLog().error("Property file '" + propertyFile + "' cannot be found, aborting..."); throw new MojoFailureException(propertyFile + " not found.", e); } catch (IOException e) { + getLog().error("Property file '" + propertyFile + "' cannot be loaded, aborting..."); throw new MojoFailureException("Problem while loading " + propertyFile, e); } } diff --git a/test/maven-plugin/pom.xml b/test/maven-plugin/pom.xml index 0130f6ea9c..67dc7e12de 100644 --- a/test/maven-plugin/pom.xml +++ b/test/maven-plugin/pom.xml @@ -29,8 +29,9 @@ ${project.build.directory}/it src/it/settings.xml ${project.build.directory}/local-repo + before verify - install + generate-sources @@ -40,6 +41,13 @@ + + + com.h2database + h2 + ${h2.version} + + diff --git a/test/maven-plugin/src/it/generateHbm/before.bsh b/test/maven-plugin/src/it/generateHbm/before.bsh new file mode 100644 index 0000000000..afded1e007 --- /dev/null +++ b/test/maven-plugin/src/it/generateHbm/before.bsh @@ -0,0 +1,9 @@ +import java.sql.DriverManager; +import java.sql.Connection; + +String JDBC_CONNECTION = "jdbc:h2:" + basedir + "/test"; +String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"; + +Connection connection = DriverManager.getConnection(JDBC_CONNECTION); +connection.createStatement().execute(CREATE_PERSON_TABLE); +connection.close(); diff --git a/test/maven-plugin/src/it/generateHbm/invoker.properties b/test/maven-plugin/src/it/generateHbm/invoker.properties index 13598db400..df983b2cc1 100644 --- a/test/maven-plugin/src/it/generateHbm/invoker.properties +++ b/test/maven-plugin/src/it/generateHbm/invoker.properties @@ -1,2 +1 @@ -invoker.java.version = 1.8+ -invoker.goals = generate-resources \ No newline at end of file +invoker.goals = generate-sources \ No newline at end of file diff --git a/test/maven-plugin/src/it/generateHbm/pom.xml b/test/maven-plugin/src/it/generateHbm/pom.xml index 944b92a6ca..b139ea7ce2 100644 --- a/test/maven-plugin/src/it/generateHbm/pom.xml +++ b/test/maven-plugin/src/it/generateHbm/pom.xml @@ -8,13 +8,13 @@ hbm2ddl 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + @@ -25,7 +25,7 @@ HBM generation - generate-resources + generate-sources generateHbm @@ -35,17 +35,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.properties b/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.properties index 71496b3adc..9eebb30d92 100644 --- a/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.properties +++ b/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.properties @@ -1,7 +1,4 @@ -hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.pool_size=1 -hibernate.show_sql=true \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.reveng.xml b/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 7ac52fd2cf..0000000000 --- a/test/maven-plugin/src/it/generateHbm/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven-plugin/src/it/generateHbm/test.mv.db b/test/maven-plugin/src/it/generateHbm/test.mv.db deleted file mode 100644 index 72d79270f8..0000000000 Binary files a/test/maven-plugin/src/it/generateHbm/test.mv.db and /dev/null differ diff --git a/test/maven-plugin/src/it/generateHbm/verify.groovy b/test/maven-plugin/src/it/generateHbm/verify.bsh similarity index 90% rename from test/maven-plugin/src/it/generateHbm/verify.groovy rename to test/maven-plugin/src/it/generateHbm/verify.bsh index 586fe51dc5..7951640307 100644 --- a/test/maven-plugin/src/it/generateHbm/verify.groovy +++ b/test/maven-plugin/src/it/generateHbm/verify.bsh @@ -1,5 +1,3 @@ -import java.io.*; - File file = new File(basedir, "target/generated-sources/Person.hbm.xml"); if (!file.isFile()) { throw new FileNotFoundException("Could not find generated HBM file: " + file); diff --git a/test/maven-plugin/src/it/hbm2dao/before.bsh b/test/maven-plugin/src/it/hbm2dao/before.bsh new file mode 100644 index 0000000000..afded1e007 --- /dev/null +++ b/test/maven-plugin/src/it/hbm2dao/before.bsh @@ -0,0 +1,9 @@ +import java.sql.DriverManager; +import java.sql.Connection; + +String JDBC_CONNECTION = "jdbc:h2:" + basedir + "/test"; +String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"; + +Connection connection = DriverManager.getConnection(JDBC_CONNECTION); +connection.createStatement().execute(CREATE_PERSON_TABLE); +connection.close(); diff --git a/test/maven-plugin/src/it/hbm2dao/invoker.properties b/test/maven-plugin/src/it/hbm2dao/invoker.properties index 4537ab14c4..df983b2cc1 100644 --- a/test/maven-plugin/src/it/hbm2dao/invoker.properties +++ b/test/maven-plugin/src/it/hbm2dao/invoker.properties @@ -1,2 +1 @@ -invoker.java.version = 1.8+ invoker.goals = generate-sources \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2dao/pom.xml b/test/maven-plugin/src/it/hbm2dao/pom.xml index 66e7b39e9f..30ae85e0f2 100644 --- a/test/maven-plugin/src/it/hbm2dao/pom.xml +++ b/test/maven-plugin/src/it/hbm2dao/pom.xml @@ -8,13 +8,13 @@ hbm2dao 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + @@ -34,18 +34,7 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - - + diff --git a/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.properties b/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.properties index 71496b3adc..9eebb30d92 100644 --- a/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.properties +++ b/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.properties @@ -1,7 +1,4 @@ -hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.pool_size=1 -hibernate.show_sql=true \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml b/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 7ac52fd2cf..0000000000 --- a/test/maven-plugin/src/it/hbm2dao/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2dao/test.mv.db b/test/maven-plugin/src/it/hbm2dao/test.mv.db deleted file mode 100644 index aba76d3403..0000000000 Binary files a/test/maven-plugin/src/it/hbm2dao/test.mv.db and /dev/null differ diff --git a/test/maven-plugin/src/it/hbm2dao/verify.groovy b/test/maven-plugin/src/it/hbm2dao/verify.bsh similarity index 90% rename from test/maven-plugin/src/it/hbm2dao/verify.groovy rename to test/maven-plugin/src/it/hbm2dao/verify.bsh index c1c99b0976..991a243642 100644 --- a/test/maven-plugin/src/it/hbm2dao/verify.groovy +++ b/test/maven-plugin/src/it/hbm2dao/verify.bsh @@ -1,5 +1,3 @@ -import java.io.*; - File dao = new File(basedir, "target/generated-sources/PersonHome.java"); if (!dao.isFile()) { throw new FileNotFoundException("Could not find generated JPA DAO: " + dao); diff --git a/test/maven-plugin/src/it/hbm2ddl/before.bsh b/test/maven-plugin/src/it/hbm2ddl/before.bsh new file mode 100644 index 0000000000..afded1e007 --- /dev/null +++ b/test/maven-plugin/src/it/hbm2ddl/before.bsh @@ -0,0 +1,9 @@ +import java.sql.DriverManager; +import java.sql.Connection; + +String JDBC_CONNECTION = "jdbc:h2:" + basedir + "/test"; +String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"; + +Connection connection = DriverManager.getConnection(JDBC_CONNECTION); +connection.createStatement().execute(CREATE_PERSON_TABLE); +connection.close(); diff --git a/test/maven-plugin/src/it/hbm2ddl/invoker.properties b/test/maven-plugin/src/it/hbm2ddl/invoker.properties index 13598db400..df983b2cc1 100644 --- a/test/maven-plugin/src/it/hbm2ddl/invoker.properties +++ b/test/maven-plugin/src/it/hbm2ddl/invoker.properties @@ -1,2 +1 @@ -invoker.java.version = 1.8+ -invoker.goals = generate-resources \ No newline at end of file +invoker.goals = generate-sources \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2ddl/pom.xml b/test/maven-plugin/src/it/hbm2ddl/pom.xml index 00a4847b00..ef55b25df7 100644 --- a/test/maven-plugin/src/it/hbm2ddl/pom.xml +++ b/test/maven-plugin/src/it/hbm2ddl/pom.xml @@ -8,13 +8,13 @@ hbm2ddl 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + @@ -25,7 +25,7 @@ Schema generation - generate-resources + generate-sources hbm2ddl @@ -34,17 +34,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.properties b/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.properties index 71496b3adc..9eebb30d92 100644 --- a/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.properties +++ b/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.properties @@ -1,7 +1,4 @@ -hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.pool_size=1 -hibernate.show_sql=true \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml b/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 7ac52fd2cf..0000000000 --- a/test/maven-plugin/src/it/hbm2ddl/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2ddl/test.mv.db b/test/maven-plugin/src/it/hbm2ddl/test.mv.db deleted file mode 100644 index 72d79270f8..0000000000 Binary files a/test/maven-plugin/src/it/hbm2ddl/test.mv.db and /dev/null differ diff --git a/test/maven-plugin/src/it/hbm2ddl/verify.groovy b/test/maven-plugin/src/it/hbm2ddl/verify.bsh similarity index 90% rename from test/maven-plugin/src/it/hbm2ddl/verify.groovy rename to test/maven-plugin/src/it/hbm2ddl/verify.bsh index 14485800e0..8373f9520a 100644 --- a/test/maven-plugin/src/it/hbm2ddl/verify.groovy +++ b/test/maven-plugin/src/it/hbm2ddl/verify.bsh @@ -1,5 +1,3 @@ -import java.io.*; - File schema = new File(basedir, "target/generated-resources/schema.ddl"); if (!schema.isFile()) { throw new FileNotFoundException("Could not find generated schema file: " + schema); diff --git a/test/maven-plugin/src/it/hbm2java/before.bsh b/test/maven-plugin/src/it/hbm2java/before.bsh new file mode 100644 index 0000000000..afded1e007 --- /dev/null +++ b/test/maven-plugin/src/it/hbm2java/before.bsh @@ -0,0 +1,9 @@ +import java.sql.DriverManager; +import java.sql.Connection; + +String JDBC_CONNECTION = "jdbc:h2:" + basedir + "/test"; +String CREATE_PERSON_TABLE = "create table PERSON (ID int not null, NAME varchar(20), primary key (ID))"; + +Connection connection = DriverManager.getConnection(JDBC_CONNECTION); +connection.createStatement().execute(CREATE_PERSON_TABLE); +connection.close(); diff --git a/test/maven-plugin/src/it/hbm2java/invoker.properties b/test/maven-plugin/src/it/hbm2java/invoker.properties index 4537ab14c4..df983b2cc1 100644 --- a/test/maven-plugin/src/it/hbm2java/invoker.properties +++ b/test/maven-plugin/src/it/hbm2java/invoker.properties @@ -1,2 +1 @@ -invoker.java.version = 1.8+ invoker.goals = generate-sources \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2java/pom.xml b/test/maven-plugin/src/it/hbm2java/pom.xml index 90666ccc09..b0b532f1c2 100644 --- a/test/maven-plugin/src/it/hbm2java/pom.xml +++ b/test/maven-plugin/src/it/hbm2java/pom.xml @@ -8,13 +8,13 @@ hbm2java 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + @@ -34,17 +34,6 @@ - - ${project.basedir}/src/main/resources/hibernate.reveng.xml - - - - - com.h2database - h2 - ${h2.version} - - diff --git a/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.properties b/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.properties index 71496b3adc..9eebb30d92 100644 --- a/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.properties +++ b/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.properties @@ -1,7 +1,4 @@ -hibernate.dialect=org.hibernate.dialect.H2Dialect hibernate.connection.driver_class=org.h2.Driver -hibernate.connection.url=jdbc:h2:./test;DB_CLOSE_ON_EXIT=FALSE -hibernate.connection.username=sa -hibernate.connection.password= -hibernate.connection.pool_size=1 -hibernate.show_sql=true \ No newline at end of file +hibernate.connection.url=jdbc:h2:./test +hibernate.default_catalog=TEST +hibernate.default_schema=PUBLIC \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.reveng.xml b/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.reveng.xml deleted file mode 100644 index 7ac52fd2cf..0000000000 --- a/test/maven-plugin/src/it/hbm2java/src/main/resources/hibernate.reveng.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/maven-plugin/src/it/hbm2java/test.mv.db b/test/maven-plugin/src/it/hbm2java/test.mv.db deleted file mode 100644 index aba76d3403..0000000000 Binary files a/test/maven-plugin/src/it/hbm2java/test.mv.db and /dev/null differ diff --git a/test/maven-plugin/src/it/hbm2java/verify.groovy b/test/maven-plugin/src/it/hbm2java/verify.bsh similarity index 90% rename from test/maven-plugin/src/it/hbm2java/verify.groovy rename to test/maven-plugin/src/it/hbm2java/verify.bsh index b42495d3d5..74acb87c0b 100644 --- a/test/maven-plugin/src/it/hbm2java/verify.groovy +++ b/test/maven-plugin/src/it/hbm2java/verify.bsh @@ -1,5 +1,3 @@ -import java.io.*; - File entity = new File(basedir, "target/generated-sources/Person.java"); if (!entity.isFile()) { throw new FileNotFoundException("Could not find generated JPA Entity: " + entity); diff --git a/test/maven-plugin/src/it/noPropertiesFile/invoker.properties b/test/maven-plugin/src/it/noPropertiesFile/invoker.properties index 4537ab14c4..62359c56d4 100644 --- a/test/maven-plugin/src/it/noPropertiesFile/invoker.properties +++ b/test/maven-plugin/src/it/noPropertiesFile/invoker.properties @@ -1,2 +1 @@ -invoker.java.version = 1.8+ -invoker.goals = generate-sources \ No newline at end of file +invoker.buildResult = failure \ No newline at end of file diff --git a/test/maven-plugin/src/it/noPropertiesFile/pom.xml b/test/maven-plugin/src/it/noPropertiesFile/pom.xml index 2431341e2c..f857cdff77 100644 --- a/test/maven-plugin/src/it/noPropertiesFile/pom.xml +++ b/test/maven-plugin/src/it/noPropertiesFile/pom.xml @@ -8,13 +8,13 @@ no-properties-file 0.0.1-SNAPSHOT - - UTF-8 - UTF-8 - - 1.8 - 1.4.195 - + + + com.h2database + h2 + @h2.version@ + + diff --git a/test/maven-plugin/src/it/noPropertiesFile/verify.bsh b/test/maven-plugin/src/it/noPropertiesFile/verify.bsh new file mode 100644 index 0000000000..48865c7e78 --- /dev/null +++ b/test/maven-plugin/src/it/noPropertiesFile/verify.bsh @@ -0,0 +1,29 @@ +import java.util.Scanner; + +File buildLog = new File(basedir, "build.log"); + +if (!buildLog.exists()) { + + System.out.println( "'" + buildLog.absolutePath + "' is not found."); + + throw new FileNotFoundException("Could not find build log file: '" + buildLog + "'"); + +} else { + + System.out.println( "Inspecting build log lines"); + + String startString = "[ERROR] Property file '"; + String endString = "src/main/resources/hibernate.properties' cannot be found, aborting..."; + + Scanner s = new Scanner(buildLog); + while (s.hasNextLine()) { + String line = s.nextLine(); + if (line.startsWith(startString) && line.endsWith(endString)) { + return true; + } + } + + return false; + +} + diff --git a/test/maven-plugin/src/it/noPropertiesFile/verify.groovy b/test/maven-plugin/src/it/noPropertiesFile/verify.groovy deleted file mode 100644 index 040800a6dd..0000000000 --- a/test/maven-plugin/src/it/noPropertiesFile/verify.groovy +++ /dev/null @@ -1,28 +0,0 @@ -import java.io.*; - -println "start verify.groovy" - -File buildLog = new File(basedir, "build.log") - -if (!buildLog.isFile()) { - - println "'" + buildLog.absolutePath + "' is not a file." - - throw new FileNotFoundException("Could not find build log file: '" + buildLog + "'") - -} else { - - println "inspecting build log lines" - - boolean found = false - String startString = "[INFO] Property file '" - String endString = "src/main/resources/hibernate.properties' cannot be found, aborting..." - buildLog.eachLine { - line -> if (line.startsWith(startString) && line.endsWith(endString)) found = true - } - return found - -} - - -println "end verify.groovy" \ No newline at end of file