tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1756451 - in /tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run: AbstractRunMojo.java RunMojo.java
Date Tue, 16 Aug 2016 01:05:15 GMT
Author: olamy
Date: Tue Aug 16 01:05:15 2016
New Revision: 1756451

URL: http://svn.apache.org/viewvc?rev=1756451&view=rev
Log:
get classloader resources from reactor modules as well second part

Modified:
    tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
    tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java

Modified: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java?rev=1756451&r1=1756450&r2=1756451&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
(original)
+++ tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Tue Aug 16 01:05:15 2016
@@ -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/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=1756451&r1=1756450&r2=1756451&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:05:15 2016
@@ -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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message