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=f09cbd676b5d20aaee67832efb691ec8a37c2929;hpb=99a7eaddd1301df0d151f01791e3d177297670aa;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 f09cbd67..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.AuditConfiguration;
+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;
@@ -88,7 +85,7 @@ public class Hbm2DdlMojo extends AbstractMojo
public final static String NAMING_STRATEGY="hibernate.ejb.naming_strategy";
public final static String ENVERS = "hibernate.export.envers";
- public final static String MD5S = "schema.md5s";
+ public final static String MD5S = "hibernate4-generatedschema.md5s";
private final static Pattern split = Pattern.compile("[^,\\s]+");
@@ -119,7 +116,7 @@ public class Hbm2DdlMojo extends AbstractMojo
* Classes-Directory to scan.
*
* This parameter defaults to the maven build-output-directory for classes.
- * Additonally, all dependencies are scanned for annotated classes.
+ * Additionally, all dependencies are scanned for annotated classes.
*
* @parameter property="project.build.outputDirectory"
* @since 1.0
@@ -127,7 +124,7 @@ public class Hbm2DdlMojo extends AbstractMojo
private String outputDirectory;
/**
- * Wether to scan test-classes too, or not.
+ * Whether to scan test-classes too, or not.
*
* If this parameter is set to true the test-classes of the
* artifact will be scanned for hibernate-annotated classes additionally.
@@ -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.
@@ -172,13 +172,13 @@ public class Hbm2DdlMojo extends AbstractMojo
*
* If set to true, the execution is skipped.
*
- * A skipped excecution is signaled via the maven-property
+ * A skipped execution is signaled via the maven-property
* ${hibernate.export.skipped}.
*
- * The excecution is skipped automatically, if no modified or newly added
+ * The execution is skipped automatically, if no modified or newly added
* annotated classes are found and the dialect was not changed.
*
- * @parameter property="maven.test.skip" default-value="false"
+ * @parameter property="hibernate.skip" default-value="${maven.test.skip}"
* @since 1.0
*/
private boolean skip;
@@ -262,37 +262,36 @@ public class Hbm2DdlMojo extends AbstractMojo
private String hibernateMapping;
/**
- * Target of execution:
- *
- *
NONE only export schema to SQL-script (forces excecution, signals skip)
SCRIPT export schema to SQL-script and print it to STDOUT
- *
BOTH
- *
+ * Do not output the script to stdout.
*
- * A databaseconnection is only needed for EXPORT and BOTH, but a
- * Hibernate-Dialect must always be choosen.
+ * @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.
@@ -335,7 +334,7 @@ public class Hbm2DdlMojo extends AbstractMojo
{
if (skip)
{
- getLog().info("Exectuion of hibernate4-maven-plugin:export was skipped!");
+ getLog().info("Execution of hibernate4-maven-plugin:export was skipped!");
project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true");
return;
}
@@ -344,7 +343,7 @@ public class Hbm2DdlMojo extends AbstractMojo
boolean modified = false;
File saved = new File(buildDirectory + File.separator + MD5S);
- if (saved.exists())
+ if (saved.isFile() && saved.length() > 0)
{
try
{
@@ -536,7 +535,7 @@ public class Hbm2DdlMojo extends AbstractMojo
throw new MojoExecutionException(e.getMessage());
}
- /** Overwrite values from propertie-file or set, if given */
+ /** Overwrite values from properties-file or set, if given */
if (driverClassName != null)
{
if (properties.containsKey(DRIVER_CLASS))
@@ -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))
@@ -667,10 +670,11 @@ public class Hbm2DdlMojo extends AbstractMojo
if (properties.isEmpty())
{
getLog().error("No properties set!");
- throw new MojoFailureException("Hibernate-Configuration is missing!");
+ throw new MojoFailureException("Hibernate configuration is missing!");
}
- Configuration config = new Configuration();
+ final ValidationConfiguration config = new ValidationConfiguration(hibernateDialect);
+
config.setProperties(properties);
if ( properties.containsKey(NAMING_STRATEGY))
@@ -690,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