Author: olamy
Date: Fri Jan 13 09:39:47 2012
New Revision: 1230968
URL: http://svn.apache.org/viewvc?rev=1230968&view=rev
Log:
fix a FIXME :-)
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-exec/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-exec/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-exec/pom.xml?rev=1230968&r1=1230967&r2=1230968&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-exec/pom.xml
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/basic-webapp-exec/pom.xml
Fri Jan 13 09:39:47 2012
@@ -45,7 +45,6 @@
</goals>
<phase>package</phase>
<configuration>
- <path>/</path>
<warRunDependencies>
<warRunDependency>
<dependency>
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java?rev=1230968&r1=1230967&r2=1230968&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractExecWarMojo.java
Fri Jan 13 09:39:47 2012
@@ -335,15 +335,16 @@ public abstract class AbstractExecWarMoj
IOUtils.copy( new FileInputStream( warFile ), os );
os.closeArchiveEntry();
String propertyWarValue = properties.getProperty(
Tomcat7Runner.WARS_KEY );
- // FIXME check contextPath is not empty or at least
only / for root app
+ String contextPath =
+ StringUtils.isEmpty( warRunDependency.contextPath
) ? "/" : warRunDependency.contextPath;
if ( propertyWarValue != null )
{
properties.put( Tomcat7Runner.WARS_KEY,
- propertyWarValue + ";" +
warFileName + "|" + warRunDependency.contextPath );
+ propertyWarValue + ";" +
warFileName + "|" + contextPath );
}
else
{
- properties.put( Tomcat7Runner.WARS_KEY,
warFileName + "|" + warRunDependency.contextPath );
+ properties.put( Tomcat7Runner.WARS_KEY,
warFileName + "|" + contextPath );
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
