jvanzyl 2002/06/01 13:59:43
Modified: . project.xml
src/java/org/apache/maven MavenConstants.java
ProjectProperties.java UpdatePomCheck.java
src/java/org/apache/maven/ant AntUtils.java
src/java/org/apache/maven/project Build.java Dependency.java
Project.java
src/test/org/apache/maven/project ProjectMapperTest.java
Log:
I have updated all the code so that everything works with the
changes to the POM.
I'm checking this in before I apply Pete's patch to the doc system.
Bare with me for a couple minutes. I'll apply the patches then it's
time to cut a release.
Revision Changes Path
1.89 +57 -58 jakarta-turbine-maven/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/project.xml,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- project.xml 1 Jun 2002 17:50:50 -0000 1.88
+++ project.xml 1 Jun 2002 20:59:42 -0000 1.89
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<project>
- <version>2</version>
+ <pomVersion>3</pomVersion>
<name>jakarta-turbine-maven</name>
<id>maven</id>
- <currentVersion>0.9.8</currentVersion>
+ <currentVersion>1.0-b4-dev</currentVersion>
<organization>
<name>Apache Software Foundation</name>
<url>http://jakarta.apache.org/</url>
@@ -12,7 +12,7 @@
<inceptionYear>2001</inceptionYear>
<package>org.apache.maven</package>
- <shortDescription>Project Management Tools</shortDescription>
+ <shortDescription>Java Project Management Tools</shortDescription>
<!-- Gump integration -->
<gumpRepositoryId>jakarta</gumpRepositoryId>
@@ -27,37 +27,38 @@
</description>
<url>http://jakarta.apache.org/turbine/maven/</url>
- <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</cvsWebUrl>
<issueTrackingUrl>http://nagoya.apache.org/scarab/servlet/scarab/</issueTrackingUrl>
<siteAddress>jakarta.apache.org</siteAddress>
<siteDirectory>/www/jakarta.apache.org/turbine/maven/</siteDirectory>
<distributionDirectory>/www/jakarta.apache.org/builds/jakarta-turbine-maven/</distributionDirectory>
- <cvsRoot>:pserver:[EMAIL PROTECTED]:/home/cvspublic</cvsRoot>
- <cvsModule>jakarta-turbine-maven</cvsModule>
+ <repository>
+
<connection>scm:cvs:pserver:[EMAIL PROTECTED]:/home/cvspublic/jakarta-turbine-maven</connection>
+ <url>http://cvs.apache.org/viewcvs/jakarta-turbine-maven/</url>
+ </repository>
- <distributions>
- <distribution>
+ <versions>
+ <version>
<id>b1</id>
- <version>1.0-b1</version>
+ <name>1.0-b1</name>
<tag>MAVEN_1_0_B1</tag>
- </distribution>
- <distribution>
+ </version>
+ <version>
<id>b2</id>
- <version>1.0-b2</version>
+ <name>1.0-b2</name>
<tag>MAVEN_1_0_B2</tag>
- </distribution>
- <distribution>
+ </version>
+ <version>
<id>b3</id>
- <version>1.0-b3</version>
+ <name>1.0-b3</name>
<tag>MAVEN_1_0_B3</tag>
- </distribution>
- <distribution>
+ </version>
+ <version>
<id>b4</id>
- <version>1.0-b4</version>
+ <name>1.0-b4</name>
<tag>HEAD</tag>
- </distribution>
- </distributions>
+ </version>
+ </versions>
<branches>
</branches>
@@ -132,6 +133,9 @@
<id>kaz</id>
<email>[EMAIL PROTECTED]</email>
<organization></organization>
+ <roles>
+ <role>Documentation</role>
+ </roles>
</developer>
<developer>
@@ -181,6 +185,10 @@
<id>jvanzyl</id>
<email>[EMAIL PROTECTED]</email>
<organization>Zenplex</organization>
+ <roles>
+ <role>Architect</role>
+ <role>Release Manager</role>
+ </roles>
</developer>
<developer>
@@ -198,49 +206,45 @@
<dependencies>
<dependency>
- <name>dom4j</name>
+ <id>dom4j</id>
<version>1.3</version>
<url>http://www.dom4j.org/</url>
</dependency>
<dependency>
- <name>commons-betwixt</name>
+ <id>commons-betwixt</id>
<version>1.0-dev</version>
- <url>http://jakarta.apache.org/commons/sandbox/betwixt</url>
</dependency>
<dependency>
- <name>commons-digester</name>
+ <id>commons-digester</id>
<version>1.2</version>
- <url>http://jakarta.apache.org/commons/digester.html</url>
</dependency>
<dependency>
- <name>commons-logging</name>
+ <id>commons-logging</id>
<version>1.0</version>
- <url>http://jakarta.apache.org/commons/logging.html</url>
</dependency>
<dependency>
- <name>commons-graph</name>
+ <id>commons-graph</id>
<version>0.8</version>
- <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <name>bcel</name>
+ <id>bcel</id>
<version>5.0</version>
<url>http://jakarta.apache.org/bcel/</url>
</dependency>
<dependency>
- <name>velocity</name>
+ <id>velocity</id>
<version>1.3-dev</version>
<url>http://jakarta.apache.org/velocity/</url>
</dependency>
<dependency>
- <name>oro</name>
+ <id>oro</id>
<version>2.0.6</version>
<url>http://jakarta.apache.org/oro/</url>
</dependency>
@@ -248,89 +252,89 @@
<!-- Runtime dependencies -->
<dependency>
- <name>log4j</name>
+ <id>log4j</id>
<version>1.1.3</version>
<url>http://jakarta.apache.org/log4j/</url>
</dependency>
<dependency>
- <name>commons-lang</name>
+ <id>commons-lang</id>
<version>0.1-dev</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <name>commons-io</name>
+ <id>commons-io</id>
<version>0.1</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <name>commons-util</name>
+ <id>commons-util</id>
<version>1.0-rc2-dev</version>
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <name>commons-beanutils</name>
+ <id>commons-beanutils</id>
<version>1.0</version>
<jar>commons-beanutils-dev.jar</jar>
- <url>http://jakarta.apache.org/commons/beanutils.html</url>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
- <name>commons-collections</name>
+ <id>commons-collections</id>
<version>2.0</version>
- <url>http://jakarta.apache.org/commons/collections.html</url>
+ <url>http://jakarta.apache.org/commons/</url>
</dependency>
<!-- Documentation dependencies -->
<dependency>
- <name>velocity-dvsl</name>
+ <id>velocity-dvsl</id>
<version>0.43</version>
<url>http://jakarta.apache.org/velocity/dvsl/</url>
</dependency>
<dependency>
- <name>jdepend</name>
+ <id>jdepend</id>
<version>2.2</version>
<url>http://www.clarkware.com/software/JDepend.html</url>
</dependency>
<!-- maven:pdf requirements
<dependency>
- <name>fop</name>
+ <id>fop</id>
<version>0.20.3</version>
<url>http://xml.apache.org/fop/</url>
</dependency>
<dependency>
- <name>batik</name>
+ <id>batik</id>
<version>1.0</version>
<url>http://xml.apache.org/batik/</url>
</dependency>
<dependency>
- <name>logkit</name>
+ <id>logkit</id>
<version>1.0.1</version>
<url>http://jakarta.apache.org/avalon/logkit/</url>
</dependency>
<dependency>
- <name>avalon-framework</name>
+ <id>avalon-framework</id>
<version>4.0</version>
<url>http://jakarta.apache.org/avalon/</url>
</dependency>
<dependency>
- <name>xerces</name>
+ <id>xerces</id>
<version>1.2.3</version>
<url>http://xml.apache.org/xerces/</url>
</dependency>
<dependency>
- <name>xalan</name>
+ <id>xalan</id>
<version>2.0.0</version>
<url>http://xml.apache.org/xalan/</url>
</dependency>
@@ -338,19 +342,19 @@
<!-- the following are all required for checkstyle to work -->
<dependency>
- <name>checkstyle</name>
+ <id>checkstyle</id>
<version>2.2</version>
<url>http://checkstyle.sourceforge.net/</url>
</dependency>
<dependency>
- <name>antlr</name>
+ <id>antlr</id>
<version>2.7.1</version>
<url>http://www.antlr.org/</url>
</dependency>
<dependency>
- <name>regexp</name>
+ <id>regexp</id>
<version>1.2</version>
<url>http://jakarta.apache.org/regexp/</url>
</dependency>
@@ -362,20 +366,16 @@
<nagEmailAddress>[EMAIL PROTECTED]</nagEmailAddress>
- <sourceDirectories>
- <sourceDirectory>src/java</sourceDirectory>
- </sourceDirectories>
+ <sourceDirectory>src/java</sourceDirectory>
<unitTestSourceDirectory>src/test</unitTestSourceDirectory>
<integrationUnitTestSourceDirectory/>
- <aspectSourceDirectories>
- </aspectSourceDirectories>
+ <aspectSourceDirectory></aspectSourceDirectory>
<!-- Unit test classes -->
<unitTestPatterns>
<unitTestPattern>include = **/*Test.java</unitTestPattern>
- <unitTestPattern>exclude = **/*Project*.java</unitTestPattern>
</unitTestPatterns>
<!-- Integration unit test classes -->
@@ -387,7 +387,6 @@
<jarResources>
<jarResource>include = *.dtd</jarResource>
- <jarResource>include = log4j.properties</jarResource>
</jarResources>
<jars>
1.6 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/MavenConstants.java
Index: MavenConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenConstants.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MavenConstants.java 27 May 2002 12:19:51 -0000 1.5
+++ MavenConstants.java 1 Jun 2002 20:59:42 -0000 1.6
@@ -60,7 +60,7 @@
* Maven constants.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: MavenConstants.java,v 1.5 2002/05/27 12:19:51 dion Exp $
+ * @version $Id: MavenConstants.java,v 1.6 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class MavenConstants
{
@@ -79,5 +79,5 @@
* the POM that this version of Maven can deal with then
* the POM will be transformed into compliance.
*/
- public static final int POM_VERSION = 2;
+ public static final int POM_VERSION = 3;
}
1.40 +18 -42
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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- ProjectProperties.java 1 Jun 2002 03:31:56 -0000 1.39
+++ ProjectProperties.java 1 Jun 2002 20:59:42 -0000 1.40
@@ -74,7 +74,7 @@
import org.apache.maven.ant.AntUtils;
import org.apache.maven.executor.ProjectExecutor;
import org.apache.maven.project.Dependency;
-import org.apache.maven.project.Distribution;
+import org.apache.maven.project.Version;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.Project;
@@ -86,7 +86,7 @@
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: ProjectProperties.java,v 1.39 2002/06/01 03:31:56 jvanzyl Exp $
+ * @version $Id: ProjectProperties.java,v 1.40 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class ProjectProperties
extends ProjectExecutor
@@ -147,23 +147,26 @@
log("Creating dependency.set ...", Project.MSG_DEBUG);
createDependencySet();
+
+ System.out.println("!!!!!!!!!!! " +
getMavenProject().getBuild().getSourceDirectory());
+
// If a project does not have any sources then there isn't
// much point in running source related tasks.
- if (getMavenProject().getBuild().getSourceDirectories().size() > 0)
+ if (getMavenProject().getBuild().getSourceDirectory() != null)
{
getProject().setProperty("maven.sourcesPresent", "true");
}
log("Creating source set reference ...", Project.MSG_DEBUG);
- createPathReference("maven.src.set",
- getMavenProject().getBuild().getSourceDirectories());
+ AntUtils.createPathReference(getProject(), "maven.src.set",
+ getMavenProject().getBuild().getSourceDirectory());
log("Creating aspect source set reference ...", Project.MSG_DEBUG);
- createPathReference("maven.src.aspect.set",
- getMavenProject().getBuild().getAspectSourceDirectories());
+ AntUtils.createPathReference(getProject(), "maven.src.aspect.set",
+ getMavenProject().getBuild().getAspectSourceDirectory());
String mavenPrepareSourceDirectory =
getProject().getProperty("maven.prepareSourceDirectory");
@@ -172,9 +175,8 @@
if (mavenPrepareSourceDirectory != null)
{
- AntUtils.createPatternSetReferenceFromPaths(getProject(),
- "maven.src.set.patternset",
- getMavenProject().getBuild().getSourceDirectories());
+ AntUtils.createPatternSetReferenceFromPath(getProject(),
+ "maven.src.set.patternset",
getMavenProject().getBuild().getSourceDirectory());
Path srcSet = new Path(getProject());
Path p = new Path(getProject());
@@ -184,8 +186,8 @@
}
else
{
- createPathReference("maven.compile.src.set",
- getMavenProject().getBuild().getSourceDirectories());
+ AntUtils.createPathReference(getProject(), "maven.compile.src.set",
+ getMavenProject().getBuild().getSourceDirectory());
}
if (!Strings.isEmpty(
@@ -297,32 +299,6 @@
}
/**
- * Create an Ant <code>{@link Path}</code> in the current project
- * using the specified <code>reference</code> as the name. The path
- * is made up of all directories in the <code>directories</code> list.
- *
- * @param reference name of the property in the project to set
- * @param directories a {@link List} of directories
- */
- private void createPathReference(String reference, List directories)
- {
- Path srcSet = new Path(getProject());
-
- for (Iterator i = directories.iterator(); i.hasNext();)
- {
- String sourceDirectory = (String) i.next();
- Path p = new Path(getProject());
- p.setPath(sourceDirectory);
- srcSet.append(p);
- }
-
- log("Adding Reference " + reference + " with a value of " + srcSet,
- Project.MSG_DEBUG);
-
- getProject().addReference(reference, srcSet);
- }
-
- /**
* Possibly sets <code>jar.resources.present</code> if there are
* resources, and sets the <code>jar.resources.set</code> list.
*/
@@ -392,14 +368,14 @@
*/
private void createDistProperties()
{
- String id = getProject().getProperty("maven.distid");
+ String id = getProject().getProperty("maven.versionid");
if (id != null)
{
- Distribution d = (Distribution)
- getMavenProject().getDistributionById(id);
+ Version version = (Version)
+ getMavenProject().getVersionById(id);
- getProject().setProperty("maven.tag", d.getTag());
+ getProject().setProperty("maven.tag", version.getTag());
}
}
}
1.5 +6 -6
jakarta-turbine-maven/src/java/org/apache/maven/UpdatePomCheck.java
Index: UpdatePomCheck.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/UpdatePomCheck.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UpdatePomCheck.java 28 May 2002 07:49:35 -0000 1.4
+++ UpdatePomCheck.java 1 Jun 2002 20:59:42 -0000 1.5
@@ -83,7 +83,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author dion
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: UpdatePomCheck.java,v 1.4 2002/05/28 07:49:35 vmassol Exp $
+ * @version $Id: UpdatePomCheck.java,v 1.5 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class UpdatePomCheck extends AbstractExecutor
{
@@ -131,20 +131,20 @@
// If the version property is null we know that we are dealing
// with v1 of the POM because the <version> element doesn't
// exist in v1 of the POM.
- if (project.getVersion() == null)
+ if (project.getPomVersion() == null)
{
- project.setVersion("1");
+ project.setPomVersion("1");
}
- if (Integer.parseInt(project.getVersion()) !=
+ if (Integer.parseInt(project.getPomVersion()) !=
MavenConstants.POM_VERSION)
{
getProject().setProperty("pomUpdateRequired", "true");
- getProject().setProperty("fromVersion", project.getVersion());
+ getProject().setProperty("fromVersion", project.getPomVersion());
getProject().setProperty("toVersion",
Integer.toString(MavenConstants.POM_VERSION));
- log("fromVersion -> " + project.getVersion());
+ log("fromVersion -> " + project.getPomVersion());
log(" toVersion -> " + MavenConstants.POM_VERSION);
}
1.7 +36 -1
jakarta-turbine-maven/src/java/org/apache/maven/ant/AntUtils.java
Index: AntUtils.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ant/AntUtils.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AntUtils.java 27 May 2002 12:25:44 -0000 1.6
+++ AntUtils.java 1 Jun 2002 20:59:42 -0000 1.7
@@ -69,7 +69,7 @@
* sets of values.
*
* @author <a href="[EMAIL PROTECTED]">Jason van Zyl</a>
- * @version $Id: AntUtils.java,v 1.6 2002/05/27 12:25:44 dion Exp $
+ * @version $Id: AntUtils.java,v 1.7 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class AntUtils
{
@@ -193,4 +193,39 @@
project.addReference(reference, patternSet);
}
+ /**
+ * Create a file set reference in <code>project</code>, named
+ * <code>reference</code> from the <code>list</code> of includes/excludes/
+ * file names
+ * @param project the Ant project to create the reference in
+ * @param reference the name of the reference to create
+ * @param list the list of paths
+ * a file name
+ */
+ public static void createPatternSetReferenceFromPath(Project project,
+ String reference,
+ String path)
+ {
+ StringBuffer includesSb = new StringBuffer();
+ PatternSet patternSet = new PatternSet();
+ includesSb.append(path.trim()).append("/**,");
+ project.addReference(reference, patternSet);
+ }
+
+ /**
+ * Create an Ant <code>{@link Path}</code> in the current project
+ * using the specified <code>reference</code> as the name. The path
+ * is made up of all directories in the <code>directories</code> list.
+ *
+ * @param reference name of the property in the project to set
+ * @param directories a {@link List} of directories
+ */
+ public static void createPathReference(Project project, String reference,
String directory)
+ {
+ Path srcSet = new Path(project);
+ Path p = new Path(project);
+ p.setPath(directory);
+ srcSet.append(p);
+ project.addReference(reference, srcSet);
+ }
}
1.7 +12 -13
jakarta-turbine-maven/src/java/org/apache/maven/project/Build.java
Index: Build.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Build.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Build.java 1 May 2002 14:59:13 -0000 1.6
+++ Build.java 1 Jun 2002 20:59:42 -0000 1.7
@@ -59,7 +59,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Build.java,v 1.6 2002/05/01 14:59:13 jtaylor Exp $
+ * @version $Id: Build.java,v 1.7 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class Build
extends BaseObject
@@ -87,13 +87,13 @@
* Path entries that control which source directories are used
* to compile the project.
*/
- private List sourceDirectories;
+ private String sourceDirectory;
/**
* Path entries that control which source directories contain
* aspectj sources to be compiled.
*/
- private List aspectSourceDirectories;
+ private String aspectSourceDirectory;
/**
* JAR files that are produced by this project.
@@ -125,8 +125,6 @@
jarResources = new ArrayList();
unitTestPatterns = new ArrayList();
integrationUnitTestPatterns = new ArrayList();
- sourceDirectories = new ArrayList();
- aspectSourceDirectories = new ArrayList();
jars = new ArrayList();
}
@@ -213,33 +211,34 @@
/**
* Adds a feature to the SourceDirectory attribute of the Build object
*/
- public void addSourceDirectory(String sourceDirectory)
+ public void setSourceDirectory(String sourceDirectory)
{
- sourceDirectories.add(sourceDirectory);
+ System.out.println("!!!!!!!!!!!!! " + sourceDirectory);
+ this.sourceDirectory = sourceDirectory;
}
/**
* Gets the sourceDirectories attribute of the Build object
*/
- public List getSourceDirectories()
+ public String getSourceDirectory()
{
- return sourceDirectories;
+ return sourceDirectory;
}
/**
* Adds a feature to the AspectSourceDirectory attribute of the Build object
*/
- public void addAspectSourceDirectory(String aspectSourceDirectory)
+ public void setAspectSourceDirectory(String aspectSourceDirectory)
{
- aspectSourceDirectories.add(aspectSourceDirectory);
+ this.aspectSourceDirectory = aspectSourceDirectory;
}
/**
* Gets the aspectSourceDirectories attribute of the Build object
*/
- public List getAspectSourceDirectories()
+ public String getAspectSourceDirectory()
{
- return aspectSourceDirectories;
+ return aspectSourceDirectory;
}
/**
1.8 +2 -2
jakarta-turbine-maven/src/java/org/apache/maven/project/Dependency.java
Index: Dependency.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Dependency.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Dependency.java 28 May 2002 14:49:22 -0000 1.7
+++ Dependency.java 1 Jun 2002 20:59:42 -0000 1.8
@@ -55,7 +55,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Dependency.java,v 1.7 2002/05/28 14:49:22 jvanzyl Exp $
+ * @version $Id: Dependency.java,v 1.8 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class Dependency
extends BaseObject
@@ -116,7 +116,7 @@
{
if (jar == null)
{
- return getName() + "-" + getVersion() + ".jar";
+ return getId() + "-" + getVersion() + ".jar";
}
return jar;
1.20 +23 -21
jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/project/Project.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Project.java 30 May 2002 17:41:58 -0000 1.19
+++ Project.java 1 Jun 2002 20:59:42 -0000 1.20
@@ -62,10 +62,12 @@
import java.util.List;
import java.util.Map;
+import org.apache.maven.project.repository.Repository;
+
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="[EMAIL PROTECTED]">Vincent Massol</a>
- * @version $Id: Project.java,v 1.19 2002/05/30 17:41:58 jvanzyl Exp $
+ * @version $Id: Project.java,v 1.20 2002/06/01 20:59:42 jvanzyl Exp $
*/
public class Project
extends BaseObject
@@ -155,7 +157,7 @@
/**
* Version of the project model.
*/
- private String version;
+ private String pomVersion;
/**
* Cvs root
@@ -173,15 +175,15 @@
private String cvsPassword;
/**
- * Distributions associated with this project.
+ * Versions associated with this project.
*/
- private List distributions;
+ private List versions;
/**
* Distributions map that associates the distribution ids
* with the distribution objects.
*/
- private HashMap distributionMap;
+ private HashMap versionMap;
/**
* Default constructor.
@@ -191,7 +193,7 @@
dependencies = new ArrayList();
mailingLists = new ArrayList();
developers = new ArrayList();
- distributions = new ArrayList();
+ versions = new ArrayList();
//distributionMap = new HashMap();
}
@@ -500,17 +502,17 @@
/**
* Sets the version attribute of the Project object
*/
- public void setVersion(String version)
+ public void setPomVersion(String pomVersion)
{
- this.version = version;
+ this.pomVersion = pomVersion;
}
/**
* Gets the version attribute of the Project object
*/
- public String getVersion()
+ public String getPomVersion()
{
- return version;
+ return pomVersion;
}
/**
@@ -566,9 +568,9 @@
*
* @param distribution Distribution for this project.
*/
- public void addDistribution(Distribution distribution)
+ public void addVersion(Version version)
{
- distributions.add(distribution);
+ versions.add(version);
}
/**
@@ -576,9 +578,9 @@
*
* @return List of distributions.
*/
- public List getDistributions()
+ public List getVersions()
{
- return distributions;
+ return versions;
}
/**
@@ -586,23 +588,23 @@
*
* @return List of distributions.
*/
- public Distribution getDistributionById(String distId)
+ public Version getVersionById(String versionId)
{
// We have to lazily initialize this because of betwixt/digester
// behavior where an objects addXXX() method is called but
// the parameter object is not yet fully populated.
- if (distributionMap == null)
+ if (versionMap == null)
{
- distributionMap = new HashMap();
+ versionMap = new HashMap();
- for (Iterator i = distributions.iterator(); i.hasNext();)
+ for (Iterator i = versions.iterator(); i.hasNext();)
{
- Distribution d = (Distribution) i.next();
- distributionMap.put(d.getId(), d);
+ Version version = (Version) i.next();
+ versionMap.put(version.getId(), version);
}
}
- return (Distribution) distributionMap.get(distId);
+ return (Version) versionMap.get(versionId);
}
}
1.19 +21 -13
jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java
Index: ProjectMapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-maven/src/test/org/apache/maven/project/ProjectMapperTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ProjectMapperTest.java 30 May 2002 17:42:23 -0000 1.18
+++ ProjectMapperTest.java 1 Jun 2002 20:59:42 -0000 1.19
@@ -97,10 +97,13 @@
assertEquals("Apache Software Foundation", p.getOrganization().getName());
assertEquals("http://jakarta.apache.org/";, p.getOrganization().getUrl());
assertEquals("http://jakarta.apache.org/turbine/maven/",p.getUrl());
-
assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-maven/",p.getCvsWebUrl());
assertEquals("http://nagoya.apache.org/scarab/servlet/scarab/",p.getIssueTrackingUrl());
assertEquals("1.0-b4-dev", p.getCurrentVersion());
+ // Test Repository Info
+ //assertEquals("http://cvs.apache.org/viewcvs/jakarta-turbine-maven/";,
+ // p.getRepository().getUrl());
+
// Test Mailing List info
assertEquals("Maven User List",
((MailingList)p.getMailingLists().get(0)).getName());
@@ -117,16 +120,21 @@
// Test Dependencies
assertEquals("dom4j",
- ((Dependency)p.getDependencies().get(0)).getName());
+ ((Dependency)p.getDependencies().get(0)).getId());
assertEquals("1.3",
((Dependency)p.getDependencies().get(0)).getVersion());
+
+ // This is synthesized
assertEquals("dom4j-1.3.jar",
((Dependency)p.getDependencies().get(0)).getJar());
assertEquals("http://www.dom4j.org/";,
((Dependency)p.getDependencies().get(0)).getUrl());
// Test Source Directories
- assertEquals("src/java",
(String)p.getBuild().getSourceDirectories().get(0));
+ assertEquals("src/java", p.getBuild().getSourceDirectory());
+
+ // Test Aspect Source Directories
+ //assertEquals("src/aspect", p.getBuild().getAspectSourceDirectory());
// Test Test Source Directories ;-)
assertEquals("src/test", p.getBuild().getUnitTestSourceDirectory());
@@ -134,16 +142,16 @@
assertTrue("Should be empty in maven's project descriptor: ["+iuSrc+"]",
Strings.isEmpty(iuSrc));
- // Test Distributions
- Distribution d0 = (Distribution) p.getDistributions().get(0);
- assertEquals("b1", d0.getId());
- assertEquals("1.0-b1", d0.getVersion());
- assertEquals("MAVEN_1_0_B1", d0.getTag());
+ // Test Versions
+ Version v0 = (Version) p.getVersions().get(0);
+ assertEquals("b1", v0.getId());
+ assertEquals("1.0-b1", v0.getName());
+ assertEquals("MAVEN_1_0_B1", v0.getTag());
- // Test the distribution map
- Distribution d4 = (Distribution) p.getDistributionById("b4");
- assertEquals("b4", d4.getId());
- assertEquals("1.0-b4", d4.getVersion());
- assertEquals("HEAD", d4.getTag());
+ // Test the version map
+ Version v4 = (Version) p.getVersionById("b4");
+ assertEquals("b4", v4.getId());
+ assertEquals("1.0-b4", v4.getName());
+ assertEquals("HEAD", v4.getTag());
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
