jmartin 01/02/04 15:54:36
Modified: . build.xml
src/xml alexandria.xml
src/xsl build.build.xsl build.cvs.xsl build.javadoc.xsl
build.test.xsl left-advanced.xsl left-basic.xsl
right.xsl top.xsl
Added: src/xml workspace.xml workspace.xsd
src/xml/projects Alexandria.xml Ant.xml Apache 1.3.x.xml
Apache 2.0.xml Avalon.xml Cocoon.xml ECS.xml
EJBoss.xml FOP.xml JDK 1.1.8.xml JDK 1.2.2.xml
Jakarta Tools.xml James.xml Jetspeed.xml RegExp.xml
Slide.xml Stylebook.xml Tomcat.xml Turbine.xml
Xalan.xml Xerces.xml alexandria.xml cocoon.xml
hbug.xml
src/xml/repositories Alexandria.xml EJBoss.xml JDK 1.1.8.xml
JDK 1.2.2.xml Jetspeed.xml Turbine.xml
alexandria.xml cocoon.xml jakarta.apache.org.xml
java.apache.org.xml local.xml xml.apache.org.xml
src/xsl merge.xsl migrate0.2.xml nav-page.xsl
Log:
Converted style sheets over the new version of the schema and added
new definition files.
Revision Changes Path
1.9 +11 -4 jakarta-alexandria/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 2001/01/07 15:22:24 1.8
+++ build.xml 2001/02/04 23:54:33 1.9
@@ -31,12 +31,19 @@
<javac
srcdir="${src.dir}"
destdir="${build.classes}"
-
classpath="lib/xerces.jar;lib/castor.jar.bk;lib/castor-0.8.11.jar;lib/turbine-2.0.jar;../batik/batik-rasterizer.jar;lib/xalan.jar;${ant.home}/lib/junit.jar"
+
classpath="lib/xerces.jar;lib/castor-0.8.11.jar;lib/turbine-2.0.jar;../batik/batik-rasterizer.jar;lib/xalan.jar;${ant.home}/lib/junit.jar"
/>
<jar jarfile="${build.dir}/Alexandria.jar" basedir="${build.classes}"
excludes="**/test_*.class"
/>
<copy file="src/xml/global.xml" toDir="${build.dir}/etc" />
+ <copy toDir="${build.dir}/etc/projects">
+ <fileset dir="src/xml/projects"/>
+ </copy>
+ <copy toDir="${build.dir}/etc/repositories">
+ <fileset dir="src/xml/repositories"/>
+ </copy>
+ <copy file="src/xml/workspace.xml" toDir="${build.dir}/etc" />
<copy file="src/xml/alexandria.xml" toDir="${build.dir}/xml" />
<copy file="src/scripts/alexandria" toDir="${build.dir}" />
<chmod file="${build.dir}/alexandria" perm="ug+rx"/>
@@ -59,16 +66,16 @@
<target name="apis" depends="prepare" unless="apis.uptodate"
description="Generate XML interfaces">
- <echo message="generating new CVS Markup APIs" />
+ <echo message="generating new Workspace APIs" />
<java classname="org.exolab.castor.builder.SourceGenerator"
fork="true"
dir="src/java"
classpath="lib/castor-0.8.11.jar:lib/xerces.jar" >
<arg value="-f" />
<arg value="-i" />
- <arg value="../xml/cvs.xsd" />
+ <arg value="../xml/workspace.xsd" />
<arg value="-package" />
- <arg value="org.apache.alexandria.xml.api.cvs" />
+ <arg value="org.apache.alexandria.xml.api.workspace" />
</java>
<echo message="generating new Blame Markup APIs" />
<java classname="org.exolab.castor.builder.SourceGenerator"
1.8 +25 -31 jakarta-alexandria/src/xml/alexandria.xml
Index: alexandria.xml
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xml/alexandria.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- alexandria.xml 2001/01/07 15:24:01 1.7
+++ alexandria.xml 2001/02/04 23:54:33 1.8
@@ -7,7 +7,7 @@
<property name="lib.castor" value="lib/castor-0.8.11.jar" />
<property name="markup.dir" value="etc" />
<property name="markup.file" value="global.xml" />
- <property name="cvs.markup" value="${markup.dir}/${markup.file}" />
+ <property name="workspace" value="var/${markup.file}" />
<taskdef name="xstyle" classname="org.apache.tools.ant.xtaskdefs.XSLTProcess"/>
@@ -22,16 +22,21 @@
<lock/>
</target>
+ <target name="merge">
+ <echo message="Generating definition file"/>
+ <xstyle in="${markup.dir}/${markup.file}" out="${workspace}"
style="xsl/merge.xsl" />
+ </target>
+
<!-- convience target to build everything -->
<target name="all" depends="menus,cvs,javadoc,build,jxr,test" description="Builds
up the entire set of alexandrai documents">
</target>
<!-- Main page generation target -->
- <target name="cvs" depends="lock" description="Get the latest version of modules
from cvs">
+ <target name="cvs" depends="lock,merge" description="Get the latest version of
modules from cvs">
<!-- create main build.xml file to drive content building -->
<echo message="Generating cvs file"/>
- <xstyle in="${cvs.markup}" out="var/build.cvs.xml" style="xsl/build.cvs.xsl" />
+ <xstyle in="${workspace}" out="var/build.cvs.xml" style="xsl/build.cvs.xsl" />
<ant antfile="var/build.cvs.xml"/>
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
@@ -40,9 +45,9 @@
</chmod>
</target>
- <target name="javadoc" depends="lock" description="Create javadocs">
+ <target name="javadoc" depends="lock,merge" description="Create javadocs">
<echo message="Generating javadoc file"/>
- <xstyle in="${cvs.markup}" out="var/build.javadoc.xml"
style="xsl/build.javadoc.xsl" />
+ <xstyle in="${workspace}" out="var/build.javadoc.xml"
style="xsl/build.javadoc.xsl" />
<ant antfile="var/build.javadoc.xml"/>
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
@@ -51,9 +56,9 @@
</chmod>
</target>
- <target name="build" depends="lock" description="Build modules">
+ <target name="build" depends="lock,merge" description="Build modules">
<echo message="Generating build file"/>
- <xstyle in="${cvs.markup}" out="var/build.build.xml"
style="xsl/build.build.xsl" />
+ <xstyle in="${workspace}" out="var/build.build.xml" style="xsl/build.build.xsl"
/>
<ant antfile="var/build.build.xml"/>
<chmod perm="ug+rwX" type="both">
@@ -62,9 +67,9 @@
<fileset dir="var"/>
</chmod>
</target>
- <target name="test" depends="lock" description="Run tests">
+ <target name="test" depends="lock,merge" description="Run tests">
<echo message="Generating test file"/>
- <xstyle in="${cvs.markup}" out="var/build.test.xml" style="xsl/build.test.xsl"
/>
+ <xstyle in="${workspace}" out="var/build.test.xml" style="xsl/build.test.xsl" />
<ant antfile="var/build.test.xml"/>
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
@@ -72,21 +77,15 @@
<fileset dir="var"/>
</chmod>
</target>
- <target name="jxr" depends="lock" description="Generate cross referenced java
code">
+ <target name="jxr" depends="lock,merge" description="Generate cross referenced
java code">
<taskdef name="jxr" classname="org.apache.alexandria.AlexandriaTask"/>
<!-- Run JXR -->
<echo message="Running JXR" />
<mkdir dir="${content.dir}/html/jxr"/>
- <jxr markup="${cvs.markup}" dest="${content.dir}/html/jxr"
cvsDir="${content.dir}/cvs"
+ <jxr markup="${workspace}" dest="${content.dir}/html/jxr"
cvsDir="${content.dir}/cvs"
imagefolder="${jxr.image.folder}"
imagefile="${jxr.image.file}"
/>
- <!--
- <java classpath="${lib.alexandria};${lib.turbine};${lib.castor}"
classname="org.apache.alexandria.Main" >
- <arg value="-properties" />
- <arg value="etc/AlexandriaResources.properties" />
- </java>
- -->
<chmod perm="ug+rwX" type="both">
<fileset dir="${content.dir}"/>
<fileset dir="logs"/>
@@ -95,24 +94,19 @@
</target>
<!-- Menu generation target -->
- <target name="menus" depends="lock" description="Generate Alexandria menus">
- <echo message="${content.dir}" />
- <mkdir dir="${content.dir}"/>
- <!-- make the content dir -->
+ <target name="menus" depends="lock,merge" description="Generate Alexandria
menus">
+ <mkdir dir="${content.dir}" />
- <echo message="Copying file from src/content to ${content.dir}" />
+ <echo
+ message="Copying file from src/content to ${content.dir}" />
+
<copy toDir="${content.dir}">
- <fileset dir="content"/>
+ <fileset dir="content" />
</copy>
- <xstyle in="${cvs.markup}" out="${content.dir}/html/links.html"
style="xsl/links.xsl"/>
- <xstyle in="${cvs.markup}" out="${content.dir}/html/right.html"
style="xsl/right.xsl"/>
- <xstyle in="${cvs.markup}" out="${content.dir}/html/top.html"
style="xsl/top.xsl"/>
- <xstyle in="${cvs.markup}" out="${content.dir}/html/left-basic.html"
style="xsl/left-basic.xsl"/>
- <xstyle in="${cvs.markup}" out="${content.dir}/html/sidebar/content.js"
style="xsl/left-advanced.xsl"/>
+ <xstyle in="${workspace}" out="var/nav-page.xml" style="xsl/nav-page.xsl"/>
- <chmod perm="ug+rwX" type="both">
- <fileset dir="${content.dir}"/>
- </chmod>
+ <ant antfile="var/nav-page.xml"/>
+
</target>
</project>
1.1 jakarta-alexandria/src/xml/workspace.xml
Index: workspace.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<workspace version="0.2">
<repository href="repositories/Alexandria.xml"/>
<repository href="repositories/EJBoss.xml"/>
<repository href="repositories/JDK 1.1.8.xml"/>
<repository href="repositories/JDK 1.2.2.xml"/>
<repository href="repositories/Jetspeed.xml"/>
<repository href="repositories/jakarta.apache.org.xml"/>
<repository href="repositories/xml.apache.org.xml"/>
<repository href="repositories/Turbine.xml"/>
<repository href="repositories/java.apache.org.xml"/>
<project href="projects/Alexandria.xml" revision="HEAD"/>
<project href="projects/EJBoss.xml" revision="HEAD"/>
<project href="projects/JDK 1.1.8.xml" revision="jdk1.1.8"/>
<project href="projects/JDK 1.2.2.xml" revision="HEAD"/>
<project href="projects/Jetspeed.xml" revision="HEAD"/>
<project href="projects/Ant.xml" revision="HEAD"/>
<project href="projects/Tomcat.xml" revision="HEAD"/>
<project href="projects/Jakarta Tools.xml" revision="HEAD"/>
<project href="projects/RegExp.xml" revision="HEAD"/>
<project href="projects/Slide.xml" revision="HEAD"/>
<project href="projects/Xerces.xml" revision="HEAD"/>
<project href="projects/Xalan.xml" revision="HEAD"/>
<project href="projects/Cocoon.xml" revision="HEAD"/>
<project href="projects/Cocoon.xml" revision="xml-cocoon2"/>
<project href="projects/Stylebook.xml" revision="HEAD"/>
<project href="projects/FOP.xml" revision="HEAD"/>
<project href="projects/Apache 2.0.xml" revision="HEAD"/>
<project href="projects/Apache 1.3.x.xml" revision="HEAD"/>
<project href="projects/Turbine.xml" revision="HEAD"/>
<project href="projects/ECS.xml" revision="HEAD"/>
<project href="projects/Avalon.xml" revision="HEAD"/>
<project href="projects/James.xml" revision="HEAD"/>
<nav-page out="links.html" style="../xsl/links.xsl"/>
<nav-page out="right.html" style="../xsl/right.xsl"/>
<nav-page out="top.html" style="../xsl/top.xsl"/>
<nav-page out="left-basic.html" style="../xsl/left-basic.xsl"/>
<nav-page out="sidebar/content.js" style="../xsl/left-advanced.xsl"/>
</workspace>
1.1 jakarta-alexandria/src/xml/workspace.xsd
Index: workspace.xsd
===================================================================
<schema targetNamespace="http://www.apache.org/2000/02/CVS"
xmlns="http://www.w3.org/2000/10/XMLSchema">
<element name="workspace">
<complexType>
<sequence>
<element name="repository" type="repository" minOccurs="1"
maxOccurs="unbounded"/>
<element name="project" type="project" minOccurs="1"
maxOccurs="unbounded"/>
</sequence>
</complexType>
</element>
<complexType name ="repository">
<sequence>
<!-- required elements -->
<element name="title" type="string" minOccurs="1"
maxOccurs="1"/>
<element name="root" type="string" minOccurs="1"
maxOccurs="1"/>
<!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
<element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
<!-- optional elements -->
<element name="password" type="string" minOccurs="0" maxOccurs="1"/>
<element name="description" type="string" minOccurs="1" maxOccurs="0"/>
<!-- URL for the CVS web interface for this project -->
<!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
<element name="cvsweb" type="string" minOccurs="0"
maxOccurs="1"/>
</sequence>
<!-- The type of repository this is. DEFAULT: CVS. If 'LOCAL' then
this is just a local set of files -->
<attribute name="type" type="string" minOccurs="0" maxOccurs="1"/>
<!-- if this is true the user has the option to browse the source this was
generated from.
The default is true.
-->
</complexType>
<!--
<complexType name="revision">
<attribute name="tag" type="string" minOccurs="1" maxOccurs="1"/>
<attribute name="latest" type="boolean" minOccurs="1" maxOccurs="1"/>
</complexType>
-->
<complexType name="project">
<sequence>
<element name="title" type="string" minOccurs="1"
maxOccurs="1"/>
<!--
The URL for this module's homepage.
-->
<!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
<element name="home" type="string" minOccurs="1"
maxOccurs="1"/>
<!--
A description of what this module does.
-->
<element name="description" type="string" minOccurs="1"
maxOccurs="1"/>
<!--
The license for this module. Begin lawyer speak here...
-->
<element name="license" type="string" minOccurs="1"
maxOccurs="1"/>
<!--
The CVS name of this module
-->
<element name="module" type="string" minOccurs="1" maxOccurs="1"/>
<!--
the begining of java program files. Should be in the from of "dir/dir"
-->
<element name="javasrc" type="string" minOccurs="0"
maxOccurs="unbounded"/>
<!--
Specify the different tagged version that you want to view within
CVS. You need to specify at least one and this should be probably be
HEAD
-->
<!--<element name="revision" type="revision" minOccurs="1"
maxOccurs="unbounded"/>-->
<!--
Specify the url to a bug database for this module
-->
<!-- FIX ME: castor doesn't support the URL datatype... change this..
-->
<element name="bug-database" type="string" minOccurs="0" maxOccurs="1"/>
<!--
A URL where this module can be downloaded. This should be a URL
that can be browsed and not absolute to a specific version.
-->
<element name="download" type="string" minOccurs="0" maxOccurs="1"/>
<!--
Specify the available mailing lists for this module.
-->
<element name="mailing-list" type="mailing-list" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
<attribute name="opensource" type="boolean" default="true" minOccurs="0"
maxOccurs="1"/>
<attribute name="tag" type="string" minOccurs="1" maxOccurs="1"/>
</complexType>
<complexType name="mailing-list">
<sequence>
<element name="mailto" type="string" minOccurs="1"
maxOccurs="1"/>
<element name="name" type="string" minOccurs="1"
maxOccurs="1"/>
<element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
</sequence>
</complexType>
</schema>
1.1 jakarta-alexandria/src/xml/projects/Alexandria.xml
Index: Alexandria.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="Alexandria">
<title>Alexandria</title>
<module>alexandria</module>
<license>APL</license>
<description>Internet content management system</description>
<home>http://java.apache.org/alexandria</home>
<javasrc>src/java</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/Ant.xml
Index: Ant.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="jakarta.apache.org">
<title>Ant</title>
<module>jakarta-ant</module>
<license>APL</license>
<description>An Open Source java based build tool</description>
<home>http://jakarta.apache.org/ant</home>
<javasrc>src/main</javasrc>
</project>
No revision
No revision
No revision
No revision
1.1 jakarta-alexandria/src/xml/projects/Avalon.xml
Index: Avalon.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="java.apache.org">
<title>Avalon</title>
<module>framework</module>
<license>APL</license>
<home>http://java.apache.org/framework</home>
<javasrc>src</javasrc>
<description>Default Project Description</description>
</project>
1.1 jakarta-alexandria/src/xml/projects/Cocoon.xml
Index: Cocoon.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="xml.apache.org">
<title>Cocoon</title>
<module>xml-cocoon</module>
<license>APL</license>
<description>
Cocoon is a 100% pure Java publishing framework that relies on
new W3C technologies (such as DOM, XML, and XSL) to provide
we content.
</description>
<home>http://xml.apache.org/cocoon</home>
<javasrc>src</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/ECS.xml
Index: ECS.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="java.apache.org">
<title>ECS</title>
<module>ecs</module>
<license>APL</license>
<home>http://java.apache.org/ecs</home>
<javasrc>src/java</javasrc>
<description>Default Project Description</description>
</project>
1.1 jakarta-alexandria/src/xml/projects/EJBoss.xml
Index: EJBoss.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="EJBoss">
<title>EJBoss</title>
<module>ejboss</module>
<license>GPL</license>
<description>Open Source EJB server</description>
<home>http://www.ejboss.org</home>
<javasrc>src/java</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/FOP.xml
Index: FOP.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="xml.apache.org">
<title>FOP</title>
<module>xml-fop</module>
<license>APL</license>
<description>
FOP is the world's first print formatter driven by XSL
formatting objects.
</description>
<home>http://xml.apache.org/fop</home>
<javasrc>src</javasrc>
</project>
No revision
No revision
No revision
No revision
No revision
No revision
1.1 jakarta-alexandria/src/xml/projects/James.xml
Index: James.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="java.apache.org">
<title>James</title>
<module>james</module>
<license>APL</license>
<home>http://java.apache.org/james</home>
<javasrc>src</javasrc>
<description>Default Project Description</description>
</project>
1.1 jakarta-alexandria/src/xml/projects/Jetspeed.xml
Index: Jetspeed.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="Jetspeed">
<title>Jetspeed</title>
<module>jetspeed</module>
<license>APL</license>
<description>An open source Web Portal</description>
<home>http://java.apache.org/jetspeed</home>
<javasrc>src/java</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/RegExp.xml
Index: RegExp.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="jakarta.apache.org">
<title>RegExp</title>
<module>jakarta-regexp</module>
<license>APL</license>
<home>http://jakarta.apache.org/slide</home>
<javasrc>src/java</javasrc>
<description>Default Project Description</description>
</project>
1.1 jakarta-alexandria/src/xml/projects/Slide.xml
Index: Slide.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="jakarta.apache.org">
<title>Slide</title>
<module>jakarta-slide</module>
<license>APL</license>
<home>http://jakarta.apache.org/regexp</home>
<javasrc>src/share</javasrc>
<description>Default Project Description</description>
</project>
1.1 jakarta-alexandria/src/xml/projects/Stylebook.xml
Index: Stylebook.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="xml.apache.org">
<title>Stylebook</title>
<module>xml-stylebook</module>
<license>APL</license>
<description>
Stylebook is an XML technology for creating documentation.
</description>
<home>http://xml.apache.org</home>
<javasrc>src</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/Tomcat.xml
Index: Tomcat.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="jakarta.apache.org">
<title>Tomcat</title>
<module>jakarta-tomcat</module>
<license>APL</license>
<description>A Servlet Engine</description>
<home>http://jakarta.apache.org/tomcat</home>
<javasrc>src/share</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/Turbine.xml
Index: Turbine.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="Turbine">
<title>Turbine</title>
<module>turbine</module>
<license>APL</license>
<description>
Turbine is a servlet based framework that allows experienced
Java developers to quickly build secure web applications.
</description>
<home>http://java.apache.org/turbine</home>
<javasrc>src/java</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/Xalan.xml
Index: Xalan.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="xml.apache.org">
<title>Xalan</title>
<module>xml-xalan</module>
<license>APL</license>
<description>XSLT Processor</description>
<home>http://xml.apache.org/xalan</home>
<javasrc>src</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/Xerces.xml
Index: Xerces.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project repository="xml.apache.org">
<title>Xerces</title>
<module>xml-xerces</module>
<license>APL</license>
<description>XML Parser</description>
<home>http://xml.apache.org/xerces</home>
<javasrc>java/src</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/alexandria.xml
Index: alexandria.xml
===================================================================
<project opensource="true" repository="alexandria">
<title>Alexandria 2</title>
<license>APL</license>
<description>Internet content management system</description>
<home>http://java.apache.org/alexandria</home>
<module>alexandria</module>
<javasrc>src/java</javasrc>
<build file="build.xml" target="main" />
<test file="build.xml" target="test" />
</project>
1.1 jakarta-alexandria/src/xml/projects/cocoon.xml
Index: cocoon.xml
===================================================================
<project opensource="true" repository="cocoon">
<title>Cocoon 2</title>
<license>APL</license>
<description>Internet content management system</description>
<home>http://java.apache.org/alexandria</home>
<module>xml-cocoon</module>
<javasrc>src</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/projects/hbug.xml
Index: hbug.xml
===================================================================
<project opensource="true" repository="local">
<title>HBug</title>
<license>APL</license>
<description>HTTP Debuging Tool</description>
<home>http://www.custommonkey.org/</home>
<module>hbug</module>
<javasrc>src</javasrc>
</project>
1.1 jakarta-alexandria/src/xml/repositories/Alexandria.xml
Index: Alexandria.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="Alexandria">
<title>Alexandria</title>
<root>:pserver:[EMAIL PROTECTED]:/products/cvs/alexandria</root>
<password>anon</password>
<cvsweb>http://www.working-dogs.com/alexandria/cvsweb/index.cgi/</cvsweb>
<home>http://java.apache.org/alexandria</home>
<description>Alexandria home repository @ working-dogs.com</description>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/EJBoss.xml
Index: EJBoss.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="EJBoss">
<title>EJBoss</title>
<root>:pserver:[EMAIL PROTECTED]:/products/cvs/ejboss</root>
<password>anon</password>
<cvsweb>http://www.working-dogs.com/ejboss/cvsweb/index.cgi/</cvsweb>
<home>http://www.ejboss.org</home>
<description/>
</repository>
No revision
No revision
No revision
No revision
1.1 jakarta-alexandria/src/xml/repositories/Jetspeed.xml
Index: Jetspeed.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="Jetspeed">
<title>Jetspeed</title>
<root>:pserver:[EMAIL PROTECTED]:/products/cvs/jetspeed</root>
<home>http://java.apache.org/jetspeed</home>
<password>anon</password>
<cvsweb>http://www.working-dogs.com/jetspeed/cvsweb/index.cgi/</cvsweb>
<description/>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/Turbine.xml
Index: Turbine.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="Turbine">
<title>Turbine</title>
<root>:pserver:[EMAIL PROTECTED]:/products/cvs/turbine</root>
<password>anon</password>
<home>http://java.apache.org/turbine</home>
<cvsweb>http://www.working-dogs.com/turbine/cvsweb/index.cgi/</cvsweb>
<description/>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/alexandria.xml
Index: alexandria.xml
===================================================================
<repository type="local" name="alexandria">
<title>My Disc</title>
<root>/home/jmartin</root>
<home>http://java.apache.org/alexandria</home>
<description>It's my disc stupid</description>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/cocoon.xml
Index: cocoon.xml
===================================================================
<repository type="local" name="cocoon">
<title>Cocoon 2</title>
<root>/home/jmartin</root>
<home>http://java.apache.org/alexandria</home>
<description>The Alexandria repoitory</description>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/jakarta.apache.org.xml
Index: jakarta.apache.org.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="jakarta.apache.org">
<title>jakarta.apache.org</title>
<root>:pserver:[EMAIL PROTECTED]:/home/cvspublic</root>
<home>http://jakarta.apache.org</home>
<password>anoncvs</password>
<cvsweb>http://jakarta.apache.org/cvsweb/index.cgi/</cvsweb>
<description/>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/java.apache.org.xml
Index: java.apache.org.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="java.apache.org">
<title>java.apache.org</title>
<root>:pserver:[EMAIL PROTECTED]:/products/cvs/master</root>
<password>jservpub</password>
<home>http://java.apache.org</home>
<cvsweb>http://www.working-dogs.com/cvsweb/index.cgi/</cvsweb>
<description/>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/local.xml
Index: local.xml
===================================================================
<repository type="cvs" name="local">
<title>Local CVS</title>
<root>/usr/local/cvs</root>
<home>http://localhost/</home>
<description>Local CVS Repository</description>
</repository>
1.1 jakarta-alexandria/src/xml/repositories/xml.apache.org.xml
Index: xml.apache.org.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<repository name="xml.apache.org">
<title>xml.apache.org</title>
<root>:pserver:[EMAIL PROTECTED]:/home/cvspublic</root>
<home>http://xml.apache.org</home>
<password>anoncvs</password>
<cvsweb>http://xml.apache.org/websrc/cvsweb.cgi/</cvsweb>
<description/>
</repository>
1.9 +33 -54 jakarta-alexandria/src/xsl/build.build.xsl
Index: build.build.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.build.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.build.xsl 2001/01/08 15:30:29 1.8
+++ build.build.xsl 2001/02/04 23:54:35 1.9
@@ -3,79 +3,60 @@
<xsl:output indent="yes"/>
- <!--
- <xsl:variable name="head-packages" select=""/>
- -->
+ <xsl:template match="/workspace">
- <xsl:template match="/cvs">
-
<project name="Alexandria" default="all" basedir=".">
<property file="etc/AlexandriaResources.properties" />
-
- <xsl:element name="target">
- <xsl:attribute name="name">
- <xsl:text>all</xsl:text>
- </xsl:attribute>
+ <target name="all">
<xsl:attribute name="depends">
- <xsl:for-each select = "/cvs/repository/module/revision">
+ <xsl:for-each select = "project/revision">
<xsl:if test="../build">
- <xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
- <xsl:value-of select="../cvs-module-name"/><xsl:text>.</xsl:text>
- <xsl:value-of select="@tag"/>
+ <xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
+ <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="@tag"/>
</xsl:if>
</xsl:for-each>
</xsl:attribute>
- </xsl:element>
+ </target>
- <xsl:apply-templates select="./repository"/>
+ <xsl:apply-templates select="project/revision"/>
</project>
</xsl:template>
- <xsl:template match="/cvs/repository">
- <xsl:apply-templates select="./module"/>
- </xsl:template>
+ <xsl:template match="project/revision">
+ <xsl:variable name="module" select="../module"/>
+ <xsl:variable name="javasrc" select="../javasrc"/>
+ <xsl:variable name="build.file" select="../build/@file"/>
+ <xsl:variable name="build.target" select="../build/@target"/>
+ <xsl:variable name="build.classpath" select="../build/@classpath"/>
-
- <!--<xsl:template match="/cvs/repository/module/javasrc">-->
- <xsl:template match="/cvs/repository/module">
- <xsl:comment>
- Generating module: <xsl:value-of select="cvs-module-name"/>
- </xsl:comment>
-
- <xsl:variable name="module" select="cvs-module-name"/>
- <xsl:variable name="tag" select="revision/@tag"/>
- <xsl:variable name="javasrc" select="javasrc"/>
- <xsl:variable name="build.file" select="build/@file"/>
- <xsl:variable name="build.target" select="build/@target"/>
- <xsl:variable name="build.classpath" select="build/@classpath"/>
-
- <xsl:if test="build">
- <target name="{$module}.{$tag}">
+ <xsl:if test="../build">
+ <target name="{$module}.{@tag}">
<java
fork="true"
classname="org.apache.tools.ant.Main">
<arg value="-buildfile" />
- <arg
value="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/{$build.file}" />
+ <arg
value="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/{$build.file}" />
<arg value="{$build.target}" />
<arg value="-listener" />
<arg value="org.apache.tools.ant.XmlLogger" />
<arg value="-listener" />
<arg value="org.apache.alexandria.blame.BlameListener" />
- <arg value="-DXmlLogger.file=logs/{$module}.{$tag}.build.log.xml" />
+ <arg value="-DXmlLogger.file=logs/{$module}.{@tag}.build.log.xml" />
<jvmarg value="-Dalexandria.module={$module}" />
- <jvmarg value="-Dalexandria.tag={$tag}" />
- <jvmarg
value="-Dalexandria.content.dir=${{content.dir}}/cvs/{$module}/{$tag}/{$module}/{$javasrc}/"
/>
+ <jvmarg value="-Dalexandria.tag={@tag}" />
+ <jvmarg
value="-Dalexandria.content.dir=${{content.dir}}/cvs/{$module}/{@tag}/{$module}/{$javasrc}/"
/>
<jvmarg value="-Dant.home=${{ant.home}}" />
<jvmarg value="-Djava.compiler=NONE" />
<arg value="-logfile" />
- <arg value="logs/{$module}.{$tag}.build.log" />
+ <arg value="logs/{$module}.{@tag}.build.log" />
<xsl:for-each select="build/arg">
- <xsl:element name="arg">
- <xsl:attribute name="value">-D<xsl:value-of
select="@name"/>=<xsl:value-of select="@value"/></xsl:attribute>
- </xsl:element>
+ <xsl:element name="arg">
+ <xsl:attribute name="value">-D<xsl:value-of
select="@name"/>=<xsl:value-of select="@value"/></xsl:attribute>
+ </xsl:element>
</xsl:for-each>
<classpath>
<pathelement path="{$build.classpath}"/>
@@ -85,7 +66,7 @@
<pathelement path="/usr/share/java/parser.jar"/>
<pathelement path="/usr/share/java/jaxp.jar"/>
<pathelement path="${{ant.home}}/lib/xml.jar"/>
- <pathelement path="lib/xerces.jar"/>
+ <pathelement path="${{ant.home}}/lib/xerces.jar"/>
<pathelement path="${{java.home}}/../lib/tools.jar"/>
<pathelement path="Alexandria.jar"/>
<pathelement path="lib/castor-0.8.11.jar"/>
@@ -93,28 +74,26 @@
</java>
<xstyle
- in="logs/{$module}.{$tag}.build.log.xml"
+ in="logs/{$module}.{@tag}.build.log.xml"
style="xsl/blog.xsl"
- out="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/build.html" />
+ out="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/build.html" />
<xstyle
- in="var/{$module}.{$tag}.blame.xml"
+ in="var/{$module}.{@tag}.blame.xml"
style="xsl/blame.kull.xsl"
- out="var/{$module}.{$tag}.blame.trim.xml">
+ out="var/{$module}.{@tag}.blame.trim.xml">
<param name="limit" expression="${{blame.size}}"/>
</xstyle>
<move
- file="var/{$module}.{$tag}.blame.trim.xml"
- tofile="var/{$module}.{$tag}.blame.xml"/>
+ file="var/{$module}.{@tag}.blame.trim.xml"
+ tofile="var/{$module}.{@tag}.blame.xml"/>
<xstyle
- in="var/{$module}.{$tag}.blame.xml"
+ in="var/{$module}.{@tag}.blame.xml"
style="xsl/blame.xsl"
- out="${{content.dir}}/html/{$module}.{$tag}.blame.html" />
+ out="${{content.dir}}/html/{$module}.{@tag}.blame.html" />
</target>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
-
-
1.5 +68 -91 jakarta-alexandria/src/xsl/build.cvs.xsl
Index: build.cvs.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.cvs.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.cvs.xsl 2001/01/17 20:05:49 1.4
+++ build.cvs.xsl 2001/02/04 23:54:35 1.5
@@ -3,114 +3,91 @@
<xsl:output indent="yes"/>
- <!--
- <xsl:variable name="head-packages" select=""/>
- -->
+ <xsl:template match="/workspace">
- <xsl:template match="/cvs">
-
- <project name="Alexandria" default="dist">
- <property name="year" value="2000"/>
+ <project name="Alexandria" default="all">
<property file="etc/AlexandriaResources.properties" />
<taskdef name="clog" classname="org.apache.tools.ant.taskdefs.ChangeLog" />
<taskdef name="aggtests" classname="org.apache.alexandria.AggregateTests" />
- <target name="dist">
-
- <xsl:apply-templates select="./repository"/>
-
- <xsl:comment>
- Generate the rest of the content
- </xsl:comment>
-
+ <target name="all">
+ <xsl:attribute name="depends">
+ <xsl:for-each select = "project/revision">
+ <xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
+ <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="@tag"/>
+ </xsl:for-each>
+ </xsl:attribute>
</target>
- </project>
- </xsl:template>
-
- <xsl:template match="/cvs/repository">
+ <xsl:apply-templates select="project/revision"/>
- <xsl:variable name="root" select="./root"/>
+ </project>
- <xsl:apply-templates select="./module"/>
-
</xsl:template>
-
-
- <xsl:template match="/cvs/repository/module">
+ <xsl:template match="revision">
- <xsl:comment>
- Generating module: <xsl:value-of select="cvs-module-name"/>
- </xsl:comment>
+ <xsl:variable name="name" select="../@repository"/>
+ <xsl:variable name="repository" select="/workspace/repository[@name=$name]"/>
- <!--
- Process all revisions on all modules
- -->
- <xsl:apply-templates select="./revision"/>
-
- </xsl:template>
-
-
- <xsl:template match="/cvs/repository/module/revision">
-
- <xsl:variable name="type" select="../../@type"/>
- <xsl:variable name="module" select="../cvs-module-name"/>
- <xsl:variable name="tag" select="@tag"/>
- <xsl:variable name="root" select="../../root"/>
+ <xsl:if test="not($repository)">
+ <xsl:message terminate="yes">
+ Repository <xsl:value-of select="$name"/> not found.
+ </xsl:message>
+ </xsl:if>
+
+ <xsl:variable name="type" select="$repository/@type"/>
+ <xsl:variable name="module" select="../module"/>
+ <xsl:variable name="root" select="$repository/root"/>
<xsl:variable name="javasrc" select="../javasrc"/>
- <xsl:variable name="name" select="name"/>
- <xsl:variable name="cvsweb-url" select="../../cvsweb"/>
-
- <!--
- Make sure that the target directory of directory is created
- -->
- <mkdir dir="${{content.dir}}/cvs/{$module}/{$tag}"/>
+ <xsl:variable name="cvsweb-url" select="$repository/cvsweb"/>
+ <target name="{$module}.{@tag}">
- <!--
- Update this module from CVS if it isn't local
- -->
+ <mkdir dir="${{content.dir}}/cvs/{$module}/{@tag}"/>
-
- <!--
- If this is a local source tree then copy the files to this tag...
- -->
- <xsl:choose>
-
- <!--
- FIX ME: There is a bug in Xalan that doesn't work with a null
- type. This is a HACK which tests if the length is 0 and then
- assumes the content is public
+ <!--
+ If this is a local source tree then copy the files to this tag...
-->
- <xsl:when test="string-length($type) != 0">
- <copy toDir="${{content.dir}}/cvs/{$module}/{$tag}/{$module}">
- <fileset dir="{$root}"/>
- </copy>
- </xsl:when>
-
- <xsl:otherwise>
- <cvs cvsRoot="{$root}"
- dest="${{content.dir}}/cvs/{$module}/{$tag}"
- package="{$module}"
- tag="{$tag}"
- output="logs/cvs.co.{$module}.{$tag}.out"
- error="logs/cvs.co.{$module}.{$tag}.error" />
- </xsl:otherwise>
- </xsl:choose>
-
- <!-- Build change log -->
- <clog basedir="${{content.dir}}/cvs/{$module}/{$tag}/{$module}"
- output="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/ChangeLog"
- userlist="etc/Users.properties" />
- <xstyle
- in="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/ChangeLog"
- style="xsl/clog.xsl"
- out="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/ChangeLog.html">
- <param name="module" expression="'{$module}'"/>
- <param name="cvsweb" expression="'{$cvsweb-url}'"/>
- </xstyle>
+ <xsl:choose>
+
+ <xsl:when test="$type='local'">
+ <!-- Dump old versions of files -->
+ <delete dir="${{content.dir}}/cvs/{$module}/{@tag}/{$module}" />
+ <copy toDir="${{content.dir}}/cvs/{$module}/{@tag}/{$module}">
+ <fileset dir="{$root}/{$module}"/>
+ </copy>
+ </xsl:when>
+
+ <xsl:when test="$type='cvs'">
+ <cvs cvsRoot="{$root}"
+ dest="${{content.dir}}/cvs/{$module}/{@tag}"
+ package="{$module}"
+ tag="{@tag}"
+ output="logs/cvs.co.{$module}.{@tag}.out"
+ error="logs/cvs.co.{$module}.{@tag}.error" />
+
+ <!-- Build change log -->
+ <clog basedir="${{content.dir}}/cvs/{$module}/{@tag}/{$module}"
+ output="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/ChangeLog"
+ userlist="etc/Users.properties" />
+
+ <xstyle
+ in="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/ChangeLog"
+ style="xsl/clog.xsl"
+ out="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/ChangeLog.html">
+ <param name="module" expression="'{$module}'"/>
+ <param name="cvsweb" expression="'{$cvsweb-url}'"/>
+ </xstyle>
+ </xsl:when>
+
+ <xsl:otherwise>
+ <xsl:message terminate="yes">
+ Unknown repository type: <xsl:value-of select="$type"/>
+ </xsl:message>
+ </xsl:otherwise>
+ </xsl:choose>
+ </target>
</xsl:template>
</xsl:stylesheet>
-
-
1.4 +45 -80 jakarta-alexandria/src/xsl/build.javadoc.xsl
Index: build.javadoc.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.javadoc.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.javadoc.xsl 2000/12/18 17:35:44 1.3
+++ build.javadoc.xsl 2001/02/04 23:54:35 1.4
@@ -3,96 +3,61 @@
<xsl:output indent="yes"/>
- <!--
- <xsl:variable name="head-packages" select=""/>
- -->
+ <xsl:template match="/workspace">
- <xsl:template match="/cvs">
-
- <project name="Alexandria" default="dist" basedir=".">
- <!--<property file="etc/AlexandriaResources.properties" />-->
+ <project name="Alexandria" default="all" basedir=".">
<taskdef name="clog" classname="org.apache.tools.ant.taskdefs.ChangeLog" />
<taskdef name="aggtests" classname="org.apache.alexandria.AggregateTests" />
- <target name="dist">
-
- <xsl:apply-templates select="./repository"/>
-
- <xsl:comment>
- Generate the rest of the content
- </xsl:comment>
-
+ <target name="all">
+ <xsl:attribute name="depends">
+ <xsl:for-each select = "project/revision">
+ <xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
+ <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="@tag"/>
+ </xsl:for-each>
+ </xsl:attribute>
</target>
- </project>
-
- </xsl:template>
-
- <xsl:template match="/cvs/repository">
- <xsl:variable name="root" select="./root"/>
-
- <xsl:apply-templates select="./module"/>
+ <xsl:apply-templates select="project/revision"/>
- </xsl:template>
-
-
- <xsl:template match="/cvs/repository/module">
-
-
- <xsl:comment>
- Generating module: <xsl:value-of select="cvs-module-name"/>
- </xsl:comment>
-
- <!--
- Generate javadoc on modules that have java source code
- -->
- <xsl:apply-templates select="./javasrc"/>
-
-
- </xsl:template>
-
-
- <xsl:template match="/cvs/repository/module/javasrc">
-
- <xsl:variable name="module" select="../cvs-module-name"/>
- <xsl:variable name="tag" select="../revision/@tag"/>
- <xsl:variable name="name" select="../name"/>
- <xsl:variable name="javasrc" select="."/>
- <xsl:variable name="build.file" select="../build/@file"/>
- <xsl:variable name="build.target" select="../build/@target"/>
- <xsl:variable name="build.classpath" select="../build/@classpath"/>
- <xsl:variable name="test.file" select="../test/@file"/>
- <xsl:variable name="test.target" select="../test/@target"/>
- <xsl:variable name="test.classpath" select="../test/@classpath"/>
-
- <!--
- Remove the old Javadoc for this module
- -->
- <delete dir="${{content.dir}}/html/javadoc/{$module}/{$tag}"/>
- <mkdir dir="${{content.dir}}/html/javadoc/{$module}/{$tag}"/>
+ </project>
+ </xsl:template>
+ <xsl:template match="revision">
- <!-- KLUDGE... there has got to be a better way to do this... -->
- <xsl:variable name="javadoc-source">${content.dir}/cvs/<xsl:value-of
select="$module"/>/<xsl:value-of select="$tag"/>/<xsl:value-of
select="$module"/>/<xsl:value-of select="$javasrc"/></xsl:variable>
- <xsl:if test="$javasrc = '.'">
- <xsl:variable name="javadoc-source">${{content.dir}}/cvs/<xsl:value-of
select="$module"/>/<xsl:value-of select="$tag"/>/<xsl:value-of
select="$module"/></xsl:variable>
- </xsl:if>
- <!-- END KLUDGE -->
-
-
- <!--
- Generate Javadoc for this module
- -->
- <javadoc sourcepath="{$javadoc-source}"
- destdir="${{content.dir}}/html/javadoc/{$module}/{$tag}"
- packagenames="uk.*, org.*, com.*, java.*, javax.*, sun.*"
- private="true"
- doctitle="{$name}"
- version="true"
- use="true"
- author="true"
- stylesheetfile="${{content.dir}}/html/javadoc.css"/>
+ <xsl:variable name="module" select="../module"/>
+ <xsl:variable name="name" select="../title"/>
+ <xsl:variable name="javasrc" select="../javasrc"/>
+
+ <target name="{$module}.{@tag}">
+
+ <!--
+ Remove the old Javadoc for this module
+ -->
+ <delete dir="${{content.dir}}/html/javadoc/{$module}/{@tag}"/>
+ <mkdir dir="${{content.dir}}/html/javadoc/{$module}/{@tag}"/>
+
+ <!-- KLUDGE... there has got to be a better way to do this... -->
+ <xsl:variable name="javadoc-source">${content.dir}/cvs/<xsl:value-of
select="$module"/>/<xsl:value-of select="@tag"/>/<xsl:value-of
select="$module"/>/<xsl:value-of select="$javasrc"/></xsl:variable>
+
+ <xsl:if test="$javasrc = '.'"><xsl:variable
name="javadoc-source">${{content.dir}}/cvs/<xsl:value-of
select="$module"/>/<xsl:value-of select="@tag"/>/<xsl:value-of
select="$module"/></xsl:variable></xsl:if>
+ <!-- END KLUDGE -->
+
+ <!--
+ Generate Javadoc for this module
+ -->
+ <javadoc sourcepath="{$javadoc-source}"
+ destdir="${{content.dir}}/html/javadoc/{$module}/{@tag}"
+ packagenames="uk.*, org.*, com.*, java.*, javax.*, sun.*"
+ private="true"
+ doctitle="{$name}"
+ version="true"
+ use="true"
+ author="true"
+ stylesheetfile="${{content.dir}}/html/javadoc.css"/>
+ </target>
</xsl:template>
</xsl:stylesheet>
1.11 +86 -102 jakarta-alexandria/src/xsl/build.test.xsl
Index: build.test.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/build.test.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.test.xsl 2001/01/08 15:30:29 1.10
+++ build.test.xsl 2001/02/04 23:54:35 1.11
@@ -3,13 +3,9 @@
<xsl:output indent="yes"/>
- <!--
- <xsl:variable name="head-packages" select=""/>
- -->
+ <xsl:template match="/workspace">
- <xsl:template match="/cvs">
-
- <project name="Alexandria" default="dist" basedir=".">
+ <project name="Alexandria" default="all" basedir=".">
<property file="etc/AlexandriaResources.properties" />
<property name="xx.lib.xerces" value="../../lib/xerces.jar" />
<property name="lib.svg" value="lib/svg.jar" />
@@ -20,110 +16,98 @@
<taskdef name="aggtests" classname="org.apache.alexandria.AggregateTests" />
- <target name="dist">
-
- <xsl:apply-templates select="./repository"/>
-
- <xsl:comment>
- Generate the rest of the content
- </xsl:comment>
-
-
+ <target name="all">
+ <xsl:attribute name="depends">
+ <xsl:for-each select = "project/revision">
+ <xsl:if test="../test">
+ <xsl:if test="position()!=1"><xsl:text>,</xsl:text></xsl:if>
+ <xsl:value-of select="../module"/><xsl:text>.</xsl:text>
+ <xsl:value-of select="@tag"/>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:attribute>
</target>
- </project>
-
- </xsl:template>
-
- <xsl:template match="/cvs/repository">
- <xsl:variable name="root" select="./root"/>
+ <xsl:apply-templates select="project/revision"/>
- <xsl:apply-templates select="./module"/>
+ </project>
</xsl:template>
-
- <xsl:template match="/cvs/repository/module">
+ <xsl:template match="project/revision">
+ <xsl:variable name="module" select="../module"/>
+ <xsl:variable name="name" select="../name"/>
+ <xsl:variable name="javasrc" select="../javasrc"/>
+ <xsl:variable name="test.file" select="../test/@file"/>
+ <xsl:variable name="test.target" select="../test/@target"/>
+ <xsl:variable name="test.classpath" select="../test/@classpath"/>
+
+ <xsl:if test="../test">
+ <target name="{$module}.{@tag}">
+ <java
+ fork="true"
+ classname="org.apache.tools.ant.Main">
+ <arg value="-buildfile" />
+ <arg value="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/{$test.file}"
/>
+ <arg value="-listener" />
+ <arg value="org.apache.tools.ant.XmlLogger" />
+ <arg value="{$test.target}" />
+ <arg
value="-DXmlLogger.file=logs/{$module}.{@tag}.{$module}.test.log.xml" />
+ <jvmarg value="-Dant.home=${{ant.home}}" />
+ <jvmarg value="-Djava.compiler=NONE" />
+ <arg value="-logfile" />
+ <arg value="logs/{$module}.{@tag}.{$module}.test.log" />
+ <xsl:for-each select="test/arg">
+ <xsl:element name="arg">
+ <xsl:attribute name="value">-D<xsl:value-of
select="@name"/>=<xsl:value-of select="@value"/></xsl:attribute>
+ </xsl:element>
+ </xsl:for-each>
+ <classpath>
+ <pathelement path="{$test.classpath}"/>
+ <pathelement path="${{ant.home}}/lib/ant.jar"/>
+ <pathelement path="/usr/share/java/ant.jar"/>
+ <pathelement path="/usr/share/java/optional.jar"/>
+ <pathelement path="/usr/share/java/parser.jar"/>
+ <pathelement path="/usr/share/java/jaxp.jar"/>
+ <pathelement path="${{ant.home}}/lib/xml.jar"/>
+ <pathelement path="lib/xerces.jar"/>
+ <pathelement path="${{java.home}}/../lib/tools.jar"/>
+ <pathelement path="Alexandria.jar"/>
+ <pathelement path="lib/castor-0.8.11.jar"/>
+ </classpath>
+ </java>
+ <xstyle
+ in="logs/{$module}.{@tag}.{$module}.test.log.xml"
+ style="xsl/blog.xsl"
+ out="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/test.html" />
+ <aggtests
+ basedir="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/"
+ output="var/{$module}.{@tag}.{$module}.tests.xml"
+ statfile="var/{$module}.{@tag}.{$module}.stats.xml"
+ />
+ <delete>
+ <fileset
+ dir="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/"
+ includes="TEST-*.xml"/>
+ </delete>
+ <xstyle
+ in="var/{$module}.{@tag}.{$module}.tests.xml"
+ style="xsl/testsuite.xsl"
+ out="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/testsuite.html" />
+ <xstyle
+ in="var/{$module}.{@tag}.{$module}.stats.xml"
+ style="xsl/stats.xsl"
+ out="${{content.dir}}/cvs/{$module}/{@tag}/{$module}/stats.html" />
+
+ <!--
+ <xstyle
+ in="${{content.dir}}/{$module}.{@tag}.{$module}.stats.xml"
+ style="xsl/graph.xsl"
+ out="${{content.dir}}/{$module}.{@tag}.{$module}.graph.svg" />
+ -->
- <xsl:comment>
- Generating module: <xsl:value-of select="cvs-module-name"/>
- </xsl:comment>
-
- <xsl:variable name="module" select="cvs-module-name"/>
- <xsl:variable name="tag" select="revision/@tag"/>
- <xsl:variable name="name" select="name"/>
- <xsl:variable name="javasrc" select="javasrc"/>
- <xsl:variable name="build.file" select="build/@file"/>
- <xsl:variable name="build.target" select="build/@target"/>
- <xsl:variable name="build.classpath" select="build/@classpath"/>
- <xsl:variable name="test.file" select="test/@file"/>
- <xsl:variable name="test.target" select="test/@target"/>
- <xsl:variable name="test.classpath" select="test/@classpath"/>
-
- <xsl:if test="test">
- <java
- fork="true"
- classname="org.apache.tools.ant.Main">
- <arg value="-buildfile" />
- <arg value="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/{$test.file}" />
- <arg value="-listener" />
- <arg value="org.apache.tools.ant.XmlLogger" />
- <arg value="{$test.target}" />
- <arg value="-DXmlLogger.file=logs/{$module}.{$tag}.{$module}.test.log.xml"
/>
- <jvmarg value="-Dant.home=${{ant.home}}" />
- <jvmarg value="-Djava.compiler=NONE" />
- <arg value="-logfile" />
- <arg value="logs/{$module}.{$tag}.{$module}.test.log" />
- <xsl:for-each select="test/arg">
- <xsl:element name="arg">
- <xsl:attribute name="value">-D<xsl:value-of
select="@name"/>=<xsl:value-of select="@value"/></xsl:attribute>
- </xsl:element>
- </xsl:for-each>
- <classpath>
- <pathelement path="{$build.classpath}"/>
- <pathelement path="${{ant.home}}/lib/ant.jar"/>
- <pathelement path="/usr/share/java/ant.jar"/>
- <pathelement path="/usr/share/java/optional.jar"/>
- <pathelement path="/usr/share/java/parser.jar"/>
- <pathelement path="/usr/share/java/jaxp.jar"/>
- <pathelement path="${{ant.home}}/lib/xml.jar"/>
- <pathelement path="lib/xerces.jar"/>
- <pathelement path="${{java.home}}/../lib/tools.jar"/>
- <pathelement path="Alexandria.jar"/>
- <pathelement path="lib/castor-0.8.11.jar"/>
- </classpath>
- </java>
- <xstyle
- in="logs/{$module}.{$tag}.{$module}.test.log.xml"
- style="xsl/blog.xsl"
- out="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/test.html" />
- <aggtests
- basedir="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/"
- output="var/{$module}.{$tag}.{$module}.tests.xml"
- statfile="var/{$module}.{$tag}.{$module}.stats.xml"
- />
- <delete>
- <fileset
- dir="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/"
- includes="TEST-*.xml"/>
- </delete>
- <xstyle
- in="var/{$module}.{$tag}.{$module}.tests.xml"
- style="xsl/testsuite.xsl"
- out="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/testsuite.html" />
- <xstyle
- in="var/{$module}.{$tag}.{$module}.stats.xml"
- style="xsl/stats.xsl"
- out="${{content.dir}}/cvs/{$module}/{$tag}/{$module}/stats.html" />
-
- <!--
- <xstyle
- in="${{content.dir}}/{$module}.{$tag}.{$module}.stats.xml"
- style="xsl/graph.xsl"
- out="${{content.dir}}/{$module}.{$tag}.{$module}.graph.svg" />
- -->
-
+ </target>
</xsl:if>
</xsl:template>
</xsl:stylesheet>
1.11 +83 -112 jakarta-alexandria/src/xsl/left-advanced.xsl
Index: left-advanced.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/left-advanced.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- left-advanced.xsl 2000/12/20 17:47:29 1.10
+++ left-advanced.xsl 2001/02/04 23:54:35 1.11
@@ -1,151 +1,122 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<?xml version="1.0"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+version="1.0">
+ <xsl:output omit-xml-declaration="yes" />
+ <xsl:strip-space elements="*" />
- <xsl:output omit-xml-declaration="yes"/>
-
- <!--
+<!--
An XSL transform that will make a Javascript to build a tree control
-->
-
- <xsl:template match="/cvs">
-
- foldersTree = gFld("Available modules", "");
-
- <xsl:apply-templates select="./repository/module">
-
- <xsl:sort select=".///name"
- order="ascending"
- case-order="upper-first"/>
-
- </xsl:apply-templates>
-
- </xsl:template>
-
- <xsl:template match="/cvs/repository/module">
-
-
- <xsl:variable name="name" select="name"/>
- <xsl:variable name="cvs-module-name" select="cvs-module-name"/>
-
- <xsl:variable name="project-url" select="concat('../right.html#',
- $cvs-module-name)"/>
-
- level1 = insFld(foldersTree, gFld("<xsl:value-of select="$name"/>",
"<xsl:value-of select="$project-url"/>"));
-
+ <xsl:template match="/workspace">foldersTree = gFld("Available modules", "");
+ <xsl:apply-templates select="project">
+ <xsl:sort select="name" order="ascending"
+ case-order="upper-first" />
+ </xsl:apply-templates>
+ </xsl:template>
- <xsl:apply-templates select="./revision"/>
+ <xsl:template match="project">
+ <xsl:variable name="title" select="title" />
- </xsl:template>
-
-
- <xsl:template match="/cvs/repository/module/revision">
+ <xsl:variable name="module" select="module" />
- <xsl:variable name="type" select="../../@type"/>
- <xsl:variable name="opensource" select="../../@opensource"/>
- <xsl:variable name="build.file" select="../build/@file"/>
- <xsl:variable name="test.file" select="../test/@file"/>
- <xsl:variable name="cvs-module-name" select="../cvs-module-name"/>
- <xsl:variable name="tag" select="@tag"/>
- <xsl:variable name="root" select="../../root"/>
- <xsl:variable name="javasrc" select="../javasrc"/>
- <xsl:variable name="name" select="../name"/>
- <xsl:variable name="cvsweb" select="../../cvsweb"/>
+ <xsl:variable name="project-url"
+ select="concat('../right.html#', $module)" />
+ level1 = insFld(foldersTree, gFld("<xsl:value-of select="$title" />", "
<xsl:value-of select="$project-url" /> "));
-
- <xsl:variable name="project-url" select="concat('../right.html#',
- $cvs-module-name)"/>
-
-
- level2 = insFld(level1, gFld("<xsl:value-of select="$tag"/>", ""));
+ <xsl:apply-templates select="./revision" />
+ </xsl:template>
-
- <xsl:apply-templates select="../javasrc"/>
-
- <!-- cvsweb -->
- <!--
- FIX ME: There is a bug in Xalan that doesn't work with a null
- type. This is a HACK which tests if the length is 0 and then
- assumes the content is public
- -->
- <xsl:if test="string-length($type) = 0 ">
+ <xsl:template match="revision">
+ <xsl:variable name="type" select="../../@type" />
- insDoc(level2, gLnk(2, "CVSWeb","<xsl:value-of select="concat($cvsweb,
$cvs-module-name)"/>"));
+ <xsl:variable name="opensource" select="../../@opensource" />
- </xsl:if>
-
- <!-- browse -->
- <!--
- FIX ME: There is a bug in Xalan that doesn't work with a null
- type. This is a HACK which tests if the length is 0 and then
- assumes the content is public
- -->
- <xsl:if test="string-length( $opensource ) = 0">
+ <xsl:variable name="build.file" select="../build/@file" />
- <xsl:variable name="browse-url" select="concat('../../cvs/',
$cvs-module-name, '/', $tag, '/', $cvs-module-name, '/alexandria.index.html')"/>
-
- insDoc(level2, gLnk(2, "Browse","<xsl:value-of
select="$browse-url"/>"));
+ <xsl:variable name="test.file" select="../test/@file" />
- </xsl:if>
+ <xsl:variable name="module"
+ select="../module" />
-
+ <xsl:variable name="tag" select="@tag" />
- <!-- ChangeLog -->
- <xsl:variable name="browse-url" select="concat('../../cvs/',
$cvs-module-name, '/', $tag, '/', $cvs-module-name, '/ChangeLog.html')"/>
+ <xsl:variable name="root" select="../../root" />
- insDoc(level2, gLnk(2, "Change Log","<xsl:value-of
select="$browse-url"/>"));
+ <xsl:variable name="javasrc" select="../javasrc" />
- <xsl:if test="string-length( $build.file ) > 0">
- <!-- Build Log -->
- <xsl:variable name="browse-url" select="concat('../../cvs/',
$cvs-module-name, '/', $tag, '/', $cvs-module-name, '/build.html')"/>
+ <xsl:variable name="title" select="../title" />
- insDoc(level2, gLnk(2, "Build Log","<xsl:value-of
select="$browse-url"/>"));
+ <xsl:variable name="cvsweb" select="../../cvsweb" />
- <xsl:variable name="blame-url" select="concat('../../html/',
$cvs-module-name, '.', $tag, '.blame.html')"/>
- <!-- Blame Log -->
- insDoc(level2, gLnk(2, "Blame Log","<xsl:value-of
select="$blame-url"/>"));
+ <xsl:variable name="project-url"
+ select="concat('../right.html#', $module)" />
- </xsl:if>
- <xsl:if test="string-length( $test.file ) > 0">
- <!-- Build Log -->
- <xsl:variable name="browse-url" select="concat('../../cvs/',
$cvs-module-name, '/', $tag, '/', $cvs-module-name, '/testsuite.html')"/>
+ level2 = insFld(level1, gFld("<xsl:value-of select="$tag" />", ""));
+ <xsl:apply-templates select="../javasrc" />
- insDoc(level2, gLnk(2, "Unit Tests","<xsl:value-of
select="$browse-url"/>"));
+ <!-- cvsweb -->
+ <xsl:if test="$type='cvs'">insDoc(level2, gLnk(2, "CVSWeb","<xsl:value-of
select="concat($cvsweb, $module)" />"));</xsl:if>
- <!-- Build Log -->
- <xsl:variable name="browse-url" select="concat('../../cvs/',
$cvs-module-name, '/', $tag, '/', $cvs-module-name, '/stats.html')"/>
+ <!-- browse -->
+ <xsl:if test="string-length( $opensource ) = 0">
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', $module, '/', $tag, '/', $module,
'/alexandria.index.html')" />
- insDoc(level2, gLnk(2, "Unit Tests Stats","<xsl:value-of
select="$browse-url"/>"));
+ insDoc(level2, gLnk(2, "Browse","<xsl:value-of select="$browse-url" />"));
+ </xsl:if>
- <!-- Build Log -->
- <xsl:variable name="browse-url" select="concat('../../cvs/',
$cvs-module-name, '/', $tag, '/', $cvs-module-name, '/test.html')"/>
+ <!-- ChangeLog -->
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', $module, '/', $tag, '/', $module,
'/ChangeLog.html')" />
- insDoc(level2, gLnk(2, "Test Log","<xsl:value-of
select="$browse-url"/>"));
- </xsl:if>
+ insDoc(level2, gLnk(2, "Change Log","<xsl:value-of select="$browse-url" />"));
+ <xsl:if test="string-length( $build.file ) > 0">
+ <!-- Build Log -->
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', $module, '/', $tag, '/', $module,
'/build.html')" />
+ insDoc(level2, gLnk(2, "Build Log","<xsl:value-of select="$browse-url"
/>"));
+ <xsl:variable name="blame-url"
+ select="concat('../../html/', $module, '.', $tag, '.blame.html')" />
- </xsl:template>
+ <!-- Blame Log -->
+ insDoc(level2, gLnk(2, "Blame Log","<xsl:value-of select="$blame-url" />"));
+ </xsl:if>
+ <xsl:if test="string-length( $test.file ) > 0">
+ <!-- Test Log -->
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', $module, '/', $tag, '/', $module,
'/testsuite.html')" />
+ insDoc(level2, gLnk(2, "Unit Tests","<xsl:value-of select="$browse-url"
/>"));
+ <!-- Test Log -->
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', $module, '/', $tag, '/', $module,
'/stats.html')" />
- <xsl:template match="/cvs/repository/module/javasrc">
+ insDoc(level2, gLnk(2, "Unit Tests Stats","<xsl:value-of select="$browse-url"
/>"));
+ <!-- Build Log -->
+ <xsl:variable name="browse-url"
+ select="concat('../../cvs/', $module, '/', $tag, '/', $module,
'/test.html')" />
-
- <xsl:variable name="cvs-module-name" select="../cvs-module-name"/>
+ insDoc(level2, gLnk(2, "Test Log","<xsl:value-of select="$browse-url" />"));
+ </xsl:if>
+ </xsl:template>
- <!-- FIX ME: this will break on multiple revisions -->
- <xsl:variable name="tag" select="../revision/@tag"/>
- <xsl:variable name="name" select="../name"/>
+ <xsl:template match="javasrc">
+ <xsl:variable name="module"
+ select="../module" />
- <xsl:variable name="browse-url" select="concat('../javadoc/',
$cvs-module-name, '/', $tag, '/index.html')"/>
-
- insDoc(level2, gLnk(2, "Javadoc","<xsl:value-of select="$browse-url"/>"));
+ <!-- FIX ME: this will break on multiple revisions -->
+ <xsl:variable name="tag" select="../revision/@tag" />
-
- </xsl:template>
+ <xsl:variable name="title" select="../title" />
+ <xsl:variable name="browse-url"
+ select="concat('../javadoc/', $module, '/', $tag, '/index.html')" />
-
+ insDoc(level2, gLnk(2, "Javadoc","<xsl:value-of select="$browse-url" />"));
+ </xsl:template>
</xsl:stylesheet>
1.4 +83 -115 jakarta-alexandria/src/xsl/left-basic.xsl
Index: left-basic.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/left-basic.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- left-basic.xsl 2000/05/25 23:04:20 1.3
+++ left-basic.xsl 2001/02/04 23:54:35 1.4
@@ -1,147 +1,115 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output indent="yes"/>
-
- <xsl:template match="/cvs">
+ <xsl:output indent="yes"/>
- <html>
- <head>
- <link rel="stylesheet" type="text/css" href="javadoc.css"
title="Style"></link>
- </head>
- <body bgcolor="white">
+ <xsl:template match="/workspace">
+ <html>
+ <head>
+ <link rel="stylesheet" type="text/css" href="javadoc.css"
title="Style"></link>
+ </head>
+ <body bgcolor="white">
<table>
- <tr>
- <td colspan="5" nowrap="true">
- <b>Available modules:</b>
- </td>
- </tr>
- <xsl:apply-templates select="./repository/module">
+ <tr>
+ <td colspan="5" nowrap="true">
+ <b>Available modules:</b>
+ </td>
+ </tr>
+ <xsl:apply-templates select="project">
+ <xsl:sort select="title"
+ order="ascending"
+ case-order="upper-first"/>
+ </xsl:apply-templates>
+ </table>
+ </body>
+ </html>
- <xsl:sort select=".///name"
- order="ascending"
- case-order="upper-first"/>
+ </xsl:template>
- </xsl:apply-templates>
- </table>
- </body>
- </html>
-
- </xsl:template>
-
- <xsl:template match="/cvs/repository">
-
- <xsl:apply-templates select="./module"/>
-
- </xsl:template>
+ <xsl:template match="project">
+ <xsl:variable name="title" select="title"/>
+ <!-- name -->
+ <tr>
+ <td colspan="3">
+ <a href="{home}" target="right"><xsl:value-of select="$title"/></a>
+ </td>
+ </tr>
-
- <xsl:template match="/cvs/repository/module">
+ <xsl:apply-templates select="revision"/>
-
- <xsl:variable name="name" select="name"/>
+ </xsl:template>
- <!-- name -->
- <tr>
- <td colspan="3">
- <!--
- <img src="folder.gif" border="0" width="16" height="22"></img>
- -->
- <a href="{home}" target="right"><xsl:value-of select="$name"/></a>
- </td>
- </tr>
-
-
- <xsl:apply-templates select="./revision"/>
+ <xsl:template match="revision">
- </xsl:template>
-
-
- <xsl:template match="/cvs/repository/module/revision">
+ <xsl:variable name="type" select="../../@type"/>
+ <xsl:variable name="opensource" select="../../@opensource"/>
+ <xsl:variable name="module" select="../module"/>
+ <xsl:variable name="tag" select="@tag"/>
+ <xsl:variable name="root" select="../../root"/>
+ <xsl:variable name="javasrc" select="../javasrc"/>
+ <xsl:variable name="title" select="title"/>
+ <xsl:variable name="cvsweb" select="../../cvsweb"/>
- <xsl:variable name="type" select="../../@type"/>
- <xsl:variable name="opensource" select="../../@opensource"/>
- <xsl:variable name="module" select="../module"/>
- <xsl:variable name="tag" select="@tag"/>
- <xsl:variable name="root" select="../../root"/>
- <xsl:variable name="javasrc" select="../javasrc"/>
- <xsl:variable name="name" select="name"/>
- <xsl:variable name="cvsweb" select="../../cvsweb"/>
+ <tr>
+ <td width="5"></td>
- <tr>
- <td width="5"></td>
-
- <td colspan="2">
- <!--
- <img src="folder.gif" border="0" width="16" height="22"></img>
- -->
+ <td colspan="2">
<xsl:value-of select="$tag"/>
+ </td>
+
+ </tr>
+
+ <!-- cvsweb -->
+ <xsl:if test="$type='cvs'">
+ <tr>
+ <td width="5"></td>
+ <td width="5"></td>
+ <td>
+ <a href="{$cvsweb}{$module}" target="right">CVSWeb</a>
</td>
-
- </tr>
+ </tr>
+ </xsl:if>
- <!-- cvsweb -->
- <!--
- FIX ME: There is a bug in Xalan that doesn't work with a null
- type. This is a HACK which tests if the length is 0 and then
- assumes the content is public
- -->
- <xsl:if test="string-length($type) = 0 ">
- <tr>
- <td width="5"></td>
- <td width="5"></td>
- <td>
- <a href="{$cvsweb}{$module}" target="right">CVSWeb</a>
- </td>
- </tr>
- </xsl:if>
-
+ <xsl:apply-templates select="../javasrc"/>
- <xsl:apply-templates select="../javasrc"/>
-
- <!-- browse -->
- <xsl:if test="$opensource != 'false'">
- <tr>
- <td width="5"></td>
- <td width="5"></td>
- <td>
- <a href="../cvs/{$module}/{$tag}/{$module}" target="right">Browse</a>
- </td>
- </tr>
- </xsl:if>
+ <!-- browse -->
+ <xsl:if test="$opensource != 'false'">
+ <tr>
+ <td width="5"></td>
+ <td width="5"></td>
+ <td>
+ <a href="../cvs/{$module}/{$tag}/{$module}" target="right">Browse</a>
+ </td>
+ </tr>
+ </xsl:if>
- </xsl:template>
-
-
+ </xsl:template>
- <xsl:template match="/cvs/repository/module/javasrc">
- <xsl:variable name="module" select="../module"/>
- <!-- FIX ME: this will break on multiple revisions -->
- <xsl:variable name="tag" select="../revision/@tag"/>
- <xsl:variable name="name" select="../name"/>
+ <xsl:template match="javasrc">
+ <xsl:variable name="module" select="../module"/>
+ <!-- FIX ME: this will break on multiple revisions -->
+ <xsl:variable name="tag" select="../revision/@tag"/>
+ <xsl:variable name="title" select="../title"/>
- <!-- javadoc -->
+ <!-- javadoc -->
- <!-- FIX ME: this will generate multiple javadoc entries if you have
- multiple javasrc entries -->
+ <!-- FIX ME: this will generate multiple javadoc entries if you have
+ multiple javasrc entries -->
- <tr>
- <td width="5"></td>
- <td width="5"></td>
- <td>
+ <tr>
+ <td width="5"></td>
+ <td width="5"></td>
+ <td>
<a href="./javadoc/{$module}/{$tag}/index.html" target="right">Javadoc</a>
- </td>
- </tr>
+ </td>
+ </tr>
- </xsl:template>
-
-
-
+ </xsl:template>
</xsl:stylesheet>
1.4 +33 -59 jakarta-alexandria/src/xsl/right.xsl
Index: right.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/right.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- right.xsl 2000/05/25 23:04:21 1.3
+++ right.xsl 2001/02/04 23:54:35 1.4
@@ -1,80 +1,54 @@
<?xml version="1.0"?>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
- <xsl:output indent="yes"/>
+ <xsl:output indent="yes"/>
- <xsl:template match="/cvs">
+ <xsl:template match="/workspace">
- <html>
- <head>
+ <html>
+ <head>
<link rel="stylesheet" type="text/css" href="javadoc.css"
title="Style"></link>
- </head>
- <body bgcolor="white">
+ </head>
+ <body bgcolor="white">
- <p><h2>Documentation currently available within Alexandria:</h2></p>
+ <p><h2>Documentation currently available within Alexandria:</h2></p>
- <xsl:apply-templates select="./repository/module">
+ <xsl:apply-templates select="project">
- <xsl:sort select=".///name"
- order="ascending"
- case-order="upper-first"/>
+ <xsl:sort select="title"
+ order="ascending"
+ case-order="upper-first"/>
- </xsl:apply-templates>
+ </xsl:apply-templates>
- </body>
- </html>
+ </body>
+ </html>
- </xsl:template>
+ </xsl:template>
+ <xsl:template match="project">
-
- <xsl:template match="/cvs/repository/module">
-
- <xsl:variable name="type" select="../@type"/>
- <xsl:variable name="cvs-module-name" select="./cvs-module-name"/>
+ <xsl:variable name="type" select="@type"/>
+ <xsl:variable name="module" select="module"/>
- <a name="{$cvs-module-name}"></a>
- <hr>
- <li>
-
+ <a name="{$module}"></a>
+ <li>
+ <p>
+ <a href="{home}"><xsl:value-of select="title"/></a>: <xsl:value-of
select="description"/>
+ </p>
+ <xsl:if test="$type='cvs'">
<p>
- <a href="{home}"><xsl:value-of select="name"/></a>: <xsl:value-of
select="description"/>
+ To obtain source: <br/><br/>
+ cvs -d <xsl:value-of select="../root"/> login <br/>
+ password: <b><xsl:value-of select="../password"/></b><br/>
+ <br/>
+ cvs -d <xsl:value-of select="../root"/> checkout <xsl:value-of
select="$module"/> <br/>
</p>
-
-
- <!--
- FIX ME: There is a bug in Xalan that doesn't work with a null
- type. This is a HACK which tests if the length is 0 and then
- assumes the content is public
- -->
- <xsl:if test="string-length($type) = 0 ">
-
- <p>
- To obtain source: <br></br><br></br>
-
- cvs -d <xsl:value-of select="../root"/> login <br></br>
- password: <b><xsl:value-of select="../password"/></b> <br></br>
-
- <br></br>
-
- cvs -d <xsl:value-of select="../root"/> checkout <xsl:value-of
select="$cvs-module-name"/> <br></br>
-
- </p>
- </xsl:if>
-
- </li>
-
- <xsl:apply-templates select="./revision"/>
- </hr>
+ </xsl:if>
+ </li>
+ <hr/>
- </xsl:template>
-
-
- <xsl:template match="/cvs/repository/module/revision">
-
-
- </xsl:template>
-
+ </xsl:template>
</xsl:stylesheet>
1.5 +1 -1 jakarta-alexandria/src/xsl/top.xsl
Index: top.xsl
===================================================================
RCS file: /home/cvs/jakarta-alexandria/src/xsl/top.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- top.xsl 2000/05/27 04:45:28 1.4
+++ top.xsl 2001/02/04 23:54:35 1.5
@@ -3,7 +3,7 @@
<xsl:output indent="yes"/>
- <xsl:template match="/cvs">
+ <xsl:template match="/workspace">
<html>
1.1 jakarta-alexandria/src/xsl/merge.xsl
Index: merge.xsl
===================================================================
<!-- ===================================================================== -->
<!-- replace references to projects with their actual definition -->
<!-- ===================================================================== -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<!-- =================================================================== -->
<!-- process all projects referenced in a workspace -->
<!-- =================================================================== -->
<xsl:template match="workspace">
<xsl:variable name="version">0.2</xsl:variable>
<xsl:if test="not(@version)">
<xsl:message terminate="yes">
Cannot find version number, should be <workspace version="<xsl:value-of
select="$version"/>">
</xsl:message>
</xsl:if>
<xsl:if test="not(@version=$version)">
<xsl:message terminate="yes">
Hmm, looks like the wrong version <xsl:value-of select="@version"/>, expecting
<xsl:value-of select="$version"/>
</xsl:message>
</xsl:if>
<xsl:variable name="basedir" select="@basedir"/>
<xsl:copy>
<xsl:copy-of select="@*"/>
<!-- Drop pre-processing versions of project and repository -->
<xsl:copy-of select="*[not(self::project|self::repository)]"/>
<!-- process any directly nested projects verbatim -->
<xsl:for-each select="project[not(@href)]">
<xsl:call-template name="project">
<xsl:with-param name="home" select="@home"/>
<xsl:with-param name="basedir" select="$basedir"/>
</xsl:call-template>
</xsl:for-each>
<!-- embed any projects specified by file -->
<xsl:for-each select="project[@href]">
<xsl:variable name="home" select="@home"/>
<xsl:message>
<xsl:text>- </xsl:text>
<xsl:value-of select="@href"/>
</xsl:message>
<xsl:text> </xsl:text>
<!-- is the file found? -->
<xsl:variable name="file" select="document(@href,.)"/>
<xsl:if test="not($file/project)">
<xsl:message terminate="yes">
<xsl:text>Unable to open </xsl:text>
<xsl:value-of select="@href"/>
</xsl:message>
</xsl:if>
<!-- process it -->
<xsl:variable name="defined-in"
select="substring-before(substring-after(@href,'/'),'.')"/>
<xsl:for-each select="$file/project">
<xsl:call-template name="project">
<xsl:with-param name="home" select="$home"/>
<xsl:with-param name="basedir" select="$basedir"/>
<xsl:with-param name="defined-in" select="$defined-in"/>
</xsl:call-template>
</xsl:for-each>
</xsl:for-each>
<!-- Process repositories -->
<xsl:for-each select="repository[@href]">
<xsl:message>
<xsl:text>- </xsl:text>
<xsl:value-of select="@href"/>
</xsl:message>
<xsl:text> </xsl:text>
<!-- is the file found? -->
<xsl:variable name="file" select="document(@href,.)"/>
<xsl:if test="not($file/repository)">
<xsl:message terminate="yes">
<xsl:text>Unable to open </xsl:text>
<xsl:value-of select="@href"/>
</xsl:message>
</xsl:if>
<!-- process it -->
<xsl:copy-of select="$file[not(self::home|self::project)] |@*| text()"/>
</xsl:for-each>
</xsl:copy>
</xsl:template>
<!-- =================================================================== -->
<!-- resolve paths and add implicit dependencies to a project -->
<!-- =================================================================== -->
<xsl:template name="project">
<xsl:param name="home"/>
<xsl:param name="basedir"/>
<xsl:param name="defined-in"/>
<xsl:variable name="project" select="@name"/>
<!-- determine the name of the source directory -->
<xsl:variable name="srcdir">
<xsl:choose>
<xsl:when test="@srcdir">
<xsl:value-of select="@srcdir"/>
</xsl:when>
<xsl:when test="../@srcdir">
<xsl:value-of select="../@srcdir"/>
</xsl:when>
<xsl:when test="../@name">
<xsl:value-of select="../@name"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="@name"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<xsl:copy>
<xsl:copy-of select="@*[name()!='srcdir']"/>
<xsl:if test="$defined-in">
<xsl:attribute name="defined-in">
<xsl:value-of select="$defined-in"/>
</xsl:attribute>
</xsl:if>
<xsl:attribute name="srcdir">
<xsl:value-of select="$srcdir"/>
</xsl:attribute>
<xsl:copy-of select="*[not(self::home|self::project)] | text()"/>
<!-- Compute fully qualified home directory -->
<home>
<xsl:choose>
<xsl:when test="$home">
<xsl:value-of select="$home"/>
</xsl:when>
<xsl:when test="home/@parent">
<xsl:value-of select="$basedir"/>
<xsl:text>/</xsl:text>
<xsl:value-of select="home/@parent"/>
</xsl:when>
<xsl:when test="home/@nested">
<xsl:value-of select="$basedir"/>
<xsl:text>/</xsl:text>
<xsl:value-of select="$srcdir"/>
<xsl:text>/</xsl:text>
<xsl:value-of select="home/@nested"/>
</xsl:when>
<xsl:when test="home/@dir">
<xsl:value-of select="@dir"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="$basedir"/>
<xsl:text>/</xsl:text>
<xsl:value-of select="$srcdir"/>
</xsl:otherwise>
</xsl:choose>
</home>
<xsl:text> </xsl:text>
<!-- Generate additional dependency entries, as needed -->
<xsl:for-each select="ant/property[@project!=$project]">
<xsl:variable name="dependency" select="@project"/>
<xsl:if test="not(../../depend[@project=$dependency])">
<xsl:variable name="position" select="position()"/>
<xsl:if test="not(../property[position() < $position and
@project=$dependency])">
<depend>
<xsl:attribute name="project">
<xsl:value-of select="$dependency"/>
</xsl:attribute>
<noclasspath/>
</depend>
<xsl:text> </xsl:text>
</xsl:if>
</xsl:if>
</xsl:for-each>
</xsl:copy>
<!-- process nested projects -->
<xsl:for-each select="project">
<xsl:text> </xsl:text>
<xsl:call-template name="project">
<xsl:with-param name="home" select="$home"/>
<xsl:with-param name="basedir" select="$basedir"/>
<xsl:with-param name="defined-in" select="$defined-in"/>
</xsl:call-template>
</xsl:for-each>
</xsl:template>
</xsl:stylesheet>
1.1 jakarta-alexandria/src/xsl/migrate0.2.xml
Index: migrate0.2.xml
===================================================================
<!-- ===================================================================== -->
<!-- Conversion XSL for transforming original Alexandria global -->
<!-- xml files into the new workspace files -->
<!-- ===================================================================== -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
extension-element-prefixes="redirect"
>
<xsl:output indent="yes"/>
<xsl:template match="cvs">
<workspace>
<xsl:attribute name="version">0.2</xsl:attribute>
<xsl:for-each select="repository">
<repository>
<xsl:attribute name="href"><xsl:value-of
select="concat('repositories/',name,'.xml')"/></xsl:attribute>
</repository>
<redirect:write select="concat('repositories/',name,'.xml')">
<xsl:copy>
<xsl:attribute name="name"><xsl:value-of select="name"/></xsl:attribute>
<title><xsl:value-of select="name"/></title>
<xsl:copy-of select="@*"/>
<xsl:copy-of select="*[not(self::module)][not(self::name)]"/>
</xsl:copy>
</redirect:write>
</xsl:for-each>
<xsl:for-each select="repository/module/revision">
<project>
<xsl:attribute name="href"><xsl:value-of
select="concat('projects/',../name,'.xml')" /></xsl:attribute>
<xsl:attribute name="revision"><xsl:value-of
select="@tag"/></xsl:attribute>
</project>
<redirect:write select="concat('projects/',../name,'.xml')">
<project>
<xsl:attribute name="repository"><xsl:value-of
select="../../name"/></xsl:attribute>
<title><xsl:value-of select="../name"/></title>
<module><xsl:value-of select="../cvs-module-name"/></module>
<xsl:copy-of
select="../@*|../*[not(self::name)][not(self::cvs-module-name)][not(self::revision)]"/>
<xsl:if test="not(../description)">
<description>Default Project Description</description>
</xsl:if>
</project>
</redirect:write>
</xsl:for-each>
<nav-page out="html/links.html" style="xsl/links.xsl"/>
<nav-page out="html/right.html" style="xsl/right.xsl"/>
<nav-page out="html/top.html" style="xsl/top.xsl"/>
<nav-page out="html/left-basic.html" style="xsl/left-basic.xsl"/>
<nav-page out="html/sidebar/content.js" style="xsl/left-advanced.xsl"/>
</workspace>
</xsl:template>
</xsl:stylesheet>
1.1 jakarta-alexandria/src/xsl/nav-page.xsl
Index: nav-page.xsl
===================================================================
<!-- Build file for generating alexandria content -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
<xsl:template match="workspace">
<project name="alexandria" default="menus" >
<taskdef name="xstyle" classname="org.apache.tools.ant.xtaskdefs.XSLTProcess"/>
<!-- Menu generation target -->
<target name="menus" description="Generate Alexandria menus">
<xsl:for-each select="nav-page">
<xstyle in="${{workspace}}" out="${{content.dir}}/{@out}"
style="{@style}"/>
</xsl:for-each>
<chmod perm="ug+rwX" type="both">
<fileset dir="${{content.dir}}"/>
</chmod>
</target>
</project>
</xsl:template>
</xsl:stylesheet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
