You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/14 17:00:41 UTC
svn commit: r1617966 -
/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Author: rmannibucau
Date: Thu Aug 14 15:00:41 2014
New Revision: 1617966
URL: http://svn.apache.org/r1617966
Log:
if a context is specified we don't want the first /
Modified:
tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
Modified: tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java?rev=1617966&r1=1617965&r2=1617966&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java (original)
+++ tomee/tomee/trunk/maven/tomee-maven-plugin/src/main/java/org/apache/openejb/maven/plugin/AbstractTomEEMojo.java Thu Aug 14 15:00:41 2014
@@ -911,6 +911,9 @@ public abstract class AbstractTomEEMojo
if (docBases != null && !docBases.isEmpty()) {
if ("war".equals(packaging)) {
appName = destinationName().replace(".war", "");
+ if (appName.startsWith("/")) {
+ appName = appName.substring(1);
+ }
strings.add("-Dtomee." + appName + ".docBases=" + filesToString(docBases));
} else {
getLog().warn("docBases parameter only valid for a war");
@@ -920,6 +923,9 @@ public abstract class AbstractTomEEMojo
if (externalRepositories != null && !externalRepositories.isEmpty()) {
if ("war".equals(packaging)) {
appName = appName == null ? destinationName().replace(".war", "") : appName;
+ if (appName.startsWith("/")) {
+ appName = appName.substring(1);
+ }
strings.add("-Dtomee." + appName + ".externalRepositories=" + filesToString(externalRepositories));
} else {
getLog().warn("externalRepositories parameter only valid for a war");