Author: olamy
Date: Tue Sep 23 05:00:15 2014
New Revision: 1626941
URL: http://svn.apache.org/r1626941
Log:
get classloader resources from reactor modules as well second part
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Modified:
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.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/AbstractRunMojo.java?rev=1626941&r1=1626940&r2=1626941&view=diff
==============================================================================
---
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Tue Sep 23 05:00:15 2014
@@ -806,8 +806,6 @@ public abstract class AbstractRunMojo
this.log = log;
}
-
-
@Override
public WebResource getResource( String path )
{
@@ -864,6 +862,8 @@ public abstract class AbstractRunMojo
log.debug( "MyDirContext#getResourcesInternal: " + path );
return super.getResourcesInternal( path, useClassLoaderResources );
}
+
+
}
/**
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=1626941&r1=1626940&r2=1626941&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
Tue Sep 23 05:00:15 2014
@@ -359,6 +359,16 @@ public class RunMojo
url = pluginRealm.getResource(
StringUtils.removeStart( path, "/" ) );
}
+ // try in reactors
+ List<WebResource> webResources =
findResourcesInDirectories( path, //
+
classLoaderEntriesCalculatorResult.getBuildDirectories() );
+
+ // so we return the first one
+ if ( !webResources.isEmpty() )
+ {
+ return webResources.get( 0 );
+ }
+
if ( url == null )
{
return new EmptyResource( this, getPath() );
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
