kaz 02/04/19 17:17:58
Modified: src/java/org/apache/maven ChangeLog.java
ProjectProperties.java ProjectVerify.java
UpdateResources.java
src/java/org/apache/maven/executor ProjectExecutor.java
Log:
Provided a protected accessor for 'mavenProject' in ProjectExecutor
rather than letting subclasses reference the field directly. This is
consistent with the manner that AbstractExecutor() provides an accessor
for 'project' (the Ant project). Also beefed up some of the javadoc.
Revision Changes Path
1.36 +2 -2 jakarta-turbine-maven/src/java/org/apache/maven/ChangeLog.java
Index: ChangeLog.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ChangeLog.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- ChangeLog.java 14 Apr 2002 17:05:35 -0000 1.35
+++ ChangeLog.java 20 Apr 2002 00:17:58 -0000 1.36
@@ -95,7 +95,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>dIon Gillard</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefan Bodewig</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Peter Donald</a>
- * @version $Id: ChangeLog.java,v 1.35 2002/04/14 17:05:35 dion Exp $
+ * @version $Id: ChangeLog.java,v 1.36 2002/04/20 00:17:58 kaz Exp $
*/
public class ChangeLog extends ProjectExecutor implements ExecuteStreamHandler
{
@@ -287,7 +287,7 @@
{
Properties userList = new Properties();
- List developers = mavenProject.getDevelopers();
+ List developers = getMavenProject().getDevelopers();
Developer developer = null;
for (Iterator i = developers.iterator(); i.hasNext();)
1.27 +16 -16
jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java
Index: ProjectProperties.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectProperties.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ProjectProperties.java 19 Apr 2002 02:31:30 -0000 1.26
+++ ProjectProperties.java 20 Apr 2002 00:17:58 -0000 1.27
@@ -79,7 +79,7 @@
* paths required to build the project.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectProperties.java,v 1.26 2002/04/19 02:31:30 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.27 2002/04/20 00:17:58 kaz Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -100,7 +100,7 @@
// Grab the libRepo property.
libRepo = getProject().getProperty("lib.repo");
- Map mavenProjectMap = new BeanMap(mavenProject);
+ Map mavenProjectMap = new BeanMap(getMavenProject());
// We can store these values in a properties file in the JAR
// eventually so it's highly configurable, less code maintenance.
@@ -127,7 +127,7 @@
// If there are no build parameters in the POM then we can
// can just leave now.
- if (mavenProject.getBuild() == null)
+ if (getMavenProject().getBuild() == null)
{
return;
}
@@ -140,19 +140,19 @@
// If a project does not have any sources then there isn't
// much point in running source related tasks.
- if (mavenProject.getBuild().getSourceDirectories().size() > 0)
+ if (getMavenProject().getBuild().getSourceDirectories().size() > 0)
{
getProject().setProperty("sourcesPresent", "true");
}
log("Creating source set reference ...");
createPathReference("src.set",
- mavenProject.getBuild().getSourceDirectories());
+ getMavenProject().getBuild().getSourceDirectories());
- if (!Strings.isEmpty(mavenProject.getBuild().getUnitTestSourceDirectory()))
+ if
(!Strings.isEmpty(getMavenProject().getBuild().getUnitTestSourceDirectory()))
{
File utdir = new File(getProject().getProperty("basedir"),
-
mavenProject.getBuild().getUnitTestSourceDirectory());
+
getMavenProject().getBuild().getUnitTestSourceDirectory());
if ( utdir.exists() )
{
getProject().setProperty("unitTestSourceDirectory",
utdir.getCanonicalPath());
@@ -160,14 +160,14 @@
log("Creating unit test class entries reference ...");
AntUtils.createPatternSetReference(getProject(),"unit.test.set",
-
mavenProject.getBuild().getUnitTestPatterns());
+
getMavenProject().getBuild().getUnitTestPatterns());
}
}
- if
(!Strings.isEmpty(mavenProject.getBuild().getIntegrationUnitTestSourceDirectory()))
+ if
(!Strings.isEmpty(getMavenProject().getBuild().getIntegrationUnitTestSourceDirectory()))
{
File utdir = new File(getProject().getProperty("basedir"),
-
mavenProject.getBuild().getIntegrationUnitTestSourceDirectory());
+
getMavenProject().getBuild().getIntegrationUnitTestSourceDirectory());
if ( utdir.exists() )
{
getProject().setProperty("integrationUnitTestSourceDirectory",
utdir.getCanonicalPath());
@@ -175,7 +175,7 @@
log("Creating integration unit test class entries reference ...");
AntUtils.createPatternSetReference(getProject(),"integration.unit.test.set",
-
mavenProject.getBuild().getIntegrationUnitTestPatterns());
+
getMavenProject().getBuild().getIntegrationUnitTestPatterns());
}
}
@@ -207,7 +207,7 @@
{
Path classpath = new Path(getProject());
- for (Iterator i = mavenProject.getDependencies().iterator(); i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
i.hasNext();)
{
Dependency dependency = (Dependency) i.next();
Path p = new Path(getProject());
@@ -223,8 +223,8 @@
*/
private void createDependencySet()
{
- List depNames = new Vector(mavenProject.getDependencies().size());
- for (Iterator i = mavenProject.getDependencies().iterator(); i.hasNext();)
+ List depNames = new Vector(getMavenProject().getDependencies().size());
+ for (Iterator i = getMavenProject().getDependencies().iterator();
i.hasNext();)
{
Dependency dep = (Dependency)i.next();
depNames.add(dep.getJar());
@@ -256,13 +256,13 @@
*/
public void createJarResourcesProperty()
{
- if (mavenProject.getBuild().getJarResources().size() > 0)
+ if (getMavenProject().getBuild().getJarResources().size() > 0)
{
getProject().setProperty("jar.resources.present", "true");
}
AntUtils.createPatternSetReference(getProject(),"jar.resources.set",
- mavenProject.getBuild().getJarResources());
+ getMavenProject().getBuild().getJarResources());
}
}
1.4 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerify.java
Index: ProjectVerify.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerify.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProjectVerify.java 18 Apr 2002 15:38:12 -0000 1.3
+++ ProjectVerify.java 20 Apr 2002 00:17:58 -0000 1.4
@@ -72,7 +72,7 @@
* and make sure they are all here before trying to compile.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectVerify.java,v 1.3 2002/04/18 15:38:12 jvanzyl Exp $
+ * @version $Id: ProjectVerify.java,v 1.4 2002/04/20 00:17:58 kaz Exp $
* @task Create a list of all things that could go wrong and then protect
* against them.
* @task Merge the XML POM validation mechanism in here.
@@ -132,7 +132,7 @@
private void verifyDependencies()
throws Exception
{
- for (Iterator i = mavenProject.getDependencies().iterator(); i.hasNext();)
+ for (Iterator i = getMavenProject().getDependencies().iterator();
i.hasNext();)
{
Dependency dependency = (Dependency)i.next();
String jar = (String) dependency.getJar();
1.14 +1 -1
jakarta-turbine-maven/src/java/org/apache/maven/UpdateResources.java
Index: UpdateResources.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/UpdateResources.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- UpdateResources.java 18 Apr 2002 14:28:30 -0000 1.13
+++ UpdateResources.java 20 Apr 2002 00:17:58 -0000 1.14
@@ -160,7 +160,7 @@
Map nonDistMap = getNonDistMap(f);
- for (Iterator j = mavenProject.getDependencies().iterator(); j.hasNext(); )
+ for (Iterator j = getMavenProject().getDependencies().iterator();
j.hasNext(); )
{
String file = ((Dependency) j.next()).getJar();
File destinationFile = new File(dest, file);
1.3 +46 -11
jakarta-turbine-maven/src/java/org/apache/maven/executor/ProjectExecutor.java
Index: ProjectExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/executor/ProjectExecutor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProjectExecutor.java 16 Apr 2002 21:15:20 -0000 1.2
+++ ProjectExecutor.java 20 Apr 2002 00:17:58 -0000 1.3
@@ -70,41 +70,76 @@
* in any desired fashion.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: ProjectExecutor.java,v 1.2 2002/04/16 21:15:20 jvanzyl Exp $
+ * @version $Id: ProjectExecutor.java,v 1.3 2002/04/20 00:17:58 kaz Exp $
*/
public abstract class ProjectExecutor
extends AbstractExecutor
{
/**
- * Project descriptor.
+ * The file that contains the project descriptor for a Maven
+ * project.
*/
- protected File projectDescriptor;
+ private File projectDescriptor;
/**
- * Project
+ * The project object model representing the project described by
+ * the <code>projectDescriptor</code>.
*/
- protected Project mavenProject;
+ private Project mavenProject;
/**
* Set the project descriptor file. This file must exist.
+ *
+ * @param projectDescriptor The file containing the project
+ * descriptor.
*/
- public void setProjectDescriptor (File projectDescriptor)
+ public void setProjectDescriptor(File projectDescriptor)
{
this.projectDescriptor = projectDescriptor;
}
+ /**
+ * Get the project descriptor file.
+ *
+ * @return The file containing the project descriptor.
+ */
+ protected File getProjectDescriptor()
+ {
+ return projectDescriptor;
+ }
+
+ /**
+ * Set the Maven project.
+ *
+ * @param mavenProject The Maven project.
+ */
+ private void setMavenProject(Project mavenProject)
+ {
+ this.mavenProject = mavenProject;
+ }
+
+ /**
+ * Get the Maven project.
+ *
+ * @return The Maven project.
+ */
+ protected Project getMavenProject()
+ {
+ return mavenProject;
+ }
+
/**
- * Get the project using the set project descriptor
+ * Load the project using the set project descriptor
*/
- protected void getMavenProject()
+ protected void loadMavenProject()
throws Exception
{
- if (projectDescriptor == null)
+ if (getProjectDescriptor() == null)
{
throw new Exception("The projectDescriptor property must be set.");
}
- mavenProject = MavenUtils.getProject(projectDescriptor);
+ setMavenProject(MavenUtils.getProject(getProjectDescriptor()));
}
/**
@@ -115,7 +150,7 @@
public void execute()
throws Exception
{
- getMavenProject();
+ loadMavenProject();
doExecute();
}
