X-Git-Url: https://juplo.de/gitweb/?p=hibernate4-maven-plugin;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=7cae92f88b1455b8653d003a4c3b5f9928dd6a33;hp=bc0bc73ad91a362f8effabdfd6adb4f3c25c2225;hb=bcf07578452d7c31dc97410bc495c73bd0f87748;hpb=55a33e35422b904b974a19d3d6368ded60ea1811 diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index bc0bc73a..7cae92f8 100644 --- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java +++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -70,6 +70,8 @@ import org.scannotation.AnnotationDB; */ public class Hbm2DdlMojo extends AbstractMojo { + public final static String EXPORT_SKIPPED_PROPERTY = "hibernate.export.skipped"; + public final static String DRIVER_CLASS = "hibernate.connection.driver_class"; public final static String URL = "hibernate.connection.url"; public final static String USERNAME = "hibernate.connection.username"; @@ -108,6 +110,16 @@ public class Hbm2DdlMojo extends AbstractMojo */ private boolean skip; + /** + * Force execution + *

+ * Force execution, even if no modified or newly added annotated classes + * where found. skip takes precedence over force. + * + * @parameter expression="${hibernate.export.force}" default-value="false" + */ + private boolean force; + /** * SQL-Driver name. * @@ -205,6 +217,7 @@ public class Hbm2DdlMojo extends AbstractMojo if (skip) { getLog().info("Exectuion of hibernate4-maven-plugin:export was skipped!"); + project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true"); return; } @@ -349,7 +362,7 @@ public class Hbm2DdlMojo extends AbstractMojo properties.load(new FileInputStream(file)); } else - getLog().info("No hibernate-properties-file found! Checked path: " + hibernateProperties); + getLog().info("No hibernate-properties-file found! (Checked path: " + hibernateProperties + ")"); } catch (IOException e) { @@ -364,14 +377,10 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + DRIVER_CLASS + "=" + properties.getProperty(DRIVER_CLASS) + - " with the value " + driverClassName + - " from the plugin-configuration-parameter driverClassName!" + " with the value " + driverClassName ); else - getLog().debug( - "Using the value " + driverClassName + - " from the plugin-configuration-parameter driverClassName!" - ); + getLog().debug("Using the value " + driverClassName); properties.setProperty(DRIVER_CLASS, driverClassName); } if (url != null) @@ -380,14 +389,10 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + URL + "=" + properties.getProperty(URL) + - " with the value " + url + - " from the plugin-configuration-parameter url!" + " with the value " + url ); else - getLog().debug( - "Using the value " + url + - " from the plugin-configuration-parameter url!" - ); + getLog().debug("Using the value " + url); properties.setProperty(URL, url); } if (username != null) @@ -396,14 +401,10 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + USERNAME + "=" + properties.getProperty(USERNAME) + - " with the value " + username + - " from the plugin-configuration-parameter username!" + " with the value " + username ); else - getLog().debug( - "Using the value " + username + - " from the plugin-configuration-parameter username!" - ); + getLog().debug("Using the value " + username); properties.setProperty(USERNAME, username); } if (password != null) @@ -412,14 +413,10 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + PASSWORD + "=" + properties.getProperty(PASSWORD) + - " with the value " + password + - " from the plugin-configuration-parameter password!" + " with the value " + password ); else - getLog().debug( - "Using the value " + password + - " from the plugin-configuration-parameter password!" - ); + getLog().debug("Using the value " + password); properties.setProperty(PASSWORD, password); } if (hibernateDialect != null) @@ -428,14 +425,10 @@ public class Hbm2DdlMojo extends AbstractMojo getLog().debug( "Overwriting property " + DIALECT + "=" + properties.getProperty(DIALECT) + - " with the value " + hibernateDialect + - " from the plugin-configuration-parameter hibernateDialect!" + " with the value " + hibernateDialect ); else - getLog().debug( - "Using the value " + hibernateDialect + - " from the plugin-configuration-parameter hibernateDialect!" - ); + getLog().debug("Using the value " + hibernateDialect); properties.setProperty(DIALECT, hibernateDialect); } @@ -458,22 +451,11 @@ public class Hbm2DdlMojo extends AbstractMojo md5s.put(DIALECT, properties.getProperty(DIALECT)); } - if (!modified) - { - getLog().info("No modified annotated classes found and dialect unchanged."); - getLog().info("Skipping schema generation!"); - project.getProperties().setProperty("hibernate.export.skipped", "true"); - return; - } - - getLog().info("Gathered hibernate-configuration (turn on debugging for details):"); if (properties.isEmpty()) { getLog().error("No properties set!"); throw new MojoFailureException("Hibernate-Configuration is missing!"); } - for (Entry entry : properties.entrySet()) - getLog().info(" " + entry.getKey() + " = " + entry.getValue()); Configuration config = new Configuration(); config.setProperties(properties); @@ -487,7 +469,7 @@ public class Hbm2DdlMojo extends AbstractMojo Target target = null; try { - target = Target.valueOf(this.target); + target = Target.valueOf(this.target.toUpperCase()); } catch (IllegalArgumentException e) { @@ -498,7 +480,7 @@ public class Hbm2DdlMojo extends AbstractMojo Type type = null; try { - type = Type.valueOf(this.type); + type = Type.valueOf(this.type.toUpperCase()); } catch (IllegalArgumentException e) { @@ -507,6 +489,27 @@ public class Hbm2DdlMojo extends AbstractMojo throw new MojoExecutionException("Invalid value for configuration-option \"type\""); } + if (target.equals(Target.SCRIPT) || target.equals(Target.NONE)) + { + project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true"); + } + if ( + !modified + && !target.equals(Target.SCRIPT) + && !target.equals(Target.NONE) + && !force + ) + { + getLog().info("No modified annotated classes found and dialect unchanged."); + getLog().info("Skipping schema generation!"); + project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true"); + return; + } + + getLog().info("Gathered hibernate-configuration (turn on debugging for details):"); + for (Entry entry : properties.entrySet()) + getLog().info(" " + entry.getKey() + " = " + entry.getValue()); + Connection connection = null; try { @@ -524,17 +527,28 @@ public class Hbm2DdlMojo extends AbstractMojo case CREATE: case DROP: case BOTH: - Class driverClass = classLoader.loadClass(driverClassName); + Class driverClass = classLoader.loadClass(properties.getProperty(DRIVER_CLASS)); getLog().debug("Registering JDBC-driver " + driverClass.getName()); DriverManager.registerDriver(new DriverProxy((Driver)driverClass.newInstance())); - getLog().debug("Opening JDBC-connection to " + url + " as " + username + " with password " + password); - connection = DriverManager.getConnection(url, username, password); + getLog().debug( + "Opening JDBC-connection to " + + properties.getProperty(URL) + + " as " + + properties.getProperty(USERNAME) + + " with password " + + properties.getProperty(PASSWORD) + ); + connection = DriverManager.getConnection( + properties.getProperty(URL), + properties.getProperty(USERNAME), + properties.getProperty(PASSWORD) + ); } } } catch (ClassNotFoundException e) { - getLog().error("Dependency for driver-class " + driverClassName + " is missing!"); + getLog().error("Dependency for driver-class " + properties.getProperty(DRIVER_CLASS) + " is missing!"); throw new MojoExecutionException(e.getMessage()); } catch (Exception e) @@ -578,7 +592,8 @@ public class Hbm2DdlMojo extends AbstractMojo /** Close the connection */ try { - connection.close(); + if (connection != null) + connection.close(); } catch (SQLException e) {