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 2010/01/11 18:11:07 UTC
svn commit: r897952 - in /cxf/branches/2.2.x-fixes: ./
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/
maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/
maven-plugins/codegen-plugin/src/test/resources/
Author: dkulp
Date: Mon Jan 11 17:11:07 2010
New Revision: 897952
URL: http://svn.apache.org/viewvc?rev=897952&view=rev
Log:
Merged revisions 897596 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r897596 | cschneider | 2010-01-10 02:49:39 -0500 (Sun, 10 Jan 2010) | 1 line
CXF-2611 Removed generating temporary file generation to add wsdlLocation to binding as an empty wsdlLocation has the same effect
........
Removed:
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/BindingFileHelper.java
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/java/org/apache/cxf/maven_plugin/
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/resources/bindingWithWsdlLocation.xml
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/test/resources/bindingWithoutWsdlLocation.xml
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=897952&r1=897951&r2=897952&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java (original)
+++ cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java Mon Jan 11 17:11:07 2010
@@ -51,7 +51,6 @@
* @requiresDependencyResolution test
*/
public class WSDL2JavaMojo extends AbstractMojo {
- private static final String TEMPBINDINGS_DIR = "tempbindings";
/**
* @parameter expression="${cxf.testSourceRoot}"
@@ -261,12 +260,12 @@
}
mergeOptions(effectiveWsdlOptions);
downloadRemoteWsdls(effectiveWsdlOptions);
- String buildDir = project.getBuild().getDirectory();
- File tempBindingDir = new File(buildDir, TEMPBINDINGS_DIR);
- for (WsdlOption o : effectiveWsdlOptions) {
- BindingFileHelper.setWsdlLocationInBindingsIfNotSet(project.getBasedir(), tempBindingDir, o,
- getLog());
- }
+// String buildDir = project.getBuild().getDirectory();
+// File tempBindingDir = new File(buildDir, TEMPBINDINGS_DIR);
+// for (WsdlOption o : effectiveWsdlOptions) {
+// BindingFileHelper.setWsdlLocationInBindingsIfNotSet(project.getBasedir(), tempBindingDir, o,
+// getLog());
+// }
return effectiveWsdlOptions;
}