You are viewing a plain text version of this content. The canonical link for it is here.
Posted to alexandria-dev@jakarta.apache.org by sa...@apache.org on 2002/01/30 19:58:12 UTC
cvs commit: jakarta-alexandria/proposal/vindico/src/xml/project jakarta-ant.xml xml-xerces.xml
sanders 02/01/30 10:58:12
Modified: proposal/vindico/src/java/org/apache/alexandria Vindico.java
proposal/vindico/src/java/org/apache/alexandria/exc
VindicoException.java
proposal/vindico/src/java/org/apache/alexandria/om Jar.java
Module.java Project.java Workspace.java
WorkspaceLoader.java
proposal/vindico/src/java/org/apache/alexandria/util
XMLHelper.java
proposal/vindico/src/xml/profile vindico.xml
proposal/vindico/src/xml/project jakarta-ant.xml
xml-xerces.xml
Log:
Updated to have separate cvs and build tasks per project.
Changed the project definitions so that the cvs def is in the first
project to use the code.
Logging everything to files that can be converted later.
Revision Changes Path
1.2 +5 -5 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Vindico.java
Index: Vindico.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Vindico.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Vindico.java 29 Jan 2002 17:33:14 -0000 1.1
+++ Vindico.java 30 Jan 2002 18:58:12 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Vindico.java,v 1.1 2002/01/29 17:33:14 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/29 17:33:14 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Vindico.java,v 1.2 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -61,9 +61,9 @@
package org.apache.alexandria;
+import org.apache.alexandria.exc.VindicoException;
import org.apache.alexandria.om.Workspace;
import org.apache.alexandria.om.WorkspaceLoader;
-import org.apache.alexandria.exc.VindicoException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
@@ -72,7 +72,7 @@
* Vindico provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/29 17:33:14 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/30 18:58:12 $
*/
public class Vindico extends Task {
1.2 +4 -4 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/exc/VindicoException.java
Index: VindicoException.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/exc/VindicoException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VindicoException.java 29 Jan 2002 17:33:15 -0000 1.1
+++ VindicoException.java 30 Jan 2002 18:58:12 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/exc/VindicoException.java,v 1.1 2002/01/29 17:33:15 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/29 17:33:15 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/exc/VindicoException.java,v 1.2 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -66,7 +66,7 @@
super();
}
- public VindicoException( String message ) {
- super( message );
+ public VindicoException(String message) {
+ super(message);
}
}
1.3 +14 -4 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Jar.java
Index: Jar.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Jar.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jar.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Jar.java 30 Jan 2002 18:58:12 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Jar.java,v 1.2 2002/01/29 17:30:48 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/29 17:30:48 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Jar.java,v 1.3 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -68,12 +68,13 @@
* Jar provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
*/
public class Jar {
private String name;
private String id;
+ private String type;
public String getName() {
return name;
@@ -91,9 +92,18 @@
this.id = id;
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
public void toXML(XMLHelper helper) {
helper.attribute("name", name);
helper.attribute("id", id);
+ helper.attribute("type", type);
helper.element("jar", true);
}
1.3 +4 -23 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Module.java
Index: Module.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Module.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Module.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Module.java 30 Jan 2002 18:58:12 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Module.java,v 1.2 2002/01/29 17:30:48 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/29 17:30:48 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Module.java,v 1.3 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -71,27 +71,17 @@
* Module provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
*/
public class Module {
- private boolean cvsFinished = false;
private String href;
private String name;
private String url;
private String description;
- private String repository;
private Workspace parentWorkspace;
private HashMap projects = new HashMap();
- public boolean isCvsFinished() {
- return cvsFinished;
- }
-
- public void setCvsFinished(boolean cvsFinished) {
- this.cvsFinished = cvsFinished;
- }
-
public String getHref() {
return href;
}
@@ -124,14 +114,6 @@
this.description = description;
}
- public String getRepository() {
- return repository;
- }
-
- public void setRepository(String repository) {
- this.repository = repository;
- }
-
public Workspace getParentWorkspace() {
return parentWorkspace;
}
@@ -155,7 +137,6 @@
helper.attribute("href", href);
helper.attribute("url", url);
helper.attribute("description", description);
- helper.attribute("repository", repository);
helper.element("module");
helper.element("projects");
Iterator iter = projects.values().iterator();
1.3 +77 -9 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java
Index: Project.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Project.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Project.java 30 Jan 2002 18:58:12 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v 1.2 2002/01/29 17:30:48 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/29 17:30:48 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v 1.3 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -64,14 +64,16 @@
import java.util.HashMap;
import java.util.Iterator;
+import org.apache.alexandria.exc.VindicoException;
import org.apache.alexandria.util.XMLHelper;
+import org.apache.commons.io.FileUtils;
/**
* Project provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
*/
public class Project {
@@ -87,6 +89,8 @@
private Javadoc javadoc;
private Workspace parentWorkspace;
private Module parentModule;
+ private Cvs cvs;
+ private boolean cvsFinished = false;
private HashMap dependencies = new HashMap();
private HashMap optionalDependencies = new HashMap();
private HashMap jars = new HashMap();
@@ -155,6 +159,34 @@
public void setParentModule(Module parentModule) {
this.parentModule = parentModule;
}
+
+ public boolean isCvsFinished() {
+ return cvsFinished;
+ }
+
+ public void setCvsFinished(boolean cvsFinished) {
+ this.cvsFinished = cvsFinished;
+ }
+
+ public Cvs getCvs() {
+ if (cvs != null) {
+ //Fixup the cvs
+ // repo WILL be set :)
+ if (cvs.getModule() == null) {
+ cvs.setModule(getParentModule().getName());
+ }
+ if (cvs.getRepo() == null) {
+ cvs.setRepo(getParentWorkspace().getRepository(cvs.getRepository()));
+ }
+ }
+ return cvs;
+ }
+
+ public void setCvs(Cvs cvs) {
+ this.cvs = cvs;
+ cvs.setParentProject(this);
+ }
+
//FIXME What about <depend project="foo" inherit="all"?
//FIXME What about <depend project="foo" inherit="hard"?
public void addDependency(String projectName) {
@@ -177,12 +209,45 @@
return dependencies.values().iterator();
}
- public void build() {
- if (script == null) {
-// log.info("Nothing to build for project: " + name);
- } else {
-// log.info("Building project: " + name);
+ public void build(String filename) throws VindicoException {
+ XMLHelper helper = new XMLHelper();
+
+ helper.attribute("name", name);
+ helper.attribute("default", "all");
+ helper.attribute("basedir", ".");
+ helper.element("project");
+
+ helper.attribute("name", "all");
+ helper.attribute("depends", "cvs-" + name + ", build-" + name);
+ helper.element("target");
+
+ helper.attribute("message", "Finished building " + name);
+ helper.element("echo", true);
+
+ helper.popElement();
+
+ helper.attribute("name", "cvs-" + name);
+ helper.element("target");
+
+ helper.attribute("message", "Calling cvs for " + name);
+ helper.element("echo", true);
+ helper.popElement();
+
+ helper.attribute("name", "build-" + name);
+ helper.element("target");
+
+ helper.attribute("message", "Calling build for " + name);
+ helper.element("echo", true);
+
+ helper.popElement();
+
+ helper.popElement();
+
+ try {
+ FileUtils.fileWrite(filename, helper.toString());
+ } catch (Exception e) {
+ throw new VindicoException(e.getMessage());
}
}
@@ -191,6 +256,9 @@
helper.attribute("status", status);
helper.attribute("packageDir", packageDir);
helper.element("project");
+ if (cvs != null) {
+ cvs.toXML(helper);
+ }
if (script != null) {
script.toXML(helper);
}
1.3 +70 -26 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java
Index: Workspace.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Workspace.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Workspace.java 30 Jan 2002 18:58:12 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v 1.2 2002/01/29 17:30:48 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/29 17:30:48 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v 1.3 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -64,8 +64,8 @@
import java.util.HashMap;
import java.util.Iterator;
-import org.apache.alexandria.util.XMLHelper;
import org.apache.alexandria.exc.VindicoException;
+import org.apache.alexandria.util.XMLHelper;
import org.apache.commons.io.FileUtils;
@@ -73,7 +73,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
*/
public class Workspace {
@@ -148,6 +148,10 @@
properties.put(property.getName(), property);
}
+ public Repository getRepository(String name) {
+ return (Repository) repositories.get(name);
+ }
+
public void addRepository(Repository repository) {
if (repository.getHref() == null) {
WorkspaceLoader.loadRepository(repository,
@@ -185,12 +189,29 @@
vindicoBuild.element("project");
vindicoBuild.attribute("name", "vindico");
+ vindicoBuild.attribute("depends", "cvs-all,build-all,list-unbuilt");
+ vindicoBuild.element("target");
+
+ vindicoBuild.attribute("message", "Vindico has finished");
+ vindicoBuild.element("echo", true);
+ vindicoBuild.popElement();
+
+ vindicoBuild.attribute("name", "cvs-all");
vindicoBuild.element("target");
- vindicoBuild.attribute("message", "Welcome to vindico");
- vindicoBuild.element("echo");
+ doCVSDefs(vindicoBuild);
vindicoBuild.popElement();
+
+ vindicoBuild.attribute("name", "build-all");
+ vindicoBuild.element("target");
+ boolean infinite = doBuildDefs(vindicoBuild);
vindicoBuild.popElement();
+ vindicoBuild.attribute("name", "list-unbuilt");
+ vindicoBuild.element("target");
+ listUnbuiltProjects(vindicoBuild, infinite);
+ vindicoBuild.popElement();
+
+
vindicoBuild.popElement();
try {
FileUtils.fileWrite(buildPath + "/build.xml", vindicoBuild.toString());
@@ -202,36 +223,69 @@
// doBuilds();
}
- private void doBuilds() {
-// log.info("Building projects...");
+ private void doCVSDefs(XMLHelper helper) {
+ Iterator iter = projects.values().iterator();
+ while (iter.hasNext()) {
+ Project project = (Project) iter.next();
+ if (project.getCvs() != null) {
+ Cvs cvs = project.getCvs();
+ String projectName = cvs.getParentProject().getName();
+ helper.attribute("antfile", "build-" + projectName + ".xml");
+ helper.attribute("target", "cvs-" + projectName);
+ helper.attribute("output", logPath + "/" + project.getName() + "-cvs.xml");
+ helper.element("ant");
+ helper.comment("From project: " + cvs.getParentProject().getName());
+ helper.popElement();
+ }
+ }
+ }
+
+ private boolean doBuildDefs(XMLHelper helper) throws VindicoException {
int numProjects = projects.size();
int infiniteLoopPreventor = 0;
+ boolean infiniteLoop = false;
while (numProjects > finishedProjects.size()) {
infiniteLoopPreventor++;
Iterator iter = projects.values().iterator();
while (iter.hasNext()) {
Project project = (Project) iter.next();
if ((project.getStatus() == null) && (resolveDependencies(project))) {
- finishedProjects.put(project.getName(), project);
- doCvsUpdate(project);
- project.build();
+ String projectName = project.getName();
+ helper.attribute("antfile", "build-" + projectName + ".xml");
+ helper.attribute("target", "build-" + projectName);
+ helper.attribute("output", logPath + "/" + project.getName() + "-build.xml");
+ helper.element("ant");
+ if (project.getParentModule() != null) {
+ helper.comment("From module: " + project.getParentModule().getName());
+ } else {
+ helper.comment("From workspace: " + project.getParentWorkspace().getName());
+ }
+ helper.popElement();
+
+ project.build(buildPath + "/build-" + project.getName() + ".xml");
project.setStatus(Project.STATUS_BUILT);
+ finishedProjects.put(project.getName(), project);
}
}
if (infiniteLoopPreventor > (projects.size() * 2)) {
-// log.error("Infinite loop detected in project dependencies");
- listUnbuiltProjects();
+ infiniteLoop = true;
break;
}
}
+ return infiniteLoop;
}
- private void listUnbuiltProjects() {
+ private void listUnbuiltProjects(XMLHelper helper, boolean infiniteLoop) {
+ if (infiniteLoop) {
+ helper.attribute("message", "ERROR: An infinite loop was detected in the project dependencies");
+ helper.element("echo", true);
+ }
Iterator iter = projects.values().iterator();
while (iter.hasNext()) {
Project project = (Project) iter.next();
if ((project.getStatus() == null) || (!project.getStatus().equals(Project.STATUS_BUILT))) {
-// log.error("Project: " + project.getName() + " not built.");
+ helper.attribute("message", "WARN: Project " + project.getName() + " was not built");
+ helper.element("echo", true);
}
}
}
@@ -255,16 +309,6 @@
}
// log.info("Project: " + project.getName() + " has resolved all of its dependencies");
return true;
- }
-
- private void doCvsUpdate(Project project) {
- Module mod = project.getParentModule();
- if ((mod != null) && (!mod.isCvsFinished())) {
-// log.info("Doing CVS checkout for module: " + mod.getName());
- Repository repo = (Repository) repositories.get(mod.getRepository());
- //repo.checkout(mod.getName(), cvsbasedir, logPath + "/" + mod.getName() + "-cvs.xml");
- mod.setCvsFinished(true);
- }
}
private void prepare() {
1.3 +8 -5 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/WorkspaceLoader.java
Index: WorkspaceLoader.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/WorkspaceLoader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WorkspaceLoader.java 29 Jan 2002 17:30:48 -0000 1.2
+++ WorkspaceLoader.java 30 Jan 2002 18:58:12 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/WorkspaceLoader.java,v 1.2 2002/01/29 17:30:48 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/29 17:30:48 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/WorkspaceLoader.java,v 1.3 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
*/
public class WorkspaceLoader {
@@ -156,7 +156,6 @@
digester.addSetNext("*/module", "addModule", Module.class.getName());
digester.addSetProperties("module");
- digester.addSetProperties("module/cvs");
digester.addCallMethod("module/url", "setUrl", 1);
digester.addCallParam("module/url", 0, "href");
digester.addCallMethod("module/description", "setDescription", 0);
@@ -166,6 +165,10 @@
digester.addCallMethod("*/project", "setPackageDir", 1);
digester.addCallParam("*/project", 0, "package");
digester.addSetNext("*/project", "addProject", Project.class.getName());
+
+ digester.addObjectCreate("*/project/cvs", Cvs.class);
+ digester.addSetProperties("*/project/cvs");
+ digester.addSetNext("*/project/cvs", "setCvs", Cvs.class.getName());
digester.addCallMethod("*/project/depend", "addDependency", 1);
digester.addCallParam("*/project/depend", 0, "project");
1.3 +14 -4 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/util/XMLHelper.java
Index: XMLHelper.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/util/XMLHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLHelper.java 29 Jan 2002 17:30:48 -0000 1.2
+++ XMLHelper.java 30 Jan 2002 18:58:12 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/util/XMLHelper.java,v 1.2 2002/01/29 17:30:48 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/01/29 17:30:48 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/util/XMLHelper.java,v 1.3 2002/01/30 18:58:12 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/30 18:58:12 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
*/
public class XMLHelper {
@@ -84,6 +84,8 @@
private static final String CLOSE = "</";
private static final String INDENT = " ";
private static final String EQUALS = "=\"";
+ private static final String COMMENT_BEGIN = "<!-- ";
+ private static final String COMMENT_END = " -->";
public XMLHelper() {
}
@@ -154,6 +156,14 @@
if (value == null || isEmpty) {
newLine();
}
+ }
+
+ public void comment(String comment) {
+ indent();
+ buf.append(COMMENT_BEGIN);
+ buf.append(comment);
+ buf.append(COMMENT_END);
+ newLine();
}
private void appendAttributes() {
1.2 +1 -0 jakarta-alexandria/proposal/vindico/src/xml/profile/vindico.xml
Index: vindico.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/xml/profile/vindico.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vindico.xml 28 Jan 2002 12:45:34 -0000 1.1
+++ vindico.xml 30 Jan 2002 18:58:12 -0000 1.2
@@ -1,5 +1,6 @@
<profile name="vindico">
<module href="project/jakarta-ant.xml"/>
+ <module href="project/xml-xerces.xml"/>
<!-- cvs repos -->
<repository href="repository/jakarta.xml"/>
1.2 +2 -3 jakarta-alexandria/proposal/vindico/src/xml/project/jakarta-ant.xml
Index: jakarta-ant.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/xml/project/jakarta-ant.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jakarta-ant.xml 28 Jan 2002 12:45:34 -0000 1.1
+++ jakarta-ant.xml 30 Jan 2002 18:58:12 -0000 1.2
@@ -5,8 +5,6 @@
Java based build tool
</description>
- <cvs repository="jakarta"/>
-
<project name="jakarta-ant">
<ant target="dist-lite">
<property name="ant.home" reference="home" project="jakarta-ant"/>
@@ -56,6 +54,7 @@
</project>
<project name="bootstrap-ant">
+ <cvs repository="jakarta"/>
<script name="bootstrap"/>
<depend project="jaxp"/>
@@ -74,7 +73,7 @@
<depend project="jakarta-avalon-logkit"/>
<option project="xml-xalan2"/>
</project>
-
+
<project name="jakarta-ant-mutant">
<ant basedir="proposal/mutant"/>
1.2 +1 -2 jakarta-alexandria/proposal/vindico/src/xml/project/xml-xerces.xml
Index: xml-xerces.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/xml/project/xml-xerces.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xml-xerces.xml 28 Jan 2002 12:45:35 -0000 1.1
+++ xml-xerces.xml 30 Jan 2002 18:58:12 -0000 1.2
@@ -5,11 +5,10 @@
Java XML Parser
</description>
- <cvs repository="xml" tag="xerces_j_1"/>
-
<!-- build bootstrap -->
<project name="xml-xerces">
+ <cvs repository="xml" tag="xerces_j_1"/>
<ant basedir="java" target="jar"/>
<depend project="jaxp"/>
<depend project="bootstrap-ant"/>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>