Commit [4101e5] Maximize Restore History

Clarified operation names on ChoiceMakerConfiguration interface.

Added a new operation, getCluemakerSourceRoot(), and renamed an
existing operation, getSourceCodeRoot, to getGeneratedSourceRoot().
Modified stuff in the core, compiler and mymojo-plugin* projects.

In the mymojo-plugin* projects, renamed package org.apache.maven.plugin.my
to com.choicemaker.fake. Removed MyMojo stuff and kept MyMojo2 stuff.
Simplified and reduced test resources.

The integration tests are still writing build products
to source directories, but that should be fixed with
the next commit.

com.choicemaker.cm.compiler
src/com/choicemaker/cm/compiler/gen/
GeneratorImpl.java
src/com/choicemaker/cm/compiler/util/
ProductionModelsJarBuilder.java

com.choicemaker.cm.core
src/com/choicemaker/cm/core/configure/
ChoiceMakerConfiguration.java
ConfigurationManager.java
InstalledConfiguration.java
ListBackedConfiguration.java

src/com/choicemaker/cm/core/xmlconf/
EmbeddedXmlConfigurator.java
XmlConfigurator.java

mymojo-plugin-it
pom.xml

src/test/java
com/choicemaker/fake/
SmokeTest.java

src/test/resources/smoke-test
pom.xml

mymojo-plugin
pom.xml

src/main/java/
Renamed package org.apache.maven.plugin.my. ==> com.choicemaker.fake.

mymojo-plugin
src/main/java
Removed org/apache/maven/plugin/my/MyMojo.java
src/test/java
org.apache.maven.plugin.my. ==> com.choicemaker.fake.
Removed MyMojoTest.java
src/test/resources
A bunch of changes

rphall rphall 2014-07-09

1 2 3 4 > >> (Page 1 of 4)
removed 2.7.x/misc/mymojo-plugin/src/main/java/org
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MojoConfigurationUtils.java
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MojoConfigurator.java
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MyMojo.java
removed 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MyMojo2.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.compiler/src/com/choicemaker/cm/compiler/gen/GeneratorImpl.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.compiler/src/com/choicemaker/cm/compiler/util/ProductionModelsJarBuilder.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/ChoiceMakerConfiguration.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/ConfigurationManager.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/InstalledConfiguration.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/ListBackedConfiguration.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/xmlconf/EmbeddedXmlConfigurator.java
changed 2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/xmlconf/XmlConfigurator.java
changed 2.7.x/misc/mymojo-plugin-it/src/test/java/com/choicemaker/fake/SmokeTest.java
changed 2.7.x/misc/mymojo-plugin-it/src/test/resources/smoke-test/pom.xml
changed 2.7.x/misc/mymojo-plugin-it/pom.xml
copied 2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MojoConfiguration.java -> 2.7.x/misc/mymojo-plugin/src/main/java/com/choicemaker/fake/MojoConfiguration.java
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.compiler/src/com/choicemaker/cm/compiler/gen/GeneratorImpl.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.compiler/src/com/choicemaker/cm/compiler/util/ProductionModelsJarBuilder.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/ChoiceMakerConfiguration.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/ConfigurationManager.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/InstalledConfiguration.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/configure/ListBackedConfiguration.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/xmlconf/EmbeddedXmlConfigurator.java Diff Switch to side-by-side view
Loading...
2.7.x/choicemaker-cm/choicemaker-common/com.choicemaker.cm.core/src/com/choicemaker/cm/core/xmlconf/XmlConfigurator.java Diff Switch to side-by-side view
Loading...
2.7.x/misc/mymojo-plugin-it/src/test/java/com/choicemaker/fake/SmokeTest.java Diff Switch to side-by-side view
Loading...
2.7.x/misc/mymojo-plugin-it/src/test/resources/smoke-test/pom.xml Diff Switch to side-by-side view
Loading...
2.7.x/misc/mymojo-plugin-it/pom.xml Diff Switch to side-by-side view
Loading...
2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MojoConfiguration.java to 2.7.x/misc/mymojo-plugin/src/main/java/com/choicemaker/fake/MojoConfiguration.java
--- a/2.7.x/misc/mymojo-plugin/src/main/java/org/apache/maven/plugin/my/MojoConfiguration.java
+++ b/2.7.x/misc/mymojo-plugin/src/main/java/com/choicemaker/fake/MojoConfiguration.java
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.my;
+package com.choicemaker.fake;
 
 import java.io.File;
 import java.util.List;
@@ -17,28 +17,33 @@
 public class MojoConfiguration implements ChoiceMakerConfiguration {
 
 	// private final MavenProject project;
-	private final File sourceDirectory;
-	private final File targetDirectory;
+	private final File cluemakerDirectory;
+	private final File generatedSourceDirectory;
+	private final File compiledCodeDirectory;
 	private final List<Artifact> artifacts;
-	
+
 	private String classpath;
 
-	public MojoConfiguration(MavenProject p, File srcDir, File outDir, List<Artifact> a) {
+	public MojoConfiguration(MavenProject p, File cluemakerDir, File generatedSrcDir, File compiledCodeDir, List<Artifact> a) {
 //		if (p == null) {
 //			throw new IllegalArgumentException("null maven project");
 //		}
-		if (srcDir == null) {
-			throw new IllegalArgumentException("null source directory");
+		if (cluemakerDir == null) {
+			throw new IllegalArgumentException("null ClueMaker directory");
 		}
-		if (outDir == null) {
-			throw new IllegalArgumentException("null target directory");
+		if (generatedSrcDir == null) {
+			throw new IllegalArgumentException("null generated-source directory");
+		}
+		if (compiledCodeDir == null) {
+			throw new IllegalArgumentException("null compiled-code directory");
 		}
 		if (a == null) {
 			throw new IllegalArgumentException("null artifact list");
 		}
 //		this.project = p;
-		this.sourceDirectory = srcDir;
-		this.targetDirectory = outDir;
+		this.cluemakerDirectory = cluemakerDir;
+		this.generatedSourceDirectory = generatedSrcDir;
+		this.compiledCodeDirectory = compiledCodeDir;
 		this.artifacts = a;
 	}
 
@@ -105,12 +110,16 @@
 		throw new Error("not yet implemented");
 	}
 
-	public String getSourceCodeRoot() {
-		return this.sourceDirectory.getAbsolutePath();
+	public String getClueMakerSourceRoot() {
+		return this.cluemakerDirectory.getAbsolutePath();
+	}
+
+	public String getGeneratedSourceRoot() {
+		return this.generatedSourceDirectory.getAbsolutePath();
 	}
 
 	public String getCompiledCodeRoot() {
-		return this.targetDirectory.getAbsolutePath();
+		return this.compiledCodeDirectory.getAbsolutePath();
 	}
 
 	public String getPackagedCodeRoot() {
1 2 3 4 > >> (Page 1 of 4)