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/02/09 01:22:14 UTC
cvs commit: jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om Ant.java Workspace.java
sanders 02/02/08 16:22:14
Modified: proposal/vindico build.xml vindico.build.properties
proposal/vindico/src/java/org/apache/alexandria/ant
XMLListener.java
proposal/vindico/src/java/org/apache/alexandria/om Ant.java
Workspace.java
Log:
Save point. Going home to work on it.
Revision Changes Path
1.8 +4 -3 jakarta-alexandria/proposal/vindico/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 5 Feb 2002 16:07:30 -0000 1.7
+++ build.xml 9 Feb 2002 00:22:14 -0000 1.8
@@ -2,7 +2,7 @@
<!--
Jakarta Vindico (Alexandria)
- $Id: build.xml,v 1.7 2002/02/05 16:07:30 sanders Exp $
+ $Id: build.xml,v 1.8 2002/02/09 00:22:14 sanders Exp $
-->
<!-- User's overrides to existing properties -->
@@ -184,7 +184,7 @@
basedir="${build.home}/classes"/>
</target>
- <target name="run" depends="compile, ant">
+ <target name="run"><!-- depends="compile, ant"-->
<echo message="Running ${component.title}..."/>
<taskdef name="vindico" classname="org.apache.alexandria.Vindico">
<classpath refid="compile.classpath"/>
@@ -203,7 +203,8 @@
<!--ant dir="${vindico.basedir}/builds" target="vindico" output="${vindico.basedir}/logs/masterbuild.txt"/-->
<java classname="org.apache.tools.ant.Main" fork="yes" failonerror="yes" dir="${vindico.basedir}/builds" output="${vindico.basedir}/logs/masterbuild.txt">
- <arg line="-listener org.apache.alexandria.ant.XMLListener -Dvindicologfile=${vindico.logdir}/vindico-master.xml vindco"/>
+ <jvmarg line="-Dvindico.logfile=${vindico.logdir}/vindico-master.log.xml"/>
+ <arg line="-listener org.apache.alexandria.ant.XMLListener vindco"/>
<classpath>
<pathelement location="${ant.home}/lib/ant.jar"/>
<pathelement location="${dist.home}/vindico-ant.jar"/>
1.3 +1 -0 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vindico.build.properties 29 Jan 2002 17:30:47 -0000 1.2
+++ vindico.build.properties 9 Feb 2002 00:22:14 -0000 1.3
@@ -1,5 +1,6 @@
vindico.profile=${basedir}\\src\\xml\\vindico.xml
vindico.basedir=/vindico
+vindico.logdir=${vindico.basedir}/logs
commons.home=/dev/jakarta-commons
commons-beanutils.jar=${commons.home}/beanutils/dist/commons-beanutils.jar
1.5 +5 -5 jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/XMLListener.java
Index: XMLListener.java
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/XMLListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLListener.java 5 Feb 2002 16:07:30 -0000 1.4
+++ XMLListener.java 9 Feb 2002 00:22:14 -0000 1.5
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/XMLListener.java,v 1.4 2002/02/05 16:07:30 sanders Exp $
- * $Revision: 1.4 $
- * $Date: 2002/02/05 16:07:30 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/XMLListener.java,v 1.5 2002/02/09 00:22:14 sanders Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/02/09 00:22:14 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* XMLListener provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.4 $ $Date: 2002/02/05 16:07:30 $
+ * @version $Revision: 1.5 $ $Date: 2002/02/09 00:22:14 $
*/
public class XMLListener implements BuildListener {
@@ -149,7 +149,7 @@
public void buildStarted(BuildEvent event) {
startTime = System.currentTimeMillis();
try {
- String filename = event.getProject().getUserProperty("vindicologfile");
+ String filename = System.getProperty("vindico.logfile");
System.out.println("XML Logger Filename: " + filename);
writer = new FileWriter(filename);
} catch (IOException e) {
1.9 +12 -7 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Ant.java 5 Feb 2002 16:07:30 -0000 1.8
+++ Ant.java 9 Feb 2002 00:22:14 -0000 1.9
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java,v 1.8 2002/02/05 16:07:30 sanders Exp $
- * $Revision: 1.8 $
- * $Date: 2002/02/05 16:07:30 $
+ * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java,v 1.9 2002/02/09 00:22:14 sanders Exp $
+ * $Revision: 1.9 $
+ * $Date: 2002/02/09 00:22:14 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Ant provides ...
*
* @author <a href="mailto:sanders@apache.org">Scott Sanders</a>
- * @version $Revision: 1.8 $ $Date: 2002/02/05 16:07:30 $
+ * @version $Revision: 1.9 $ $Date: 2002/02/09 00:22:14 $
*/
public class Ant implements IScript {
@@ -143,9 +143,14 @@
}
helper.element("java");
- String commandLine = "-listener org.apache.alexandria.ant.XMLListener" +
- " -Dvindicologfile=${vindico.logdir}/" + getParentProject().getName() +
- "-build.xml";
+ String jvmArgs = "-Dvindico.logfile=" +
+ getParentProject().getParentWorkspace().getLogPath() +
+ getParentProject().getName() +
+ ".log.xml";
+ helper.attribute("line", jvmArgs);
+ helper.element("jvmarg", true);
+
+ String commandLine = "-listener org.apache.alexandria.ant.XMLListener";
if (buildfile != null) {
commandLine += " -buildfile " + buildfile;
1.11 +6 -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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Workspace.java 3 Feb 2002 04:25:57 -0000 1.10
+++ Workspace.java 9 Feb 2002 00:22:14 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Workspace.java,v 1.10 2002/02/03 04:25:57 sanders Exp $
- * $Revision: 1.10 $
- * $Date: 2002/02/03 04:25:57 $
+ * $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 $
*
* ====================================================================
*
@@ -73,13 +73,13 @@
* Represents ...
*
* @author Scott Sanders
- * @version $Revision: 1.10 $ $Date: 2002/02/03 04:25:57 $
+ * @version $Revision: 1.11 $ $Date: 2002/02/09 00:22:14 $
*/
public class Workspace {
private String name;
private String basedir;
- private String cvsbasedir;
+// private String cvsbasedir;
private String pkgdir;
private String version;
private String filename;
@@ -106,7 +106,7 @@
public void setBasedir(String basedir) {
this.basedir = basedir;
- cvsbasedir = basedir + "/pristine";
+// cvsbasedir = basedir + "/pristine";
logPath = basedir + "/logs";
buildPath = basedir + "/builds";
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>