X-Git-Url: http://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=a7eab4ce6718c4084025bdedf901cee227c5ed8a;hb=9c867bbe1a7916dd06da945406693d19ef8b4778;hp=a11860ee3a1ed0919440285bb8a1898b0f64bae3;hpb=5ebae356beb162e7bdf2feb44b99afe33638e3f7;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 a11860ee..a7eab4ce 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -17,6 +17,37 @@ package de.juplo.plugins.hibernate4;
  */
 
 import com.pyx4j.log4j.MavenLogAppender;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.math.BigInteger;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.security.MessageDigest;
+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;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Properties;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.logging.Logger;
+import javax.persistence.Embeddable;
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -28,19 +59,6 @@ import org.hibernate.tool.hbm2ddl.SchemaExport.Type;
 import org.hibernate.tool.hbm2ddl.Target;
 import org.scannotation.AnnotationDB;
 
-import javax.persistence.Embeddable;
-import javax.persistence.Entity;
-import javax.persistence.MappedSuperclass;
-import java.io.*;
-import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.security.MessageDigest;
-import java.sql.*;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.logging.Logger;
-
 
 /**
  * Goal which extracts the hibernate-mapping-configuration and
@@ -181,6 +199,13 @@ public class Hbm2DdlMojo extends AbstractMojo
    */
   private String hibernateDialect;
 
+  /**
+   * Generate envers schema for auditing tables.
+   *
+   * @parameter expression="${hibernate.export.envers}" default-value="false"
+   */
+  private Boolean envers;
+
   /**
    * Path to Hibernate configuration file.
    *
@@ -196,7 +221,6 @@ public class Hbm2DdlMojo extends AbstractMojo
    *   <li><strong>SCRIPT</strong> export schema to SQL-script</li>
    *   <li><strong>BOTH</strong></li>
    * </ul>
-   *
    * @parameter expression="${hibernate.export.target}" default-value="EXPORT"
    */
   private String target;
@@ -209,7 +233,6 @@ public class Hbm2DdlMojo extends AbstractMojo
    *   <li><strong>DROP</strong> drop database-schema</li>
    *   <li><strong>BOTH</strong> (<strong>DEFAULT!</strong>)</li>
    * </ul>
-   *
    * @parameter expression="${hibernate.export.type}" default-value="BOTH"
    */
   private String type;
@@ -235,17 +258,6 @@ public class Hbm2DdlMojo extends AbstractMojo
    */
   private boolean format;
 
-  /**
-   * Generate envers schema for auditing tables.
-   *
-   * @parameter expression="${hibernate.export.envers}" default-value="false"
-   */
-  private Boolean envers;
-
-  /**
-   * Transient attribute, used only for knowing if the schema has changed since it was last run.
-   */
-  private boolean modified;
 
   @Override
   public void execute()
@@ -265,7 +277,7 @@ public class Hbm2DdlMojo extends AbstractMojo
       throw new MojoExecutionException("Cannot scan for annotated classes in " + outputDirectory + ": directory does not exist!");
 
     Map<String,String> md5s;
-    modified = false;
+    boolean modified = false;
     File saved = new File(buildDirectory + File.separator + MD5S);
 
     if (saved.exists())
@@ -296,7 +308,7 @@ public class Hbm2DdlMojo extends AbstractMojo
       }
     }
 
-    ClassLoader classLoader;
+    ClassLoader classLoader = null;
     try
     {
       getLog().debug("Creating ClassLoader for project-dependencies...");
@@ -317,6 +329,89 @@ public class Hbm2DdlMojo extends AbstractMojo
       throw new MojoExecutionException(e.getMessage());
     }
 
