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=c9d5013aa1d16c1e297704c529e38850199ed577;hb=bcf07578452d7c31dc97410bc495c73bd0f87748;hpb=a2859d3177a64880ca429d4dfd9437a7fb78dede
diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index c9d5013a..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";
@@ -79,7 +81,7 @@ public class Hbm2DdlMojo extends AbstractMojo
private final static String MD5S = "schema.md5s";
/**
- * The project whose project files to create.
+ * The maven project.
*
* @parameter expression="${project}"
* @required
@@ -88,7 +90,14 @@ public class Hbm2DdlMojo extends AbstractMojo
private MavenProject project;
/**
- * Directories to scan.
+ * Build-directory.
+ *
+ * @parameter expression="${project.build.directory}"
+ */
+ private String buildDirectory;
+
+ /**
+ * Class-directory to scan.
*
* @parameter expression="${project.build.outputDirectory}"
*/
@@ -97,10 +106,20 @@ public class Hbm2DdlMojo extends AbstractMojo
/**
* Skip execution
*
- * @parameter expression="${maven.test.skip}"
+ * @parameter expression="${maven.test.skip}" default-value="false"
*/
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.
*
@@ -137,7 +156,7 @@ public class Hbm2DdlMojo extends AbstractMojo
private String hibernateDialect;
/**
- * Hibernate configuration file.
+ * Path to Hibernate configuration file.
*
* @parameter default-value="${project.build.outputDirectory}/hibernate.properties"
*/
@@ -151,7 +170,7 @@ public class Hbm2DdlMojo extends AbstractMojo
*
SCRIPT export schema to SQL-script
* BOTH
*
- * @parameter default-value="EXPORT"
+ * @parameter expression="${hibernate.export.target}" default-value="EXPORT"
*/
private String target;
@@ -163,28 +182,28 @@ public class Hbm2DdlMojo extends AbstractMojo
* DROP drop database-schema
* BOTH (DEFAULT!)
*
- * @parameter default-value="BOTH"
+ * @parameter expression="${hibernate.export.type}" default-value="BOTH"
*/
private String type;
/**
* Output file.
*
- * @parameter default-value="${project.build.outputDirectory}/schema.sql"
+ * @parameter expression="${hibernate.export.schema.filename}" default-value="${project.build.directory}/schema.sql"
*/
private String outputFile;
/**
* Delimiter in output-file.
*
- * @parameter default-value=";"
+ * @parameter expression="${hibernate.export.schema.delimiter}" default-value=";"
*/
private String delimiter;
/**
* Format output-file.
*
- * @parameter default-value="true"
+ * @parameter expression="${hibernate.export.schema.format}" default-value="true"
*/
private boolean format;
@@ -198,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;
}
@@ -207,7 +227,7 @@ public class Hbm2DdlMojo extends AbstractMojo
Map md5s;
boolean modified = false;
- File saved = new File(outputDirectory + File.separator + MD5S);
+ File saved = new File(buildDirectory + File.separator + MD5S);
if (saved.exists())
{
@@ -325,14 +345,6 @@ public class Hbm2DdlMojo extends AbstractMojo
if (classes.isEmpty())
throw new MojoFailureException("No annotated classes found in directory " + outputDirectory);
- if (!modified)
- {
- getLog().info("No modified annotated classes found.");
- getLog().info("Skipping schema generation!");
- project.getProperties().setProperty("hibernate4.skipped", "true");
- return;
- }
-
getLog().debug("Detected classes with mapping-annotations:");
for (Class> annotatedClass : classes)
getLog().debug(" " + annotatedClass.getName());
@@ -350,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)
{
@@ -365,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)
@@ -381,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)
@@ -397,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)
@@ -413,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)
@@ -429,25 +425,37 @@ 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);
}
- getLog().info("Gathered hibernate-configuration (turn on debugging for details):");
+ /** The generated SQL varies with the dialect! */
+ if (md5s.containsKey(DIALECT))
+ {
+ String dialect = properties.getProperty(DIALECT);
+ if (md5s.get(DIALECT).equals(dialect))
+ getLog().debug("SQL-dialect unchanged.");
+ else
+ {
+ getLog().debug("SQL-dialect changed: " + dialect);
+ modified = true;
+ md5s.put(DIALECT, dialect);
+ }
+ }
+ else
+ {
+ modified = true;
+ md5s.put(DIALECT, properties.getProperty(DIALECT));
+ }
+
if (properties.isEmpty())
{
getLog().error("No properties set!");
throw new MojoFailureException("Hibernate-Configuration is missing!");
}
- for (Entry