Index: hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/maven/MavenInhabitantsGenerator.java
===================================================================
--- hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/maven/MavenInhabitantsGenerator.java (revision 3941)
+++ hk2-inhabitant-generator/src/main/java/org/jvnet/hk2/generator/maven/MavenInhabitantsGenerator.java (working copy)
@@ -39,35 +39,42 @@
*/
package org.jvnet.hk2.generator.maven;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
import java.util.LinkedList;
-
+import java.util.List;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
import org.jvnet.hk2.generator.HabitatGenerator;
/**
* Calls the generator with maven
*
* @goal generateInhabitants
- * @phase process-classes
+ * @phase process-classes
+ * @requiresDependencyResolution test
*/
public class MavenInhabitantsGenerator extends AbstractMojo {
/**
+ * The maven project.
+ *
+ * @parameter expression="${project}" @required @readonly
+ */
+ protected MavenProject project;
+
+ /**
* @parameter expression="${project.build.outputDirectory}"
*/
- private String outputDirectory;
+ private File outputDirectory;
/**
* @parameter expression="${project.build.testOutputDirectory}"
*/
- private String testOutputDirectory;
+ private File testOutputDirectory;
/**
* @parameter
@@ -87,36 +94,37 @@
/**
* @parameter
*/
- private String classpath;
+ private boolean noswap;
/**
- * @parameter
+ * @parameter expression="${supportedProjectTypes}" default-value="jar"
*/
- private boolean noswap;
-
+ private String supportedProjectTypes;
+
/**
* This method will compile the inhabitants file based on
* the classes just compiled
*/
+ @Override
public void execute() throws MojoFailureException {
- File output;
- if (!test) {
- output = new File(outputDirectory);
+ List<String> projectTypes = Arrays.asList(supportedProjectTypes.split(","));
+ if(!projectTypes.contains(project.getPackaging())){
+ return;
}
- else {
- output = new File(testOutputDirectory);
- }
+ File output = (test)? testOutputDirectory : outputDirectory;
+ output.mkdirs();
+
if (!output.exists()) {
- if (verbose) {
- System.out.println("Exiting hk2-inhabitant-generator because could not find output directory " +
+ getLog().info("Exiting hk2-inhabitant-generator because could not find output directory " +
output.getAbsolutePath());
- }
return;
}
if (verbose) {
- System.out.println("hk2-inhabitant-generator generating into location " + output.getAbsolutePath());
+ getLog().info("");
+ getLog().info("hk2-inhabitant-generator generating into location " + output.getAbsolutePath());
+ getLog().info("");
}
LinkedList<String> arguments = new LinkedList<String>();
@@ -133,15 +141,8 @@
arguments.add(locator);
}
- if (classpath != null) {
- String classpathValue = getClasspathFromFile();
- if (classpathValue == null) {
- throw new MojoFailureException("Found the file, but it did not contain a line with the classpath");
- }
-
- arguments.add(HabitatGenerator.SEARCHPATH_ARG);
- arguments.add(classpathValue);
- }
+ arguments.add(HabitatGenerator.SEARCHPATH_ARG);
+ arguments.add(getBuildClasspath());
if (noswap) {
arguments.add(HabitatGenerator.NOSWAP_ARG);
@@ -157,35 +158,34 @@
}
}
- private String getClasspathFromFile() throws MojoFailureException {
- File classpathFile = new File(classpath);
- if (!classpathFile.exists() || classpathFile.isDirectory() || !classpathFile.canRead()) {
- throw new MojoFailureException("Could not find or read file " + classpathFile.getAbsolutePath());
- }
+ private String getBuildClasspath() {
+ StringBuilder sb = new StringBuilder();
+ // Make sure to add in the directory that has been built
+ if (test) {
+ sb.append(outputDirectory.getAbsolutePath());
+ sb.append(File.pathSeparator);
+ }
- try {
- InputStream is = new FileInputStream(classpathFile);
- Reader reader = new InputStreamReader(is);
- BufferedReader bis = new BufferedReader(reader);
-
- String line = bis.readLine();
-
- bis.close();
- reader.close();
- is.close();
-
- if (test) {
- File buildDirectoryFile = new File(outputDirectory);
-
- // Make sure to add in the directory that has been built
- return buildDirectoryFile.getAbsolutePath() + File.pathSeparator + line;
+ List<Artifact> artList = new ArrayList<Artifact>(project.getArtifacts());
+ Iterator<Artifact> i = artList.iterator();
+
+ if (i.hasNext()) {
+ sb.append(i.next().getFile().getPath());
+
+ while (i.hasNext()) {
+ sb.append(File.pathSeparator);
+ sb.append(i.next().getFile().getPath());
}
-
- return line;
}
- catch (IOException ioe) {
- throw new MojoFailureException(ioe.getMessage());
+
+ String classpath = sb.toString();
+ if(verbose){
+ getLog().info("");
+ getLog().info("-- Classpath --");
+ getLog().info("");
+ getLog().info(classpath);
+ getLog().info("");
}
-
- }
+ return classpath;
+ }
}
Index: hk2-inhabitant-generator/pom.xml
===================================================================
--- hk2-inhabitant-generator/pom.xml (revision 3941)
+++ hk2-inhabitant-generator/pom.xml (working copy)
@@ -103,5 +103,11 @@
<version>3.3.0-v20070604</version>
</dependency>
-->
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>3.0-alpha-2</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
Index: config-generator/src/java/org/jvnet/hk2/config/generator/maven/ConfigGeneratorPlugin.java
===================================================================
--- config-generator/src/java/org/jvnet/hk2/config/generator/maven/ConfigGeneratorPlugin.java (revision 3941)
+++ config-generator/src/java/org/jvnet/hk2/config/generator/maven/ConfigGeneratorPlugin.java (working copy)
@@ -39,168 +39,121 @@
*/
package org.jvnet.hk2.config.generator.maven;
-import java.io.BufferedReader;
+import com.sun.tools.apt.Main;
import java.io.File;
-import java.io.FileFilter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.LinkedList;
-
+import java.util.*;
+import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.FileUtils;
import org.jvnet.hk2.config.generator.AnnotationProcessorFactoryImpl;
-import com.sun.tools.apt.Main;
-
/**
* @author jwells
*
* @goal generateInjectors
- * @phase generate-sources
+ * @phase generate-sources
+ * @requiresDependencyResolution test
*/
public class ConfigGeneratorPlugin extends AbstractMojo {
- private final static String GENERATED_SOURCES = "generated-sources";
- private final static String APT_GENERATED = "hk2-config-generator";
- private final static String SRC_NAME = "src";
+ private final static String GENERATED_SOURCES = "generated-sources/hk2-config-generator/src";
private final static String MAIN_NAME = "main";
private final static String TEST_NAME = "test";
private final static String JAVA_NAME = "java";
-
+
/**
- * @parameter expression="${basedir}"
+ * The maven project.
+ *
+ * @parameter expression="${project}" @required @readonly
*/
- private String basedir;
+ protected MavenProject project;
/**
* @parameter expression="${project.build.directory}"
*/
- private String buildDirectory;
+ private File buildDirectory;
/**
+ * @parameter expression="${project.build.sourceDirectory}"
+ */
+ private File sourceDirectory;
+
+ /**
+ * @parameter expression="${project.build.testSourceDirectory}"
+ */
+ private File testSourceDirectory;
+
+ /**
* @parameter expression="${project.build.outputDirectory}"
*/
- private String outputDirectory;
+ private File outputDirectory;
/**
* @parameter
*/
- private String classpath;
+ private boolean test;
/**
* @parameter
*/
- private boolean test;
+ private boolean verbose;
- private void getAllJavaFiles(File directory, final LinkedList<String> foundFiles) {
- File allJavaFiles[] = directory.listFiles(new FileFilter() {
-
- @Override
- public boolean accept(File name) {
- if (name.isDirectory()) {
- getAllJavaFiles(name, foundFiles);
- return false;
- }
-
- if (name.getName().endsWith(".java")) {
- return true;
- }
-
- return false;
- }
-
- });
-
- for (File aJavaFile : allJavaFiles) {
- foundFiles.add(aJavaFile.getAbsolutePath());
- }
-
- }
+ /**
+ * @parameter expression="${supportedProjectTypes}" default-value="jar"
+ */
+ private String supportedProjectTypes;
- private boolean getAllSources(LinkedList<String> args) throws MojoFailureException {
- File dotMe = new File(basedir);
- File src = new File(dotMe, SRC_NAME);
- File main = (test) ? new File(src, TEST_NAME) : new File(src, MAIN_NAME);
- File java = new File(main, JAVA_NAME);
-
- if (!java.exists() && !java.isDirectory()) {
- return false;
+ /* (non-Javadoc)
+ * @see org.apache.maven.plugin.Mojo#execute()
+ */
+ private void internalExecute() throws Throwable {
+ List<String> projectTypes = Arrays.asList(supportedProjectTypes.split(","));
+ File srcDir = (test) ? testSourceDirectory : sourceDirectory;
+ if(!projectTypes.contains(project.getPackaging())
+ || !srcDir.exists()
+ || !srcDir.isDirectory()){
+ return;
}
- getAllJavaFiles(java, args);
-
- return true;
- }
-
- private String getClasspathFromFile() throws MojoFailureException {
- File classpathFile = new File(classpath);
- if (!classpathFile.exists() || classpathFile.isDirectory() || !classpathFile.canRead()) {
- throw new MojoFailureException("Could not find or read file " + classpathFile.getAbsolutePath());
- }
-
- try {
- InputStream is = new FileInputStream(classpathFile);
- Reader reader = new InputStreamReader(is);
- BufferedReader bis = new BufferedReader(reader);
-
- String line = bis.readLine();
-
- bis.close();
- reader.close();
- is.close();
-
- if (test) {
- File outputDirectoryFile = new File(outputDirectory);
-
- // Make sure to add in the directory that has been built
- return outputDirectoryFile.getAbsolutePath() + File.pathSeparator + line;
- }
-
- return line;
- }
- catch (IOException ioe) {
- throw new MojoFailureException(ioe.getMessage());
- }
-
- }
-
- private void generateMinusSOption(LinkedList<String> args) {
- File buildDirectoryFile = new File(buildDirectory);
- File generatedSources = new File(buildDirectoryFile, GENERATED_SOURCES);
- File aptGeneratedFile = new File(generatedSources, APT_GENERATED);
- File srcGeneratedFile = new File(aptGeneratedFile, SRC_NAME);
- File phaseGeneratedFile = (test) ? new File(srcGeneratedFile, TEST_NAME) : new File(srcGeneratedFile, MAIN_NAME);
+ // prepare the generated source directory
+ File generatedSources = new File(buildDirectory, GENERATED_SOURCES);
+ File phaseGeneratedFile = (test) ? new File(generatedSources, TEST_NAME) : new File(generatedSources, MAIN_NAME);
File javaGeneratedFile = new File(phaseGeneratedFile, JAVA_NAME);
+ javaGeneratedFile.mkdirs();
- aptGeneratedFile.mkdirs();
-
+ // prepare command line arguments
+ LinkedList<String> args = new LinkedList<String>();
+ args.add("-nocompile");
args.add("-s");
args.add(javaGeneratedFile.getAbsolutePath());
- }
-
- private void generateMinusCPOption(LinkedList<String> args) throws MojoFailureException {
- if (classpath == null) throw new MojoFailureException("classpath argument may not be null");
args.add("-cp");
- args.add(getClasspathFromFile());
- }
-
- /* (non-Javadoc)
- * @see org.apache.maven.plugin.Mojo#execute()
- */
- private void internalExecute() throws Throwable {
- LinkedList<String> args = new LinkedList<String>();
+ args.add(getBuildClasspath());
+ args.addAll(FileUtils.getFileNames(srcDir, "**/*.java", "",true));
- args.add("-nocompile");
-
- generateMinusSOption(args);
- generateMinusCPOption(args);
- if (!getAllSources(args)) return; // No src/main/java
-
String[] cmdLine = args.toArray(new String[args.size()]);
+ if(verbose){
+ getLog().info("");
+ getLog().info("-- Apt Command Line --");
+ getLog().info("");
+ getLog().info(Arrays.toString(cmdLine));
+ getLog().info("");
+ }
Main.process(new AnnotationProcessorFactoryImpl(), cmdLine);
+
+ // make the generated source directory visible for compilation
+ if(test){
+ project.addTestCompileSourceRoot(javaGeneratedFile.getAbsolutePath());
+ if (getLog().isInfoEnabled()) {
+ getLog().info("Test Source directory: " + javaGeneratedFile + " added.");
+ }
+ } else {
+ project.addCompileSourceRoot(javaGeneratedFile.getAbsolutePath());
+ if (getLog().isInfoEnabled()) {
+ getLog().info("Source directory: " + javaGeneratedFile + " added.");
+ }
+ }
}
/* (non-Javadoc)
@@ -222,7 +175,7 @@
Throwable cause = th;
int lcv = 0;
while (cause != null) {
- System.out.println("Exception from hk2-config-generator[" + lcv++ + "]=" + cause.getMessage());
+ getLog().error("Exception from hk2-config-generator[" + lcv++ + "]=" + cause.getMessage());
cause.printStackTrace();
cause = cause.getCause();
@@ -231,5 +184,35 @@
throw new MojoExecutionException(th.getMessage(), th);
}
}
+
+ private String getBuildClasspath() {
+ StringBuilder sb = new StringBuilder();
+ // Make sure to add in the directory that has been built
+ if (test) {
+ sb.append(outputDirectory.getAbsolutePath());
+ sb.append(File.pathSeparator);
+ }
+
+ List<Artifact> artList = new ArrayList<Artifact>(project.getArtifacts());
+ Iterator<Artifact> i = artList.iterator();
+
+ if (i.hasNext()) {
+ sb.append(i.next().getFile().getPath());
+ while (i.hasNext()) {
+ sb.append(File.pathSeparator);
+ sb.append(i.next().getFile().getPath());
+ }
+ }
+
+ String classpath = sb.toString();
+ if(verbose){
+ getLog().info("");
+ getLog().info("-- Classpath --");
+ getLog().info("");
+ getLog().info(classpath);
+ getLog().info("");
+ }
+ return classpath;
+ }
}
Index: config-generator/pom.xml
===================================================================
--- config-generator/pom.xml (revision 3941)
+++ config-generator/pom.xml (working copy)
@@ -80,6 +80,12 @@
<artifactId>maven-plugin-api</artifactId>
<version>2.0.4</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>3.0-alpha-2</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
<profiles>