svn commit: r1618790 - in /tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src: main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ test/java/org/apache/tomcat/maven/it/

[olamy]

Author: olamy
Date: Tue Aug 19 03:39:37 2014
New Revision: 1618790

URL: http://svn.apache.org/r1618790
Log:
Fix: MTOMCAT-234

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/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
    
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.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=1618790&r1=1618789&r2=1618790&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 Aug 19 03:39:37 2014
@@ -800,12 +800,6 @@ public abstract class AbstractRunMojo
         }
 
         @Override
-        public String[] list( String path )
-        {
-            return super.list( path );
-        }
-
-        @Override
         public WebResource getResource( String path )
         {
             File file = new File( path );
@@ -817,23 +811,6 @@ public abstract class AbstractRunMojo
             return webResource;
         }
 
-        @Override
-        public WebResource getClassLoaderResource( String path )
-        {
-            if ( this.webResourceSet != null )
-            {
-                WebResource webResource = this.webResourceSet.getResource( 
path );
-                return webResource;
-            }
-
-            return super.getClassLoaderResource( path );
-        }
-
-        @Override
-        public void addJarResources( WebResourceSet webResourceSet )
-        {
-            this.webResourceSet = webResourceSet;
-        }
     }
 
     /**

Modified: 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java?rev=1618790&r1=1618789&r2=1618790&view=diff
==============================================================================
--- 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
 (original)
+++ 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8RunMultiConfigIT.java
 Tue Aug 19 03:39:37 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.maven.it;
  */
 
 import org.apache.maven.it.VerificationException;
-import org.apache.tomcat.maven.it.AbstractTomcatRunMultiConfigIT;
 
 /**
  * @author Olivier Lamy
@@ -31,8 +30,8 @@ public class Tomcat8RunMultiConfigIT
     protected void verifyConnectorsStarted()
         throws VerificationException
     {
-        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-" 
+ getHttpItPort() + "\"]");
-        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-" 
+ getHttpsItPort() + "\"]");
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-" 
+ getHttpItPort() + "\"]");
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-" 
+ getHttpsItPort() + "\"]");
         verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"ajp-bio-" 
+ getAjpItPort() + "\"]");
     }
 }

Modified: 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java?rev=1618790&r1=1618789&r2=1618790&view=diff
==============================================================================
--- 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
 (original)
+++ 
tomcat/maven-plugin/branches/tc8.x/tomcat8-maven-plugin/src/test/java/org/apache/tomcat/maven/it/Tomcat8SimpleWarProjectIT.java
 Tue Aug 19 03:39:37 2014
@@ -19,7 +19,6 @@ package org.apache.tomcat.maven.it;
  */
 
 import org.apache.maven.it.VerificationException;
-import org.apache.tomcat.maven.it.AbstractSimpleWarProjectIT;
 
 /**
  * @author Olivier Lamy
@@ -36,7 +35,7 @@ public class Tomcat8SimpleWarProjectIT
     protected void verifyConnectorsStarted()
         throws VerificationException
     {
-        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-bio-" 
+ getHttpItPort() + "\"]");
+        verifier.verifyTextInLog("INFO: Starting ProtocolHandler [\"http-nio-" 
+ getHttpItPort() + "\"]");
 
         verifier.verifyTextInLog( "INFO: Starting ProtocolHandler 
[\"ajp-bio-"+ getAjpItPort() +"\"]" );
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org