cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r667323 - in /cxf/branches/2.0.x-fixes: ./ common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Date Fri, 13 Jun 2008 03:24:03 GMT
Author: dkulp
Date: Thu Jun 12 20:24:03 2008
New Revision: 667323

URL: http://svn.apache.org/viewvc?rev=667323&view=rev
Log:
Merged revisions 667322 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r667322 | dkulp | 2008-06-12 23:22:33 -0400 (Thu, 12 Jun 2008) | 2 lines
  
  Try to fix build failures on windows 
........

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
    cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java?rev=667323&r1=667322&r2=667323&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
(original)
+++ cxf/branches/2.0.x-fixes/common/xsd/src/main/java/org/apache/cxf/maven_plugin/XSDToJavaMojo.java
Thu Jun 12 20:24:03 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/branches/2.0.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.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=667323&r1=667322&r2=667323&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
(original)
+++ cxf/branches/2.0.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Thu Jun 12 20:24:03 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())) {



Mime
View raw message