X-Git-Url: https://juplo.de/gitweb/?p=hibernate4-maven-plugin;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=044e3307ec7aa47f2d203426fb7400751fb57777;hp=2ad0a29929112e24f90e40364e56c695cd3658f9;hb=02312592d27d628cc7e0d8e28cc40bf74a80de21;hpb=c2135b5dedc55fc9e3f4dd9fe53f8c7b4141204c

diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index 2ad0a299..044e3307 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -19,6 +19,7 @@ package de.juplo.plugins.hibernate4;
 import com.pyx4j.log4j.MavenLogAppender;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,6 +29,7 @@ import java.math.BigInteger;
 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;
@@ -48,11 +50,13 @@ import java.util.logging.Logger;
 import javax.persistence.Embeddable;
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
+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.tool.hbm2ddl.SchemaExport;
 import org.hibernate.tool.hbm2ddl.SchemaExport.Type;
 import org.hibernate.tool.hbm2ddl.Target;
@@ -77,6 +81,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   public final static String USERNAME = "hibernate.connection.username";
   public final static String PASSWORD = "hibernate.connection.password";
   public final static String DIALECT = "hibernate.dialect";
+  public final static String NAMING_STRATEGY="hibernate.ejb.naming_strategy";
 
   private final static String MD5S = "schema.md5s";
 
@@ -197,6 +202,12 @@ public class Hbm2DdlMojo extends AbstractMojo
    */
   private String hibernateDialect;
 
+  /**
+   * Hibernate Naming Strategy
+   * @parameter property="hibernate.ejb.naming_strategy"
+   */
+  private String hibernateNamingStrategy;
+
   /**
    * Path to Hibernate configuration file.
    *
@@ -204,6 +215,14 @@ public class Hbm2DdlMojo extends AbstractMojo
    */
   private String hibernateProperties;
 
+  /**
+   * List of Hibernate-Mapping-Files (XML).
+   * Multiple files can be separated with white-spaces and/or commas.
+   *
+   * @parameter property="hibernate.mapping"
+   */
+  private String hibernateMapping;
+
   /**
    * Target of execution:
    * <ul>
@@ -398,11 +417,16 @@ public class Hbm2DdlMojo extends AbstractMojo
     }
 
     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());
+    {
+      if (hibernateMapping == null || hibernateMapping.isEmpty())
+        throw new MojoFailureException("No annotated classes found in directory " + outputDirectory);
+    }
+    else
+    {
+      getLog().debug("Detected classes with mapping-annotations:");
+      for (Class<?> annotatedClass : classes)
+        getLog().debug("  " + annotatedClass.getName());
+    }
 
 
     Properties properties = new Properties();
@@ -468,7 +492,7 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             PASSWORD + "=" + properties.getProperty(PASSWORD) +
-            " with the value " + password 
+            " with the value " + password
           );
       else
         getLog().debug("Using the value " + password);
@@ -486,6 +510,18 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug("Using the value " + hibernateDialect);
       properties.setProperty(DIALECT, hibernateDialect);
     }
+    if ( hibernateNamingStrategy != null )
+    {
+      if ( properties.contains(NAMING_STRATEGY))
+        getLog().debug(
+            "Overwriting property " +
+            NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) +
+            " with the value " + hibernateNamingStrategy
+           );
+      else
+        getLog().debug("Using the value " + hibernateNamingStrategy);
+      properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
+    }
 
     /** The generated SQL varies with the dialect! */
     if (md5s.containsKey(DIALECT))
@@ -514,6 +550,24 @@ public class Hbm2DdlMojo extends AbstractMojo
 
     Configuration config = new Configuration();
     config.setProperties(properties);
+
+    if ( properties.containsKey(NAMING_STRATEGY))
+    {
+      String namingStrategy = properties.getProperty(NAMING_STRATEGY);
+      getLog().debug("Explicitly set NamingStrategy: " + namingStrategy);
+      try
+      {
+        @SuppressWarnings("unchecked")
+        Class<NamingStrategy> namingStrategyClass = (Class<NamingStrategy>) Class.forName(namingStrategy);
+        config.setNamingStrategy(namingStrategyClass.newInstance());
+      }
+      catch (Exception e)
+      {
+        getLog().error("Error setting NamingStrategy", e);
+        throw new MojoExecutionException(e.getMessage());
+      }
+    }
+
     getLog().debug("Adding annotated classes to hibernate-mapping-configuration...");
     for (Class<?> annotatedClass : classes)
     {
@@ -521,6 +575,63 @@ public class Hbm2DdlMojo extends AbstractMojo
       config.addAnnotatedClass(annotatedClass);
     }
 
+    if (hibernateMapping != null)
+    {
+      try
+      {
+        MessageDigest digest = java.security.MessageDigest.getInstance("MD5");
+        for (String filename : hibernateMapping.split("[\\s,]+"))
+        {
+          File file = null;
+          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))
+            {
+              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
+            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-summs!", e);
+      }
+      catch (FileNotFoundException e)
+      {
+        throw new MojoFailureException("Cannot calculate MD5-summs!", e);
+      }
+      catch (IOException e)
+      {
+        throw new MojoFailureException("Cannot calculate MD5-summs!", e);
+      }
+    }
+
     Target target = null;
     try
     {
@@ -555,7 +666,7 @@ public class Hbm2DdlMojo extends AbstractMojo
         && !force
       )
     {
-      getLog().info("No modified annotated classes found and dialect unchanged.");
+      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;