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=e7aa1541d9f85f23b81c56fcfa5fa9e383739b37;hp=7a5e0af0f1b9b9fb277ff2c077de984fc0b849d8;hb=6c95bef6019d3ad9b6b0c7ae61d2f0cd868e8f1d;hpb=8a2e08b6409034fd692c4bea72058f785e6802ad diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java index 7a5e0af0..e7aa1541 100644 --- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java +++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java @@ -110,6 +110,16 @@ public class Hbm2DdlMojo extends AbstractMojo */ private boolean skip; + /** + * Force execution + *
+ * Force execution, even if no modified or newly added annotated classes
+ * where found. skip
takes precedence over force
.
+ *
+ * @parameter expression="${hibernate.export.force}" default-value="false"
+ */
+ private boolean force;
+
/**
* SQL-Driver name.
*
@@ -352,7 +362,7 @@ public class Hbm2DdlMojo extends AbstractMojo
properties.load(new FileInputStream(file));
}
else
- getLog().info("No hibernate-properties-file found! Checked path: " + hibernateProperties);
+ getLog().info("No hibernate-properties-file found! (Checked path: " + hibernateProperties + ")");
}
catch (IOException e)
{
@@ -367,14 +377,10 @@ public class Hbm2DdlMojo extends AbstractMojo
getLog().debug(
"Overwriting property " +
DRIVER_CLASS + "=" + properties.getProperty(DRIVER_CLASS) +
- " with the value " + driverClassName +
- " from the plugin-configuration-parameter driverClassName!"
+ " with the value " + driverClassName
);
else
- getLog().debug(
- "Using the value " + driverClassName +
- " from the plugin-configuration-parameter driverClassName!"
- );
+ getLog().debug("Using the value " + driverClassName);
properties.setProperty(DRIVER_CLASS, driverClassName);
}
if (url != null)
@@ -383,14 +389,10 @@ public class Hbm2DdlMojo extends AbstractMojo
getLog().debug(
"Overwriting property " +
URL + "=" + properties.getProperty(URL) +
- " with the value " + url +
- " from the plugin-configuration-parameter url!"
+ " with the value " + url
);
else
- getLog().debug(
- "Using the value " + url +
- " from the plugin-configuration-parameter url!"
- );
+ getLog().debug("Using the value " + url);
properties.setProperty(URL, url);
}
if (username != null)
@@ -399,14 +401,10 @@ public class Hbm2DdlMojo extends AbstractMojo
getLog().debug(
"Overwriting property " +
USERNAME + "=" + properties.getProperty(USERNAME) +
- " with the value " + username +
- " from the plugin-configuration-parameter username!"
+ " with the value " + username
);
else
- getLog().debug(
- "Using the value " + username +
- " from the plugin-configuration-parameter username!"
- );
+ getLog().debug("Using the value " + username);
properties.setProperty(USERNAME, username);
}
if (password != null)
@@ -415,14 +413,10 @@ public class Hbm2DdlMojo extends AbstractMojo
getLog().debug(
"Overwriting property " +
PASSWORD + "=" + properties.getProperty(PASSWORD) +
- " with the value " + password +
- " from the plugin-configuration-parameter password!"
+ " with the value " + password
);
else
- getLog().debug(
- "Using the value " + password +
- " from the plugin-configuration-parameter password!"
- );
+ getLog().debug("Using the value " + password);
properties.setProperty(PASSWORD, password);
}
if (hibernateDialect != null)
@@ -431,14 +425,10 @@ public class Hbm2DdlMojo extends AbstractMojo
getLog().debug(
"Overwriting property " +
DIALECT + "=" + properties.getProperty(DIALECT) +
- " with the value " + hibernateDialect +
- " from the plugin-configuration-parameter hibernateDialect!"
+ " with the value " + hibernateDialect
);
else
- getLog().debug(
- "Using the value " + hibernateDialect +
- " from the plugin-configuration-parameter hibernateDialect!"
- );
+ getLog().debug("Using the value " + hibernateDialect);
properties.setProperty(DIALECT, hibernateDialect);
}
@@ -479,7 +469,7 @@ public class Hbm2DdlMojo extends AbstractMojo
Target target = null;
try
{
- target = Target.valueOf(this.target);
+ target = Target.valueOf(this.target.toUpperCase());
}
catch (IllegalArgumentException e)
{
@@ -490,7 +480,7 @@ public class Hbm2DdlMojo extends AbstractMojo
Type type = null;
try
{
- type = Type.valueOf(this.type);
+ type = Type.valueOf(this.type.toUpperCase());
}
catch (IllegalArgumentException e)
{
@@ -507,6 +497,7 @@ public class Hbm2DdlMojo extends AbstractMojo
!modified
&& !target.equals(Target.SCRIPT)
&& !target.equals(Target.NONE)
+ && !force
)
{
getLog().info("No modified annotated classes found and dialect unchanged.");
@@ -590,7 +581,8 @@ public class Hbm2DdlMojo extends AbstractMojo
/** Close the connection */
try
{
- connection.close();
+ if (connection != null)
+ connection.close();
}
catch (SQLException e)
{