Author: olamy
Date: Wed Jan 30 13:32:00 2013
New Revision: 1440408
URL: http://svn.apache.org/viewvc?rev=1440408&view=rev
Log:
[MTOMCAT-187] Scan resources executing run goal
ease configuration of reloadable feature.
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1440408&r1=1440407&r2=1440408&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
Wed Jan 30 13:32:00 2013
@@ -314,6 +314,13 @@ public abstract class AbstractRunMojo
@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 @@ public abstract class AbstractRunMojo
protected boolean isContextReloadable()
throws MojoExecutionException
{
- if ( contextReloadable )
+ if ( contextReloadable || backgroundProcessorDelay > 0 )
{
return true;
}
Modified:
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java?rev=1440408&r1=1440407&r2=1440408&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/RunMojo.java
Wed Jan 30 13:32:00 2013
@@ -89,14 +89,6 @@ public class RunMojo
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 )
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1440408&r1=1440407&r2=1440408&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Wed Jan 30 13:32:00 2013
@@ -334,6 +334,14 @@ public abstract class AbstractRunMojo
@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 @@ public abstract class AbstractRunMojo
protected boolean isContextReloadable()
throws MojoExecutionException
{
- if ( contextReloadable )
+ if ( contextReloadable || backgroundProcessorDelay > 0 )
{
return true;
}
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java?rev=1440408&r1=1440407&r2=1440408&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunMojo.java
Wed Jan 30 13:32:00 2013
@@ -89,14 +89,6 @@ public class RunMojo
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
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
