X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=b85c601f1fa0e9392868189ae5e74a126a6a3665;hb=55dc25ac24b0e3edca26c9015ddd2fd31d3092e5;hp=f73fa2b574ae0685000cfc3b49ffe8ae0de30743;hpb=1979c6349fc2a9e0fe3f028fa1cc76557b32031c;p=hibernate-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 f73fa2b5..b85c601f 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -58,12 +58,9 @@ import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
-import org.hibernate.cfg.Configuration;
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;
@@ -144,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.
@@ -262,37 +262,36 @@ public class Hbm2DdlMojo extends AbstractMojo
private String hibernateMapping;
/**
- * Target of execution:
- *
- * NONE only export schema to SQL-script (forces execution, signals skip)
- * EXPORT create database (DEFAULT! ). forces execution, signals skip)
- * SCRIPT export schema to SQL-script and print it to STDOUT
- * BOTH
- *
+ * Do not output the script to stdout.
*
- * A database connection is only needed for EXPORT and BOTH, but a
- * Hibernate-Dialect must always be chosen.
+ * @parameter property="hibernate.export.quiet" default-value="true"
+ * @since 1.0.6
+ */
+ private boolean quiet;
+
+ /**
+ * Only drop the tables.
*
- * @parameter property="hibernate.export.target" default-value="EXPORT"
- * @since 1.0
+ * @parameter property="hibernate.export.drop" default-value="true"
+ * @since 1.0.6
*/
- 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! )
- *
+ * Only create the tables.
*
- * If NONE is choosen, no databaseconnection is needed.
+ * @parameter property="hibernate.export.create" default-value="true"
+ * @since 1.0.6
+ */
+ private boolean create;
+
+ /**
+ * Do not export to the database.
*
- * @parameter property="hibernate.export.type" default-value="BOTH"
- * @since 1.0
+ * @parameter property="hibernate.export.text" default-value="false"
+ * @since 1.0.6
*/
- private String type;
+ private boolean text;
/**
* Output file.
@@ -599,6 +598,10 @@ public class Hbm2DdlMojo extends AbstractMojo
);
properties.setProperty(DIALECT, hibernateDialect);
}
+ else
+ {
+ hibernateDialect = properties.getProperty(DIALECT);
+ }
if ( hibernateNamingStrategy != null )
{
if ( properties.contains(NAMING_STRATEGY))
@@ -670,7 +673,7 @@ public class Hbm2DdlMojo extends AbstractMojo
throw new MojoFailureException("Hibernate configuration is missing!");
}
- final Configuration config = new ValidationConfiguration(hibernateDialect);
+ final ValidationConfiguration config = new ValidationConfiguration(hibernateDialect);
config.setProperties(properties);
@@ -691,181 +694,156 @@ public class Hbm2DdlMojo extends AbstractMojo
}
}
- getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
- for (Class> annotatedClass : classes)
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ Connection connection = null;
+ MavenLogAppender.startPluginLog(this);
+ try
{
- getLog().debug("Class " + annotatedClass);
- config.addAnnotatedClass(annotatedClass);
- }
+ /**
+ * Change class-loader of current thread, so that hibernate can
+ * see all dependencies!
+ */
+ Thread.currentThread().setContextClassLoader(classLoader);
- if (hibernateMapping != null)
- {
- try
+ getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
+ // build annotated packages
+ Set packages = new HashSet();
+ for (Class> annotatedClass : classes)
+ {
+ String packageName = annotatedClass.getPackage().getName();
+ if (!packages.contains(packageName))
+ {
+ getLog().debug("Add package " + packageName);
+ packages.add(packageName);
+ config.addPackage(packageName);
+ getLog().debug("type definintions" + config.getTypeDefs());
+ }
+ getLog().debug("Class " + annotatedClass);
+ config.addAnnotatedClass(annotatedClass);
+ }
+
+ if (hibernateMapping != null)
{
- MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
- for (String filename : hibernateMapping.split("[\\s,]+"))
+ try
{
- // First try the filename as absolute/relative path
- File file = new File(filename);
- if (!file.exists())
+ MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
+ for (String filename : hibernateMapping.split("[\\s,]+"))
{
- // If the file was not found, search for it in the resource-directories
- for (Resource resource : project.getResources())
+ // First try the filename as absolute/relative path
+ File file = new File(filename);
+ if (!file.exists())
{
- file = new File(resource.getDirectory() + File.separator + filename);
- if (file.exists())
- break;
+ // If the file was not found, search for it in the resource-directories
+ for (Resource resource : project.getResources())
+ {
+ file = new File(resource.getDirectory() + File.separator + filename);
+ if (file.exists())
+ break;
+ }
}
- }
- if (file != null && file.exists())
- {
- InputStream is = new FileInputStream(file);
- byte[] buffer = new byte[1024*4]; // copy data in 4MB-chunks
- int i;
- while((i = is.read(buffer)) > -1)
- digest.update(buffer, 0, i);
- is.close();
- byte[] bytes = digest.digest();
- BigInteger bi = new BigInteger(1, bytes);
- String newMd5 = String.format("%0" + (bytes.length << 1) + "x", bi);
- String oldMd5 = !md5s.containsKey(filename) ? "" : md5s.get(filename);
- if (!newMd5.equals(oldMd5))
+ if (file != null && file.exists())
{
- getLog().debug("Found new or modified mapping-file: " + filename);
- modified = true;
- md5s.put(filename, newMd5);
+ InputStream is = new FileInputStream(file);
+ byte[] buffer = new byte[1024*4]; // copy data in 4MB-chunks
+ int i;
+ while((i = is.read(buffer)) > -1)
+ digest.update(buffer, 0, i);
+ is.close();
+ byte[] bytes = digest.digest();
+ BigInteger bi = new BigInteger(1, bytes);
+ String newMd5 = String.format("%0" + (bytes.length << 1) + "x", bi);
+ String oldMd5 = !md5s.containsKey(filename) ? "" : md5s.get(filename);
+ if (!newMd5.equals(oldMd5))
+ {
+ getLog().debug("Found new or modified mapping-file: " + filename);
+ modified = true;
+ md5s.put(filename, newMd5);
+ }
+ else
+ {
+ getLog().debug(oldMd5 + " -> mapping-file unchanged: " + filename);
+ }
+ getLog().debug("Adding mappings from XML-configurationfile: " + file);
+ config.addFile(file);
}
else
- {
- getLog().debug(oldMd5 + " -> mapping-file unchanged: " + filename);
- }
- getLog().debug("Adding mappings from XML-configurationfile: " + file);
- config.addFile(file);
+ throw new MojoFailureException("File " + filename + " could not be found in any of the configured resource-directories!");
}
- else
- throw new MojoFailureException("File " + filename + " could not be found in any of the configured resource-directories!");
+ }
+ catch (NoSuchAlgorithmException e)
+ {
+ throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ }
+ catch (FileNotFoundException e)
+ {
+ throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ }
+ catch (IOException e)
+ {
+ throw new MojoFailureException("Cannot calculate MD5 sums!", e);
}
}
- catch (NoSuchAlgorithmException e)
+
+ getLog().info("Gathered hibernate-configuration (turn on debugging for details):");
+ for (Entry entry : properties.entrySet())
+ getLog().info(" " + entry.getKey() + " = " + entry.getValue());
+
+ if (!modified)
{
- throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ getLog().info(
+ "No modified annotated classes or mapping-files found and dialect " +
+ "unchanged."
+ );
+ if (!force)
+ {
+ getLog().info("Skipping schema generation!");
+ project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true");
+ return;
+ }
}
- catch (FileNotFoundException e)
+
+ try
{
- throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ /**
+ * The connection must be established outside of hibernate, because
+ * hibernate does not use the context-classloader of the current
+ * thread and, hence, would not be able to resolve the driver-class!
+ */
+ if (!text && (create || drop))
+ {
+ 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 "
+ + 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 (IOException e)
+ catch (ClassNotFoundException e)
{
- throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ getLog().error("Dependency for driver-class " + properties.getProperty(DRIVER_CLASS) + " is missing!");
+ throw new MojoExecutionException(e.getMessage());
}
- }
-
- 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 entry : properties.entrySet())
- getLog().info(" " + entry.getKey() + " = " + entry.getValue());
-
- Connection connection = null;
- try
- {
- /**
- * The connection must be established outside of hibernate, because
- * hibernate does not use the context-classloader of the current
- * thread and, hence, would not be able to resolve the driver-class!
- */
- getLog().debug("Target: " + target + ", Type: " + type);
- switch (target)
+ catch (Exception e)
{
- case EXPORT:
- case BOTH:
- switch (type)
- {
- case CREATE:
- case DROP:
- case BOTH:
- 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 "
- + properties.getProperty(URL)
- + " as "
- + properties.getProperty(USERNAME)
- + " with password "
- + properties.getProperty(PASSWORD)
- );
- connection = DriverManager.getConnection(
- properties.getProperty(URL),
- properties.getProperty(USERNAME),
- properties.getProperty(PASSWORD)
- );
- }
+ getLog().error("Cannot establish connection to database!");
+ Enumeration drivers = DriverManager.getDrivers();
+ if (!drivers.hasMoreElements())
+ getLog().error("No drivers registered!");
+ while (drivers.hasMoreElements())
+ getLog().debug("Driver: " + drivers.nextElement());
+ throw new MojoExecutionException(e.getMessage());
}
- }
- catch (ClassNotFoundException e)
- {
- getLog().error("Dependency for driver-class " + properties.getProperty(DRIVER_CLASS) + " is missing!");
- throw new MojoExecutionException(e.getMessage());
- }
- catch (Exception e)
- {
- getLog().error("Cannot establish connection to database!");
- Enumeration drivers = DriverManager.getDrivers();
- if (!drivers.hasMoreElements())
- getLog().error("No drivers registered!");
- while (drivers.hasMoreElements())
- getLog().debug("Driver: " + drivers.nextElement());
- throw new MojoExecutionException(e.getMessage());
- }
-
- ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
- MavenLogAppender.startPluginLog(this);
- try
- {
- /**
- * Change class-loader of current thread, so that hibernate can
- * see all dependencies!
- */
- Thread.currentThread().setContextClassLoader(classLoader);
config.buildMappings();
@@ -904,7 +882,7 @@ public class Hbm2DdlMojo extends AbstractMojo
}
export.setOutputFile(outF.getPath());
- export.execute(target, type);
+ export.execute(!quiet, !text, drop, create);
for (Object exception : export.getExceptions())
getLog().debug(exception.toString());