You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by cm...@apache.org on 2002/08/01 09:17:15 UTC
cvs commit: jakarta-slide/src/doc/stylesheets slide.xsl project.xml
cmlenz 2002/08/01 00:17:15
Modified: src/doc architecture.xml changelog.xml conf-lib.xml
contrib.xml domain.xml examples.xml
howto-j2eestore.xml howto-jdbcstore.xml
howto-tomcat.xml index.xml installation.xml
jstl-taglib.xml library.xml lock.xml macro.xml
namespace.xml news.xml process.xml release.xml
search.xml security.xml server.xml status.xml
structure.xml struts-taglib.xml version.xml
webdav-client.xml
src/doc/stylesheets slide.xsl
Added: src/doc project.xml
Removed: src/doc/stylesheets project.xml
Log:
Use an "include" from the stylesheet instead of an entity to include the
information from project.xml.
This fixes soe problems with entity resolving in my build, and parallels
what the Struts build is doing
Revision Changes Path
1.7 +0 -6 jakarta-slide/src/doc/architecture.xml
Index: architecture.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/architecture.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- architecture.xml 11 Sep 2001 00:37:36 -0000 1.6
+++ architecture.xml 1 Aug 2002 07:17:13 -0000 1.7
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.81 +0 -6 jakarta-slide/src/doc/changelog.xml
Index: changelog.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/changelog.xml,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- changelog.xml 18 Mar 2002 14:46:07 -0000 1.80
+++ changelog.xml 1 Aug 2002 07:17:13 -0000 1.81
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.21 +0 -6 jakarta-slide/src/doc/conf-lib.xml
Index: conf-lib.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/conf-lib.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- conf-lib.xml 27 Sep 2001 14:56:37 -0000 1.20
+++ conf-lib.xml 1 Aug 2002 07:17:13 -0000 1.21
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.28 +0 -5 jakarta-slide/src/doc/contrib.xml
Index: contrib.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/contrib.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- contrib.xml 6 May 2002 16:12:04 -0000 1.27
+++ contrib.xml 1 Aug 2002 07:17:13 -0000 1.28
@@ -1,10 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.8 +0 -6 jakarta-slide/src/doc/domain.xml
Index: domain.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/domain.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- domain.xml 11 Sep 2001 00:37:36 -0000 1.7
+++ domain.xml 1 Aug 2002 07:17:13 -0000 1.8
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.10 +0 -6 jakarta-slide/src/doc/examples.xml
Index: examples.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/examples.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- examples.xml 11 Sep 2001 06:48:09 -0000 1.9
+++ examples.xml 1 Aug 2002 07:17:13 -0000 1.10
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.4 +0 -6 jakarta-slide/src/doc/howto-j2eestore.xml
Index: howto-j2eestore.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/howto-j2eestore.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- howto-j2eestore.xml 11 Jan 2002 13:59:05 -0000 1.3
+++ howto-j2eestore.xml 1 Aug 2002 07:17:13 -0000 1.4
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="cbritton@metatomix.com">Colin Britton</author>
1.11 +0 -6 jakarta-slide/src/doc/howto-jdbcstore.xml
Index: howto-jdbcstore.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/howto-jdbcstore.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- howto-jdbcstore.xml 3 Jan 2002 21:42:31 -0000 1.10
+++ howto-jdbcstore.xml 1 Aug 2002 07:17:13 -0000 1.11
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.16 +0 -6 jakarta-slide/src/doc/howto-tomcat.xml
Index: howto-tomcat.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/howto-tomcat.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- howto-tomcat.xml 13 Nov 2001 22:19:54 -0000 1.15
+++ howto-tomcat.xml 1 Aug 2002 07:17:13 -0000 1.16
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.14 +0 -6 jakarta-slide/src/doc/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/index.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- index.xml 11 Sep 2001 00:37:36 -0000 1.13
+++ index.xml 1 Aug 2002 07:17:14 -0000 1.14
@@ -1,12 +1,6 @@
<?xml version="1.0"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.25 +0 -6 jakarta-slide/src/doc/installation.xml
Index: installation.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/installation.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- installation.xml 21 Mar 2002 18:05:37 -0000 1.24
+++ installation.xml 1 Aug 2002 07:17:14 -0000 1.25
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.3 +0 -6 jakarta-slide/src/doc/jstl-taglib.xml
Index: jstl-taglib.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/jstl-taglib.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jstl-taglib.xml 20 Mar 2002 16:03:27 -0000 1.2
+++ jstl-taglib.xml 1 Aug 2002 07:17:14 -0000 1.3
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="cmlenz@apache.org">Christopher Lenz</author>
1.7 +0 -6 jakarta-slide/src/doc/library.xml
Index: library.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/library.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- library.xml 11 Sep 2001 00:37:36 -0000 1.6
+++ library.xml 1 Aug 2002 07:17:14 -0000 1.7
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.8 +0 -6 jakarta-slide/src/doc/lock.xml
Index: lock.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/lock.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lock.xml 11 Sep 2001 00:37:36 -0000 1.7
+++ lock.xml 1 Aug 2002 07:17:14 -0000 1.8
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.6 +0 -6 jakarta-slide/src/doc/macro.xml
Index: macro.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/macro.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- macro.xml 11 Sep 2001 00:37:36 -0000 1.5
+++ macro.xml 1 Aug 2002 07:17:14 -0000 1.6
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.8 +0 -6 jakarta-slide/src/doc/namespace.xml
Index: namespace.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/namespace.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- namespace.xml 11 Sep 2001 00:37:36 -0000 1.7
+++ namespace.xml 1 Aug 2002 07:17:14 -0000 1.8
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.31 +0 -6 jakarta-slide/src/doc/news.xml
Index: news.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/news.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- news.xml 7 Nov 2001 07:07:09 -0000 1.30
+++ news.xml 1 Aug 2002 07:17:14 -0000 1.31
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.5 +0 -6 jakarta-slide/src/doc/process.xml
Index: process.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/process.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- process.xml 11 Sep 2001 00:37:36 -0000 1.4
+++ process.xml 1 Aug 2002 07:17:14 -0000 1.5
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.20 +0 -6 jakarta-slide/src/doc/release.xml
Index: release.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/release.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- release.xml 11 Sep 2001 00:37:36 -0000 1.19
+++ release.xml 1 Aug 2002 07:17:14 -0000 1.20
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.7 +0 -6 jakarta-slide/src/doc/search.xml
Index: search.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/search.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- search.xml 11 Sep 2001 00:37:36 -0000 1.6
+++ search.xml 1 Aug 2002 07:17:14 -0000 1.7
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.10 +0 -6 jakarta-slide/src/doc/security.xml
Index: security.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/security.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- security.xml 21 Sep 2001 00:44:20 -0000 1.9
+++ security.xml 1 Aug 2002 07:17:14 -0000 1.10
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.8 +0 -6 jakarta-slide/src/doc/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/server.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- server.xml 24 Sep 2001 01:46:08 -0000 1.7
+++ server.xml 1 Aug 2002 07:17:14 -0000 1.8
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.25 +0 -6 jakarta-slide/src/doc/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/status.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- status.xml 4 Jan 2002 01:41:13 -0000 1.24
+++ status.xml 1 Aug 2002 07:17:14 -0000 1.25
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.6 +0 -6 jakarta-slide/src/doc/structure.xml
Index: structure.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/structure.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- structure.xml 11 Sep 2001 00:37:36 -0000 1.5
+++ structure.xml 1 Aug 2002 07:17:14 -0000 1.6
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.9 +0 -6 jakarta-slide/src/doc/struts-taglib.xml
Index: struts-taglib.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/struts-taglib.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- struts-taglib.xml 22 Mar 2002 13:21:31 -0000 1.8
+++ struts-taglib.xml 1 Aug 2002 07:17:14 -0000 1.9
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="cmlenz@apache.org">Christopher Lenz</author>
1.9 +0 -6 jakarta-slide/src/doc/version.xml
Index: version.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/version.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- version.xml 11 Sep 2001 00:37:36 -0000 1.8
+++ version.xml 1 Aug 2002 07:17:14 -0000 1.9
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.6 +0 -6 jakarta-slide/src/doc/webdav-client.xml
Index: webdav-client.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/webdav-client.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- webdav-client.xml 11 Sep 2001 00:37:36 -0000 1.5
+++ webdav-client.xml 1 Aug 2002 07:17:14 -0000 1.6
@@ -1,12 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE document [
- <!ENTITY project SYSTEM "stylesheets/project.xml">
-]>
-
<document>
-
- &project;
<properties>
<author email="remm@apache.org">Remy Maucherat</author>
1.19 +40 -46 jakarta-slide/src/doc/project.xml
1.7 +9 -7 jakarta-slide/src/doc/stylesheets/slide.xsl
Index: slide.xsl
===================================================================
RCS file: /home/cvs/jakarta-slide/src/doc/stylesheets/slide.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- slide.xsl 19 Mar 2002 17:56:06 -0000 1.6
+++ slide.xsl 1 Aug 2002 07:17:15 -0000 1.7
@@ -30,9 +30,11 @@
<!-- Process an entire document into an HTML page -->
<xsl:template match="document">
+ <xsl:variable name="project"
+ select="document('../project.xml')/project"/>
<html>
<head>
- <title><xsl:value-of select="project/title"/> - <xsl:value-of select="properties/title"/></title>
+ <title><xsl:value-of select="$project/title"/> - <xsl:value-of select="properties/title"/></title>
<xsl:for-each select="properties/author">
<xsl:variable name="name">
<xsl:value-of select="."/>
@@ -66,15 +68,15 @@
<a href="{$href}">
<img src="{$src}" align="left" alt="{$alt}" border="0"/>
</a>
- <xsl:if test="project/logo">
+ <xsl:if test="$project/logo">
<xsl:variable name="alt">
- <xsl:value-of select="project/logo"/>
+ <xsl:value-of select="$project/logo"/>
</xsl:variable>
<xsl:variable name="home">
- <xsl:value-of select="project/@href"/>
+ <xsl:value-of select="$project/@href"/>
</xsl:variable>
<xsl:variable name="src">
- <xsl:value-of select="$relative-path"/><xsl:value-of select="project/logo/@href"/>
+ <xsl:value-of select="$relative-path"/><xsl:value-of select="$project/logo/@href"/>
</xsl:variable>
<xsl:comment>PROJECT LOGO</xsl:comment>
@@ -96,7 +98,7 @@
<xsl:comment>LEFT SIDE NAVIGATION</xsl:comment>
<td width="20%" valign="top" nowrap="true">
- <xsl:apply-templates select="project/body/menu"/>
+ <xsl:apply-templates select="$project/body/menu"/>
</td>
<xsl:comment>RIGHT SIDE MAIN BODY</xsl:comment>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>