+    Set<Class<?>> classes =
+        new TreeSet<Class<?>>(
+            new Comparator<Class<?>>() {
+              @Override
+              public int compare(Class<?> a, Class<?> b)
+              {
+                return a.getName().compareTo(b.getName());
+              }
+            }
+          );
+
+    try
+    {
+      AnnotationDB db = new AnnotationDB();
+      getLog().info("Scanning directory " + outputDirectory + " for annotated classes...");
+      URL dirUrl = dir.toURI().toURL();
+      db.scanArchives(dirUrl);
+      if (scanTestClasses)
+      {
+        dir = new File(testOutputDirectory);
+        if (!dir.exists())
+          throw new MojoExecutionException("Cannot scan for annotated test-classes in " + testOutputDirectory + ": directory does not exist!");
+        getLog().info("Scanning directory " + testOutputDirectory + " for annotated classes...");
+        dirUrl = dir.toURI().toURL();
+        db.scanArchives(dirUrl);
+      }
+
+      Set<String> classNames = new HashSet<String>();
+      if (db.getAnnotationIndex().containsKey(Entity.class.getName()))
+        classNames.addAll(db.getAnnotationIndex().get(Entity.class.getName()));
+      if (db.getAnnotationIndex().containsKey(MappedSuperclass.class.getName()))
+        classNames.addAll(db.getAnnotationIndex().get(MappedSuperclass.class.getName()));
+      if (db.getAnnotationIndex().containsKey(Embeddable.class.getName()))
+        classNames.addAll(db.getAnnotationIndex().get(Embeddable.class.getName()));
+
+      MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
+      for (String name : classNames)
+      {
+        Class<?> annotatedClass = classLoader.loadClass(name);
+        classes.add(annotatedClass);
+        InputStream is =
+            annotatedClass
+                .getResourceAsStream(annotatedClass.getSimpleName() + ".class");
+        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(name) ? "" : md5s.get(name);
+        if (!newMd5.equals(oldMd5))
+        {
+          getLog().debug("Found new or modified annotated class: " + name);
+          modified = true;
+          md5s.put(name, newMd5);
+        }
+        else
+        {
+          getLog().debug(oldMd5 + " -> class unchanged: " + name);
+        }
+      }
+    }
+    catch (ClassNotFoundException e)
+    {
+      getLog().error("Error while adding annotated classes!", e);
+      throw new MojoExecutionException(e.getMessage());
+    }
+    catch (Exception e)
+    {
+      getLog().error("Error while scanning!", e);
+      throw new MojoFailureException(e.getMessage());
+    }
+
+    if (classes.isEmpty())
+      throw new MojoFailureException("No annotated classes found in directory " + outputDirectory);
+
+    getLog().debug("Detected classes with mapping-annotations:");
+    for (Class<?> annotatedClass : classes)
+      getLog().debug("  " + annotatedClass.getName());
+
+
     Properties properties = new Properties();
 
     /** Try to read configuration from properties-file */
@@ -398,6 +493,19 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug("Using the value " + hibernateDialect);
       properties.setProperty(DIALECT, hibernateDialect);
     }
+    if (envers != null)
+    {
+      if (properties.containsKey(ENVERS))
+        getLog().debug(
+            "Overwriting property " +
+            ENVERS + "=" + properties.getProperty(ENVERS) +
+            " with the value " + envers
+          );
+      else
+        getLog().debug("Using the value " + envers);
+      properties.setProperty(ENVERS, envers.toString());
+    }
+
 
     /** The generated SQL varies with the dialect! */
     if (md5s.containsKey(DIALECT))
@@ -418,14 +526,15 @@ public class Hbm2DdlMojo extends AbstractMojo
       md5s.put(DIALECT, properties.getProperty(DIALECT));
     }
 
+    /** The generated SQL varies with the envers-configuration! */
     if (md5s.containsKey(ENVERS))
     {
       String envers = properties.getProperty(ENVERS);
       if (md5s.get(ENVERS).equals(envers))
-        getLog().debug("Envers unchanged.");
+        getLog().debug("Envers-configuration unchanged.");
       else
       {
-        getLog().debug("Envers changed: " + envers);
+        getLog().debug("Envers-configuration changed: " + envers);
         modified = true;
         md5s.put(ENVERS, envers.toString());
       }
@@ -436,25 +545,29 @@ public class Hbm2DdlMojo extends AbstractMojo
       md5s.put(ENVERS, properties.getProperty(ENVERS));
     }
 
-    if (envers != null) {
-      if (properties.containsKey(ENVERS))
-        getLog().debug(
-            "Overwriting property " +
-                ENVERS + "=" + properties.getProperty(ENVERS) +
-                " with the value " + envers
-        );
-      else
-        getLog().debug("Using the value " + envers);
-      properties.setProperty(ENVERS, envers.toString());
-    }
-
     if (properties.isEmpty())
     {
       getLog().error("No properties set!");
       throw new MojoFailureException("Hibernate-Configuration is missing!");
     }
 
