sanders 02/02/05 08:07:30
Modified: proposal/vindico build.xml
proposal/vindico/src/java/org/apache/alexandria/ant
XMLListener.java
proposal/vindico/src/java/org/apache/alexandria/om Ant.java
Added: proposal/vindico vindico-run.xml
Log:
Savepoint. Still can't get properties to work.
Revision Changes Path
1.7 +9 -7 jakarta-alexandria/proposal/vindico/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/proposal/vindico/build.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build.xml 3 Feb 2002 04:16:32 -0000 1.6
+++ build.xml 5 Feb 2002 16:07:30 -0000 1.7
@@ -2,7 +2,7 @@
<!--
Jakarta Vindico (Alexandria)
- $Id: build.xml,v 1.6 2002/02/03 04:16:32 sanders Exp $
+ $Id: build.xml,v 1.7 2002/02/05 16:07:30 sanders Exp $
-->
<!-- User's overrides to existing properties -->
@@ -200,13 +200,15 @@
<mkdir dir="${vindico.basedir}/builds"/>
<copy file="${dist.home}/vindico-ant.jar" todir="${vindico.basedir}/builds"/>
<vindico workspace="${vindico.profile}"/>
- <ant dir="${vindico.basedir}/builds" target="vindico"
output="${vindico.basedir}/logs/masterbuild.txt"/>
+ <!--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 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"/>
+ <classpath>
+ <pathelement location="${ant.home}/lib/ant.jar"/>
+ <pathelement location="${dist.home}/vindico-ant.jar"/>
+ </classpath>
+ </java>
</target>
</project>
1.1 jakarta-alexandria/proposal/vindico/vindico-run.xml
Index: vindico-run.xml
===================================================================
<project name="vindico run script" default="run" basedir=".">
<!--
Jakarta Vindico (Alexandria)
$Id: vindico-run.xml,v 1.1 2002/02/05 16:07:30 sanders Exp $
-->
<!-- User's overrides to existing properties -->
<property file="${user.home}/vindico.build.properties"/>
<!-- local properties -->
<property file="vindico.build.properties"/>
<!-- compile classpath -->
<path id="compile.classpath">
<pathelement location="${build.home}/classes"/>
<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}"/>
<patheleme
</path>
<target name="ant">
<delete dir="${build.home}/ant"/>
<mkdir dir="${build.home}/ant"/>
<javac srcdir="${source.home}"
destdir="${build.home}/ant"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
includes="org/apache/alexandria/ant/XMLListener.java,org/apache/alexandria/util/XMLHelper.java"/>
<jar jarfile="${dist.home}/vindico-ant.jar"
basedir="${build.home}/classes"/>
</target>
<target name="run" depends="ant">
<echo message="Running Vindico"/>
<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"/>
<delete dir="${vindico.basedir}/logs"/>
<mkdir dir="${vindico.basedir}/logs"/>
<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}"/>
<java classname="org.apache.tools.ant.Main" fork="yes" failonerror="yes"
dir="${vindico.basedir}/builds" output="${vindico.basedir}/logs/masterbuild.txt">
<arg line=" vindco"/>
<classpath>
</classpath>
</target>
</project>
1.4 +7 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLListener.java 3 Feb 2002 04:25:57 -0000 1.3
+++ XMLListener.java 5 Feb 2002 16:07:30 -0000 1.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/ant/XMLListener.java,v
1.3 2002/02/03 04:25:57 sanders Exp $
- * $Revision: 1.3 $
- * $Date: 2002/02/03 04:25:57 $
+ * $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 $
*
* ====================================================================
*
@@ -79,7 +79,7 @@
* XMLListener provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.3 $ $Date: 2002/02/03 04:25:57 $
+ * @version $Revision: 1.4 $ $Date: 2002/02/05 16:07:30 $
*/
public class XMLListener implements BuildListener {
@@ -149,7 +149,9 @@
public void buildStarted(BuildEvent event) {
startTime = System.currentTimeMillis();
try {
- writer = new FileWriter(System.getProperty("vindico.log.file"));
+ String filename = event.getProject().getUserProperty("vindicologfile");
+ System.out.println("XML Logger Filename: " + filename);
+ writer = new FileWriter(filename);
} catch (IOException e) {
throw new RuntimeException("Could not create log file");
}
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Ant.java 3 Feb 2002 04:20:01 -0000 1.7
+++ Ant.java 5 Feb 2002 16:07:30 -0000 1.8
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-alexandria/proposal/vindico/src/java/org/apache/alexandria/om/Ant.java,v
1.7 2002/02/03 04:20:01 sanders Exp $
- * $Revision: 1.7 $
- * $Date: 2002/02/03 04:20:01 $
+ * $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 $
*
* ====================================================================
*
@@ -71,7 +71,7 @@
* Ant provides ...
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Scott Sanders</a>
- * @version $Revision: 1.7 $ $Date: 2002/02/03 04:20:01 $
+ * @version $Revision: 1.8 $ $Date: 2002/02/05 16:07:30 $
*/
public class Ant implements IScript {
@@ -144,7 +144,7 @@
helper.element("java");
String commandLine = "-listener org.apache.alexandria.ant.XMLListener" +
- " -Dvindico.log.file=${vindico.logdir}/" + getParentProject().getName()
+
+ " -Dvindicologfile=${vindico.logdir}/" + getParentProject().getName() +
"-build.xml";
if (buildfile != null) {
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
