bump version to 3.0-SNAPSHOT
git-svn-id: https://svn.apache.org/repos/asf/tomcat/maven-plugin/trunk@1756455 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/common-tomcat-maven-plugin/pom.xml b/common-tomcat-maven-plugin/pom.xml
index 1df21db..ddd6f94 100644
--- a/common-tomcat-maven-plugin/pom.xml
+++ b/common-tomcat-maven-plugin/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index 42fdb14..84a00bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/tomcat-maven-archetype/pom.xml b/tomcat-maven-archetype/pom.xml
index e9d8685..128680b 100644
--- a/tomcat-maven-archetype/pom.xml
+++ b/tomcat-maven-archetype/pom.xml
@@ -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>
diff --git a/tomcat-maven-plugin-it/pom.xml b/tomcat-maven-plugin-it/pom.xml
index fc5d9e7..7569339 100644
--- a/tomcat-maven-plugin-it/pom.xml
+++ b/tomcat-maven-plugin-it/pom.xml
@@ -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>
diff --git a/tomcat6-maven-plugin/pom.xml b/tomcat6-maven-plugin/pom.xml
index 18bebd1..2b84d41 100644
--- a/tomcat6-maven-plugin/pom.xml
+++ b/tomcat6-maven-plugin/pom.xml
@@ -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>
diff --git a/tomcat7-maven-plugin/pom.xml b/tomcat7-maven-plugin/pom.xml
index 17a7e02..8bf9d29 100644
--- a/tomcat7-maven-plugin/pom.xml
+++ b/tomcat7-maven-plugin/pom.xml
@@ -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>
diff --git a/tomcat7-war-runner/pom.xml b/tomcat7-war-runner/pom.xml
index cd81e8c..3ba1ac2 100644
--- a/tomcat7-war-runner/pom.xml
+++ b/tomcat7-war-runner/pom.xml
@@ -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>
diff --git a/tomcat8-maven-plugin/pom.xml b/tomcat8-maven-plugin/pom.xml
index 2505b81..5e75b27 100644
--- a/tomcat8-maven-plugin/pom.xml
+++ b/tomcat8-maven-plugin/pom.xml
@@ -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>
diff --git a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
index 80fff36..8da9f97 100644
--- a/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
+++ b/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
@@ -20,6 +20,7 @@
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 @@
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 @@
@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
diff --git a/tomcat8-war-runner/pom.xml b/tomcat8-war-runner/pom.xml
index 1621cdd..ca580c6 100644
--- a/tomcat8-war-runner/pom.xml
+++ b/tomcat8-war-runner/pom.xml
@@ -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>
