Author: dkulp Date: Tue Jul 24 17:20:12 2012 New Revision: 1365180 URL: http://svn.apache.org/viewvc?rev=1365180&view=rev Log: Merged revisions 1365178 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1365178 | dkulp | 2012-07-24 13:19:07 -0400 (Tue, 24 Jul 2012) | 19 lines Merged revisions 1365176 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1365176 | dkulp | 2012-07-24 13:16:33 -0400 (Tue, 24 Jul 2012) | 11 lines Merged revisions 1365174 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1365174 | dkulp | 2012-07-24 13:12:31 -0400 (Tue, 24 Jul 2012) | 3 lines [CXF-4388] Wsdl options from artifacts only works if the artifact versions are the first options in the list. ........ ........ ........ Modified: cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java Modified: cxf/branches/2.4.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.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java?rev=1365180&r1=1365179&r2=1365180&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java (original) +++ cxf/branches/2.4.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java Tue Jul 24 17:20:12 2012 @@ -772,6 +772,7 @@ public class WSDL2JavaMojo extends Abstr // ignore } } +<<<<<<< HEAD:maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java boolean doWork = false; if (!doneFile.exists()) { doWork = true; @@ -786,6 +787,45 @@ public class WSDL2JavaMojo extends Abstr if (files[z].lastModified() > doneFile.lastModified()) { doWork = true; } +======= + if (file == null || !file.exists()) { + file = new File(option.getUri()); + } + if (!file.exists()) { + file = new File(baseDir, option.getUri()); + } + return file; + } + + public URI getWsdlURI(GenericWsdlOption option, URI baseURI) throws MojoExecutionException { + String wsdlLocation = option.getUri(); + if (wsdlLocation == null) { + throw new MojoExecutionException("No wsdl available for base URI " + baseURI); + } + File wsdlFile = new File(wsdlLocation); + return wsdlFile.exists() ? wsdlFile.toURI() + : baseURI.resolve(URIParserUtil.escapeChars(wsdlLocation)); + } + + protected void downloadRemoteWsdls(List<GenericWsdlOption> effectiveWsdlOptions) + throws MojoExecutionException { + + for (GenericWsdlOption wsdlOption : effectiveWsdlOptions) { + WsdlArtifact wsdlA = wsdlOption.getArtifact(); + if (wsdlA == null) { + continue; + } + Artifact wsdlArtifact = artifactFactory.createBuildArtifact(wsdlA.getGroupId(), + wsdlA.getArtifactId(), + wsdlA.getVersion(), wsdlA.getType()); + wsdlArtifact = resolveRemoteWsdlArtifact(wsdlArtifact); + if (wsdlArtifact != null) { + File supposedFile = wsdlArtifact.getFile(); + if (!supposedFile.exists() || !supposedFile.isFile()) { + getLog().info("Apparent Maven bug: wsdl artifact 'resolved' to " + + supposedFile.getAbsolutePath() + " for " + wsdlArtifact.toString()); + continue; +>>>>>>> 646689a... Merged revisions 1365176 via git cherry-pick from:maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/AbstractCodegenMoho.java } } }
