Index: src/java/org/apache/maven/ProjectProperties.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.32
diff -u -r1.32 ProjectProperties.java
--- src/java/org/apache/maven/ProjectProperties.java 7 May 2002 16:09:40 -0000 1.32
+++ src/java/org/apache/maven/ProjectProperties.java 22 May 2002 22:08:35 -0000
@@ -70,9 +70,8 @@
import org.apache.maven.project.Dependency;
import org.apache.maven.project.Distribution;
-import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.types.PatternSet;
+import org.apache.tools.ant.Project;
/**
* {@link org.apache.maven.executor.Executor} which takes values from
@@ -80,6 +79,7 @@
* paths required to build the project.
*
* @author Jason van Zyl
+ * @author Vincent Massol
* @version $Id: ProjectProperties.java,v 1.32 2002/05/07 16:09:40 glennm Exp $
*/
public class ProjectProperties
@@ -91,9 +91,7 @@
private String libRepo;
/**
- * Execute the task.
- *
- * @throws BuildException
+ * @see ProjectExecutor#doExecute()
*/
public void doExecute()
throws Exception
@@ -138,10 +136,10 @@
return;
}
- log("Creating classpath reference ...");
+ getProject().log("Creating classpath reference ...", Project.MSG_DEBUG);
createClasspathReference();
- log("Creating dependency.set ...");
+ getProject().log("Creating dependency.set ...", Project.MSG_DEBUG);
createDependencySet();
// If a project does not have any sources then there isn't
@@ -151,12 +149,14 @@
getProject().setProperty("maven.sourcesPresent", "true");
}
- log("Creating source set reference ...");
+ getProject().log("Creating source set reference ...",
+ Project.MSG_DEBUG);
createPathReference("maven.src.set",
getMavenProject().getBuild().getSourceDirectories());
- log("Creating aspect source set reference ...");
+ getProject().log("Creating aspect source set reference ...",
+ Project.MSG_DEBUG);
createPathReference("maven.src.aspect.set",
getMavenProject().getBuild().getAspectSourceDirectories());
@@ -164,13 +164,14 @@
String mavenPrepareSourceDirectory =
getProject().getProperty("maven.prepareSourceDirectory");
- System.out.println("mpsd => " + mavenPrepareSourceDirectory);
+ getProject().log("mpsd => " + mavenPrepareSourceDirectory,
+ Project.MSG_DEBUG);
if (mavenPrepareSourceDirectory != null)
{
AntUtils.createPatternSetReferenceFromPaths(
- getProject(),"maven.src.set.patternset",
- getMavenProject().getBuild().getSourceDirectories());
+ getProject(),"maven.src.set.patternset",
+ getMavenProject().getBuild().getSourceDirectories());
Path srcSet = new Path(getProject());
Path p = new Path(getProject());
@@ -184,39 +185,47 @@
getMavenProject().getBuild().getSourceDirectories());
}
- if (!Strings.isEmpty(getMavenProject().getBuild().getUnitTestSourceDirectory()))
+ if (!Strings.isEmpty(
+ getMavenProject().getBuild().getUnitTestSourceDirectory()))
{
File utdir = new File(getProject().getProperty("basedir"),
- getMavenProject().getBuild().getUnitTestSourceDirectory());
+ getMavenProject().getBuild().getUnitTestSourceDirectory());
if ( utdir.exists() )
{
- getProject().setProperty("maven.unitTestSourceDirectory", utdir.getCanonicalPath());
- getProject().setProperty("maven.unitTestSourcesPresent", "true");
-
- log("Creating unit test class entries reference ...");
- AntUtils.createPatternSetReference(getProject(),"maven.unit.test.set",
+ getProject().setProperty("maven.unitTestSourceDirectory",
+ utdir.getCanonicalPath());
+ getProject().setProperty("maven.unitTestSourcesPresent",
+ "true");
+
+ getProject().log("Creating unit test class entries " +
+ "reference ...", Project.MSG_DEBUG);
+ AntUtils.createPatternSetReference(getProject(),
+ "maven.unit.test.set",
getMavenProject().getBuild().getUnitTestPatterns());
}
}
- if (!Strings.isEmpty(getMavenProject().getBuild().getIntegrationUnitTestSourceDirectory()))
+ if (!Strings.isEmpty(getMavenProject().getBuild().
+ getIntegrationUnitTestSourceDirectory()))
{
File utdir = new File(getProject().getProperty("basedir"),
- getMavenProject().getBuild().getIntegrationUnitTestSourceDirectory());
- if ( utdir.exists() )
+ getMavenProject().getBuild().
+ getIntegrationUnitTestSourceDirectory());
+ if (utdir.exists())
{
getProject().setProperty(
- "maven.integrationUnitTestSourceDirectory",
- utdir.getCanonicalPath());
+ "maven.integrationUnitTestSourceDirectory",
+ utdir.getCanonicalPath());
getProject().setProperty(
- "maven.integrationUnitTestSourcesPresent",
- "true");
+ "maven.integrationUnitTestSourcesPresent",
+ "true");
- log("Creating integration unit test class entries reference ...");
+ getProject().log("Creating integration unit test class " +
+ "entries reference ...", Project.MSG_DEBUG);
AntUtils.createPatternSetReference(
- getProject(),"maven.integration.unit.test.set",
- getMavenProject().getBuild().getIntegrationUnitTestPatterns());
+ getProject(),"maven.integration.unit.test.set",
+ getMavenProject().getBuild().getIntegrationUnitTestPatterns());
}
}
@@ -236,7 +245,8 @@
if (value.length() > 0 && getProject().getProperty(key) == null)
{
- getProject().setProperty("maven." + key, (String)values.get(key));
+ getProject().setProperty("maven." + key,
+ (String)values.get(key));
}
}
}
@@ -248,7 +258,8 @@
{
Path classpath = new Path(getProject());
- for (Iterator i = getMavenProject().getDependencies().iterator(); i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
+ i.hasNext();)
{
Dependency dependency = (Dependency) i.next();
@@ -266,15 +277,22 @@
private void createDependencySet()
{
List depNames = new Vector(getMavenProject().getDependencies().size());
- for (Iterator i = getMavenProject().getDependencies().iterator(); i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
+ i.hasNext();)
{
Dependency dep = (Dependency)i.next();
depNames.add(dep.getJar());
} // end of for (Iterator = .iterator(); .hasNext();)
- AntUtils.createPatternSetReference(getProject(),"maven.dependency.set", depNames);
+ AntUtils.createPatternSetReference(getProject(),"maven.dependency.set",
+ depNames);
}
- // Create the source directories reference.
+ /**
+ * Create the source directories reference.
+ *
+ * @param reference
+ * @param directories
+ */
private void createPathReference(String reference, List directories)
{
Path srcSet = new Path(getProject());
@@ -287,7 +305,8 @@
srcSet.append(p);
}
- log("Adding Reference " + reference + " with a value of " + srcSet);
+ getProject().log("Adding Reference " + reference + " with a value of " +
+ srcSet, Project.MSG_DEBUG);
getProject().addReference(reference, srcSet);
}
@@ -303,20 +322,20 @@
getProject().setProperty("maven.jar.resources.present", "true");
}
- AntUtils.createPatternSetReference(getProject(),"maven.jar.resources.set",
+ AntUtils.createPatternSetReference(getProject(),
+ "maven.jar.resources.set",
getMavenProject().getBuild().getJarResources());
-
}
private void createOrganizationProperties()
{
if (getMavenProject().getOrganization() != null)
{
- getProject().setProperty( "maven.organization",
- getMavenProject().getOrganization().getName() );
+ getProject().setProperty("maven.organization",
+ getMavenProject().getOrganization().getName());
- getProject().setProperty( "maven.organization.url",
- getMavenProject().getOrganization().getUrl() );
+ getProject().setProperty("maven.organization.url",
+ getMavenProject().getOrganization().getUrl());
}
}
Index: src/java/org/apache/maven/ProjectVerifier.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java,v
retrieving revision 1.5
diff -u -r1.5 ProjectVerifier.java
--- src/java/org/apache/maven/ProjectVerifier.java 22 May 2002 17:49:32 -0000 1.5
+++ src/java/org/apache/maven/ProjectVerifier.java 22 May 2002 22:08:35 -0000
@@ -81,6 +81,7 @@
* and make sure they are all here before trying to compile.
*
* @author Jason van Zyl
+ * @author Vincent Massol
* @version $Id: ProjectVerifier.java,v 1.5 2002/05/22 17:49:32 tcopeland Exp $
* @task Create a list of all things that could go wrong and then protect
* against them.
@@ -131,7 +132,8 @@
* Name of the file in the maven.remoteRepo that enumerates the
* JARs that cannot be distributed by Maven.
*/
- private static final String NON_DIST_JAR_LIST = "non-distributable-jars.list";
+ private static final String NON_DIST_JAR_LIST =
+ "non-distributable-jars.list";
/**
* Default ctor.
@@ -197,9 +199,7 @@
}
/**
- * Execute the task.
- *
- * @throws BuildException
+ * @see ProjectExecutor#doExecute()
*/
public void doExecute()
throws Exception
@@ -214,7 +214,8 @@
private void verifyDependencies()
throws Exception
{
- for (Iterator i = getMavenProject().getDependencies().iterator(); i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
+ i.hasNext();)
{
Dependency dependency = (Dependency)i.next();
String jar = dependency.getJar();
@@ -268,14 +269,18 @@
{
if (!destinationFile.exists())
{
- String[] entry = Strings.split((String)nonDistMap.get(dependency),"$");
+ String[] entry = Strings.split(
+ (String)nonDistMap.get(dependency),"$");
String downloadLocation = entry[0];
String additionalNotes = entry[1];
- warnings.append("-------------------------------------------------\n");
+ warnings.append("---------------------------------" +
+ "----------------\n");
warnings.append("W A R N I N G\n");
- warnings.append("------------------------------------------------\n");
- warnings.append("The following JAR must be downloaded manually:\n");
+ warnings.append("---------------------------------" +
+ "---------------\n");
+ warnings.append("The following JAR must be " +
+ "downloaded manually:\n");
warnings.append(dependency + "\n");
warnings.append("\n");
warnings.append("You can find the JAR here:\n");
@@ -289,12 +294,14 @@
if (!getRemoteFile( dependency, destinationFile ))
{
- warnings.append("-------------------------------------------------\n")
- .append("W A R N I N G\n")
- .append("------------------------------------------------\n")
- .append("Failed to download dependent file ")
- .append(dependency)
- .append("\n\n");
+ warnings.append("-------------------------------------" +
+ "------------\n");
+ warnings.append("W A R N I N G\n");
+ warnings.append("-------------------------------------" +
+ "-----------\n");
+ warnings.append("Failed to download dependent file ");
+ warnings.append(dependency);
+ warnings.append("\n\n");
}
}
}
@@ -361,7 +368,8 @@
// Allow comments to be placed in the payload
// descriptor.
- if (line.startsWith("#") || line.startsWith("--") || line.length() < 1)
+ if (line.startsWith("#") || line.startsWith("--") ||
+ line.length() < 1)
{
continue;
}
Index: src/java/org/apache/maven/UpdateProperties.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/UpdateProperties.java,v
retrieving revision 1.2
diff -u -r1.2 UpdateProperties.java
--- src/java/org/apache/maven/UpdateProperties.java 8 May 2002 12:12:58 -0000 1.2
+++ src/java/org/apache/maven/UpdateProperties.java 22 May 2002 22:08:35 -0000
@@ -55,6 +55,7 @@
*/
import org.apache.maven.executor.AbstractExecutor;
+import org.apache.tools.ant.Project;
/**
* Interim task that will transparently update old Maven properties to
@@ -62,6 +63,7 @@
* building projects that still use the old property names.
*
* @author Pete Kazmier
+ * @author Vincent Massol
* @version $Id: UpdateProperties.java,v 1.2 2002/05/08 12:12:58 kaz Exp $
*/
public class UpdateProperties extends AbstractExecutor
@@ -194,7 +196,7 @@
"cvsModule"
};
- log("Checking for old properties ...");
+ getProject().log("Checking for old properties ...", Project.MSG_DEBUG);
for (int i = 0; i < properties.length; i++)
{
@@ -218,7 +220,8 @@
{
if (getProject().getProperty(key) == null)
{
- log(" Updating property: " + property);
+ getProject().log("Updating property: " + property,
+ Project.MSG_DEBUG);
getProject().setProperty(key, value);
}
}
Index: src/java/org/apache/maven/executor/AbstractExecutor.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/executor/AbstractExecutor.java,v
retrieving revision 1.2
diff -u -r1.2 AbstractExecutor.java
--- src/java/org/apache/maven/executor/AbstractExecutor.java 22 Apr 2002 02:43:32 -0000 1.2
+++ src/java/org/apache/maven/executor/AbstractExecutor.java 22 May 2002 22:08:35 -0000
@@ -64,6 +64,7 @@
* available.
*
* @author Jason van Zyl
+ * @author Vincent Massol
* @version $Id: AbstractExecutor.java,v 1.2 2002/04/22 02:43:32 dion Exp $
*/
public abstract class AbstractExecutor
@@ -93,12 +94,12 @@
}
/**
- * When used as an Ant task the Ant logging
- * mechanism will be used.
+ * Log using the Ant Project logger.
* @param message the message to be logged
*/
public void log(String message)
{
project.log(message);
}
+
}
Index: src/java/org/apache/maven/executor/ProjectExecutor.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-maven/src/java/org/apache/maven/executor/ProjectExecutor.java,v
retrieving revision 1.3
diff -u -r1.3 ProjectExecutor.java
--- src/java/org/apache/maven/executor/ProjectExecutor.java 20 Apr 2002 00:17:58 -0000 1.3
+++ src/java/org/apache/maven/executor/ProjectExecutor.java 22 May 2002 22:08:35 -0000
@@ -56,13 +56,9 @@
import java.io.File;
-import org.apache.tools.ant.BuildException;
-
import org.apache.maven.MavenUtils;
import org.apache.maven.project.Project;
-import org.apache.commons.xo.Mapper;
-
/**
* An executor that uses the Template Method pattern to alleviate the
* burden subclasses having to create the Maven project object and
@@ -70,6 +66,7 @@
* in any desired fashion.
*
* @author Jason van Zyl
+ * @author Vincent Massol
* @version $Id: ProjectExecutor.java,v 1.3 2002/04/20 00:17:58 kaz Exp $
*/
public abstract class ProjectExecutor
@@ -129,7 +126,9 @@
}
/**
- * Load the project using the set project descriptor
+ * Load the project using the set project descriptor.
+ *
+ * @throws Exception
*/
protected void loadMavenProject()
throws Exception
@@ -145,7 +144,7 @@
/**
* Execute the task.
*
- * @throws BuildException
+ * @throws Exception
*/
public void execute()
throws Exception
@@ -157,6 +156,8 @@
/**
* Method to override in subclasses that make use of the maven project
* object created by getProject()
+ *
+ * @throws Exception
*/
public abstract void doExecute()
throws Exception;