sanders 02/04/10 19:01:59
Modified: proposal/vindico/src/java/org/apache/alexandria Main.java
proposal/vindico/src/java/org/apache/alexandria/om Ant.java
Home.java IScript.java Jar.java Javadoc.java
Module.java Property.java Repository.java
Script.java Work.java Workspace.java
Added: proposal/vindico/src/java/org/apache/alexandria/om
Override.java
Log:
License change. Workspace now logs cvs updates to XML
Revision Changes Path
1.3 +11 -5
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Main.java
Index: Main.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Main.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Main.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Main.java 11 Apr 2002 02:01:59 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Main.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/Main.java,v
1.3 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -63,6 +63,9 @@
import org.apache.alexandria.om.Workspace;
import org.apache.alexandria.om.WorkspaceLoader;
+//import org.apache.log4j.BasicConfigurator;
+//import org.apache.log4j.Category;
+//import org.apache.log4j.Priority;
/**
@@ -70,15 +73,18 @@
* the workspace which you intend to execute.
*
* @author Scott Sanders
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/11 02:01:59 $
*/
public class Main {
public static void main(String[] args) {
+// BasicConfigurator.configure();
+// Category.getDefaultHierarchy().getRoot().setPriority(Priority.INFO);
if (args.length == 1) {
Workspace workspace = WorkspaceLoader.loadWorkspace(args[0]);
try {
workspace.execute();
+ System.out.println(workspace.toXMLString());
} catch (Exception e) {
System.out.println("Exception: " + e.getMessage());
}
1.11 +5 -5
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Ant.java 11 Feb 2002 16:20:28 -0000 1.10
+++ Ant.java 11 Apr 2002 02:01:59 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java,v
1.10 2002/02/11 16:20:28 sanders Exp $
- * $Revision: 1.10 $
- * $Date: 2002/02/11 16:20:28 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java,v
1.11 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -71,7 +71,7 @@
* Ant provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.10 $ $Date: 2002/02/11 16:20:28 $
+ * @version $Revision: 1.11 $ $Date: 2002/04/11 02:01:59 $
*/
public class Ant implements IScript {
1.3 +5 -5
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Home.java
Index: Home.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Home.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Home.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Home.java 11 Apr 2002 02:01:59 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Home.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/Home.java,v
1.3 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -68,7 +68,7 @@
* Home 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/04/11 02:01:59 $
*/
public class Home {
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IScript.java 3 Feb 2002 03:08:34 -0000 1.4
+++ IScript.java 11 Apr 2002 02:01:59 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v
1.4 2002/02/03 03:08:34 sanders Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/03 03:08:34 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/IScript.java,v
1.5 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -69,7 +69,7 @@
* <code>Script</code>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/03 03:08:34 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/11 02:01:59 $
*/
public interface IScript {
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Jar.java 30 Jan 2002 18:58:12 -0000 1.3
+++ Jar.java 11 Apr 2002 02:01:59 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Jar.java,v
1.4 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -68,7 +68,7 @@
* Jar 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/04/11 02:01:59 $
*/
public class Jar {
1.3 +5 -5
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Javadoc.java
Index: Javadoc.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Javadoc.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Javadoc.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Javadoc.java 11 Apr 2002 02:01:59 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Javadoc.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/Javadoc.java,v
1.3 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -68,7 +68,7 @@
* Javadoc 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/04/11 02:01:59 $
*/
public class Javadoc {
1.4 +5 -5
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Module.java 30 Jan 2002 18:58:12 -0000 1.3
+++ Module.java 11 Apr 2002 02:01:59 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Module.java,v
1.4 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -71,7 +71,7 @@
* Module 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/04/11 02:01:59 $
*/
public class Module {
1.3 +5 -5
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Property.java
Index: Property.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Property.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Property.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Property.java 11 Apr 2002 02:01:59 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Property.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/Property.java,v
1.3 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -68,7 +68,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/11 02:01:59 $
*/
public class Property {
1.5 +5 -5
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Repository.java 2 Feb 2002 06:57:45 -0000 1.4
+++ Repository.java 11 Apr 2002 02:01:59 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Repository.java,v
1.4 2002/02/02 06:57:45 sanders Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/02 06:57:45 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Repository.java,v
1.5 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -71,7 +71,7 @@
* logged at the DEBUG level saying so.
*
* @author Scott Sanders
- * @version $Revision: 1.4 $ $Date: 2002/02/02 06:57:45 $
+ * @version $Revision: 1.5 $ $Date: 2002/04/11 02:01:59 $
*/
public class Repository {
1.8 +4 -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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Script.java 3 Feb 2002 03:21:26 -0000 1.7
+++ Script.java 11 Apr 2002 02:01:59 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java,v
1.7 2002/02/03 03:21:26 sanders Exp $
- * $Revision: 1.7 $
- * $Date: 2002/02/03 03:21:26 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.java,v
1.8 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.8 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -68,7 +68,7 @@
* Script provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.7 $ $Date: 2002/02/03 03:21:26 $
+ * @version $Revision: 1.8 $ $Date: 2002/04/11 02:01:59 $
*/
public class Script implements IScript {
1.3 +5 -5
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Work.java
Index: Work.java
===================================================================
RCS file:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Work.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Work.java 29 Jan 2002 17:30:48 -0000 1.2
+++ Work.java 11 Apr 2002 02:01:59 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Work.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/Work.java,v
1.3 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -68,7 +68,7 @@
* Work 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/04/11 02:01:59 $
*/
public class Work {
1.12 +45 -24
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Workspace.java 9 Feb 2002 00:22:14 -0000 1.11
+++ Workspace.java 11 Apr 2002 02:01:59 -0000 1.12
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
1.11 2002/02/09 00:22:14 sanders Exp $
- * $Revision: 1.11 $
- * $Date: 2002/02/09 00:22:14 $
+ * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v
1.12 2002/04/11 02:01:59 sanders Exp $
+ * $Revision: 1.12 $
+ * $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
@@ -29,7 +29,7 @@
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
+ * 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
@@ -73,13 +73,12 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.11 $ $Date: 2002/02/09 00:22:14 $
+ * @version $Revision: 1.12 $ $Date: 2002/04/11 02:01:59 $
*/
public class Workspace {
private String name;
private String basedir;
-// private String cvsbasedir;
private String pkgdir;
private String version;
private String filename;
@@ -106,7 +105,6 @@
public void setBasedir(String basedir) {
this.basedir = basedir;
-// cvsbasedir = basedir + "/pristine";
logPath = basedir + "/logs";
buildPath = basedir + "/builds";
}
@@ -138,7 +136,6 @@
public void setFilename(String filename) {
this.filename = filename;
selfBaseDir = FileUtils.dirname(filename);
-// log.info("selfBaseDir set to: " + selfBaseDir);
}
public String getLogPath() {
@@ -182,13 +179,18 @@
module.setParentWorkspace(this);
}
+ public void addOverride(Override override) {
+ Project project = (Project) projects.get(override.getProject());
+ if (project != null) {
+ project.setPackageDir(pkgdir + "/" + override.getSubdir());
+ }
+ }
+
public void loadProfile(String filename) {
WorkspaceLoader.loadProfile(this, selfBaseDir + "/" + filename);
}
public void execute() throws VindicoException {
-// log.info("Building all necessary build files...");
-
XMLHelper vindicoBuild = new XMLHelper();
vindicoBuild.attribute("name", "vindico");
vindicoBuild.attribute("default", "vindico");
@@ -225,9 +227,6 @@
} catch (Exception e) {
throw new VindicoException(e.getMessage());
}
-// prepare();
-
-// doBuilds();
}
private void doCVSDefs(XMLHelper helper) {
@@ -237,12 +236,37 @@
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.txt");
- helper.attribute("inheritAll", "false");
- helper.element("ant");
- helper.comment("From project: " + cvs.getParentProject().getName());
+// helper.attribute("antfile", "build-" + projectName + ".xml");
+// helper.attribute("target", "cvs-" + projectName);
+// helper.attribute("output", logPath + "/" + project.getName() +
"-cvs.txt");
+// helper.attribute("inheritAll", "false");
+// helper.element("ant");
+// helper.comment("From project: " +
cvs.getParentProject().getName());
+// helper.popElement();
+
+
+ helper.attribute("classname", "org.apache.tools.ant.Main");
+ helper.attribute("fork", "yes");
+ helper.attribute("failonerror", "no");
+ helper.attribute("dir", "${basedir}");
+ helper.element("java");
+
+ String jvmArgs = "-Dvindico.logfile=" + getLogPath() + "/" +
projectName + ".log.xml";
+ helper.attribute("line", jvmArgs);
+ helper.element("jvmarg", true);
+
+ String commandLine = "-listener
org.apache.alexandria.ant.XMLListener -buildfile build-" +
+ projectName + ".xml " + "cvs-" + projectName;
+ //FIXME - need to pass properties here
+ helper.attribute("line", commandLine);
+ helper.element("arg", true);
+
+ helper.element("classpath");
+ helper.attribute("location", "${ant.home}/lib/ant.jar");
+ helper.element("pathelement", true);
+ helper.attribute("location", "${basedir}/vindico-ant.jar");
+ helper.element("pathelement", true);
+ helper.popElement();
helper.popElement();
}
}
@@ -277,7 +301,7 @@
finishedProjects.put(project.getName(), project);
}
}
- if (infiniteLoopPreventor > (projects.size() * 2)) {
+ if (infiniteLoopPreventor > (projects.size() * 8)) {
infiniteLoop = true;
break;
}
@@ -294,7 +318,7 @@
while (iter.hasNext()) {
Project project = (Project) iter.next();
if ((project.getStatus() == null) ||
(!project.getStatus().equals(Project.STATUS_BUILT))) {
- helper.attribute("message", "WARN: Project " + project.getName() +
" was not built");
+ helper.attribute("message", "WARN: Project " + project.getName() +
" was not built because: " + project.getStatus());
helper.element("echo", true);
}
}
@@ -308,16 +332,13 @@
if (depProj == null) {
return false;
} else if (!((Project)
depProj).getStatus().equals(Project.STATUS_BUILT)) {
-// log.error("Not building " + project.getName() + "because
dependent project: " + dep + " failed to build");
project.setStatus("Dependent project failed: " + dep);
finishedProjects.put(project.getName(), project);
} else if (projects.get(dep) == null) {
-// log.error("Project: " + project.getName() + " has dependency on
undefined project: " + dep);
project.setStatus("Dependency on undefined project: " + dep);
finishedProjects.put(project.getName(), project);
}
}
-// log.info("Project: " + project.getName() + " has resolved all of its
dependencies");
return true;
}
1.1
jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Override.java
Index: Override.java
===================================================================
/*
* $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Override.java,v
1.1 2002/04/11 02:01:59 sanders Exp $
* $Revision: 1.1 $
* $Date: 2002/04/11 02:01:59 $
*
* ====================================================================
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 1999-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Alexandria", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*
*/
package org.apache.alexandria.om;
public class Override {
private String project;
private String subdir;
public String getProject() {
return project;
}
public void setProject(String project) {
this.project = project;
}
public String getSubdir() {
return subdir;
}
public void setSubdir(String subdir) {
this.subdir = subdir;
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
