X-Git-Url: https://juplo.de/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fde%2Fjuplo%2Fplugins%2Fhibernate4%2FHbm2DdlMojo.java;h=3b3a72b79137b1d7a46b4d19775e3f4c40ff838f;hb=refs%2Ftags%2Fhibernate4-maven-plugin-1.0.1;hp=7a5e0af0f1b9b9fb277ff2c077de984fc0b849d8;hpb=8a2e08b6409034fd692c4bea72058f785e6802ad;p=hibernate-maven-plugin
diff --git a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
index 7a5e0af0..3b3a72b7 100644
--- a/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
+++ b/src/main/java/de/juplo/plugins/hibernate4/Hbm2DdlMojo.java
@@ -82,6 +82,8 @@ public class Hbm2DdlMojo extends AbstractMojo
/**
* The maven project.
+ *
+ * Only needed internally.
*
* @parameter expression="${project}"
* @required
@@ -91,25 +93,75 @@ public class Hbm2DdlMojo extends AbstractMojo
/**
* Build-directory.
+ *
+ * Only needed internally.
*
* @parameter expression="${project.build.directory}"
+ * @required
+ * @readonly
*/
private String buildDirectory;
/**
- * Class-directory to scan.
+ * Classes-Directory to scan.
+ *
+ * This parameter defaults to the maven build-output-directory for classes.
+ * Additonally, all dependencies are scanned for annotated classes.
*
* @parameter expression="${project.build.outputDirectory}"
*/
private String outputDirectory;
+ /**
+ * Wether to scan test-classes too, or not.
+ *
+ * If this parameter is set to true
the test-classes of the
+ * artifact will be scanned for hibernate-annotated classes additionally.
+ *
+ * @parameter expression="${hibernate.export.scann_testclasses}" default-value="false"
+ */
+ private boolean scanTestClasses;
+
+ /**
+ * Test-Classes-Directory to scan.
+ *
+ * This parameter defaults to the maven build-output-directory for
+ * test-classes.
+ *
+ * This parameter is only used, when scanTestClasses
is set
+ * to true
!
+ *
+ * @parameter expression="${project.build.testOutputDirectory}"
+ */
+ private String testOutputDirectory;
+
/**
* Skip execution
+ *
+ * If set to true
, the execution is skipped.
+ *
+ * A skipped excecution is signaled via the maven-property
+ * ${hibernate.export.skipped}
.
+ *
+ * The excecution is skipped automatically, if no modified or newly added
+ * annotated classes are found and the dialect was not changed.
*
* @parameter expression="${maven.test.skip}" default-value="false"
*/
private boolean skip;
+ /**
+ * Force execution
+ *
+ * Force execution, even if no modified or newly added annotated classes
+ * where found and the dialect was not changed.
+ *
+ * skip
takes precedence over force
.
+ *
+ * @parameter expression="${hibernate.export.force}" default-value="false"
+ */
+ private boolean force;
+
/**
* SQL-Driver name.
*
@@ -155,8 +207,8 @@ public class Hbm2DdlMojo extends AbstractMojo
/**
* Target of execution:
*
- * - NONE do nothing - just validate the configuration
- * - EXPORT create database (DEFAULT!)
+ * - NONE do nothing - just validate the configuration (forces excecution, signals skip)
+ * - EXPORT create database (DEFAULT!. forces excecution, signals skip)
* - SCRIPT export schema to SQL-script
* - BOTH
*
@@ -165,12 +217,12 @@ public class Hbm2DdlMojo extends AbstractMojo
private String target;
/**
- * Type of export.
+ * Type of execution.
*
* - NONE do nothing - just validate the configuration
* - CREATE create database-schema
* - DROP drop database-schema
- * - BOTH (DEFAULT!)
+ * - BOTH (DEFAULT!)
*
* @parameter expression="${hibernate.export.type}" default-value="BOTH"
*/
@@ -252,6 +304,8 @@ public class Hbm2DdlMojo extends AbstractMojo
{
getLog().debug("Creating ClassLoader for project-dependencies...");
List classpathFiles = project.getCompileClasspathElements();
+ if (scanTestClasses)
+ classpathFiles.addAll(project.getTestClasspathElements());
URL[] urls = new URL[classpathFiles.size()];
for (int i = 0; i < classpathFiles.size(); ++i)
{
@@ -283,6 +337,15 @@ public class Hbm2DdlMojo extends AbstractMojo
getLog().info("Scanning directory " + outputDirectory + " for annotated classes...");
URL dirUrl = dir.toURI().toURL();
db.scanArchives(dirUrl);
+ if (scanTestClasses)
+ {
+ dir = new File(testOutputDirectory);
+ if (!dir.exists())
+ throw new MojoExecutionException("Cannot scan for annotated test-classes in " + testOutputDirectory + ": directory does not exist!");
+ getLog().info("Scanning directory " + testOutputDirectory + " for annotated classes...");
+ dirUrl = dir.toURI().toURL();
+ db.scanArchives(dirUrl);
+ }
Set classNames = new HashSet();
if (db.getAnnotationIndex().containsKey(Entity.class.getName()))
@@ -352,7 +415,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 +430,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 +442,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 +454,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 +466,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 +478,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 +522,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 +533,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 +550,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.");
@@ -536,17 +580,28 @@ public class Hbm2DdlMojo extends AbstractMojo
case CREATE:
case DROP:
case BOTH:
- Class driverClass = classLoader.loadClass(driverClassName);
+ Class driverClass = classLoader.loadClass(properties.getProperty(DRIVER_CLASS));
getLog().debug("Registering JDBC-driver " + driverClass.getName());
DriverManager.registerDriver(new DriverProxy((Driver)driverClass.newInstance()));
- getLog().debug("Opening JDBC-connection to " + url + " as " + username + " with password " + password);
- connection = DriverManager.getConnection(url, username, password);
+ getLog().debug(
+ "Opening JDBC-connection to "
+ + properties.getProperty(URL)
+ + " as "
+ + properties.getProperty(USERNAME)
+ + " with password "
+ + properties.getProperty(PASSWORD)
+ );
+ connection = DriverManager.getConnection(
+ properties.getProperty(URL),
+ properties.getProperty(USERNAME),
+ properties.getProperty(PASSWORD)
+ );
}
}
}
catch (ClassNotFoundException e)
{
- getLog().error("Dependency for driver-class " + driverClassName + " is missing!");
+ getLog().error("Dependency for driver-class " + properties.getProperty(DRIVER_CLASS) + " is missing!");
throw new MojoExecutionException(e.getMessage());
}
catch (Exception e)
@@ -590,7 +645,8 @@ public class Hbm2DdlMojo extends AbstractMojo
/** Close the connection */
try
{
- connection.close();
+ if (connection != null)
+ connection.close();
}
catch (SQLException e)
{