Index: maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java
===================================================================
--- maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java (Revision 751561)
+++ maven-xbean-plugin/src/main/java/org/apache/xbean/maven/XBeanMojo.java (Arbeitskopie)
@@ -16,6 +16,7 @@
*/
package org.apache.xbean.maven;
+
import java.beans.PropertyEditorManager;
import java.io.File;
import java.net.MalformedURLException;
@@ -23,7 +24,6 @@
import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
@@ -38,17 +38,15 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
-import org.apache.tools.ant.BuildException;
-import org.apache.xbean.spring.generator.DocumentationGenerator;
import org.apache.xbean.spring.generator.GeneratorPlugin;
import org.apache.xbean.spring.generator.LogFacade;
import org.apache.xbean.spring.generator.MappingLoader;
import org.apache.xbean.spring.generator.NamespaceMapping;
import org.apache.xbean.spring.generator.QdoxMappingLoader;
-import org.apache.xbean.spring.generator.WikiDocumentationGenerator;
import org.apache.xbean.spring.generator.XmlMetadataGenerator;
import org.apache.xbean.spring.generator.XsdGenerator;
+
/**
* @author Guillaume Nodet
* @version $Id: GenerateApplicationXmlMojo.java 314956 2005-10-12 16:27:15Z brett $
@@ -57,10 +55,12 @@
* @phase generate-sources
* @requiresDependencyResolution compile
*/
-public class XBeanMojo extends AbstractMojo implements LogFacade {
+public class XBeanMojo extends AbstractMojo implements LogFacade
+{
/**
- * @parameter expression="${project}"
+ * @parameter default-value="${project}
+ * @read-only
* @required
*/
private MavenProject project;
@@ -73,13 +73,14 @@
protected MavenProjectHelper projectHelper;
/**
- * @parameter
+ * @parameter expression="${namespace}"
* @required
*/
private String namespace;
/**
- * @parameter expression="${basedir}/src/main/java"
+ * @parameter default-value="${project.build.sourceDirectory}"
+ * @read-only
* @required
*/
private File srcDir;
@@ -90,170 +91,215 @@
private String excludedClasses;
/**
- * @parameter expression="${basedir}/target/xbean/"
+ * @parameter default-value="${project.build.directory}/xbean"
* @required
*/
- private File outputDir;
+ private File outputDirectory;
/**
- * @parameter
+ * @parameter default-value="${project.artifactId}.xsd"
*/
- private File schema;
+ private String schema;
/**
- * @parameter expression="org.apache.xbean.spring.context.impl"
+ * @parameter default-value="org.apache.xbean.spring.context.impl"
*/
private String propertyEditorPaths;
/**
- * @parameter schemaAsArtifact
+ * @parameter default-value="true"
*/
- private boolean schemaAsArtifact = true;
-
+ private boolean schemaAsArtifact;
+
/**
- * @parameter
+ * @parameter default-value="true"
*/
- private boolean generateSpringSchemasFile = true;
+ private boolean generateSpringSchemasFile;
/**
- * @parameter
+ * @parameter default-value="true"
*/
- private boolean generateSpringHandlersFile = true;
-
+ private boolean generateSpringHandlersFile;
+
/**
* A list of additional GeneratorPlugins that should get used executed
- * when generating output.
+ * when generating output, separated by comma.
*
- * @parameter
+ * @parameter default-value="org.apache.xbean.spring.generator.DocumentationGenerator,org.apache.xbean.spring.generator.WikiDocumentationGenerator,org.apache.xbean.spring.generator.XmlGenerator"
*/
- private List generatorPlugins = Collections.emptyList();
+ private String generatorPlugins;
- public void execute() throws MojoExecutionException, MojoFailureException {
+
+ public void execute() throws MojoExecutionException, MojoFailureException
+ {
+
+ if ( schema == null )
+ {
+ schema = project.getArtifactId() + ".xsd";
+ }
+
+ final File schemaFile = new File( outputDirectory, schema );
+
getLog().debug( " ======= XBeanMojo settings =======" );
getLog().debug( "namespace[" + namespace + "]" );
getLog().debug( "srcDir[" + srcDir + "]" );
- getLog().debug( "schema[" + schema + "]" );
- getLog().debug( "excludedClasses[" + excludedClasses + "]");
- getLog().debug( "outputDir[" + outputDir + "]" );
+ getLog().debug( "schema[" + schemaFile + "]" );
+ getLog().debug( "excludedClasses[" + excludedClasses + "]" );
+ getLog().debug( "outputDir[" + outputDirectory + "]" );
getLog().debug( "propertyEditorPaths[" + propertyEditorPaths + "]" );
- getLog().debug( "schemaAsArtifact[" + schemaAsArtifact + "]");
- getLog().debug( "generateSpringSchemasFile[" + generateSpringSchemasFile + "]");
- getLog().debug( "generateSpringHandlersFile[" + generateSpringHandlersFile + "]");
-
- if (schema == null) {
- schema = new File(outputDir, project.getArtifactId() + ".xsd");
- }
+ getLog().debug( "schemaAsArtifact[" + schemaAsArtifact + "]" );
+ getLog().debug( "generateSpringSchemasFile[" + generateSpringSchemasFile + "]" );
+ getLog().debug( "generateSpringHandlersFile[" + generateSpringHandlersFile + "]" );
- if (propertyEditorPaths != null) {
- List editorSearchPath = new LinkedList(Arrays.asList(PropertyEditorManager.getEditorSearchPath()));
- for (StringTokenizer paths = new StringTokenizer(propertyEditorPaths, " ,"); paths.hasMoreElements(); ) {
+ if ( propertyEditorPaths != null )
+ {
+ List editorSearchPath = new LinkedList( Arrays.asList( PropertyEditorManager
+ .getEditorSearchPath() ) );
+ for ( StringTokenizer paths = new StringTokenizer( propertyEditorPaths, " ," ); paths.hasMoreElements(); )
+ {
//StringTokenizer implements Enumeration