Author: olamy
Date: Tue Oct 11 20:19:12 2011
New Revision: 1182064
URL: http://svn.apache.org/viewvc?rev=1182064&view=rev
Log:
[MTOMCAT-100] support war overlay to add war external dependencies in tomcat
run: tomcat6 support too.
Modified:
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/RunMojo.java
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=1182064&r1=1182063&r2=1182064&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
Tue Oct 11 20:19:12 2011
@@ -100,6 +100,14 @@ public class RunMojo
*/
private ClassLoaderEntriesCalculator classLoaderEntriesCalculator;
+ /**
+ * will add /WEB-INF/lib/*.jar and /WEB-INF/classes from war dependencies
in the webappclassloader
+ *
+ * @parameter expression="${maven.tomcat.addWarDependenciesInClassloader}"
default-value="false"
+ * @since 2.0
+ */
+ private boolean addWarDependenciesInClassloader;
+
private File temporaryContextFile = null;
// ----------------------------------------------------------------------
@@ -140,7 +148,9 @@ public class RunMojo
try
{
ClassLoaderEntriesCalculatorRequest request =
- new ClassLoaderEntriesCalculatorRequest().setDependencies(
dependencies ).setLog( getLog() ).setMavenProject( project );
+ new ClassLoaderEntriesCalculatorRequest().setDependencies(
dependencies )
+ .setLog( getLog() ).setMavenProject( project )
+ .setAddWarDependenciesInClassloader(
addWarDependenciesInClassloader );
List<String> classLoaderEntries =
classLoaderEntriesCalculator.calculateClassPathEntries(request);
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=1182064&r1=1182063&r2=1182064&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
Tue Oct 11 20:19:12 2011
@@ -99,7 +99,7 @@ public class RunMojo
private ClassLoaderEntriesCalculator classLoaderEntriesCalculator;
/**
- * FIXME javadoc
+ * will add /WEB-INF/lib/*.jar and /WEB-INF/classes from war dependencies
in the webappclassloader
*
* @parameter expression="${maven.tomcat.addWarDependenciesInClassloader}"
default-value="false"
* @since 2.0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
