Author: niclas
Date: Sat May 29 13:34:56 2004
New Revision: 20611
Added:
avalon/trunk/central/site/src/resources/images/Profile.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/Profile.gif
avalon/trunk/central/site/src/resources/images/ServiceDefinition.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/ServiceDefinition.gif
avalon/trunk/central/site/src/resources/images/Type.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/Type.gif
avalon/trunk/central/site/src/resources/images/asf_logo_wide.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/asf_logo_wide.gif
avalon/trunk/central/site/src/resources/images/cover.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/cover.gif
avalon/trunk/central/site/src/resources/images/deployment.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/resources/images/images/deployment.gif
avalon/trunk/central/site/src/resources/images/logic.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/images/logic.gif
avalon/trunk/central/site/src/resources/images/merlin-service-dialog.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/merlin-service-dialog.gif
avalon/trunk/central/site/src/resources/images/meta.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/meta.gif
avalon/trunk/central/site/src/resources/images/overview.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/overview.gif
avalon/trunk/central/site/src/resources/images/packages.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/packages.gif
avalon/trunk/central/site/src/resources/images/server-01.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/resources/images/images/server-01.gif
avalon/trunk/central/site/src/resources/images/server-02.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/resources/images/images/server-02.gif
avalon/trunk/central/site/src/resources/images/server-03.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/resources/images/images/server-03.gif
avalon/trunk/central/site/src/resources/images/server-04.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/resources/images/images/server-04.gif
avalon/trunk/central/site/src/resources/images/service-dialog.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/service-dialog.gif
avalon/trunk/central/site/src/resources/images/service.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/service.gif
avalon/trunk/central/site/src/resources/images/simple-servlet.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/simple-servlet.gif
avalon/trunk/central/site/src/resources/images/uml-top-level.gif
- copied unchanged from rev 20538,
avalon/trunk/central/site/src/xdocs/products/runtime/images/uml-top-level.gif
avalon/trunk/central/site/src/resources/images/unreferenced/
- copied from rev 20538,
avalon/trunk/central/site/src/resources/images/images/
Removed:
avalon/trunk/central/site/src/resources/images/images/
avalon/trunk/central/site/src/resources/images/unreferenced/deployment.gif
avalon/trunk/central/site/src/resources/images/unreferenced/server-01.gif
avalon/trunk/central/site/src/resources/images/unreferenced/server-02.gif
avalon/trunk/central/site/src/resources/images/unreferenced/server-03.gif
avalon/trunk/central/site/src/resources/images/unreferenced/server-04.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/Profile.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/ServiceDefinition.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/Type.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/asf_logo_wide.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/cover.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/merlin-service-dialog.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/meta.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/overview.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/packages.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/service-dialog.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/service.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/simple-servlet.gif
avalon/trunk/central/site/src/xdocs/products/runtime/images/uml-top-level.gif
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/images/logic.gif
Modified:
avalon/trunk/central/site/src/xdocs/central/community/history/what-is-a-server.xml
avalon/trunk/central/site/src/xdocs/central/legacy/developing/decomposing.xml
avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/about/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml
avalon/trunk/central/system/themes/avalon2/html/transform.xsl
Log:
Fixed 'root' references in <a> and <img> tags to point to resources/ directory,
and changed the xdocs to utilize this for the images.
Modified:
avalon/trunk/central/site/src/xdocs/central/community/history/what-is-a-server.xml
==============================================================================
---
avalon/trunk/central/site/src/xdocs/central/community/history/what-is-a-server.xml
(original)
+++
avalon/trunk/central/site/src/xdocs/central/community/history/what-is-a-server.xml
Sat May 29 13:34:56 2004
@@ -75,7 +75,7 @@
"service". To clarify things a little bit, maybe a picture would
help:
</p>
- <img src="../../images/server-01.gif" alt="Server 1"/>
+ <img src="/images/server-01.gif" alt="Server 1"/>
</section>
<section name="Dividing the code">
<p>
@@ -95,11 +95,11 @@
The solution would be to have a sort of "in-core" modularization of our
server.... To be continued...
</p>
- <img src="../../images/server-02.gif" alt="Server 2"/>
- <img src="../../images/server-03.gif" alt="Server 3"/>
+ <img src="/images/server-02.gif" alt="Server 2"/>
+ <img src="/images/server-03.gif" alt="Server 3"/>
</section>
<section name="The concept of a Block">
- <img src="../../images/server-04.gif" alt="Server 4"/>
+ <img src="/images/server-04.gif" alt="Server 4"/>
</section>
<section name="The Avalon Framework">
<fixme author="PF">We need some info in here.</fixme>
Modified:
avalon/trunk/central/site/src/xdocs/central/legacy/developing/decomposing.xml
==============================================================================
---
avalon/trunk/central/site/src/xdocs/central/legacy/developing/decomposing.xml
(original)
+++
avalon/trunk/central/site/src/xdocs/central/legacy/developing/decomposing.xml
Sat May 29 13:34:56 2004
@@ -263,7 +263,7 @@
come back together to identify common components so that you can
reuse as much code as possible.
</p>
- <img src="../images/deployment.gif"/>
+ <img src="/images/deployment.gif"/>
</subsection>
</section>
<section name="Implementing the Services">
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/about/index.xml
Sat May 29 13:34:56 2004
@@ -37,7 +37,7 @@
</p>
<p>
-<img src="../images/cover.gif"/>
+<img src="/images/cover.gif"/>
</p>
<subsection name="Service Management Platform (SMP)">
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/platform/nt.xml
Sat May 29 13:34:56 2004
@@ -19,11 +19,11 @@
<document>
- <properties>
- <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
- </properties>
-
+ <properties>
+ <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+ <title>Merlin Runtime</title>
+ </properties>
+
<body>
<section name="Merlin NT Service">
@@ -31,7 +31,7 @@
The Merlin installation includes support for the running of a Merlin Kernel as
an Windows(TM) NT4 Service.
</p>
<p>
- <img src="../../images/service.gif"/>
+ <img src="/images/service.gif"/>
</p>
<subsection name="Service Installation">
<p>Installation of the service is achieved using the following
@@ -45,7 +45,7 @@
by using the Service manager in the Windows Control Panel.
</p>
<p>
- <img src="../../images/service-dialog.gif"/>
+ <img src="/images/service-dialog.gif"/>
</p>
</subsection>
@@ -55,7 +55,7 @@
account you must ensure that the MERLIN_HOME environment variable
is declared in system scope. </p>
<p>
- <img src="../../images/merlin-service-dialog.gif"/>
+ <img src="/images/merlin-service-dialog.gif"/>
</p>
</subsection>
Modified:
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/about/index.xml
==============================================================================
---
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/about/index.xml
(original)
+++
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/about/index.xml
Sat May 29 13:34:56 2004
@@ -42,7 +42,7 @@
creation, and generic application bootstrapping.
</p>
- <img src="../images/logic.gif"/>
+ <img src="/images/logic.gif"/>
</section>
</body>
Modified:
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/index.xml
==============================================================================
---
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/index.xml
(original)
+++
avalon/trunk/central/site/src/xdocs/products/runtime/system/repository/index.xml
Sat May 29 13:34:56 2004
@@ -41,7 +41,7 @@
creation, and generic application bootstrapping.
</p>
- <img src="images/logic.gif"/>
+ <img src="/images/logic.gif"/>
</section>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml
(original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/system/uml.xml Sat May
29 13:34:56 2004
@@ -19,11 +19,11 @@
<document>
- <properties>
- <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
- <title>Merlin Runtime</title>
- </properties>
-
+ <properties>
+ <author email="dev@avalon.apache.org">Avalon Documentation Team</author>
+ <title>Merlin Runtime</title>
+ </properties>
+
<body>
<section name="Object Model">
<subsection name="UML">
@@ -31,7 +31,7 @@
<i>UML diagram of the principal abstractions within the
Merlin platform.</i>
</p>
- <img src="../images/uml-top-level.gif"/>
+ <img src="/images/uml-top-level.gif"/>
</subsection>
</section>
</body>
Modified: avalon/trunk/central/system/themes/avalon2/html/transform.xsl
==============================================================================
--- avalon/trunk/central/system/themes/avalon2/html/transform.xsl
(original)
+++ avalon/trunk/central/system/themes/avalon2/html/transform.xsl Sat May
29 13:34:56 2004
@@ -149,9 +149,31 @@
<xsl:template match="a">
<a>
<xsl:attribute name="class">doclink</xsl:attribute>
- <xsl:attribute name="href"><xsl:value-of select="@href"
/></xsl:attribute>
+ <xsl:choose>
+ <!-- Test if a root reference -->
+ <xsl:when test="substring( @href, 1, 1 ) = '/'" >
+ <xsl:attribute name="href"><xsl:value-of select="concat(
$relativepath, @href)" /></xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="href"><xsl:value-of select="@href"
/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:value-of select="." />
</a>
+ </xsl:template>
+
+ <xsl:template match="img" >
+ <img>
+ <xsl:choose>
+ <!-- Test if a root reference -->
+ <xsl:when test="substring( @src, 1, 1 ) = '/'" >
+ <xsl:attribute name="src"><xsl:value-of
select="$relativepath[position() = last()]" />/resources<xsl:value-of
select="@src" /></xsl:attribute>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute name="src"><xsl:value-of select="@src"
/></xsl:attribute>
+ </xsl:otherwise>
+ </xsl:choose>
+ </img>
</xsl:template>
<xsl:template match="section">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
