Author: olamy
Date: Tue Aug 16 01:06:55 2016
New Revision: 1756455
URL: http://svn.apache.org/viewvc?rev=1756455&view=rev
Log:
bump version to 3.0-SNAPSHOT
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
tomcat/maven-plugin/trunk/tomcat8-war-runner/pom.xml
Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Tue Aug 16
01:06:55 2016
@@ -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/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Aug 16 01:06:55 2016
@@ -32,7 +32,7 @@
<artifactId>tomcat-maven-plugin</artifactId>
<packaging>pom</packaging>
<name>Apache Tomcat Maven Plugin</name>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<description>The Tomcat Maven Plugin provides goals to manipulate WAR
projects within the Tomcat servlet
container.
</description>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-archetype/pom.xml Tue Aug 16
01:06:55 2016
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/pom.xml Tue Aug 16
01:06:55 2016
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Tue Aug 16 01:06:55
2016
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat-maven-plugin</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Tue Aug 16 01:06:55
2016
@@ -23,7 +23,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>tomcat7-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Modified: tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-war-runner/pom.xml Tue Aug 16 01:06:55
2016
@@ -23,10 +23,10 @@
<parent>
<artifactId>tomcat-maven-plugin</artifactId>
<groupId>org.apache.tomcat.maven</groupId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>tomcat7-war-runner</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<name>Apache Tomcat Maven Plugin :: Tomcat 7.x War Runner</name>
<dependencies>
Modified: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat8-maven-plugin/pom.xml Tue Aug 16 01:06:55
2016
@@ -23,7 +23,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>tomcat8-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Tue Aug 16 01:06:55 2016
@@ -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
Modified: tomcat/maven-plugin/trunk/tomcat8-war-runner/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-war-runner/pom.xml?rev=1756455&r1=1756454&r2=1756455&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-war-runner/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat8-war-runner/pom.xml Tue Aug 16 01:06:55
2016
@@ -23,10 +23,10 @@
<parent>
<artifactId>tomcat-maven-plugin</artifactId>
<groupId>org.apache.tomcat.maven</groupId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
</parent>
<artifactId>tomcat8-war-runner</artifactId>
- <version>2.3-SNAPSHOT</version>
+ <version>3.0-SNAPSHOT</version>
<name>Apache Tomcat Maven Plugin :: Tomcat 8.x War Runner</name>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
