From d0917f2399c20464f6140582fdea49dfa827833f Mon Sep 17 00:00:00 2001 From: Paul McCulloch Date: Thu, 20 Nov 2014 13:43:52 +0000 Subject: [PATCH] Fix CAMEL-8065 --- .../apache/camel/maven/AbstractApiMethodGeneratorMojo.java | 7 ++++--- .../org/apache/camel/maven/ApiComponentGeneratorMojo.java | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java index d11d894f91195..cdbbc38c3837d 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractApiMethodGeneratorMojo.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.TreeMap; import java.util.regex.Pattern; +import java.util.regex.Matcher; import org.apache.camel.util.component.ApiMethodParser; import org.apache.camel.util.component.ArgumentSubstitutionParser; @@ -111,7 +112,7 @@ private VelocityContext getApiMethodContext(List public File getApiMethodFile() throws MojoExecutionException { final StringBuilder fileName = new StringBuilder(); - fileName.append(outPackage.replaceAll("\\.", File.separator)).append(File.separator); + fileName.append(outPackage.replaceAll("\\.", Matcher.quoteReplacement(File.separator))).append(File.separator); fileName.append(getEnumName()).append(".java"); return new File(generatedSrcDir, fileName.toString()); } @@ -133,7 +134,7 @@ private VelocityContext getApiTestContext(List m private String getTestFilePath() throws MojoExecutionException { final StringBuilder fileName = new StringBuilder(); - fileName.append(componentPackage.replaceAll("\\.", File.separator)).append(File.separator); + fileName.append(componentPackage.replaceAll("\\.", Matcher.quoteReplacement(File.separator))).append(File.separator); fileName.append(getUnitTestName()).append(".java"); return fileName.toString(); } @@ -195,7 +196,7 @@ private VelocityContext getEndpointContext(List private File getConfigurationFile() throws MojoExecutionException { final StringBuilder fileName = new StringBuilder(); // endpoint configuration goes in component package - fileName.append(componentPackage.replaceAll("\\.", File.separator)).append(File.separator); + fileName.append(componentPackage.replaceAll("\\.", Matcher.quoteReplacement(File.separator))).append(File.separator); fileName.append(getConfigName()).append(".java"); return new File(generatedSrcDir, fileName.toString()); } diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/ApiComponentGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/ApiComponentGeneratorMojo.java index 3008be84a7f54..960dc5993be5c 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/ApiComponentGeneratorMojo.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/ApiComponentGeneratorMojo.java @@ -19,6 +19,7 @@ import java.io.File; import java.util.Collections; import java.util.List; +import java.util.regex.Matcher; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -225,7 +226,7 @@ private File getApiNameFile() { private StringBuilder getFileBuilder() { final StringBuilder fileName = new StringBuilder(); - fileName.append(outPackage.replaceAll("\\.", File.separator)).append(File.separator); + fileName.append(outPackage.replaceAll("\\.", Matcher.quoteReplacement(File.separator))).append(File.separator); return fileName; }