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=f9912536b76ffb7810c841bbb1815da49d89743c;hp=2174765fa97d21eb87146f2af5157c1b7150ad50;hb=2b1147d5e99c764c1f6816f4d4f000abe260097c;hpb=e88830c968c1aabc5c32df8a061a8b446c26505c

diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index 2174765f..f9912536 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -83,7 +83,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   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";
-  public final static String ENVERS = "hibernate.envers";
+  public final static String ENVERS = "hibernate.export.envers";
 
   private final static String MD5S = "schema.md5s";
 
@@ -280,7 +280,7 @@ public class Hbm2DdlMojo extends AbstractMojo
   /**
    * Generate envers schema for auditing tables.
    *
-   * @parameter expression="${hibernate.envers}" default-value="false"
+   * @parameter property="hibernate.export.envers" default-value="false"
    */
   private boolean envers;
 
@@ -538,18 +538,6 @@ public class Hbm2DdlMojo extends AbstractMojo
         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));
-    }
 
     /** The generated SQL varies with the dialect! */
     if (md5s.containsKey(DIALECT))
@@ -571,22 +559,21 @@ public class Hbm2DdlMojo extends AbstractMojo
     }
 
     /** 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 +780,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);
       }