From dc29fabf542812f84df03581a5f20b747794edf6 Mon Sep 17 00:00:00 2001 From: Olivier Roger Date: Mon, 8 Dec 2014 15:04:45 +0100 Subject: [PATCH 1/2] Fix for parallel deployment --- .../tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java index 929242fd..f9c7bfe1 100644 --- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java +++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java @@ -635,7 +635,12 @@ public void execute() */ protected String getPath() { - return path; + String versionSeparator = "##"; + if (path.contains(versionSeparator)) { + return path.substring(0, path.indexOf(versionSeparator)); + } else { + return path; + } } /** From f4a0b01ecb0a92385eaf86a2dc4fa8ade41e6daf Mon Sep 17 00:00:00 2001 From: Olivier Roger Date: Tue, 9 Dec 2014 12:01:22 +0100 Subject: [PATCH 2/2] Use version separator token --- .../maven/plugin/tomcat7/run/AbstractRunMojo.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java index f9c7bfe1..64f146ec 100644 --- a/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java +++ b/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java @@ -636,11 +636,11 @@ public void execute() protected String getPath() { String versionSeparator = "##"; - if (path.contains(versionSeparator)) { - return path.substring(0, path.indexOf(versionSeparator)); - } else { - return path; - } + if (path.contains(versionSeparator)) { + return path.substring(0, path.indexOf(versionSeparator)); + } else { + return path; + } } /**