Added patch by Joachim Van der Auwera to support package level annotations

[hibernate4-maven-plugin] / src / main / java / de / juplo / plugins / hibernate4 / Hbm2DdlMojo.java

diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index f991253..73f0ab0 100644 (file)
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -47,17 +47,19 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Logger;
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.logging.Logger;

+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;

+import org.apache.maven.artifact.Artifact;

 import org.apache.maven.model.Resource;
 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.apache.maven.model.Resource;
 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.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.hibernate.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.hbm2ddl.SchemaExport.Type;
 import org.hibernate.tool.hbm2ddl.Target;


@@ -85,7 +87,10 @@ 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 NAMING_STRATEGY="hibernate.ejb.naming_strategy";
   public final static String ENVERS = "hibernate.export.envers";
 

-  private final static String MD5S = "schema.md5s";
+  public final static String MD5S = "hibernate4-generatedschema.md5s";
+
+  private final static Pattern split = Pattern.compile("[^,\\s]+");
+

 
   /**
    * The maven project.
 
   /**
    * The maven project.


@@ -113,22 +118,40 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Classes-Directory to scan.
    * <p>
    * This parameter defaults to the maven build-output-directory for classes.
    * Classes-Directory to scan.
    * <p>
    * 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"
    *
    * @parameter property="project.build.outputDirectory"

+   * @since 1.0

    */
   private String outputDirectory;
 
   /**
    */
   private String outputDirectory;
 
   /**

-   * Wether to scan test-classes too, or not.
+   * Whether to scan test-classes too, or not.

    * <p>
    * If this parameter is set to <code>true</code> the test-classes of the
    * artifact will be scanned for hibernate-annotated classes additionally.
    *
    * @parameter property="hibernate.export.scan_testclasses" default-value="false"
    * <p>
    * If this parameter is set to <code>true</code> the test-classes of the
    * artifact will be scanned for hibernate-annotated classes additionally.
    *
    * @parameter property="hibernate.export.scan_testclasses" default-value="false"

+   * @since 1.0.1

    */
   private boolean scanTestClasses;
 
    */
   private boolean scanTestClasses;
 

+  /**
+   * Dependency-Scopes, that should be scanned for annotated classes.
+   * <p>
+   * By default, only dependencies in the scope <code>compile</code> are
+   * scanned for annotated classes. Multiple scopes can be seperated by
+   * white space or commas.
+   * <p>
+   * 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.
+   *
+   * @parameter property="hibernate.export.scan_dependencies" default-value="compile"
+   * @since 1.0.3
+   */
+  private String scanDependencies;
+

   /**
    * Test-Classes-Directory to scan.
    * <p>
   /**
    * Test-Classes-Directory to scan.
    * <p>


@@ -139,6 +162,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * to <code>true</code>!
    *
    * @parameter property="project.build.testOutputDirectory"
    * to <code>true</code>!
    *
    * @parameter property="project.build.testOutputDirectory"

+   * @since 1.0.2

    */
   private String testOutputDirectory;
 
    */
   private String testOutputDirectory;
 


@@ -147,13 +171,14 @@ public class Hbm2DdlMojo extends AbstractMojo
    * <p>
    * If set to <code>true</code>, the execution is skipped.
    * <p>
    * <p>
    * If set to <code>true</code>, the execution is skipped.
    * <p>

-   * A skipped excecution is signaled via the maven-property
+   * A skipped execution is signaled via the maven-property

    * <code>${hibernate.export.skipped}</code>.
    * <p>
    * <code>${hibernate.export.skipped}</code>.
    * <p>

-   * 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.
    *
    * annotated classes are found and the dialect was not changed.
    *

-   * @parameter property="hibernate.export.skip" default-value="false"
+   * @parameter property="hibernate.skip" default-value="${maven.test.skip}"
+   * @since 1.0

    */
   private boolean skip;
 
    */
   private boolean skip;
 


@@ -166,6 +191,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * <code>skip</code> takes precedence over <code>force</code>.
    *
    * @parameter property="hibernate.export.force" default-value="false"
    * <code>skip</code> takes precedence over <code>force</code>.
    *
    * @parameter property="hibernate.export.force" default-value="false"

+   * @since 1.0

    */
   private boolean force;
 
    */
   private boolean force;
 


@@ -173,6 +199,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * SQL-Driver name.
    *
    * @parameter property="hibernate.connection.driver_class"
    * SQL-Driver name.
    *
    * @parameter property="hibernate.connection.driver_class"

+   * @since 1.0

    */
   private String driverClassName;
 
    */
   private String driverClassName;
 


