Author: dkulp
Date: Thu Jun 12 20:22:33 2008
New Revision: 667322
URL: http://svn.apache.org/viewvc?rev=667322&view=rev
Log:
Try to fix build failures on windows
Modified:
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Modified:
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=667322&r1=667321&r2=667322&view=diff
==============================================================================
---
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
(original)
+++
cxf/trunk/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Thu Jun 12 20:22:33 2008
@@ -85,8 +85,14 @@
String[] args = getArguments(xsdOptions[x], outputDir);
String xsdLocation = xsdOptions[x].getXsd();
+ File xsdFile = new File(xsdLocation);
URI basedir = project.getBasedir().toURI();
- URI xsdURI = basedir.resolve(xsdLocation);
+ URI xsdURI;
+ if (xsdFile.exists()) {
+ xsdURI = xsdFile.toURI();
+ } else {
+ xsdURI = basedir.resolve(xsdLocation);
+ }
String doneFileName = xsdURI.toString();
if (doneFileName.startsWith(basedir.toString())) {
Modified:
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=667322&r1=667321&r2=667322&view=diff
==============================================================================
---
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
(original)
+++
cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Thu Jun 12 20:22:33 2008
@@ -264,8 +264,14 @@
String wsdlLocation = wsdlOption.getWsdl();
+ File wsdlFile = new File(wsdlLocation);
URI basedir = project.getBasedir().toURI();
- URI wsdlURI = basedir.resolve(wsdlLocation);
+ URI wsdlURI;
+ if (wsdlFile.exists()) {
+ wsdlURI = wsdlFile.toURI();
+ } else {
+ wsdlURI = basedir.resolve(wsdlLocation);
+ }
String doneFileName = wsdlURI.toString();
if (doneFileName.startsWith(basedir.toString())) {
