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

[olamy]

Author: olamy
Date: Thu Apr 12 10:31:35 2012
New Revision: 1325194

URL: http://svn.apache.org/viewvc?rev=1325194&view=rev
Log:
[MTOMCAT-136] Tomcat7-maven-plugin 2.0-beta1 and useSeparateTomcatClassloader 
fails with run goal

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

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=1325194&r1=1325193&r2=1325194&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
 Thu Apr 12 10:31:35 2012
@@ -363,6 +363,8 @@ public abstract class AbstractRunMojo
      */
     private ClassRealm tomcatRealm;
 
+    private ClassLoader originalClassLoaser;
+
     // ----------------------------------------------------------------------
     // Mojo Implementation
     // ----------------------------------------------------------------------
@@ -384,13 +386,12 @@ public abstract class AbstractRunMojo
             getLog().info( messagesProvider.getMessage( 
"AbstractRunMojo.nonWar" ) );
             return;
         }
-        ClassLoader originalClassLoaser = 
Thread.currentThread().getContextClassLoader();
+        if ( useSeparateTomcatClassLoader )
+        {
+            originalClassLoaser = 
Thread.currentThread().getContextClassLoader();
+        }
         try
         {
-            if ( useSeparateTomcatClassLoader )
-            {
-                Thread.currentThread().setContextClassLoader( 
getTomcatClassLoader() );
-            }
             getLog().info( messagesProvider.getMessage( 
"AbstractRunMojo.runningWar", getWebappUrl() ) );
 
             initConfiguration();
@@ -796,11 +797,6 @@ public abstract class AbstractRunMojo
 
                 embeddedTomcat.setConnector( connector );
 
-                if ( useSeparateTomcatClassLoader )
-                {
-                    embeddedTomcat.getEngine().setParentClassLoader( 
getTomcatClassLoader() );
-                }
-
                 AccessLogValve alv = new AccessLogValve();
                 alv.setDirectory( new File( configurationDir, "logs" 
).getAbsolutePath() );
                 alv.setPattern( "%h %l %u %t \"%r\" %s %b %I %D" );
@@ -840,14 +836,15 @@ public abstract class AbstractRunMojo
                     embeddedTomcat.getEngine().getService().addConnector( 
ajpConnector );
                 }
 
-                if ( useSeparateTomcatClassLoader )
+                if ( addContextWarDependencies )
                 {
-                    embeddedTomcat.getEngine().setParentClassLoader( 
getTomcatClassLoader() );
+                    createDependencyContexts( embeddedTomcat );
                 }
 
-                if ( addContextWarDependencies )
+                if ( useSeparateTomcatClassLoader )
                 {
-                    createDependencyContexts( embeddedTomcat );
+                    Thread.currentThread().setContextClassLoader( 
getTomcatClassLoader() );
+                    embeddedTomcat.getEngine().setParentClassLoader( 
getTomcatClassLoader() );
                 }
 
                 embeddedTomcat.start();



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