Author: olamy
Date: Tue Jul 31 07:06:31 2012
New Revision: 1367433
URL: http://svn.apache.org/viewvc?rev=1367433&view=rev
Log:
[MTOMCAT-170] Unable to Specify Additional Classpath for WAR Defined via
"webapps" Declaration
Submitted by Josh Harness.
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
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=1367433&r1=1367432&r2=1367433&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
Tue Jul 31 07:06:31 2012
@@ -1165,7 +1165,7 @@ public abstract class AbstractRunMojo
* @return dependency tomcat contexts of warfiles in scope "tomcat"
*/
private Collection<Context> createDependencyContexts( Tomcat container )
- throws MojoExecutionException, MalformedURLException, ServletException
+ throws MojoExecutionException, MalformedURLException,
ServletException, IOException
{
getLog().info( "Deploying dependency wars" );
// Let's add other modules
@@ -1200,7 +1200,7 @@ public abstract class AbstractRunMojo
private void addContextFromArtifact( Tomcat container, List<Context>
contexts, Artifact artifact,
String contextPath, File contextXml,
boolean asWebApp )
- throws MojoExecutionException, MalformedURLException, ServletException
+ throws MojoExecutionException, MalformedURLException,
ServletException, IOException
{
getLog().info( "Deploy warfile: " + String.valueOf( artifact.getFile()
) + " to contextPath: " + contextPath );
File webapps = new File( configurationDir, "webapps" );
@@ -1229,7 +1229,9 @@ public abstract class AbstractRunMojo
return;
}
}
- WebappLoader webappLoader = new WebappLoader(
Thread.currentThread().getContextClassLoader() );
+ // TODO make that configurable ?
+ //WebappLoader webappLoader = new WebappLoader(
Thread.currentThread().getContextClassLoader() );
+ WebappLoader webappLoader = createWebappLoader();
Context context = null;
if ( asWebApp )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
