X-Git-Url: http://juplo.de/gitweb/?p=hibernate4-maven-plugin;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=a37176cc78771eaf3fbbde6ca0f3c4eeef4fb254;hp=ef983c2dc83041c218d9bc61fff05c5c72ac399d;hb=5da1114d419ae10f94a83ad56cea9856a39f00b6;hpb=5fba40e135677130cbe0ff3c59f6055228293d92
diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index ef983c2d..a37176cc 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -30,14 +30,11 @@ import java.net.URL;
import java.net.URLClassLoader;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-import java.sql.Connection;
import java.sql.Driver;
-import java.sql.DriverManager;
import java.sql.DriverPropertyInfo;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
import java.util.Comparator;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -58,9 +55,12 @@ 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.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.boot.registry.internal.StandardServiceRegistryImpl;
+import org.hibernate.cfg.Environment;
import org.hibernate.cfg.NamingStrategy;
import org.hibernate.envers.configuration.spi.AuditConfiguration;
+import org.hibernate.internal.util.config.ConfigurationHelper;
import org.hibernate.tool.hbm2ddl.SchemaExport;
import org.hibernate.tool.hbm2ddl.SchemaExport.Type;
import org.hibernate.tool.hbm2ddl.Target;
@@ -144,6 +144,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.
@@ -599,6 +602,10 @@ public class Hbm2DdlMojo extends AbstractMojo
);
properties.setProperty(DIALECT, hibernateDialect);
}
+ else
+ {
+ hibernateDialect = properties.getProperty(DIALECT);
+ }
if ( hibernateNamingStrategy != null )
{
if ( properties.contains(NAMING_STRATEGY))
@@ -670,15 +677,7 @@ public class Hbm2DdlMojo extends AbstractMojo
throw new MojoFailureException("Hibernate configuration is missing!");
}
- Configuration config= null;
- try
- {
- config = new ValidationConfiguration(hibernateDialect);
- }
- catch (ClassNotFoundException e)
- {
- e.printStackTrace();
- }
+ final ValidationConfiguration config = new ValidationConfiguration(hibernateDialect);
config.setProperties(properties);
@@ -699,181 +698,144 @@ public class Hbm2DdlMojo extends AbstractMojo
}
}
- getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
- for (Class> annotatedClass : classes)
+ ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader();
+ 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)
+
+ Target target = null;
+ try
{
- throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ target = Target.valueOf(this.target.toUpperCase());
}
- catch (FileNotFoundException e)
+ catch (IllegalArgumentException e)
{
- throw new MojoFailureException("Cannot calculate MD5 sums!", 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\"");
}
- catch (IOException e)
+ Type type = null;
+ try
{
- throw new MojoFailureException("Cannot calculate MD5 sums!", e);
+ 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\"");
}
- }
-
- 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