You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/03/26 22:05:28 UTC
svn commit: r641576 - in
/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder:
MakeComponentsMojo.java MakeConfigMojo.java
Author: skitching
Date: Wed Mar 26 14:05:26 2008
New Revision: 641576
URL: http://svn.apache.org/viewvc?rev=641576&view=rev
Log:
Minor tidyups only
Modified:
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java?rev=641576&r1=641575&r2=641576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeComponentsMojo.java Wed Mar 26 14:05:26 2008
@@ -20,8 +20,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.PrintStream;
-import java.util.Iterator;
import java.util.logging.Logger;
import org.apache.maven.plugin.AbstractMojo;
@@ -29,10 +27,10 @@
import org.apache.maven.project.MavenProject;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.ComponentMeta;
import org.apache.myfaces.buildtools.maven2.plugin.builder.model.Model;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.model.PropertyMeta;
-import org.apache.myfaces.buildtools.maven2.plugin.builder.qdox.QdoxModelBuilder;
/**
+ * Maven goal to generate java source code for Component classes.
+ *
* @version $Id$
* @requiresDependencyResolution compile
* @goal make-components
@@ -43,6 +41,66 @@
final Logger log = Logger.getLogger(MakeComponentsMojo.class.getName());
/**
+ * Injected Maven project.
+ *
+ * @parameter expression="${project}"
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * @parameter expression="${project.build.directory}"
+ * @readonly
+ */
+ private File buildDirectory;
+
+ /**
+ * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
+ *
+ * @parameter
+ */
+ private String metadataFile = "classes/META-INF/myfaces-metadata.xml";
+
+ /**
+ * @parameter expression="src/main/java-templates"
+ * @required
+ */
+ private File templateSourceDirectory;
+
+ /**
+ * @parameter expression="${project.build.directory}/maven-faces-plugin/main/java"
+ * @required
+ */
+ private File generatedSourceDirectory;
+
+ /**
+ * @parameter
+ * @required
+ */
+ private String packageContains;
+
+ /**
+ * @parameter
+ * @required
+ */
+ private String typePrefix;
+
+ /**
+ * @parameter
+ */
+ private boolean force;
+
+ /**
+ * @parameter
+ */
+ private boolean suppressListenerMethods;
+
+ /**
+ * @parameter
+ */
+ private String jsfVersion;
+
+ /**
* Execute the Mojo.
*/
public void execute() throws MojoExecutionException
@@ -51,10 +109,10 @@
// getProject().addCompileSourceRoot( absoluteGeneratedPath.getPath() );
try
{
-
- Model artifacts = scanSource(project);
- dumpModel(artifacts);
- generateComponents(artifacts);
+ Model model = IOUtils.loadModel(new File(buildDirectory,
+ metadataFile));
+ model.flatten();
+ generateComponents(model);
}
catch (IOException e)
{
@@ -63,49 +121,9 @@
}
/**
- * Scan the source tree for annotations. Sets
- */
- private Model scanSource(MavenProject project)
- throws MojoExecutionException
- {
- Model model = new Model();
- QdoxModelBuilder builder = new QdoxModelBuilder();
- builder.buildModel(model, project);
- return model;
- }
-
- private void dumpModel(Model artifacts)
- {
- System.out.println("--dumping artifacts--");
- Iterator components = artifacts.components();
- while (components.hasNext())
- {
- dumpComponent((ComponentMeta) components.next());
- }
- System.out.println("--dumped artifacts--");
- }
-
- private void dumpComponent(ComponentMeta c)
- {
- PrintStream out = System.out;
- out.println("==Component");
- out.println("class:" + c.getClassName());
- out.println("type:" + c.getType());
- Iterator p = c.properties();
- while (p.hasNext())
- {
- PropertyMeta prop = (PropertyMeta) p.next();
- out.println("prop:" + prop.getName());
- out.println(" class:" + prop.getClassName());
- out.println(" isLiteral:" + prop.isLiteralOnly());
- out.println(" desc:" + prop.getDescription());
- }
- }
-
- /**
* Generates parsed components.
*/
- private void generateComponents(Model artifacts) throws IOException,
+ private void generateComponents(Model model) throws IOException,
MojoExecutionException
{
throw new MojoExecutionException("stopping..");
@@ -251,48 +269,4 @@
return "1.2".equals(jsfVersion) || "12".equals(jsfVersion);
}
- /**
- * @parameter expression="${project}"
- * @readonly
- */
- private MavenProject project;
-
- /**
- * @parameter expression="src/main/java-templates"
- * @required
- */
- private File templateSourceDirectory;
-
- /**
- * @parameter expression="${project.build.directory}/maven-faces-plugin/main/java"
- * @required
- */
- private File generatedSourceDirectory;
-
- /**
- * @parameter
- * @required
- */
- private String packageContains;
-
- /**
- * @parameter
- * @required
- */
- private String typePrefix;
-
- /**
- * @parameter
- */
- private boolean force;
-
- /**
- * @parameter
- */
- private boolean suppressListenerMethods;
-
- /**
- * @parameter
- */
- private String jsfVersion;
}
Modified: myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java?rev=641576&r1=641575&r2=641576&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java (original)
+++ myfaces/myfaces-build-tools/branches/skitching/myfaces-builder-plugin/src/main/java/org/apache/myfaces/buildtools/maven2/plugin/builder/MakeConfigMojo.java Wed Mar 26 14:05:26 2008
@@ -58,7 +58,7 @@
* @parameter expression="${project.build.directory}"
* @readonly
*/
- private File targetDirectory;
+ private File buildDirectory;
/**
* The directory for compiled classes.
@@ -70,6 +70,8 @@
private File outputDirectory;
/**
+ * Injected name of file generated by earlier run of BuildMetaDataMojo goal.
+ *
* @parameter
*/
private String metadataFile = "classes/META-INF/myfaces-metadata.xml";
@@ -104,7 +106,7 @@
{
try
{
- Model model = IOUtils.loadModel(new File(targetDirectory,
+ Model model = IOUtils.loadModel(new File(buildDirectory,
metadataFile));
model.flatten();
generateConfig(model);
@@ -127,7 +129,7 @@
MojoExecutionException
{
- File targetFile = new File(targetDirectory, facesConfigFile);
+ File targetFile = new File(buildDirectory, facesConfigFile);
try
{