[MTOMCAT-187] Scan resources executing run goal
ease configuration of reloadable feature.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1440408 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
index ac592f5..4c369da 100644
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
+++ b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
@@ -314,6 +314,13 @@
@Parameter( property = "maven.tomcat.contextReloadable", defaultValue = "false" )
protected boolean contextReloadable;
+ /**
+ * represents the delay in seconds between each classPathScanning change invocation
+ *
+ * @see <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/context.html">http://tomcat.apache.org/tomcat-6.0-doc/config/context.html</a>
+ */
+ @Parameter( property = "maven.tomcat.backgroundProcessorDelay", defaultValue = "-1" )
+ protected int backgroundProcessorDelay = -1;
/**
* The path of the Tomcat context XML file.
@@ -547,7 +554,7 @@
protected boolean isContextReloadable()
throws MojoExecutionException
{
- if ( contextReloadable )
+ if ( contextReloadable || backgroundProcessorDelay > 0 )
{
return true;
}
diff --git a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
index 91d5a4a..2f63774 100644
--- a/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
+++ b/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
@@ -89,14 +89,6 @@
private boolean delegate = true;
/**
- * represents the delay in seconds between each classPathScanning change invocation
- *
- * @see <a href="http://tomcat.apache.org/tomcat-6.0-doc/config/context.html">http://tomcat.apache.org/tomcat-6.0-doc/config/context.html</a>
- */
- @Parameter( property = "maven.tomcat.backgroundProcessorDelay", defaultValue = "-1" )
- protected int backgroundProcessorDelay = -1;
-
- /**
* @since 2.0
*/
@Component( role = ClassLoaderEntriesCalculator.class )
diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
index f06c4f0..086360d 100644
--- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
+++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
@@ -334,6 +334,14 @@
@Parameter( property = "maven.tomcat.contextReloadable", defaultValue = "false" )
protected boolean contextReloadable;
+ /**
+ * represents the delay in seconds between each classPathScanning change invocation
+ *
+ * @see <a href="http://tomcat.apache.org/tomcat-7.0-doc/config/context.html">http://tomcat.apache.org/tomcat-7.0-doc/config/context.html</a>
+ */
+ @Parameter( property = "maven.tomcat.backgroundProcessorDelay", defaultValue = "-1" )
+ protected int backgroundProcessorDelay = -1;
+
/**
* <p>The path of the Tomcat context XML file.</p>
@@ -719,7 +727,7 @@
protected boolean isContextReloadable()
throws MojoExecutionException
{
- if ( contextReloadable )
+ if ( contextReloadable || backgroundProcessorDelay > 0 )
{
return true;
}
diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
index 46c108d..0fefd3a 100644
--- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
+++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
@@ -89,14 +89,6 @@
private boolean delegate = true;
/**
- * represents the delay in seconds between each classPathScanning change invocation
- *
- * @see <a href="http://tomcat.apache.org/tomcat-7.0-doc/config/context.html">http://tomcat.apache.org/tomcat-7.0-doc/config/context.html</a>
- */
- @Parameter( property = "maven.tomcat.backgroundProcessorDelay", defaultValue = "-1" )
- protected int backgroundProcessorDelay = -1;
-
- /**
* @since 2.0
*/
@Component