@@ -180,6 +207,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Database URL.
    *
    * @parameter property="hibernate.connection.url"
    * Database URL.
    *
    * @parameter property="hibernate.connection.url"

+   * @since 1.0

    */
   private String url;
 
    */
   private String url;
 


@@ -187,6 +215,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Database username
    *
    * @parameter property="hibernate.connection.username"
    * Database username
    *
    * @parameter property="hibernate.connection.username"

+   * @since 1.0

    */
   private String username;
 
    */
   private String username;
 


@@ -194,6 +223,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Database password
    *
    * @parameter property="hibernate.connection.password"
    * Database password
    *
    * @parameter property="hibernate.connection.password"

+   * @since 1.0

    */
   private String password;
 
    */
   private String password;
 


@@ -201,12 +231,15 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Hibernate dialect.
    *
    * @parameter property="hibernate.dialect"
    * Hibernate dialect.
    *
    * @parameter property="hibernate.dialect"

+   * @since 1.0

    */
   private String hibernateDialect;
 
   /**
    * Hibernate Naming Strategy
    */
   private String hibernateDialect;
 
   /**
    * Hibernate Naming Strategy

+   *

    * @parameter property="hibernate.ejb.naming_strategy"
    * @parameter property="hibernate.ejb.naming_strategy"

+   * @since 1.0.2

    */
   private String hibernateNamingStrategy;
 
    */
   private String hibernateNamingStrategy;
 


@@ -214,6 +247,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Path to Hibernate configuration file.
    *
    * @parameter default-value="${project.build.outputDirectory}/hibernate.properties"
    * Path to Hibernate configuration file.
    *
    * @parameter default-value="${project.build.outputDirectory}/hibernate.properties"

+   * @since 1.0

    */
   private String hibernateProperties;
 
    */
   private String hibernateProperties;
 


@@ -222,22 +256,24 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Multiple files can be separated with white-spaces and/or commas.
    *
    * @parameter property="hibernate.mapping"
    * Multiple files can be separated with white-spaces and/or commas.
    *
    * @parameter property="hibernate.mapping"

+   * @since 1.0.2

    */
   private String hibernateMapping;
 
   /**
    * Target of execution:
    * <ul>
    */
   private String hibernateMapping;
 
   /**
    * Target of execution:
    * <ul>

-   *   <li><strong>NONE</strong> only export schema to SQL-script (forces excecution, signals skip)</li>
-   *   <li><strong>EXPORT</strong> create database (<strong>DEFAULT!</strong>). forces excecution, signals skip)</li>
+   *   <li><strong>NONE</strong> only export schema to SQL-script (forces execution, signals skip)</li>
+   *   <li><strong>EXPORT</strong> create database (<strong>DEFAULT!</strong>). forces execution, signals skip)</li>

    *   <li><strong>SCRIPT</strong> export schema to SQL-script and print it to STDOUT</li>
    *   <li><strong>BOTH</strong></li>
    * </ul>
    *
    *   <li><strong>SCRIPT</strong> export schema to SQL-script and print it to STDOUT</li>
    *   <li><strong>BOTH</strong></li>
    * </ul>
    *

-   * A databaseconnection is only needed for EXPORT and BOTH, but a
-   * Hibernate-Dialect must always be choosen.
+   * A database connection is only needed for EXPORT and BOTH, but a
+   * Hibernate-Dialect must always be chosen.

    *
    * @parameter property="hibernate.export.target" default-value="EXPORT"
    *
    * @parameter property="hibernate.export.target" default-value="EXPORT"

+   * @since 1.0

    */
   private String target;
 
    */
   private String target;
 


@@ -253,6 +289,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * If NONE is choosen, no databaseconnection is needed.
    *
    * @parameter property="hibernate.export.type" default-value="BOTH"
    * If NONE is choosen, no databaseconnection is needed.
    *
    * @parameter property="hibernate.export.type" default-value="BOTH"

+   * @since 1.0

    */
   private String type;
 
    */
   private String type;
 


@@ -260,6 +297,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Output file.
    *
    * @parameter property="hibernate.export.schema.filename" default-value="${project.build.directory}/schema.sql"
    * Output file.
    *
    * @parameter property="hibernate.export.schema.filename" default-value="${project.build.directory}/schema.sql"

+   * @since 1.0

    */
   private String outputFile;
 
    */
   private String outputFile;
 


