2014-10-01 9:31 GMT+04:00 <ol...@apache.org>: > Author: olamy > Date: Wed Oct 1 05:31:10 2014 > New Revision: 1628603 > > URL: http://svn.apache.org/r1628603 > Log: > bump version to 3.0-SNAPSHOT > > Modified: > tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml > tomcat/maven-plugin/branches/tc8.x/pom.xml > tomcat/maven-plugin/branches/tc8.x/tomcat-maven-archetype/pom.xml > tomcat/maven-plugin/branches/tc8.x/tomcat-maven-plugin-it/pom.xml > tomcat/maven-plugin/branches/tc8.x/tomcat6-maven-plugin/pom.xml > tomcat/maven-plugin/branches/tc8.x/tomcat7-maven-plugin/pom.xml > tomcat/maven-plugin/branches/tc8.x/tomcat7-war-runner/pom.xml > tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/pom.xml > > tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
A change to RunMojo.java has crawled in. It is unrelated to version bumps in pom.xml files. My concern is that it is a non-trivial change that is not mentioned in commit message. > tomcat/maven-plugin/branches/tc8.x/tomcat8-war-runner/pom.xml > > Modified: > tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml > URL: > http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml?rev=1628603&r1=1628602&r2=1628603&view=diff > ============================================================================== > --- tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml > (original) > +++ tomcat/maven-plugin/branches/tc8.x/common-tomcat-maven-plugin/pom.xml Wed > Oct 1 05:31:10 2014 > @@ -24,7 +24,7 @@ > <parent> > <artifactId>tomcat-maven-plugin</artifactId> > <groupId>org.apache.tomcat.maven</groupId> > - <version>2.3-SNAPSHOT</version> > + <version>3.0-SNAPSHOT</version> > </parent> > <artifactId>common-tomcat-maven-plugin</artifactId> > <name>Apache Tomcat Maven Plugin :: Common API</name> (...) > Modified: > tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java > URL: > http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1628603&r1=1628602&r2=1628603&view=diff > ============================================================================== > --- > tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java > (original) > +++ > tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java > Wed Oct 1 05:31:10 2014 > @@ -20,6 +20,7 @@ package org.apache.tomcat.maven.plugin.t > > import org.apache.catalina.Context; > import org.apache.catalina.WebResource; > +import org.apache.catalina.WebResourceRoot; > import org.apache.catalina.WebResourceSet; > import org.apache.catalina.loader.WebappLoader; > import org.apache.catalina.webresources.EmptyResource; > @@ -339,10 +340,13 @@ public class RunMojo > > getLog().debug( "classLoaderEntriesCalculator urls: " + urls ); > > - final URLClassLoader urlClassLoader = new URLClassLoader( > urls.toArray( new URL[urls.size()] ) ); > + final URLClassLoader urlClassLoader = new URLClassLoader( > urls.toArray( new URL[urls.size()] ), // > + > Thread.currentThread().getContextClassLoader() ); > > final ClassRealm pluginRealm = getTomcatClassLoader(); > > + final WebResourceRoot previous = context.getResources(); > + > context.setResources( > new MyDirContext( new File( > project.getBuild().getOutputDirectory() ).getAbsolutePath(), // > getPath(), // > @@ -351,6 +355,13 @@ public class RunMojo > @Override > public WebResource getClassLoaderResource( String path ) > { > + > + if (previous.getState().isAvailable()) > + { > + WebResource webResource = > previous.getClassLoaderResource( path ); > + log.debug( "foo" ); > + } > + > log.debug( "RunMojo#getClassLoaderResource: " + path > ); > URL url = urlClassLoader.getResource( > StringUtils.removeStart( path, "/" ) ); > // search in parent (plugin) classloader > --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
