X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=0ba4673231323a9e197ac162e294803230129110;hb=refs%2Fheads%2F2.0;hp=73f0ab0639eef2ecfc58fba1e4dee39018232013;hpb=426d18e689b89f33bf71601becfa465a00067b10;p=hibernate4-maven-plugin
diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index 73f0ab06..0ba46732 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -61,8 +61,6 @@ import org.apache.maven.project.MavenProject;
import org.hibernate.cfg.NamingStrategy;
import org.hibernate.envers.configuration.spi.AuditConfiguration;
import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.hibernate.tool.hbm2ddl.SchemaExport.Type;
-import org.hibernate.tool.hbm2ddl.Target;
import org.scannotation.AnnotationDB;
@@ -143,6 +141,9 @@ public class Hbm2DdlMojo extends AbstractMojo
* scanned for annotated classes. Multiple scopes can be seperated by
* white space or commas.
*
+ * If you do not want any dependencies to be scanned for annotated
+ * classes, set this parameter to none.
+ *
* The plugin does not scan for annotated classes in transitive
* dependencies. If some of your annotated classes are hidden in a
* transitive dependency, you can simply add that dependency explicitly.
@@ -261,37 +262,30 @@ public class Hbm2DdlMojo extends AbstractMojo
private String hibernateMapping;
/**
- * Target of execution:
- *
- *
NONE only export schema to SQL-script (forces execution, signals skip)
SCRIPT export schema to SQL-script and print it to STDOUT
- *
BOTH
- *
- *
- * A database connection is only needed for EXPORT and BOTH, but a
- * Hibernate-Dialect must always be chosen.
+ * Create drop-statements for the generated tables.
+ * At least one of {@link #drop} and {@link #create} must be set.
*
- * @parameter property="hibernate.export.target" default-value="EXPORT"
- * @since 1.0
+ * @parameter property="hibernate.export.drop" default-value="true"
+ * @since 2.0
*/
- private String target;
+ private boolean drop;
/**
- * Type of execution.
- *
- *
NONE do nothing - just validate the configuration
- *
CREATE create database-schema
- *
DROP drop database-schema
- *
BOTH (DEFAULT!)
- *
+ * Create create-statements for the generated tables.
+ * At least one of {@link #drop} and {@link #create} must be set.
*
- * If NONE is choosen, no databaseconnection is needed.
+ * @parameter property="hibernate.export.create" default-value="true"
+ * @since 2.0
+ */
+ private boolean create;
+
+ /**
+ * Only create the database schema. Do not export it to the database.
*
- * @parameter property="hibernate.export.type" default-value="BOTH"
- * @since 1.0
+ * @parameter property="hibernate.export.export" default-value="true"
+ * @since 2.0
*/
- private String type;
+ private boolean export;
/**
* Output file.
@@ -339,6 +333,11 @@ public class Hbm2DdlMojo extends AbstractMojo
return;
}
+ if (!create && !drop)
+ throw new MojoFailureException(
+ "At least one of drop and create must be set!"
+ );
+
Map md5s;
boolean modified = false;
File saved = new File(buildDirectory + File.separator + MD5S);
@@ -598,6 +597,10 @@ public class Hbm2DdlMojo extends AbstractMojo
);
properties.setProperty(DIALECT, hibernateDialect);
}
+ else
+ {
+ hibernateDialect = properties.getProperty(DIALECT);
+ }
if ( hibernateNamingStrategy != null )
{
if ( properties.contains(NAMING_STRATEGY))
@@ -780,50 +783,26 @@ public class Hbm2DdlMojo extends AbstractMojo
}
}
- Target target = null;
- try
- {
- target = Target.valueOf(this.target.toUpperCase());
- }
- catch (IllegalArgumentException e)
- {
- getLog().error("Invalid value for configuration-option \"target\": " + this.target);
- getLog().error("Valid values are: NONE, SCRIPT, EXPORT, BOTH");
- throw new MojoExecutionException("Invalid value for configuration-option \"target\"");
- }
- Type type = null;
- try
- {
- type = Type.valueOf(this.type.toUpperCase());
- }
- catch (IllegalArgumentException e)
- {
- getLog().error("Invalid value for configuration-option \"type\": " + this.type);
- getLog().error("Valid values are: NONE, CREATE, DROP, BOTH");
- 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 or mapping-files 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