svn commit: r1297073 - in /tomcat/maven-plugin/trunk: tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java

[olamy]

Author: olamy
Date: Mon Mar  5 14:32:53 2012
New Revision: 1297073

URL: http://svn.apache.org/viewvc?rev=1297073&view=rev
Log:
[MTOMCAT-122] add all plugin dependencies to the tomcat class loader

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

Modified: 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java?rev=1297073&r1=1297072&r2=1297073&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat6/AbstractRunMojo.java
 Mon Mar  5 14:32:53 2012
@@ -807,13 +807,12 @@ public abstract class AbstractRunMojo
             for ( @SuppressWarnings( "rawtypes" ) Iterator i = 
pluginArtifacts.iterator(); i.hasNext(); )
             {
                 Artifact pluginArtifact = (Artifact) i.next();
-                if ( "org.apache.tomcat".equals( pluginArtifact.getGroupId() ) 
)
+                // add all plugin artifacts see 
https://issues.apache.org/jira/browse/MTOMCAT-122
+                if ( pluginArtifact.getFile() != null )
                 {
-                    if ( pluginArtifact.getFile() != null )
-                    {
-                        root.addURL( pluginArtifact.getFile().toURI().toURL() 
);
-                    }
+                    root.addURL( pluginArtifact.getFile().toURI().toURL() );
                 }
+
             }
             tomcatRealm = root;
             return root;

Modified: 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL: 
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1297073&r1=1297072&r2=1297073&view=diff
==============================================================================
--- 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
 (original)
+++ 
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
 Mon Mar  5 14:32:53 2012
@@ -70,7 +70,7 @@ import java.util.Set;
  * @since 2.0
  */
 public abstract class AbstractRunMojo
-    extends AbstractTomcat7Mojo             
+    extends AbstractTomcat7Mojo
 {
 // ----------------------------------------------------------------------
     // Mojo Parameters
@@ -322,7 +322,6 @@ public abstract class AbstractRunMojo
      */
     protected boolean skip;
 
-
     // ----------------------------------------------------------------------
     // Fields
     // ----------------------------------------------------------------------
@@ -807,13 +806,12 @@ public abstract class AbstractRunMojo
             for ( @SuppressWarnings( "rawtypes" ) Iterator i = 
pluginArtifacts.iterator(); i.hasNext(); )
             {
                 Artifact pluginArtifact = (Artifact) i.next();
-                if ( "org.apache.tomcat".equals( pluginArtifact.getGroupId() ) 
)
+                // add all plugin artifacts see 
https://issues.apache.org/jira/browse/MTOMCAT-122
+                if ( pluginArtifact.getFile() != null )
                 {
-                    if ( pluginArtifact.getFile() != null )
-                    {
-                        root.addURL( pluginArtifact.getFile().toURI().toURL() 
);
-                    }
+                    root.addURL( pluginArtifact.getFile().toURI().toURL() );
                 }
+
             }
             tomcatRealm = root;
             return root;



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