Author: olamy Date: Tue Oct 22 01:00:12 2013 New Revision: 1534433 URL: http://svn.apache.org/r1534433 Log: [MTOMCAT-239] when running a jar with tomcat7:run ServletContainerInitializer is ignored fix an issue with reactor containing a jar module with ServletContainerInitializer and running the webapp (target/classes from the jar is ignored during scanning)
Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java tomcat/maven-plugin/trunk/pom.xml 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/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java?rev=1534433&r1=1534432&r2=1534433&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/DefaultClassLoaderEntriesCalculator.java Tue Oct 22 01:00:12 2013 @@ -68,7 +68,7 @@ public class DefaultClassLoaderEntriesCa { @SuppressWarnings ("unchecked") List<String> classPathElements = request.isUseTestClassPath() ? request.getMavenProject().getTestClasspathElements() - : request.getMavenProject().getRuntimeClasspathElements();//.getCompileClasspathElements(); + : request.getMavenProject().getRuntimeClasspathElements(); if ( classPathElements != null ) { for ( String classPathElement : classPathElements ) Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1534433&r1=1534432&r2=1534433&view=diff ============================================================================== --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue Oct 22 01:00:12 2013 @@ -48,7 +48,7 @@ <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion> <!-- Test settings --> <maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile> - <surefire.version>2.13</surefire.version> + <surefire.version>2.16</surefire.version> <failsafe.version>${surefire.version}</failsafe.version> <junit.version>4.10</junit.version> 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=1534433&r1=1534432&r2=1534433&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 Oct 22 01:00:12 2013 @@ -53,10 +53,12 @@ import org.apache.maven.shared.filtering import org.apache.maven.shared.filtering.MavenFilteringException; import org.apache.naming.NamingEntry; import org.apache.naming.resources.FileDirContext; +import org.apache.tomcat.JarScanner; import org.apache.tomcat.maven.common.config.AbstractWebapp; import org.apache.tomcat.maven.common.run.EmbeddedRegistry; import org.apache.tomcat.maven.common.run.ExternalRepositoriesReloadableWebappLoader; import org.apache.tomcat.maven.plugin.tomcat7.AbstractTomcat7Mojo; +import org.apache.tomcat.util.scan.StandardJarScanner; import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.UnArchiver; import org.codehaus.plexus.archiver.manager.ArchiverManager; @@ -632,6 +634,18 @@ public abstract class AbstractRunMojo loader.setLoaderClass( classLoaderClass ); } + + // https://issues.apache.org/jira/browse/MTOMCAT-239 + // get the jar scanner to configure scanning directories as we can run a jar or a reactor project with a jar so + // the entries is a directory (target/classes) + JarScanner jarScanner = context.getJarScanner(); + + // normally this one only but just in case ... + if (jarScanner instanceof StandardJarScanner) + { + ((StandardJarScanner) jarScanner).setScanAllDirectories( true ); + } + return context; } 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=1534433&r1=1534432&r2=1534433&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 22 01:00:12 2013 @@ -225,6 +225,7 @@ public class RunMojo throws IOException, MojoExecutionException { WebappLoader loader = super.createWebappLoader(); + if ( useSeparateTomcatClassLoader ) { loader.setDelegate( delegate ); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org