@@ -267,6 +305,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Delimiter in output-file.
    *
    * @parameter property="hibernate.export.schema.delimiter" default-value=";"
    * Delimiter in output-file.
    *
    * @parameter property="hibernate.export.schema.delimiter" default-value=";"

+   * @since 1.0

    */
   private String delimiter;
 
    */
   private String delimiter;
 


@@ -274,6 +313,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Format output-file.
    *
    * @parameter property="hibernate.export.schema.format" default-value="true"
    * Format output-file.
    *
    * @parameter property="hibernate.export.schema.format" default-value="true"

+   * @since 1.0

    */
   private boolean format;
 
    */
   private boolean format;
 


@@ -281,9 +321,11 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Generate envers schema for auditing tables.
    *
    * @parameter property="hibernate.export.envers" default-value="false"
    * Generate envers schema for auditing tables.
    *
    * @parameter property="hibernate.export.envers" default-value="false"

+   * @since 1.0.3

    */
   private boolean envers;
 
    */
   private boolean envers;
 

+

   @Override
   public void execute()
     throws
   @Override
   public void execute()
     throws


@@ -292,7 +334,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   {
     if (skip)
     {
   {
     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;
     }
       project.getProperties().setProperty(EXPORT_SKIPPED_PROPERTY, "true");
       return;
     }


@@ -301,7 +343,7 @@ public class Hbm2DdlMojo extends AbstractMojo
     boolean modified = false;
     File saved = new File(buildDirectory + File.separator + MD5S);
 
     boolean modified = false;
     File saved = new File(buildDirectory + File.separator + MD5S);
 

-    if (saved.exists())
+    if (saved.isFile() && saved.length() > 0)

     {
       try
       {
     {
       try
       {


@@ -381,6 +423,34 @@ public class Hbm2DdlMojo extends AbstractMojo
           db.scanArchives(dirUrl);
         }
       }
           db.scanArchives(dirUrl);
         }
       }

+      if (scanDependencies != null)
+      {
+        Matcher matcher = split.matcher(scanDependencies);
+        while (matcher.find())
+        {
+          getLog().info("Scanning dependencies for scope " + matcher.group());
+          for (Artifact artifact : project.getDependencyArtifacts())
+          {
+            if (!artifact.getScope().equalsIgnoreCase(matcher.group()))
+              continue;
+            if (artifact.getFile() == null)
+            {
+              getLog().warn(
+                  "Cannot scan dependency " +
+                  artifact.getId() +
+                  ": no JAR-file available!"
+                  );
+              continue;
+            }
+            getLog().info(
+                "Scanning dependency " +
+                artifact.getId() +
+                " for annotated classes..."
+                );
+            db.scanArchives(artifact.getFile().toURI().toURL());
+          }
+        }
+      }

 
       Set<String> classNames = new HashSet<String>();
       if (db.getAnnotationIndex().containsKey(Entity.class.getName()))
 
       Set<String> classNames = new HashSet<String>();
       if (db.getAnnotationIndex().containsKey(Entity.class.getName()))


@@ -465,7 +535,7 @@ public class Hbm2DdlMojo extends AbstractMojo
       throw new MojoExecutionException(e.getMessage());
     }
 
       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))
     if (driverClassName != null)
     {
       if (properties.containsKey(DRIVER_CLASS))


@@ -508,10 +578,10 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             PASSWORD + "=" + properties.getProperty(PASSWORD) +
         getLog().debug(
             "Overwriting property " +
             PASSWORD + "=" + properties.getProperty(PASSWORD) +

-            " with the value " + password
+            " with value " + password

           );
       else
           );
       else

-        getLog().debug("Using the value " + password);
+        getLog().debug("Using value " + password + " for property " + PASSWORD);

       properties.setProperty(PASSWORD, password);
     }
     if (hibernateDialect != null)
       properties.setProperty(PASSWORD, password);
     }
     if (hibernateDialect != null)


@@ -520,10 +590,12 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             DIALECT + "=" + properties.getProperty(DIALECT) +
         getLog().debug(
             "Overwriting property " +
             DIALECT + "=" + properties.getProperty(DIALECT) +

-            " with the value " + hibernateDialect
+            " with value " + hibernateDialect

           );
       else
           );
       else

-        getLog().debug("Using the value " + hibernateDialect);
+        getLog().debug(
+            "Using value " + hibernateDialect + " for property " + DIALECT
+            );

       properties.setProperty(DIALECT, hibernateDialect);
     }
     if ( hibernateNamingStrategy != null )
       properties.setProperty(DIALECT, hibernateDialect);
     }
     if ( hibernateNamingStrategy != null )