-    Target target;
+    Configuration config = new Configuration();
+    config.setProperties(properties);
+    getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
+    for (Class<?> annotatedClass : classes)
+    {
+      getLog().debug("Class " + annotatedClass);
+      config.addAnnotatedClass(annotatedClass);
+    }
+    if ("true".equals(properties.getProperty(ENVERS)))
+    {
+      config.buildMappings();
+      getLog().debug("Using envers");
+      AuditConfiguration.getFor(config);
+    }
+
+
+    Target target = null;
     try
     {
       target = Target.valueOf(this.target.toUpperCase());
@@ -465,7 +578,7 @@ public class Hbm2DdlMojo extends AbstractMojo
       getLog().error("Valid values are: NONE, SCRIPT, EXPORT, BOTH");
       throw new MojoExecutionException("Invalid value for configuration-option \"target\"");
     }
-    Type type;
+    Type type = null;
     try
     {
       type = Type.valueOf(this.type.toUpperCase());
@@ -560,23 +673,6 @@ public class Hbm2DdlMojo extends AbstractMojo
        */
       Thread.currentThread().setContextClassLoader(classLoader);
 
-      Set<Class<?>> classes = scanForAnnotations(dir, classLoader, md5s);
-
-      Configuration config = new Configuration();
-      config.setProperties(properties);
-      getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
-      for (Class<?> annotatedClass : classes)
-      {
-        getLog().debug("Class " + annotatedClass);
-        config.addAnnotatedClass(annotatedClass);
-      }
-      config.buildMappings();
-      if ("true".equals(properties.getProperty(ENVERS)))
-      {
-        getLog().debug("Using envers");
-        AuditConfiguration.getFor(config);
-      }
-
       SchemaExport export = new SchemaExport(config, connection);
       export.setOutputFile(outputFile);
       export.setDelimiter(delimiter);
@@ -719,77 +815,4 @@ public class Hbm2DdlMojo extends AbstractMojo
       return this.target.equals(other.target);
     }
   }
-
-  public Set<Class<?>> scanForAnnotations(File dir, ClassLoader classLoader, Map<String,String> md5s) throws MojoExecutionException, MojoFailureException {
-    Set<Class<?>> classes = new TreeSet<Class<?>>(
-        new Comparator<Class<?>>() {
-          @Override
-          public int compare(Class<?> a, Class<?> b) {
-            return a.getName().compareTo(b.getName());
-          }
-        }
-    );
-
-    try {
-      AnnotationDB db = new AnnotationDB();
-      getLog().info("Scanning directory " + outputDirectory + " for annotated classes...");
-      URL dirUrl = dir.toURI().toURL();
-      db.scanArchives(dirUrl);
-      if (scanTestClasses) {
-        dir = new File(testOutputDirectory);
-        if (!dir.exists())
-          throw new MojoExecutionException("Cannot scan for annotated test-classes in " + testOutputDirectory + ": directory does not exist!");
-        getLog().info("Scanning directory " + testOutputDirectory + " for annotated classes...");
-        dirUrl = dir.toURI().toURL();
-        db.scanArchives(dirUrl);
-      }
-
-      Set<String> classNames = new HashSet<String>();
-      if (db.getAnnotationIndex().containsKey(Entity.class.getName()))
-        classNames.addAll(db.getAnnotationIndex().get(Entity.class.getName()));
-      if (db.getAnnotationIndex().containsKey(MappedSuperclass.class.getName()))
-        classNames.addAll(db.getAnnotationIndex().get(MappedSuperclass.class.getName()));
-      if (db.getAnnotationIndex().containsKey(Embeddable.class.getName()))
-        classNames.addAll(db.getAnnotationIndex().get(Embeddable.class.getName()));
-
-      MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
-      for (String name : classNames) {
-        Class<?> annotatedClass = classLoader.loadClass(name);
-        classes.add(annotatedClass);
-        InputStream is =
-            annotatedClass
-                .getResourceAsStream(annotatedClass.getSimpleName() + ".class");
-        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(name) ? "" : md5s.get(name);
-        if (!newMd5.equals(oldMd5))
-        {
-          getLog().debug("Found new or modified annotated class: " + name);
-          modified = true;
-          md5s.put(name, newMd5);
-        }
-        else
-        {
-          getLog().debug(oldMd5 + " -> class unchanged: " + name);
-        }
-      }
-    } catch (Exception e) {
-      getLog().error("Error while scanning!", e);
-      throw new MojoFailureException(e.getMessage());
-    }
-
-    if (classes.isEmpty())
-      throw new MojoFailureException("No annotated classes found in directory " + outputDirectory);
-
-    getLog().debug("Detected classes with mapping-annotations:");
-    for (Class<?> annotatedClass : classes)
-      getLog().debug("  " + annotatedClass.getName());
-    return classes;
-  }
 }