You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2012/11/01 16:48:10 UTC
svn commit: r1404649 - in /cxf/branches/2.5.x-fixes/maven-plugins:
codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/
java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/
wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/
Author: dkulp
Date: Thu Nov 1 15:48:10 2012
New Revision: 1404649
URL: http://svn.apache.org/viewvc?rev=1404649&view=rev
Log:
Merged revisions 1404632 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1404632 | dkulp | 2012-11-01 11:15:04 -0400 (Thu, 01 Nov 2012) | 10 lines
Merged revisions 1404621 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1404621 | dkulp | 2012-11-01 10:52:20 -0400 (Thu, 01 Nov 2012) | 2 lines
[CXF-4550] Quote params to forked mojos
........
........
Modified:
cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
Modified: cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java?rev=1404649&r1=1404648&r2=1404649&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java (original)
+++ cxf/branches/2.5.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java Thu Nov 1 15:48:10 2012
@@ -450,7 +450,7 @@ public abstract class AbstractCodegenMoh
getLog().debug("Running code generation in fork mode with args " + Arrays.asList(args));
Commandline cmd = new Commandline();
- cmd.getShell().setQuotedArgumentsEnabled(false); // for JVM args
+ cmd.getShell().setQuotedArgumentsEnabled(true); // for JVM args
cmd.setWorkingDirectory(project.getBuild().getDirectory());
try {
cmd.setExecutable(getJavaExecutable().getAbsolutePath());
Modified: cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java?rev=1404649&r1=1404648&r2=1404649&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java (original)
+++ cxf/branches/2.5.x-fixes/maven-plugins/java2ws-plugin/src/main/java/org/apache/cxf/maven_plugin/Java2WSMojo.java Thu Nov 1 15:48:10 2012
@@ -371,7 +371,7 @@ public class Java2WSMojo extends Abstrac
getLog().info("Running java2ws in fork mode...");
Commandline cmd = new Commandline();
- cmd.getShell().setQuotedArgumentsEnabled(false); // for JVM args
+ cmd.getShell().setQuotedArgumentsEnabled(true); // for JVM args
cmd.setWorkingDirectory(project.getBuild().getDirectory());
try {
cmd.setExecutable(getJavaExecutable().getAbsolutePath());
@@ -443,4 +443,4 @@ public class Java2WSMojo extends Abstrac
return javaExe;
}
-}
\ No newline at end of file
+}
Modified: cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java?rev=1404649&r1=1404648&r2=1404649&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java (original)
+++ cxf/branches/2.5.x-fixes/maven-plugins/wadl2java-plugin/src/main/java/org/apache/cxf/maven_plugin/wadlto/AbstractCodeGeneratorMojo.java Thu Nov 1 15:48:10 2012
@@ -484,7 +484,7 @@ public abstract class AbstractCodeGenera
getLog().info("Running wsdl2java in fork mode...");
Commandline cmd = new Commandline();
- cmd.getShell().setQuotedArgumentsEnabled(false); // for JVM args
+ cmd.getShell().setQuotedArgumentsEnabled(true); // for JVM args
cmd.setWorkingDirectory(project.getBuild().getDirectory());
try {
cmd.setExecutable(getJavaExecutable().getAbsolutePath());