Author: dkulp
Date: Tue Jul 24 18:24:13 2012
New Revision: 1365205
URL: http://svn.apache.org/viewvc?rev=1365205&view=rev
Log:
Resolve merge issue
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=1365205&r1=1365204&r2=1365205&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 18:24:13 2012
@@ -368,7 +368,7 @@ public class WSDL2JavaMojo extends Abstr
for (WsdlOption wsdlOption : effectiveWsdlOptions) {
WsdlArtifact wsdlA = wsdlOption.getWsdlArtifact();
if (wsdlA == null) {
- return;
+ continue;
}
Artifact wsdlArtifact =
artifactFactory.createArtifact(wsdlA.getGroupId(), wsdlA.getArtifactId(),
wsdlA.getVersion(),
@@ -772,7 +772,6 @@ 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;
@@ -787,45 +786,6 @@ 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
}
}
}
