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 2009/09/02 16:11:01 UTC
svn commit: r810510 - in /cxf/branches/2.2.x-fixes: ./
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/WSDL2JavaMojo.java
Author: dkulp
Date: Wed Sep 2 14:11:00 2009
New Revision: 810510
URL: http://svn.apache.org/viewvc?rev=810510&view=rev
Log:
Merged revisions 810376 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r810376 | cschneider | 2009-09-02 02:45:04 -0400 (Wed, 02 Sep 2009) | 1 line
Refactored for better readability
........
Added:
cxf/branches/2.2.x-fixes/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
- copied unchanged from r810376, cxf/trunk/maven-plugins/codegen-plugin/src/main/java/org/apache/cxf/maven_plugin/ClassLoaderSwitcher.java
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/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 2 14:11:00 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387,789420,789527-789530,789704-789705,789788,789811,789896-789901,790074,790094,790134,790188,790294,790553,790637-790644,790868,791301,791354,791538,791753,791947,792007,792096,792183,792261-792265,792271,792604,792683-792685,792975,792985,793059,793570,794297,794396,794680,794728,794771,794778-794780,794892,795044,795104,795160,795583,795907,796022-796023,796352,796593,796741,796780,796994-796997,797117,797159,797192,797194,797231-797233,797442,797505,797517,797534,797581-797583,797587,797640,797651,797699,797882-797883,798344-798346,798363,798461,798479,798533,798551,798557,798561-798562,798570,798573,79858
4,798654,798748-798749,798816,798891,798929-798930,799245,799267,799439,799448,799637,799723-799724,799792,800453,800497-800498,801380-801381,801447,801962,802892,803056,803129,803174,803419,803460,803493,803689,804002,804175,804276,805784,805907,805909,806020-806021,806023,806405-806406,806576,806602-806604,806620,806627,806631,806633,806638,806687,806876,806922,806979-806982,807181,807205,807295,807748,807807,808035,808069,808085,808107,808464,808488,808731,808885,808925,809082-809083,809162,809190,809417-809626,809631,809663,809706,809738,809962,810090,810143,810349,810376
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=810510&r1=810509&r2=810510&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 Wed Sep 2 14:11:00 2009
@@ -20,22 +20,15 @@
package org.apache.cxf.maven_plugin;
import java.io.File;
-import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
-import org.apache.cxf.helpers.CastUtils;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.wsdlto.WSDLToJava;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.project.MavenProject;
@@ -45,7 +38,7 @@
* @phase generate-sources
* @description CXF WSDL To Java Tool
* @requiresDependencyResolution test
-*/
+ */
public class WSDL2JavaMojo extends AbstractMojo {
/**
* @parameter expression="${cxf.testSourceRoot}"
@@ -53,8 +46,10 @@
File testSourceRoot;
/**
- * @parameter expression="${cxf.sourceRoot}"
- * default-value="${project.build.directory}/generated-sources/cxf"
+ * Path where the generated sources should be placed
+ *
+ * @parameter expression="${cxf.sourceRoot}"
+ * default-value="${project.build.directory}/generated-sources/cxf"
* @required
*/
File sourceRoot;
@@ -73,6 +68,7 @@
/**
* Default options to be used when a wsdl has not had it's options explicitly specified.
+ *
* @parameter
*/
Option defaultOptions;
@@ -86,40 +82,53 @@
* @parameter expression="${cxf.wsdlRoot}" default-value="${basedir}/src/main/resources/wsdl"
*/
File wsdlRoot;
-
+
/**
* @parameter expression="${cxf.testWsdlRoot}" default-value="${basedir}/src/test/resources/wsdl"
*/
File testWsdlRoot;
-
+
/**
- * Directory in which the "DONE" markers are saved that
- * @parameter expression="${cxf.markerDirectory}"
+ * Directory in which the "DONE" markers are saved that
+ *
+ * @parameter expression="${cxf.markerDirectory}"
* default-value="${project.build.directory}/cxf-codegen-plugin-markers"
*/
File markerDirectory;
/**
- * Use the compile classpath rather than the test classpath for execution
- * useful if the test dependencies clash with those of wsdl2java
+ * Use the compile classpath rather than the test classpath for execution useful if the test dependencies
+ * clash with those of wsdl2java
+ *
* @parameter expression="${cxf.useCompileClasspath}" default-value="false"
*/
boolean useCompileClasspath;
-
+
/**
- * A list of wsdl files to include. Can contain ant-style wildcards and double wildcards.
- * Defaults to *.wsdl
+ * A list of wsdl files to include. Can contain ant-style wildcards and double wildcards. Defaults to
+ * *.wsdl
+ *
* @parameter
*/
String includes[];
+
/**
- * A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
+ * A list of wsdl files to exclude. Can contain ant-style wildcards and double wildcards.
+ *
* @parameter
*/
String excludes[];
-
- private List<WsdlOption> getWsdlOptionsFromDir(final File root,
- final File output)
+
+ /**
+ * Create WsdlOption objects for each wsdl file found in the root dir. includes, excludes filter which
+ * files are considered. The defaultOptions will be applied.
+ *
+ * @param root Base directory to search
+ * @param output
+ * @return
+ * @throws MojoExecutionException
+ */
+ private List<WsdlOption> getWsdlOptionsFromDir(final File root, final File output)
throws MojoExecutionException {
List<WsdlOption> options = new ArrayList<WsdlOption>();
for (WsdlOption o : new WsdlOptionLoader().load(root, includes, excludes, defaultOptions)) {
@@ -132,128 +141,107 @@
}
return options;
}
-
- private void mergeOptions(List<WsdlOption> options) {
+
+ /**
+ * Try to find a file matching the given wsdlPath (either absolutely, relatively to the current dir or to
+ * the project base dir)
+ *
+ * @param wsdlPath
+ * @return wsdl file
+ */
+ private File getFileFromWsdlPath(String wsdlPath) {
+ File file = null;
+ try {
+ URI uri = new URI(wsdlPath);
+ if (uri.isAbsolute()) {
+ file = new File(uri);
+ }
+ } catch (Exception e) {
+ // ignore
+ }
+ if (file == null || !file.exists()) {
+ file = new File(wsdlPath);
+ }
+ if (!file.exists()) {
+ file = new File(project.getBasedir(), wsdlPath);
+ }
+ return file;
+ }
+
+ /**
+ * Merge WsdlOptions that point to the same file by adding the extraargs to the first option and deleting
+ * the second from the options list
+ *
+ * @param options
+ */
+ private void mergeOptions(List<WsdlOption> effectiveWsdlOptions, WsdlOption[] explicitWsdlOptions) {
File outputDirFile = testSourceRoot == null ? sourceRoot : testSourceRoot;
- for (WsdlOption o : wsdlOptions) {
+ for (WsdlOption o : explicitWsdlOptions) {
if (o.getOutputDir() == null) {
o.setOutputDir(outputDirFile);
}
-
- File file = new File(o.getWsdl());
- if (!file.exists()) {
- file = new File(project.getBasedir(), o.getWsdl());
- }
+
+ File file = getFileFromWsdlPath(o.getWsdl());
if (file.exists()) {
file = file.getAbsoluteFile();
- for (WsdlOption o2 : options) {
- File file2 = null;
- try {
- URI uri = new URI(o2.getWsdl());
- if (uri.isAbsolute()) {
- file2 = new File(uri);
- }
- } catch (Exception e) {
- //ignore
- }
- if (file2 == null || !file2.exists()) {
- file2 = new File(o2.getWsdl());
- }
- if (file2 == null || !file2.exists()) {
- file2 = new File(project.getBasedir(), o2.getWsdl());
- }
- if (file2.exists()
- && file2.getAbsoluteFile().equals(file)) {
+ for (WsdlOption o2 : effectiveWsdlOptions) {
+ File file2 = getFileFromWsdlPath(o2.getWsdl());
+ if (file2.exists() && file2.getAbsoluteFile().equals(file)) {
o.getExtraargs().addAll(0, o2.getExtraargs());
- options.remove(o2);
+ effectiveWsdlOptions.remove(o2);
break;
}
}
}
- options.add(0, o);
- }
+ effectiveWsdlOptions.add(0, o);
+ }
}
-
- public void execute() throws MojoExecutionException {
- if (includes == null) {
- includes = new String[] {"*.wsdl"};
- }
-
- File classesDir = new File(classesDirectory);
- classesDir.mkdirs();
- markerDirectory.mkdirs();
-
- List<WsdlOption> options = new ArrayList<WsdlOption>();
+
+ /**
+ * @return effective WsdlOptions
+ * @throws MojoExecutionException
+ */
+ private WsdlOption[] createWsdlOptionsFromWsdlFilesAndExplicitWsdlOptions()
+ throws MojoExecutionException {
+ List<WsdlOption> effectiveWsdlOptions = new ArrayList<WsdlOption>();
if (wsdlRoot != null && wsdlRoot.exists()) {
- options.addAll(getWsdlOptionsFromDir(wsdlRoot, sourceRoot));
+ effectiveWsdlOptions.addAll(getWsdlOptionsFromDir(wsdlRoot, sourceRoot));
}
if (testWsdlRoot != null && testWsdlRoot.exists()) {
- options.addAll(getWsdlOptionsFromDir(testWsdlRoot, testSourceRoot));
+ effectiveWsdlOptions.addAll(getWsdlOptionsFromDir(testWsdlRoot, testSourceRoot));
}
if (wsdlOptions != null) {
- mergeOptions(options);
+ mergeOptions(effectiveWsdlOptions, wsdlOptions);
}
- wsdlOptions = options.toArray(new WsdlOption[options.size()]);
+ return effectiveWsdlOptions.toArray(new WsdlOption[effectiveWsdlOptions.size()]);
+ }
- if (wsdlOptions.length == 0) {
- getLog().info("Nothing to generate");
- return;
+ public void execute() throws MojoExecutionException {
+ if (includes == null) {
+ includes = new String[] {
+ "*.wsdl"
+ };
}
- List<URL> urlList = new ArrayList<URL>();
- StringBuffer buf = new StringBuffer();
+ File classesDir = new File(classesDirectory);
+ classesDir.mkdirs();
+ markerDirectory.mkdirs();
- try {
- urlList.add(classesDir.toURI().toURL());
- if (!useCompileClasspath) {
- urlList.add(new File(project.getBuild().getOutputDirectory()).toURI().toURL());
- }
- } catch (MalformedURLException e) {
- //ignore
- }
-
- buf.append(classesDir.getAbsolutePath());
- buf.append(File.pathSeparatorChar);
- if (!useCompileClasspath) {
- buf.append(project.getBuild().getOutputDirectory());
- buf.append(File.pathSeparatorChar);
- }
- List artifacts = useCompileClasspath ? project.getCompileArtifacts() : project.getTestArtifacts();
- for (Artifact a : CastUtils.cast(artifacts, Artifact.class)) {
- try {
- if (a.getFile() != null
- && a.getFile().exists()) {
- urlList.add(a.getFile().toURI().toURL());
- buf.append(a.getFile().getAbsolutePath());
- buf.append(File.pathSeparatorChar);
- //System.out.println(" " + a.getFile().getAbsolutePath());
- }
- } catch (MalformedURLException e) {
- //ignore
- }
+ WsdlOption[] effectiveWsdlOptions = createWsdlOptionsFromWsdlFilesAndExplicitWsdlOptions();
+
+ if (effectiveWsdlOptions.length == 0) {
+ getLog().info("Nothing to generate");
+ return;
}
-
- ClassLoader origContext = Thread.currentThread().getContextClassLoader();
- URLClassLoader loader = new URLClassLoader(urlList.toArray(new URL[urlList.size()]),
- origContext);
- String newCp = buf.toString();
-
- getLog().debug("Classpath: " + urlList.toString());
-
- //with some VM's, creating an XML parser (which we will do to parse wsdls)
- //will set some system properties that then interferes with mavens
- //dependency resolution. (OSX is the major culprit here)
- //We'll save the props and then set them back later.
- Map<Object, Object> origProps = new HashMap<Object, Object>(System.getProperties());
-
- String cp = System.getProperty("java.class.path");
+
+ ClassLoaderSwitcher classLoaderSwitcher = new ClassLoaderSwitcher(getLog());
boolean result = true;
-
+
try {
- Thread.currentThread().setContextClassLoader(loader);
- System.setProperty("java.class.path", newCp);
- for (WsdlOption o : wsdlOptions) {
+ classLoaderSwitcher.switchClassLoader(project, useCompileClasspath, classesDir);
+
+ for (WsdlOption o : effectiveWsdlOptions) {
processWsdl(o);
File dirs[] = o.getDeleteDirs();
@@ -261,24 +249,15 @@
for (int idx = 0; idx < dirs.length; ++idx) {
result = result && deleteDir(dirs[idx]);
}
- }
+ }
}
} finally {
- //cleanup as much as we can.
+ // cleanup as much as we can.
Bus bus = BusFactory.getDefaultBus(false);
if (bus != null) {
bus.shutdown(true);
}
- Thread.currentThread().setContextClassLoader(origContext);
- System.setProperty("java.class.path", cp);
-
- Map<Object, Object> newProps = new HashMap<Object, Object>(System.getProperties());
- for (Object o : newProps.keySet()) {
- if (!origProps.containsKey(o)) {
- System.clearProperty(o.toString());
- }
- }
- System.getProperties().putAll(origProps);
+ classLoaderSwitcher.restoreClassLoader();
org.apache.cxf.tools.wsdlto.core.PluginLoader.unload();
}
if (project != null && sourceRoot != null && sourceRoot.exists()) {
@@ -292,11 +271,10 @@
}
private void processWsdl(WsdlOption wsdlOption) throws MojoExecutionException {
-
+
File outputDirFile = wsdlOption.getOutputDir();
outputDirFile.mkdirs();
-
-
+
String wsdlLocation = wsdlOption.getWsdl();
File wsdlFile = new File(wsdlLocation);
URI basedir = project.getBasedir().toURI();
@@ -306,7 +284,7 @@
} else {
wsdlURI = basedir.resolve(wsdlLocation);
}
-
+
String doneFileName = wsdlURI.toString();
if (doneFileName.startsWith(basedir.toString())) {
doneFileName = doneFileName.substring(basedir.toString().length());
@@ -314,13 +292,12 @@
// If URL to WSDL, replace ? and & since they're invalid chars for file names
// Not to mention slashes.
-
- doneFileName = doneFileName.replace('?', '_')
- .replace('&', '_').replace('/', '_').replace('\\', '_').replace(':', '_');
-
- File doneFile =
- new File(markerDirectory, "." + doneFileName + ".DONE");
-
+
+ doneFileName = doneFileName.replace('?', '_').replace('&', '_').replace('/', '_').replace('\\', '_')
+ .replace(':', '_');
+
+ File doneFile = new File(markerDirectory, "." + doneFileName + ".DONE");
+
long timestamp = 0;
if ("file".equals(wsdlURI.getScheme())) {
timestamp = new File(wsdlURI).lastModified();
@@ -328,10 +305,10 @@
try {
timestamp = wsdlURI.toURL().openConnection().getDate();
} catch (Exception e) {
- //ignore
+ // ignore
}
}
-
+
boolean doWork = false;
if (!doneFile.exists()) {
doWork = true;
@@ -389,7 +366,7 @@
}
}
- // -d specify the dir for generated source code
+ // -d specify the dir for generated source code
list.add("-d");
list.add(outputDirFile.toString());
@@ -438,7 +415,7 @@
list.add("-dns");
list.add(wsdlOption.getDefaultNamespacePackageMapping().toString());
}
- if (wsdlOption.getServiceName() != null) {
+ if (wsdlOption.getServiceName() != null) {
list.add("-sn");
list.add(wsdlOption.getServiceName());
}
@@ -454,7 +431,7 @@
Object value = it.next();
if (value == null) {
value = ""; // Maven makes empty tags into null
- // instead of empty strings.
+ // instead of empty strings.
}
list.add(value.toString());
}
@@ -467,7 +444,7 @@
list.add("-wsdlList");
}
if (getLog().isDebugEnabled() && !list.contains("-verbose")) {
- list.add("-verbose");
+ list.add("-verbose");
}
list.add(wsdlURI.toString());
return list;