sanders 02/01/31 08:56:23
Modified: proposal/vindico/src/java/org/apache/alexandria/om Ant.java
Cvs.java IScript.java Project.java Repository.java
Script.java Workspace.java
proposal/vindico/src/xml/profile vindico.xml
Log:
Updates to add cvs getting and building finctionality.
Throws NPE right now. This is just a savepoint.
Revision Changes Path
1.3 +24 -18
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java
Index: Ant.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ant.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Ant.java 31 Jan 2002 16:56:22 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.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/Ant.java,v
1.3 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Ant provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/31 16:56:22 $
*/
public class Ant implements IScript {
@@ -80,20 +80,6 @@
private HashMap properties = new HashMap();
- public void toXML(XMLHelper helper) {
- helper.attribute("target", target);
- helper.attribute("basedir", basedir);
- helper.element("ant");
- helper.element("properties");
- Iterator iter = properties.values().iterator();
- while (iter.hasNext()) {
- Property prop = (Property) iter.next();
- prop.toXML(helper);
- }
- helper.popElement();
- helper.popElement();
- }
-
public String getTarget() {
return target;
}
@@ -113,4 +99,24 @@
public void addProperty(Property property) {
properties.put(property.getName(), property);
}
+
+ public void toXML(XMLHelper helper) {
+ helper.attribute("target", target);
+ helper.attribute("basedir", basedir);
+ helper.element("ant");
+ helper.element("properties");
+ Iterator iter = properties.values().iterator();
+ while (iter.hasNext()) {
+ Property prop = (Property) iter.next();
+ prop.toXML(helper);
+ }
+ helper.popElement();
+ helper.popElement();
+ }
+
+ public void build(XMLHelper helper) {
+// helper.attribute("executable", name);
+// helper.element("exec", true);
+ }
+
}
1.2 +9 -4
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java
Index: Cvs.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Cvs.java 31 Jan 2002 16:02:51 -0000 1.1
+++ Cvs.java 31 Jan 2002 16:56:22 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java,v
1.1 2002/01/31 16:02:51 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/31 16:02:51 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Cvs.java,v
1.2 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
* Cvs provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/31 16:02:51 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/31 16:56:22 $
*/
public class Cvs {
@@ -103,6 +103,11 @@
}
public Repository getRepo() {
+ if (repo == null) {
+ //lazily get the repo from the workspace
+// System.out.println("Getting repo for Cvs: " + repository);
+ repo = parentProject.getParentWorkspace().getRepository(repository);
+ }
return repo;
}
1.2 +5 -4
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java
Index: IScript.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IScript.java 28 Jan 2002 12:45:33 -0000 1.1
+++ IScript.java 31 Jan 2002 16:56:22 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v
1.1 2002/01/28 12:45:33 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/28 12:45:33 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v
1.2 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -69,10 +69,11 @@
* <code>Script</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/31 16:56:22 $
*/
public interface IScript {
public void toXML(XMLHelper helper);
+ public void build(XMLHelper helper);
}
1.4 +49 -4
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Project.java 30 Jan 2002 18:58:12 -0000 1.3
+++ Project.java 31 Jan 2002 16:56:22 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v
1.4 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Project provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.3 $ $Date: 2002/01/30 18:58:12 $
+ * @version $Revision: 1.4 $ $Date: 2002/01/31 16:56:22 $
*/
public class Project {
@@ -217,6 +217,21 @@
helper.attribute("basedir", ".");
helper.element("project");
+ helper.attribute("name", "logdir");
+ helper.attribute("value", "${basedir}/../logs");
+ helper.element("property", true);
+
+ helper.attribute("name", "project.home");
+ helper.attribute("value", "${basedir}/../builds/" + name + "/" + home);
+ helper.element("property", true);
+
+ //print out the cvsdir if it is used.
+ if (getCvs() != null) {
+ helper.attribute("name", "cvsdir");
+ helper.attribute("value", "${basedir}/../pristine");
+ helper.element("property", true);
+ }
+
helper.attribute("name", "all");
helper.attribute("depends", "cvs-" + name + ", build-" + name);
helper.element("target");
@@ -232,6 +247,20 @@
helper.attribute("message", "Calling cvs for " + name);
helper.element("echo", true);
+ if (getCvs() != null) {
+ Repository repo = getCvs().getRepo();
+ if (repo.getPassword() != null) {
+ helper.attribute("cvsRoot", repo.getCvsRoot());
+ helper.attribute("password", repo.getPassword());
+ helper.element("cvspass", true);
+ }
+ helper.attribute("command", "checkout");
+ helper.attribute("cvsRoot", cvs.getRepo().getCvsRoot());
+ helper.attribute("dest", "${cvsdir}");
+ helper.attribute("package", cvs.getModule());
+ helper.element("cvs", true);
+ }
+
helper.popElement();
helper.attribute("name", "build-" + name);
@@ -239,6 +268,22 @@
helper.attribute("message", "Calling build for " + name);
helper.element("echo", true);
+
+ helper.attribute("dir", "${basedir}/../builds/" + name);
+ helper.element("mkdir", true);
+
+ helper.attribute("preservelastmodified", "yes");
+ helper.attribute("todir", "${basedir}../builds/" + name);
+ helper.attribute("includeEmptyDirs", "no");
+ helper.element("copy");
+ helper.attribute("dir", "${basedir}/../pristine/" +
getParentModule().getName() + "/" + name);
+ helper.element("fileset", true);
+ helper.popElement();
+
+ if (getScript() != null) {
+ //Note that the IScript object need a ${project.home} set
+ script.build(helper);
+ }
helper.popElement();
1.3 +17 -4
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Repository.java
Index: Repository.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Repository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Repository.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Repository.java 31 Jan 2002 16:56:22 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Repository.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/Repository.java,v
1.3 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -84,7 +84,7 @@
* logged at the DEBUG level saying so.
*
* @author Scott Sanders
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/31 16:56:22 $
*/
public class Repository {
@@ -227,6 +227,19 @@
} else {
// log.debug("Ignoring value of: " + homepage + " for propery homepage.
Value is already: " + this.homepage);
}
+ }
+
+ public String getCvsRoot() {
+ StringBuffer buf = new StringBuffer(64);
+ buf.append(':');
+ buf.append(method);
+ buf.append(':');
+ buf.append(user);
+ buf.append('@');
+ buf.append(hostname);
+ buf.append(':');
+ buf.append(path);
+ return buf.toString();
}
public Workspace getParentWorkspace() {
1.3 +9 -4
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java
Index: Script.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Script.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Script.java 31 Jan 2002 16:56:22 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.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/Script.java,v
1.3 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -68,7 +68,7 @@
* Script provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/01/31 16:56:22 $
*/
public class Script implements IScript {
@@ -87,4 +87,9 @@
helper.element("script", true);
}
+ public void build(XMLHelper helper) {
+ helper.attribute("executable", name);
+ helper.attribute("dir", "${project.home}");
+ helper.element("exec", true);
+ }
}
1.5 +6 -7
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Workspace.java 31 Jan 2002 16:11:17 -0000 1.4
+++ Workspace.java 31 Jan 2002 16:56:22 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
1.4 2002/01/31 16:11:17 sanders Exp $
- * $Revision: 1.4 $
- * $Date: 2002/01/31 16:11:17 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
1.5 2002/01/31 16:56:22 sanders Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/01/31 16:56:22 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.4 $ $Date: 2002/01/31 16:11:17 $
+ * @version $Revision: 1.5 $ $Date: 2002/01/31 16:56:22 $
*/
public class Workspace {
@@ -107,6 +107,8 @@
public void setBasedir(String basedir) {
this.basedir = basedir;
cvsbasedir = basedir + "/pristine";
+ logPath = basedir + "/logs";
+ buildPath = basedir + "/builds";
}
public String getPkgdir() {
@@ -178,9 +180,6 @@
public void execute() throws VindicoException {
// log.info("Building all necessary build files...");
-
- logPath = basedir + "/logs";
- buildPath = basedir + "/builds";
XMLHelper vindicoBuild = new XMLHelper();
vindicoBuild.attribute("name", "vindico");
1.3 +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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vindico.xml 30 Jan 2002 18:58:12 -0000 1.2
+++ vindico.xml 31 Jan 2002 16:56:23 -0000 1.3
@@ -4,6 +4,7 @@
<!-- cvs repos -->
<repository href="repository/jakarta.xml"/>
+ <repository href="repository/xml.xml"/>
<!-- Installed packages -->
<project name="jaxp" package="java_xml_pack-winter-01-dev/jaxp-1.2-ea1"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