@@ -532,10 +604,13 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) +
         getLog().debug(
             "Overwriting property " +
             NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) +

-            " with the value " + hibernateNamingStrategy
+            " with value " + hibernateNamingStrategy

            );
       else
            );
       else

-        getLog().debug("Using the value " + hibernateNamingStrategy);
+        getLog().debug(
+            "Using value " + hibernateNamingStrategy + " for property " +
+            NAMING_STRATEGY
+            );

       properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
     }
 
       properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
     }
 


@@ -547,15 +622,27 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug("SQL-dialect unchanged.");
       else
       {
         getLog().debug("SQL-dialect unchanged.");
       else
       {

-        getLog().debug("SQL-dialect changed: " + dialect);

         modified = true;
         modified = true;

-        md5s.put(DIALECT, dialect);
+        if (dialect == null)
+        {
+          getLog().debug("SQL-dialect was unset.");
+          md5s.remove(DIALECT);
+        }
+        else
+        {
+          getLog().debug("SQL-dialect changed: " + dialect);
+          md5s.put(DIALECT, dialect);
+        }

       }
     }
     else
     {
       }
     }
     else
     {

-      modified = true;
-      md5s.put(DIALECT, properties.getProperty(DIALECT));
+      String dialect = properties.getProperty(DIALECT);
+      if (dialect != null)
+      {
+        modified = true;
+        md5s.put(DIALECT, properties.getProperty(DIALECT));
+      }

     }
 
     /** The generated SQL varies with the envers-configuration */
     }
 
     /** The generated SQL varies with the envers-configuration */


@@ -579,10 +666,11 @@ public class Hbm2DdlMojo extends AbstractMojo
     if (properties.isEmpty())
     {
       getLog().error("No properties set!");
     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))
     config.setProperties(properties);
 
     if ( properties.containsKey(NAMING_STRATEGY))


@@ -602,181 +690,191 @@ 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<String> packages = new HashSet<String>();
+      for (Class<?> annotatedClass : classes)

       {
       {

-        MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
-        for (String filename : hibernateMapping.split("[\\s,]+"))
+        String packageName = annotatedClass.getPackage().getName();
+        if (!packages.contains(packageName))

         {
         {

-          // First try the filename as absolute/relative path
-          File file = new File(filename);
-          if (!file.exists())
+          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)
+      {
+        try
+        {
+          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
             }
             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-summs!", e);
+        target = Target.valueOf(this.target.toUpperCase());

       }
       }

-      catch (FileNotFoundException e)
+      catch (IllegalArgumentException e)

       {
       {

-        throw new MojoFailureException("Cannot calculate MD5-summs!", 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-summs!", 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;
-    }
+      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<Object,Object> entry : properties.entrySet())
-      getLog().info("  " + entry.getKey() + " = " + entry.getValue());
+      getLog().info("Gathered hibernate-configuration (turn on debugging for details):");
+      for (Entry<Object,Object> 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)
+      try

       {
       {

-        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)
-                  );
-          }
+        /**
+         * 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)
+        {
+          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)
+                    );
+            }
+        }
+      }
+      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<Driver> 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<Driver> 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();
 
 
       config.buildMappings();
 


@@ -787,9 +885,34 @@ public class Hbm2DdlMojo extends AbstractMojo
       }
 
       SchemaExport export = new SchemaExport(config, connection);
       }
 
       SchemaExport export = new SchemaExport(config, connection);

-      export.setOutputFile(outputFile);

       export.setDelimiter(delimiter);
       export.setFormat(format);
       export.setDelimiter(delimiter);
       export.setFormat(format);

+
+      File outF = new File(outputFile);
+
+      if (!outF.isAbsolute())
+      {
+        // Interpret relative file path relative to build directory
+        outF = new File(buildDirectory, outputFile);
+        getLog().info("Adjusted relative path, resulting path is " + outF.getPath());
+      }
+
+      // Ensure that directory path for specified file exists
+      File outFileParentDir = outF.getParentFile();
+      if (null != outFileParentDir && !outFileParentDir.exists())
+      {
+        try
+        {
+          getLog().info("Creating directory path for output file:" + outFileParentDir.getPath());
+          outFileParentDir.mkdirs();
+        }
+        catch (Exception e)
+        {
+          getLog().error("Error creating directory path for output file: " + e.getLocalizedMessage());
+        }
+      }
+
+      export.setOutputFile(outF.getPath());

       export.execute(target, type);
 
       for (Object exception : export.getExceptions())
       export.execute(target, type);
 
       for (Object exception : export.getExceptions())