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/04/22 17:59:47 UTC
cvs commit: jakarta-alexandria/proposal/vindico/src/xml/project jaxp.xml
sanders 02/04/22 08:59:47
Modified: proposal/vindico build.xml vindico.build.properties
proposal/vindico/src/java/org/apache/alexandria/ant
Vindico.java
proposal/vindico/src/java/org/apache/alexandria/om
Project.java Workspace.java
proposal/vindico/src/xml vindico.xml
proposal/vindico/src/xml/profile vindico.xml
proposal/vindico/src/xml/project jaxp.xml
Log:
more builds working, more problems with classloaders
Revision Changes Path
1.11 +15 -9 jakarta-alexandria/proposal/vindico/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 11 Apr 2002 02:03:09 -0000 1.10
+++ build.xml 22 Apr 2002 15:59:46 -0000 1.11
@@ -2,25 +2,30 @@
<!--
Jakarta Vindico (Alexandria)
- $Id: build.xml,v 1.10 2002/04/11 02:03:09 sanders Exp $
+ $Id: build.xml,v 1.11 2002/04/22 15:59:46 sanders Exp $
-->
- <!-- User's overrides to existing properties -->
<property file="${user.home}/vindico.build.properties"/>
- <!-- local properties -->
<property file="vindico.build.properties"/>
-
+ <property name="build.sysclasspath" value="ignore"/>
+ <property name="lib.repo" value="/lib/repo"/>
+ <property name="commons-logging.jar" value="${lib.repo}/commons-logging.jar"/>
+ <property name="commons-beanutils.jar" value="${lib.repo}/commons-beanutils.jar"/>
+ <property name="commons-collections.jar" value="${lib.repo}/commons-collections.jar"/>
+ <property name="commons-digester.jar" value="${lib.repo}/commons-digester.jar"/>
+ <property name="commons-io.jar" value="${lib.repo}/commons-io.jar"/>
<!-- 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="${jaxp.jar}"/>
+ <pathelement location="${ant.home}/lib/ant.jar"/>
</path>
@@ -28,10 +33,10 @@
<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="${jaxp.jar}"/>
</path>
@@ -187,13 +192,14 @@
<target name="run" depends="ant,jar">
<echo message="Running ${component.title}..."/>
- <taskdef name="vindico" classname="org.apache.alexandria.ant.Vindico">
+ <echo message="vindico.profile = ${vindico.profile}"/>
+ <taskdef name="vindico" classname="org.apache.alexandria.ant.Vindico" >
<classpath>
<pathelement location="${dist.home}/vindico-ant.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}"/>
</classpath>
</taskdef>
@@ -204,7 +210,7 @@
<delete dir="${vindico.basedir}/builds"/>
<mkdir dir="${vindico.basedir}/builds"/>
<copy file="${dist.home}/vindico-ant.jar" todir="${vindico.basedir}/builds"/>
- <vindico workspace="${vindico.profile}"/>
+ <vindico workspace="${vindico.profile}" cvsUpdate="true"/>
<ant dir="${vindico.basedir}/builds" target="vindico" output="${vindico.basedir}/logs/masterbuild.txt"/>
</target>
1.4 +0 -7 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vindico.build.properties 9 Feb 2002 00:22:14 -0000 1.3
+++ vindico.build.properties 22 Apr 2002 15:59:46 -0000 1.4
@@ -2,13 +2,6 @@
vindico.basedir=/vindico
vindico.logdir=${vindico.basedir}/logs
-commons.home=/dev/jakarta-commons
-commons-beanutils.jar=${commons.home}/beanutils/dist/commons-beanutils.jar
-commons-collections.jar=${commons.home}/collections/dist/commons-collections.jar
-commons-digester.jar=${commons.home}/digester/dist/commons-digester.jar
-commons-io.jar=${commons.home}/../jakarta-commons-sandbox/io/dist/commons-io.jar
-commons-logging.jar=${commons.home}/logging/dist/commons-logging.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
1.3 +10 -5 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/Vindico.java
Index: Vindico.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/Vindico.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Vindico.java 11 Apr 2002 01:54:25 -0000 1.2
+++ Vindico.java 22 Apr 2002 15:59:46 -0000 1.3
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/Vindico.java,v 1.2 2002/04/11 01:54:25 sanders Exp $
- * $Revision: 1.2 $
- * $Date: 2002/04/11 01:54:25 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/Vindico.java,v 1.3 2002/04/22 15:59:46 sanders Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/04/22 15:59:46 $
*
* ====================================================================
*
@@ -72,11 +72,12 @@
* Vindico provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.2 $ $Date: 2002/04/11 01:54:25 $
+ * @version $Revision: 1.3 $ $Date: 2002/04/22 15:59:46 $
*/
public class Vindico extends Task {
private String workspace;
+ private boolean cvsUpdate = true;
public String getWorkspace() {
return workspace;
@@ -86,13 +87,17 @@
this.workspace = workspace;
}
+ public void setCvsUpdate(boolean cvsUpdate) {
+ this.cvsUpdate = cvsUpdate;
+ }
+
public void execute() throws BuildException {
Workspace space = new Workspace();
space = WorkspaceLoader.loadWorkspace(space, workspace);
String basedir = space.getBasedir();
this.getProject().setProperty("vindico.basedir", basedir);
try {
- space.execute();
+ space.execute(cvsUpdate);
} catch (VindicoException ve) {
throw new BuildException(ve.getMessage(), ve);
}
1.11 +8 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Project.java 11 Apr 2002 01:50:09 -0000 1.10
+++ Project.java 22 Apr 2002 15:59:47 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v 1.10 2002/04/11 01:50:09 sanders Exp $
- * $Revision: 1.10 $
- * $Date: 2002/04/11 01:50:09 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Project.java,v 1.11 2002/04/22 15:59:47 sanders Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/04/22 15:59:47 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Project provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.10 $ $Date: 2002/04/11 01:50:09 $
+ * @version $Revision: 1.11 $ $Date: 2002/04/22 15:59:47 $
*/
public class Project {
@@ -217,6 +217,10 @@
helper.attribute("default", "all");
helper.attribute("basedir", ".");
helper.element("project");
+
+ helper.attribute("name", "build.sysclasspath");
+ helper.attribute("value", "ignore");
+ helper.element("property",true);
helper.attribute("name", "log.dir");
helper.attribute("value", "${basedir}/../logs");
1.13 +12 -6 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Workspace.java 11 Apr 2002 02:01:59 -0000 1.12
+++ Workspace.java 22 Apr 2002 15:59:47 -0000 1.13
@@ -1,7 +1,7 @@
/*
- * $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 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v 1.13 2002/04/22 15:59:47 sanders Exp $
+ * $Revision: 1.13 $
+ * $Date: 2002/04/22 15:59:47 $
*
* ====================================================================
*
@@ -73,7 +73,7 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.12 $ $Date: 2002/04/11 02:01:59 $
+ * @version $Revision: 1.13 $ $Date: 2002/04/22 15:59:47 $
*/
public class Workspace {
@@ -190,13 +190,17 @@
WorkspaceLoader.loadProfile(this, selfBaseDir + "/" + filename);
}
- public void execute() throws VindicoException {
+ public void execute(boolean shouldUpdateSource) throws VindicoException {
XMLHelper vindicoBuild = new XMLHelper();
vindicoBuild.attribute("name", "vindico");
vindicoBuild.attribute("default", "vindico");
vindicoBuild.attribute("basedir", ".");
vindicoBuild.element("project");
+ vindicoBuild.attribute("name", "build.sysclasspath");
+ vindicoBuild.attribute("value", "ignore");
+ vindicoBuild.element("property",true);
+
vindicoBuild.attribute("name", "vindico");
vindicoBuild.attribute("depends", "cvs-all,build-all,list-unbuilt");
vindicoBuild.element("target");
@@ -207,7 +211,9 @@
vindicoBuild.attribute("name", "cvs-all");
vindicoBuild.element("target");
- doCVSDefs(vindicoBuild);
+ if (shouldUpdateSource) {
+ doCVSDefs(vindicoBuild);
+ }
vindicoBuild.popElement();
vindicoBuild.attribute("name", "build-all");
1.2 +0 -1 jakarta-alexandria/proposal/vindico/src/xml/vindico.xml
Index: vindico.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/xml/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 22 Apr 2002 15:59:47 -0000 1.2
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
<workspace basedir="/vindico" pkgdir="/lib" version="0.3">
- <property name="build.sysclasspath" value="only"/>
<profile href="profile/vindico.xml"/>
</workspace>
1.7 +20 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vindico.xml 11 Apr 2002 02:00:22 -0000 1.6
+++ vindico.xml 22 Apr 2002 15:59:47 -0000 1.7
@@ -1,16 +1,35 @@
<profile name="vindico">
+ <module href="project/bsf.xml"/>
<module href="project/jakarta-ant.xml"/>
+ <module href="project/jakarta-ant-antidote.xml"/>
+ <module href="project/jakarta-bcel.xml"/>
+ <module href="project/jakarta-ecs.xml"/>
+ <module href="project/jakarta-oro.xml"/>
+ <module href="project/jakarta-regexp.xml"/>
+ <module href="project/jakarta-servletapi.xml"/>
+ <module href="project/jakarta-servletapi-4.xml"/>
<module href="project/jaxp.xml"/>
+ <module href="project/rhino.xml"/>
<module href="project/xml-xerces2.xml"/>
<module href="project/xml-xerces.xml"/>
<module href="project/xml-commons.xml"/>
+ <module href="project/xml-site.xml"/>
+ <module href="project/xml-stylebook.xml"/>
<module href="project/xml-xalan.xml"/>
<!-- cvs repos -->
+ <repository href="repository/dbxml.xml"/>
+ <repository href="repository/devworks.xml"/>
+ <repository href="repository/exolab.xml"/>
<repository href="repository/jakarta.xml"/>
+ <repository href="repository/jdom.xml"/>
+ <repository href="repository/mozilla.xml"/>
+ <repository href="repository/tigris.xml"/>
+ <repository href="repository/sourceforge.xml"/>
+ <repository href="repository/whichever.xml"/>
<repository href="repository/xml.xml"/>
<!-- Installed packages, subdir is relative to the workspace's pkgdir attribute -->
- <override project="jaxp" subdir="java_xml_pack-fall01\jaxp-1.1.3"/>
+ <override project="jaxp" subdir="java_xml_pack-spring-02-dev/jaxp-1.2-ea2"/>
</profile>
1.4 +4 -1 jakarta-alexandria/proposal/vindico/src/xml/project/jaxp.xml
Index: jaxp.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/xml/project/jaxp.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- jaxp.xml 11 Apr 2002 02:00:23 -0000 1.3
+++ jaxp.xml 22 Apr 2002 15:59:47 -0000 1.4
@@ -6,7 +6,10 @@
</description>
<project name="jaxp">
- <jar name="crimson.jar"/>
+ <jar name="jaxp-api.jar"/>
+ <jar name="sax.jar"/>
+ <jar name="dom.jar"/>
+ <jar name="xercesImpl.jar"/>
</project>
</module>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>