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=bc0bc73ad91a362f8effabdfd6adb4f3c25c2225;hp=c9d5013aa1d16c1e297704c529e38850199ed577;hb=55a33e35422b904b974a19d3d6368ded60ea1811;hpb=a2859d3177a64880ca429d4dfd9437a7fb78dede

diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index c9d5013a..bc0bc73a 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -79,7 +79,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   private final static String MD5S = "schema.md5s";
 
   /**
-   * The project whose project files to create.
+   * The maven project.
    *
    * @parameter expression="${project}"
    * @required
@@ -88,7 +88,14 @@ public class Hbm2DdlMojo extends AbstractMojo
   private MavenProject project;
 
   /**
-   * Directories to scan.
+   * Build-directory.
+   *
+   * @parameter expression="${project.build.directory}"
+   */
+  private String buildDirectory;
+
+  /**
+   * Class-directory to scan.
    *
    * @parameter expression="${project.build.outputDirectory}"
    */
@@ -97,7 +104,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   /**
    * Skip execution
    *
-   * @parameter expression="${maven.test.skip}"
+   * @parameter expression="${maven.test.skip}" default-value="false"
    */
   private boolean skip;
 
@@ -137,7 +144,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   private String hibernateDialect;
 
   /**
-   * Hibernate configuration file.
+   * Path to Hibernate configuration file.
    *
    * @parameter default-value="${project.build.outputDirectory}/hibernate.properties"
    */
@@ -151,7 +158,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    *   <li><strong>SCRIPT</strong> export schema to SQL-script</li>
    *   <li><strong>BOTH</strong></li>
    * </ul>
-   * @parameter default-value="EXPORT"
+   * @parameter expression="${hibernate.export.target}" default-value="EXPORT"
    */
   private String target;
 
@@ -163,28 +170,28 @@ public class Hbm2DdlMojo extends AbstractMojo
    *   <li><strong>DROP</strong> drop database-schema</li>
    *   <li><strong>BOTH</strong> <strong>(DEFAULT!)</strong></li>
    * </ul>
-   * @parameter default-value="BOTH"
+   * @parameter expression="${hibernate.export.type}" default-value="BOTH"
    */
   private String type;
 
   /**
    * Output file.
    *
-   * @parameter default-value="${project.build.outputDirectory}/schema.sql"
+   * @parameter expression="${hibernate.export.schema.filename}" default-value="${project.build.directory}/schema.sql"
    */
   private String outputFile;
 
   /**
    * Delimiter in output-file.
    *
-   * @parameter default-value=";"
+   * @parameter expression="${hibernate.export.schema.delimiter}" default-value=";"
    */
   private String delimiter;
 
   /**
    * Format output-file.
    *
-   * @parameter default-value="true"
+   * @parameter expression="${hibernate.export.schema.format}" default-value="true"
    */
   private boolean format;
 
@@ -207,7 +214,7 @@ public class Hbm2DdlMojo extends AbstractMojo
 
     Map<String,String> md5s;
     boolean modified = false;
-    File saved = new File(outputDirectory + File.separator + MD5S);
+    File saved = new File(buildDirectory + File.separator + MD5S);
 
     if (saved.exists())
     {
@@ -325,14 +332,6 @@ public class Hbm2DdlMojo extends AbstractMojo
     if (classes.isEmpty())
       throw new MojoFailureException("No annotated classes found in directory " + outputDirectory);
 
-    if (!modified)
-    {
-      getLog().info("No modified annotated classes found.");
-      getLog().info("Skipping schema generation!");
-      project.getProperties().setProperty("hibernate4.skipped", "true");
-      return;
-    }
-
     getLog().debug("Detected classes with mapping-annotations:");
     for (Class<?> annotatedClass : classes)
       getLog().debug("  " + annotatedClass.getName());
@@ -440,6 +439,33 @@ public class Hbm2DdlMojo extends AbstractMojo
       properties.setProperty(DIALECT, hibernateDialect);
     }
 
+    /** The generated SQL varies with the dialect! */
+    if (md5s.containsKey(DIALECT))
+    {
+      String dialect = properties.getProperty(DIALECT);
+      if (md5s.get(DIALECT).equals(dialect))
+        getLog().debug("SQL-dialect unchanged.");
+      else
+      {
+        getLog().debug("SQL-dialect changed: " + dialect);
+        modified = true;
+        md5s.put(DIALECT, dialect);
+      }
+    }
+    else
+    {
+      modified = true;
+      md5s.put(DIALECT, properties.getProperty(DIALECT));
+    }
+
+    if (!modified)
+    {
+      getLog().info("No modified annotated classes found and dialect unchanged.");
+      getLog().info("Skipping schema generation!");
+      project.getProperties().setProperty("hibernate.export.skipped", "true");
+      return;
+    }
+
     getLog().info("Gathered hibernate-configuration (turn on debugging for details):");
     if (properties.isEmpty())
     {
@@ -560,7 +586,7 @@ public class Hbm2DdlMojo extends AbstractMojo
       }
     }
 
-    /** Write timestamps for annotated classes to file */
+    /** Write md5-sums for annotated classes to file */
     try
     {
       FileOutputStream fos = new FileOutputStream(saved);
@@ -571,7 +597,7 @@ public class Hbm2DdlMojo extends AbstractMojo
     }
     catch (Exception e)
     {
-      getLog().error("Cannot write timestamps to file: " + e);
+      getLog().error("Cannot write md5-sums to file: " + e);
     }
   }
 
@@ -579,7 +605,7 @@ public class Hbm2DdlMojo extends AbstractMojo
    * Needed, because DriverManager won't pick up drivers, that were not
    * loaded by the system-classloader!
    * See:
-   * http://stackoverflow.com/questions/288828/how-to-use-a-jdbc-driver-from-an-arbitrary-location
+   * http://stackoverflow.com/questions/288828/how-to-use-a-jdbc-driver-fromodifiedm-an-arbitrary-location
    */
   static final class DriverProxy implements Driver
   {