sanders 02/01/29 09:30:48
Modified: proposal/vindico build.xml vindico.build.properties
proposal/vindico/src/java/org/apache/alexandria Main.java
proposal/vindico/src/java/org/apache/alexandria/om Ant.java
Home.java Jar.java Javadoc.java Module.java
Project.java Property.java Repository.java
Script.java Work.java Workspace.java
WorkspaceLoader.java
proposal/vindico/src/java/org/apache/alexandria/util
XMLHelper.java
Log:
Moving to the "all-ant" model.
Revision Changes Path
1.4 +16 -9 jakarta-alexandria/proposal/vindico/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 29 Jan 2002 16:29:45 -0000 1.3
+++ build.xml 29 Jan 2002 17:30:47 -0000 1.4
@@ -2,7 +2,7 @@
<!--
Jakarta Vindico (Alexandria)
- $Id: build.xml,v 1.3 2002/01/29 16:29:45 sanders Exp $
+ $Id: build.xml,v 1.4 2002/01/29 17:30:47 sanders Exp $
-->
<!-- User's overrides to existing properties -->
@@ -15,14 +15,12 @@
<!-- compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
- <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-io.jar}"/>
- <pathelement location="${cvsclient.jar}"/>
<pathelement location="${jaxp.jar}"/>
- <pathelement location="${log4j.jar}"/>
</path>
@@ -30,14 +28,12 @@
<path id="test.classpath">
<pathelement location="${build.home}/tests"/>
<pathelement location="${junit.jar}"/>
- <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-digester.jar}"/>
+ <pathelement location="${commons-logging.jar}"/>
<pathelement location="${commons-io.jar}"/>
- <pathelement location="${cvsclient.jar}"/>
<pathelement location="${jaxp.jar}"/>
- <pathelement location="${log4j.jar}"/>
</path>
@@ -177,11 +173,22 @@
<target name="run" depends="compile">
<echo message="Running ${component.title}..."/>
- <java classname="org.apache.alexandria.Main" fork="yes"
+ <taskdef name="vindico" classname="org.apache.alexandria.Vindico">
+ <classpath refid="compile.classpath"/>
+ </taskdef>
+ <delete dir="${vindico.basedir}"/>
+ <mkdir dir="${vindico.basedir}"/>
+ <mkdir dir="${vindico.basedir}/pristine"/>
+ <mkdir dir="${vindico.basedir}/logs"/>
+ <mkdir dir="${vindico.basedir}/builds"/>
+ <vindico workspace="${vindico.profile}"/>
+ <ant dir="${vindico.basedir}/builds" target="vindico"
output="${vindico.basedir}/logs/masterbuild.txt"/>
+
+ <!--java classname="org.apache.alexandria.Main" fork="yes"
failonerror="true">
<arg value="${vindico.profile}"/>
<classpath refid="compile.classpath"/>
- </java>
+ </java-->
</target>
</project>
1.2 +1 -6 jakarta-alexandria/proposal/vindico/vindico.build.properties
Index: vindico.build.properties
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/vindico.build.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vindico.build.properties 29 Jan 2002 02:11:33 -0000 1.1
+++ vindico.build.properties 29 Jan 2002 17:30:47 -0000 1.2
@@ -1,5 +1,5 @@
vindico.profile=${basedir}\\src\\xml\\vindico.xml
-
+vindico.basedir=/vindico
commons.home=/dev/jakarta-commons
commons-beanutils.jar=${commons.home}/beanutils/dist/commons-beanutils.jar
@@ -8,14 +8,9 @@
commons-io.jar=${commons.home}/../jakarta-commons-sandbox/io/dist/commons-io.jar
commons-logging.jar=${commons.home}/logging/dist/commons-logging.jar
-cvsclient.jar=lib/cvslib.jar
-
jaxp.jar=/lib/java_xml_pack-winter-01-dev/jaxp-1.2-ea1/xerces.jar
-
junit.home=/lib/junit3.7
junit.jar=${junit.home}/junit.jar
-
-log4j.jar=/lib/jakarta-log4j-1.1.3/dist/lib/log4j.jar
component.name=vindico
component.version=2.0-dev
1.2 +13 -29
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Main.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Main.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/Main.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/Main.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -63,43 +63,27 @@
import org.apache.alexandria.om.Workspace;
import org.apache.alexandria.om.WorkspaceLoader;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
-import org.apache.log4j.BasicConfigurator;
-import org.apache.log4j.Category;
-import org.apache.log4j.Priority;
/**
- * Represents ...
+ * Main is a testing entry point to vindico. Simply pass it the filename of
+ * the workspace which you intend to execute.
*
* @author Scott Sanders
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
*/
public class Main {
- static {
- BasicConfigurator.configure();
- Category.getInstance("org.apache.commons").setPriority(Priority.WARN);
-
Category.getInstance("org.apache.commons.digester.Digester.sax").setPriority(Priority.WARN);
- Category.getInstance("org.apache.alexandria").setPriority(Priority.INFO);
- }
-
- private static Log log = LogSource.getInstance(Main.class);
-
public static void main(String[] args) {
if (args.length == 1) {
- Main main = new Main();
- main.go(args[0]);
+ Workspace workspace = WorkspaceLoader.loadWorkspace(args[0]);
+ try {
+ workspace.execute();
+ } catch (Exception e) {
+ System.out.println("Exception: " + e.getMessage());
+ }
} else {
- log.error("Usage: Main profile");
+ System.out.println("Usage: Main profile");
}
}
-
-
- public void go(String filename) {
- Workspace workspace = WorkspaceLoader.loadWorkspace(filename);
- workspace.execute();
- }
-
}
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ant.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Ant.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.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/Ant.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -65,19 +65,15 @@
import java.util.Iterator;
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Ant provides ...
*
* @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/29 17:30:48 $
*/
public class Ant implements IScript {
-
- private static Log log = LogSource.getInstance(Ant.class);
private String target;
private String basedir;
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Home.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Home.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Home.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/Home.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -62,19 +62,15 @@
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Home provides ...
*
* @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/29 17:30:48 $
*/
public class Home {
-
- private static Log log = LogSource.getInstance(Home.class);
private String nested;
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Jar.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Jar.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Jar.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/Jar.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -62,19 +62,15 @@
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Jar provides ...
*
* @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/29 17:30:48 $
*/
public class Jar {
-
- private static Log log = LogSource.getInstance(Jar.class);
private String name;
private String id;
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Javadoc.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Javadoc.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Javadoc.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/Javadoc.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -62,19 +62,15 @@
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Javadoc provides ...
*
* @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/29 17:30:48 $
*/
public class Javadoc {
-
- private static Log log = LogSource.getInstance(Javadoc.class);
private String nested;
private String project;
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Module.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Module.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Module.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/Module.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -65,19 +65,15 @@
import java.util.Iterator;
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Module provides ...
*
* @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/29 17:30:48 $
*/
public class Module {
-
- private static Log log = LogSource.getInstance(Module.class);
private boolean cvsFinished = false;
private String href;
1.2 +6 -10
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Project.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Project.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.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/Project.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -65,20 +65,16 @@
import java.util.Iterator;
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Project provides ...
*
* @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/29 17:30:48 $
*/
public class Project {
- private static Log log = LogSource.getInstance(Project.class);
-
public static final String STATUS_BUILT = "built";
//FIXME what about the <mkdir/> child element????
@@ -183,9 +179,9 @@
public void build() {
if (script == null) {
- log.info("Nothing to build for project: " + name);
+// log.info("Nothing to build for project: " + name);
} else {
- log.info("Building project: " + name);
+// log.info("Building project: " + name);
}
}
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Property.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Property.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Property.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/Property.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -62,19 +62,15 @@
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
*/
public class Property {
-
- private static Log log = LogSource.getInstance(Property.class);
private String name;
private String value;
1.2 +64 -65
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Repository.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Repository.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Repository.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/Repository.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -61,19 +61,20 @@
package org.apache.alexandria.om;
-import org.apache.alexandria.cvsclient.BaseListener;
+//import org.apache.alexandria.cvsclient.BaseListener;
+
+
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
-import org.netbeans.lib.cvsclient.Client;
-import org.netbeans.lib.cvsclient.admin.StandardAdminHandler;
-import org.netbeans.lib.cvsclient.command.CommandException;
-import org.netbeans.lib.cvsclient.command.GlobalOptions;
-import org.netbeans.lib.cvsclient.command.checkout.CheckoutCommand;
-import org.netbeans.lib.cvsclient.connection.AuthenticationException;
-import org.netbeans.lib.cvsclient.connection.PServerConnection;
-import org.netbeans.lib.cvsclient.connection.StandardScrambler;
+
+//import org.netbeans.lib.cvsclient.Client;
+//import org.netbeans.lib.cvsclient.admin.StandardAdminHandler;
+//import org.netbeans.lib.cvsclient.command.CommandException;
+//import org.netbeans.lib.cvsclient.command.GlobalOptions;
+//import org.netbeans.lib.cvsclient.command.checkout.CheckoutCommand;
+//import org.netbeans.lib.cvsclient.connection.AuthenticationException;
+//import org.netbeans.lib.cvsclient.connection.PServerConnection;
+//import org.netbeans.lib.cvsclient.connection.StandardScrambler;
/**
@@ -83,12 +84,10 @@
* logged at the DEBUG level saying so.
*
* @author Scott Sanders
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
*/
public class Repository {
- private static Log log = LogSource.getInstance(Repository.class);
-
private String href;
private String name;
private String method;
@@ -118,7 +117,7 @@
if (this.name == null) {
this.name = name;
} else {
- log.debug("Ignoring value of: " + name + " for propery name. Value is
already: " + this.name);
+// log.debug("Ignoring value of: " + name + " for propery name. Value
is already: " + this.name);
}
}
@@ -130,7 +129,7 @@
if (this.method == null) {
this.method = method;
} else {
- log.debug("Ignoring value of: " + method + " for propery method. Value
is already: " + this.method);
+// log.debug("Ignoring value of: " + method + " for propery method.
Value is already: " + this.method);
}
}
@@ -142,7 +141,7 @@
if (this.user == null) {
this.user = user;
} else {
- log.debug("Ignoring value of: " + user + " for propery user. Value is
already: " + this.user);
+// log.debug("Ignoring value of: " + user + " for propery user. Value
is already: " + this.user);
}
}
@@ -154,7 +153,7 @@
if (this.path == null) {
this.path = path;
} else {
- log.debug("Ignoring value of: " + path + " for propery path. Value is
already: " + this.path);
+// log.debug("Ignoring value of: " + path + " for propery path. Value
is already: " + this.path);
}
}
@@ -166,7 +165,7 @@
if (this.type == null) {
this.type = type;
} else {
- log.debug("Ignoring value of: " + type + " for propery type. Value is
already: " + this.type);
+// log.debug("Ignoring value of: " + type + " for propery type. Value
is already: " + this.type);
}
}
@@ -178,7 +177,7 @@
if (this.hostname == null) {
this.hostname = hostname;
} else {
- log.debug("Ignoring value of: " + hostname + " for propery hostname.
Value is already: " + this.hostname);
+// log.debug("Ignoring value of: " + hostname + " for propery hostname.
Value is already: " + this.hostname);
}
}
@@ -190,7 +189,7 @@
if (this.password == null) {
this.password = password;
} else {
- log.debug("Ignoring value of: " + password + " for propery password.
Value is already: " + this.password);
+// log.debug("Ignoring value of: " + password + " for propery password.
Value is already: " + this.password);
}
}
@@ -202,7 +201,7 @@
if (this.cvsweb == null) {
this.cvsweb = cvsweb;
} else {
- log.debug("Ignoring value of: " + cvsweb + " for propery cvsweb. Value
is already: " + this.cvsweb);
+// log.debug("Ignoring value of: " + cvsweb + " for propery cvsweb.
Value is already: " + this.cvsweb);
}
}
@@ -214,7 +213,7 @@
if (this.title == null) {
this.title = title;
} else {
- log.debug("Ignoring value of: " + title + " for propery title. Value
is already: " + this.title);
+// log.debug("Ignoring value of: " + title + " for propery title. Value
is already: " + this.title);
}
}
@@ -226,7 +225,7 @@
if (this.homepage == null) {
this.homepage = homepage;
} else {
- log.debug("Ignoring value of: " + homepage + " for propery homepage.
Value is already: " + this.homepage);
+// log.debug("Ignoring value of: " + homepage + " for propery homepage.
Value is already: " + this.homepage);
}
}
@@ -238,44 +237,44 @@
this.parentWorkspace = parentWorkspace;
}
- public void checkout(String moduleName, String baseDir, String logFilename) {
- log.info("Checking out module: " + moduleName + " with basedir: " +
baseDir);
- log.debug(this);
- PServerConnection c = new PServerConnection();
- c.setUserName(user);
- c.setHostName(hostname);
- c.setRepository(path);
- c.setEncodedPassword(StandardScrambler.getInstance().scramble(password));
-
- try {
- c.open();
-
- Client client = new Client(c, new StandardAdminHandler());
- client.setLocalPath(baseDir);
-
- BaseListener listener = new BaseListener(logFilename);
- client.getEventManager().addCVSListener(listener);
-
- GlobalOptions global = new GlobalOptions();
- global.setCVSRoot(":pserver:" + user + "@" + hostname + ":" + path);
-
- //FIXME Should we be doing an update if the module already exists?
- CheckoutCommand command = new CheckoutCommand(true, moduleName);
-
- try {
- client.executeCommand(command, global);
- } catch (CommandException ce) {
- log.error("Error in cvs checkout", ce);
- } finally {
- listener.finish();
- }
-
-
- } catch (AuthenticationException ae) {
- log.error("Error in CVS login", ae);
- }
-
- }
+// public void checkout(String moduleName, String baseDir, String logFilename) {
+// log.info("Checking out module: " + moduleName + " with basedir: " +
baseDir);
+// log.debug(this);
+// PServerConnection c = new PServerConnection();
+// c.setUserName(user);
+// c.setHostName(hostname);
+// c.setRepository(path);
+// c.setEncodedPassword(StandardScrambler.getInstance().scramble(password));
+//
+// try {
+// c.open();
+//
+// Client client = new Client(c, new StandardAdminHandler());
+// client.setLocalPath(baseDir);
+//
+// BaseListener listener = new BaseListener(logFilename);
+// client.getEventManager().addCVSListener(listener);
+//
+// GlobalOptions global = new GlobalOptions();
+// global.setCVSRoot(":pserver:" + user + "@" + hostname + ":" + path);
+//
+// FIXME Should we be doing an update if the module already exists?
+// CheckoutCommand command = new CheckoutCommand(true, moduleName);
+//
+// try {
+// client.executeCommand(command, global);
+// } catch (CommandException ce) {
+// log.error("Error in cvs checkout", ce);
+// } finally {
+// listener.finish();
+// }
+//
+//
+// } catch (AuthenticationException ae) {
+// log.error("Error in CVS login", ae);
+// }
+//
+// }
public String toString() {
XMLHelper helper = new XMLHelper();
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Script.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Script.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Script.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/Script.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -62,19 +62,15 @@
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Script provides ...
*
* @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/29 17:30:48 $
*/
public class Script implements IScript {
-
- private static Log log = LogSource.getInstance(Script.class);
private String name;
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Work.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Work.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Work.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/Work.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -62,19 +62,15 @@
import org.apache.alexandria.util.XMLHelper;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Work provides ...
*
* @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/29 17:30:48 $
*/
public class Work {
-
- private static Log log = LogSource.getInstance(Work.class);
private String nested;
1.2 +44 -27
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Workspace.java 28 Jan 2002 12:45:33 -0000 1.1
+++ Workspace.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.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/Workspace.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -65,21 +65,18 @@
import java.util.Iterator;
import org.apache.alexandria.util.XMLHelper;
+import org.apache.alexandria.exc.VindicoException;
import org.apache.commons.io.FileUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
*/
public class Workspace {
- private static Log log = LogSource.getInstance(WorkspaceLoader.class);
-
private String name;
private String basedir;
private String cvsbasedir;
@@ -88,6 +85,7 @@
private String filename;
private String selfBaseDir;
private String logPath;
+ private String buildPath;
private HashMap properties = new HashMap();
private HashMap projects = new HashMap();
private HashMap finishedProjects = new HashMap();
@@ -134,7 +132,7 @@
public void setFilename(String filename) {
this.filename = filename;
selfBaseDir = FileUtils.dirname(filename);
- log.info("selfBaseDir set to: " + selfBaseDir);
+// log.info("selfBaseDir set to: " + selfBaseDir);
}
public String getLogPath() {
@@ -174,19 +172,38 @@
WorkspaceLoader.loadProfile(this, selfBaseDir + "/" + filename);
}
- public void execute() {
- log.info("Running now...");
+ public void execute() throws VindicoException {
+// log.info("Building all necessary build files...");
+
+ logPath = basedir + "/logs";
+ buildPath = basedir + "/builds";
- logPath = basedir + "/buildlogs";
- prepare();
+ XMLHelper vindicoBuild = new XMLHelper();
+ vindicoBuild.attribute("name", "vindico");
+ vindicoBuild.attribute("default", "vindico");
+ vindicoBuild.attribute("basedir", ".");
+ vindicoBuild.element("project");
+
+ vindicoBuild.attribute("name", "vindico");
+ vindicoBuild.element("target");
+ vindicoBuild.attribute("message", "Welcome to vindico");
+ vindicoBuild.element("echo");
+ vindicoBuild.popElement();
+ vindicoBuild.popElement();
- doBuilds();
+ vindicoBuild.popElement();
+ try {
+ FileUtils.fileWrite(buildPath + "/build.xml", vindicoBuild.toString());
+ } catch (Exception e) {
+ throw new VindicoException(e.getMessage());
+ }
+// prepare();
- log.info("Finished running.");
+// doBuilds();
}
private void doBuilds() {
- log.info("Building projects...");
+// log.info("Building projects...");
int numProjects = projects.size();
int infiniteLoopPreventor = 0;
while (numProjects > finishedProjects.size()) {
@@ -201,8 +218,8 @@
project.setStatus(Project.STATUS_BUILT);
}
}
- if (infiniteLoopPreventor > (projects.size()*2)) {
- log.error("Infinite loop detected in project dependencies");
+ if (infiniteLoopPreventor > (projects.size() * 2)) {
+// log.error("Infinite loop detected in project dependencies");
listUnbuiltProjects();
break;
}
@@ -214,7 +231,7 @@
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.");
+// log.error("Project: " + project.getName() + " not built.");
}
}
}
@@ -222,30 +239,30 @@
private boolean resolveDependencies(Project project) {
Iterator iter = project.getDependencies();
while (iter.hasNext()) {
- String dep = (String)iter.next();
+ String dep = (String) iter.next();
Object depProj = finishedProjects.get(dep);
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");
+ } 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);
+// 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");
+// 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());
+// 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");
+ //repo.checkout(mod.getName(), cvsbasedir, logPath + "/" +
mod.getName() + "-cvs.xml");
mod.setCvsFinished(true);
}
}
@@ -257,7 +274,7 @@
FileUtils.mkdir(logPath);
FileUtils.fileWrite(logPath + "/vindico.xml", toXMLString());
} catch (Exception e) {
- log.error("Error writing file", e);
+// log.error("Error writing file", e);
}
}
1.2 +13 -13
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WorkspaceLoader.java 28 Jan 2002 12:45:33 -0000 1.1
+++ WorkspaceLoader.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/WorkspaceLoader.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/WorkspaceLoader.java,v
1.2 2002/01/29 17:30:48 sanders Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/01/29 17:30:48 $
*
* ====================================================================
*
@@ -65,8 +65,6 @@
import org.apache.commons.digester.Digester;
import org.apache.commons.digester.ExtendedBaseRules;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
import org.xml.sax.SAXException;
@@ -75,14 +73,16 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:33 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
*/
public class WorkspaceLoader {
- private static Log log = LogSource.getInstance(WorkspaceLoader.class);
-
public static Workspace loadWorkspace(String filename) {
Workspace workspace = new Workspace();
+ return loadWorkspace(workspace, filename);
+ }
+
+ public static Workspace loadWorkspace(Workspace workspace, String filename) {
workspace.setFilename(filename);
Workspace result = (Workspace) parse(filename, workspace);
return result;
@@ -101,26 +101,26 @@
}
private static Object parse(String filename, Object topOfStack) {
- log.debug("Creating digester");
+// log.debug("Creating digester");
Digester digester = new Digester();
digester.setRules(new ExtendedBaseRules());
configure(digester);
- log.info("loading xml file: " + filename);
+// log.info("loading xml file: " + filename);
if (topOfStack != null) {
digester.push(topOfStack);
}
try {
return digester.parse(filename);
} catch (IOException ioe) {
- log.error("IOException in digester.parse()", ioe);
+// log.error("IOException in digester.parse()", ioe);
} catch (SAXException se) {
- log.error("SAXException in digester.parse()", se);
+// log.error("SAXException in digester.parse()", se);
}
return null;
}
private static void configure(Digester digester) {
- log.debug("Configuring digester");
+// log.debug("Configuring digester");
digester.addSetProperties("workspace");
digester.addSetProperties("module");
1.2 +4 -8
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLHelper.java 28 Jan 2002 12:45:34 -0000 1.1
+++ XMLHelper.java 29 Jan 2002 17:30:48 -0000 1.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/util/XMLHelper.java,v
1.1 2002/01/28 12:45:34 sanders Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/28 12:45:34 $
+ * $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 $
*
* ====================================================================
*
@@ -65,19 +65,15 @@
import java.util.Iterator;
import org.apache.commons.collections.ArrayStack;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogSource;
/**
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.1 $ $Date: 2002/01/28 12:45:34 $
+ * @version $Revision: 1.2 $ $Date: 2002/01/29 17:30:48 $
*/
public class XMLHelper {
-
- private static Log log = LogSource.getInstance(XMLHelper.class);
private static final char LT = '<';
private static final char GT = '>';
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
