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

[olamy]

Author: olamy
Date: Mon Apr 16 19:33:33 2012
New Revision: 1326764

URL: http://svn.apache.org/viewvc?rev=1326764&view=rev
Log:
[MTOMCAT-142] fix context file using / path

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=1326764&r1=1326763&r2=1326764&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 Apr 16 19:33:33 2012
@@ -466,8 +466,6 @@ public abstract class AbstractRunMojo
     {
         String contextPath = getPath();
 
-        contextPath = "/".equals( contextPath ) ? "" : contextPath;
-
         String baseDir = getDocBase().getAbsolutePath();
 
         File overridedContextFile = getContextFile();
@@ -486,6 +484,8 @@ public abstract class AbstractRunMojo
             }
         }
 
+        contextPath = "/".equals( contextPath ) ? "" : contextPath;
+
         Context context = container.addWebapp( contextPath, baseDir );
 
         context.setResources(



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