jvanzyl 01/09/02 12:44:28
Modified: proposal/maven/src/java/org/apache/maven/bean
Dependency.java Project.java Workspace.java
Log:
- adjust beans to process dep info correctly
- the dep engine takes a List of project names, but to generate
a meaningful dep descriptor we need version info as well.
Revision Changes Path
1.2 +19 -1
jakarta-alexandria/proposal/maven/src/java/org/apache/maven/bean/Dependency.java
Index: Dependency.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/maven/src/java/org/apache/maven/bean/Dependency.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Dependency.java 2001/09/02 19:12:46 1.1
+++ Dependency.java 2001/09/02 19:44:28 1.2
@@ -2,16 +2,29 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Dependency.java,v 1.1 2001/09/02 19:12:46 jvanzyl Exp $
+ * @version $Id: Dependency.java,v 1.2 2001/09/02 19:44:28 jvanzyl Exp $
*/
public class Dependency
extends BaseMavenBean
{
+ // This should eventually be a project object.
+ private String project;
+
/**
* Version associated with this dependency.
*/
private String version;
+
+ public void setProject(String project)
+ {
+ this.project = project;
+ }
+ public String getProject()
+ {
+ return project;
+ }
+
/**
* Set the version for this dependency.
*
@@ -30,5 +43,10 @@
public String getVersion()
{
return version;
+ }
+
+ public String toString()
+ {
+ return project;
}
}
1.3 +14 -4
jakarta-alexandria/proposal/maven/src/java/org/apache/maven/bean/Project.java
Index: Project.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/maven/src/java/org/apache/maven/bean/Project.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Project.java 2001/09/02 19:12:46 1.2
+++ Project.java 2001/09/02 19:44:28 1.3
@@ -7,12 +7,13 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Project.java,v 1.2 2001/09/02 19:12:46 jvanzyl Exp $
+ * @version $Id: Project.java,v 1.3 2001/09/02 19:44:28 jvanzyl Exp $
*/
public class Project
extends BaseMavenBean
{
private List dependencies;
+ private List dependenciesNames;
private Module parentModule;
private String buildFile = "build.xml";
private Map properties;
@@ -20,6 +21,7 @@
public Project()
{
dependencies = new ArrayList();
+ dependenciesNames = new ArrayList();
properties = new HashMap();
}
@@ -43,15 +45,23 @@
return parentModule;
}
- public void addDependency(String dependency)
+ public void addDependency(String project, String version)
{
- //System.out.println("[" + name + "] -> " + dependency);
- dependencies.add(dependency);
+ Dependency d = new Dependency();
+ d.setProject(project);
+ d.setVersion(version);
+ dependencies.add(d);
+ dependenciesNames.add(project);
}
public List getDependencies()
{
return dependencies;
+ }
+
+ public List getDependenciesNames()
+ {
+ return dependenciesNames;
}
public Repository getRepository()
1.2 +2 -2
jakarta-alexandria/proposal/maven/src/java/org/apache/maven/bean/Workspace.java
Index: Workspace.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/maven/src/java/org/apache/maven/bean/Workspace.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Workspace.java 2001/08/27 16:35:05 1.1
+++ Workspace.java 2001/09/02 19:44:28 1.2
@@ -18,7 +18,7 @@
/**
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Workspace.java,v 1.1 2001/08/27 16:35:05 jvanzyl Exp $
+ * @version $Id: Workspace.java,v 1.2 2001/09/02 19:44:28 jvanzyl Exp $
*/
public class Workspace
extends BaseMavenBean
@@ -190,7 +190,7 @@
Project project = (Project) j.next();
project.setParentModule(module);
String projectName = project.getName();
- dependencyEngine.addProject(projectName,
project.getDependencies(), projectName);
+ dependencyEngine.addProject(projectName,
project.getDependenciesNames(), projectName);
projectMap.put(projectName, project);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
