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=5c3b5c7e814e535fac4c9bf5ccce54d3697e0ad0;hp=e4a301e76845812db3aa1b02a3cf5387977974f1;hb=7d935b61a3d80260b9cacf959984e14708c3a96b;hpb=0a52dca3dd6729b8b6a43cc3ef3b69eb22755b0a

diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index e4a301e7..5c3b5c7e 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -508,10 +508,10 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             PASSWORD + "=" + properties.getProperty(PASSWORD) +
-            " with the value " + password
+            " with value " + password
           );
       else
-        getLog().debug("Using the value " + password);
+        getLog().debug("Using value " + password + " for property " + PASSWORD);
       properties.setProperty(PASSWORD, password);
     }
     if (hibernateDialect != null)
@@ -520,10 +520,12 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             DIALECT + "=" + properties.getProperty(DIALECT) +
-            " with the value " + hibernateDialect
+            " with value " + hibernateDialect
           );
       else
-        getLog().debug("Using the value " + hibernateDialect);
+        getLog().debug(
+            "Using value " + hibernateDialect + " for property " + DIALECT
+            );
       properties.setProperty(DIALECT, hibernateDialect);
     }
     if ( hibernateNamingStrategy != null )
@@ -532,23 +534,14 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug(
             "Overwriting property " +
             NAMING_STRATEGY + "=" + properties.getProperty(NAMING_STRATEGY) +
-            " with the value " + hibernateNamingStrategy
+            " with value " + hibernateNamingStrategy
            );
       else
-        getLog().debug("Using the value " + hibernateNamingStrategy);
-      properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
-    }
-    if (envers)
-    {
-      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, Boolean.toString(envers));
+            "Using value " + hibernateNamingStrategy + " for property " +
+            NAMING_STRATEGY
+            );
+      properties.setProperty(NAMING_STRATEGY, hibernateNamingStrategy);
     }
 
     /** The generated SQL varies with the dialect! */
@@ -559,34 +552,45 @@ public class Hbm2DdlMojo extends AbstractMojo
         getLog().debug("SQL-dialect unchanged.");
       else
       {
-        getLog().debug("SQL-dialect changed: " + dialect);
         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
     {
-      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 */
-    if (md5s.containsKey(ENVERS))
+    if (md5s.get(ENVERS) != null)
     {
-      String envers = properties.getProperty(ENVERS);
-      if (md5s.get(ENVERS).equals(envers))
-        getLog().debug("Envers unchanged.");
+      if (md5s.get(ENVERS).equals(Boolean.toString(envers)))
+        getLog().debug("Envers-Configuration unchanged. Enabled: " + envers);
       else
       {
-        getLog().debug("Envers changed: " + envers);
+        getLog().debug("Envers-Configuration changed. Enabled: " + envers);
         modified = true;
-        md5s.put(ENVERS, envers);
+        md5s.put(ENVERS, Boolean.toString(envers));
       }
     }
     else
     {
       modified = true;
-      md5s.put(ENVERS, properties.getProperty(ENVERS));
+      md5s.put(ENVERS, Boolean.toString(envers));
     }
 
     if (properties.isEmpty())
@@ -793,9 +797,9 @@ public class Hbm2DdlMojo extends AbstractMojo
 
       config.buildMappings();
 
-      if ("true".equals(properties.getProperty(ENVERS)))
+      if (envers)
       {
-        getLog().debug("Using envers");
+        getLog().info("Automatic auditing via hibernate-envers enabled!");
         AuditConfiguration.getFor(config);
       }