Author: olamy
Date: Fri Oct 21 09:15:22 2011
New Revision: 1187231
URL: http://svn.apache.org/viewvc?rev=1187231&view=rev
Log:
[MTOMCAT-95] Add directories to the embedded tomcat classloader (equivalent to
shared.loader property in regular tomcat instance).
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=1187231&r1=1187230&r2=1187231&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
Fri Oct 21 09:15:22 2011
@@ -116,6 +116,14 @@ public class RunMojo
*/
private boolean useTestClasspath;
+ /**
+ * Additional optional directories to add to the embedded tomcat classpath.
+ *
+ * @parameter alias = "additionalClassesDirs"
+ * @since 2.0
+ */
+ private List<File> additionalClasspathDirs;
+
private File temporaryContextFile = null;
// ----------------------------------------------------------------------
@@ -168,6 +176,16 @@ public class RunMojo
loader.addRepository( classLoaderEntry );
}
}
+ if ( additionalClasspathDirs != null &&
!additionalClasspathDirs.isEmpty() )
+ {
+ for ( File additionalClasspathDir : additionalClasspathDirs )
+ {
+ if ( additionalClasspathDir.exists() )
+ {
+ loader.addRepository(
additionalClasspathDir.toURI().toString() );
+ }
+ }
+ }
}
catch ( TomcatRunException e )
{
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=1187231&r1=1187230&r2=1187231&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
Fri Oct 21 09:15:22 2011
@@ -112,6 +112,14 @@ public class RunMojo
*/
private boolean useTestClasspath;
+ /**
+ * Additional optional directories to add to the embedded tomcat classpath.
+ *
+ * @parameter alias = "additionalClassesDirs"
+ * @since 2.0
+ */
+ private List<File> additionalClasspathDirs;
+
private File temporaryContextFile = null;
/**
@@ -228,6 +236,17 @@ public class RunMojo
loader.addRepository( classLoaderEntry );
}
}
+
+ if ( additionalClasspathDirs != null &&
!additionalClasspathDirs.isEmpty() )
+ {
+ for ( File additionalClasspathDir : additionalClasspathDirs )
+ {
+ if ( additionalClasspathDir.exists() )
+ {
+ loader.addRepository(
additionalClasspathDir.toURI().toString() );
+ }
+ }
+ }
}
catch ( TomcatRunException e )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
