Author: niclas
Date: Thu May 27 07:26:59 2004
New Revision: 20504
Modified:
avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml
avalon/trunk/central/site/src/xdocs/index.xml
avalon/trunk/central/site/src/xdocs/navigation.xml
avalon/trunk/central/system/themes/avalon2/html/resources/style.css
avalon/trunk/central/system/themes/avalon2/html/transform.xsl
Log:
Fixed up more siteNG things, and most stuff should now be 'acceptable'.
Modified:
avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml
==============================================================================
---
avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml
(original)
+++
avalon/trunk/central/site/src/xdocs/central/laboratory/studio/manual/chapter2.xml
Thu May 27 07:26:59 2004
@@ -19,11 +19,11 @@
<p>
A component is a logical unit of one or more classes and related
artifacts which together implement a functionality. A component
- delivers his functionality only through its “component
interface”.
- There can be one or more “component interface implementations”.
+ delivers his functionality only through its "component
interface”.
+ There can be one or more "component interface implementations”.
</p>
<p>
- A component is not aware of its functional environment – eg. a
+ A component is not aware of its functional environment - eg. a
component can be deployed predictably in different application
scenarios and environments.
</p>
@@ -32,7 +32,7 @@
incoming data / objects.
</p>
<p>
- A component is described by a “component type descriptor”
(Type)
+ A component is described by a "component type descriptor” (Type)
which holds immutable information associated with the component
implementation and its interface (Metadata). Based on information
accessible from an instance of Type a container has available the
@@ -41,8 +41,8 @@
</p>
<p>
In Merlin metadata are stored either in XML or in a binary format.
- Metadata are created automatically by “Magic” – which is the
build
- tool for Merlin – or by Eclipse Studio from JavaDoc tags
contained
+ Metadata are created automatically by "Magic” - which is the
build
+ tool for Merlin - or by Eclipse Studio from JavaDoc tags contained
in the components interface or implementation.
</p>
<p>
@@ -86,7 +86,7 @@
In Merlin a block is a logical and physical unit of one or more
components and its related artifacts. One artifact is the blocks
metadata which contains information like its containing
- components, classloader directives and the “services” it
delivers.
+ components, classloader directives and the "services” it
delivers.
</p>
<p>
Other artifacts of a block might be persistence mapping
@@ -95,10 +95,10 @@
<p>
Physically a block is deployed in a standard jar file. To make it
possible to identify blocks visually Merlin blocks are using the
- “.bar” file extension.
+ ".bar” file extension.
</p>
<p>
- It’s quite usual that the term “block” and the term
“component“
+ It's quite usual that the term "block” and the term
"component"
are used equivalent.
</p>
</subsection>
@@ -108,19 +108,19 @@
A block can declare the export of a set of services established
by
the components contained within it. This enables a container to
function as a composite component relative to its peers. This
- composition is either done by “nested” or by
“referenced” blocks.
+ composition is either done by "nested” or by "referenced”
blocks.
</p>
</subsection>
<!-- 2.1.2.3 -->
<subsection name="Nested Blocks" >
<p>
- An “include” directive in a block instructs Merlin to
include an
+ An "include” directive in a block instructs Merlin to include
an
external block within the container. Services exported by the
block will be made available to other components at the same
level as the included block
</p>
<p>
- With the “include” directive a block is included “by
value” into a
+ With the "include” directive a block is included "by value”
into a
block. This is especially useful to structure larger blocks
into
smaller reusable blocks.
</p>
@@ -128,7 +128,7 @@
<!-- 2.1.2.4 -->
<subsection name="Referenced Blocks" >
<p>
- A “container” directive is used to reference other blocks /
+ A "container” directive is used to reference other blocks /
containers. Only services declared in the referenced block are
accessible by the parent block. This directive is used to
assemble
a whole application by reusable blocks.
@@ -138,9 +138,9 @@
<!-- 2.1.3 -->
<subsection name="Kernel / Container" >
<p>
- In Merlin every block is covered by its own container. The
“startup”
+ In Merlin every block is covered by its own container. The
"startup”
program, which instantiates and manages all the subsequent
- containers is called the “kernel”.
+ containers is called the "kernel”.
</p>
<p>
Through that architecture Merlin assures a very secure and
@@ -150,8 +150,8 @@
<!-- 2.1.4 -->
<subsection name="Facilities / Application blocks" >
<p>
- Merlin differentiates two types of blocks: On one hand
“application
- blocks” and on the other hand “Facilities”.
+ Merlin differentiates two types of blocks: On one hand
"application
+ blocks” and on the other hand "Facilities”.
</p>
<!-- 2.1.4.1 -->
<subsection name="Facilities" >
Modified: avalon/trunk/central/site/src/xdocs/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/index.xml Thu May 27 07:26:59 2004
@@ -7,7 +7,10 @@
<body>
<section name="Welcome to Apache Avalon">
- <p>
+ <p class="caption">
+ <em><strong>"any sufficiently advanced technology is
+ indistinguishable from magic"</strong></em><br/>
+ Sir Arthur C Clarke
</p>
</section>
</body>
Modified: avalon/trunk/central/site/src/xdocs/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/navigation.xml Thu May 27 07:26:59 2004
@@ -30,6 +30,7 @@
</links>
<menu>
+ <item name="Welcome to Avalon" href="index.html" />
</menu>
</body>
Modified: avalon/trunk/central/system/themes/avalon2/html/resources/style.css
==============================================================================
--- avalon/trunk/central/system/themes/avalon2/html/resources/style.css
(original)
+++ avalon/trunk/central/system/themes/avalon2/html/resources/style.css Thu May
27 07:26:59 2004
@@ -209,6 +209,11 @@
display: none;
}
+.dummy
+{
+ display: none;
+}
+
dd
{
font-weight: bolder;
@@ -302,11 +307,7 @@
a.homecategory:active
{
color: black;
- background-color: #D0E0F0;
- border-left: 1px solid #003399;
- border-top: 1px solid #003399;
- border-right: 1px solid #9999FF;
- border-bottom: 1px solid #9999FF;
+ background-color: #C0D0E0;
outline: none;
}
@@ -363,11 +364,7 @@
a.homecategory-selected:active
{
color: black;
- background-color: #D0E0F0;
- border-left: 1px solid #003399;
- border-top: 1px solid #003399;
- border-right: 1px solid #9999FF;
- border-bottom: 1px solid #9999FF;
+ background-color: #C0D0E0;
outline: none;
text-decoration: underline;
}
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 Thu May
27 07:26:59 2004
@@ -57,19 +57,18 @@
</img>
</div>
- <div class="categorybar">
- <a class="homecategory">
- <xsl:variable name="x" select="document('navigation.xml', /
)/project/body//menu/level" />
- <xsl:attribute name="href"><xsl:value-of select="$x[position() =
last()]" />index.html</xsl:attribute>
- Home
- </a>
- <xsl:variable name="x" select="document('navigation.xml', /
)/project/body//category" />
- <xsl:apply-templates select="$x/item" >
- <xsl:with-param name="dir" select="$x/../level" />
- <xsl:with-param name="class" select="'category'" />
- </xsl:apply-templates>
- </div>
-
+ <xsl:choose>
+ <xsl:when test="$directory = ''" >
+ <xsl:call-template name="create-bar">
+ <xsl:with-param name="homeclass" select="'homecategory-selected'"
/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="create-bar">
+ <xsl:with-param name="homeclass" select="'homecategory'" />
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
<div class="menubar" >
<xsl:apply-templates select="document('navigation.xml', /
)/project/body/menu" >
<xsl:with-param name="dir" select="''" />
@@ -81,7 +80,25 @@
</div>
</body>
</xsl:template>
-
+
+ <xsl:template name="create-bar" >
+ <xsl:param name="homeclass" />
+ <div class="categorybar">
+ <xsl:attribute name="dir"><xsl:value-of select="$directory"
/></xsl:attribute>
+ <a>
+ <xsl:attribute name="class"><xsl:value-of select="$homeclass"
/></xsl:attribute>
+ <xsl:variable name="x" select="document('navigation.xml', /
)/project/body//menu/level" />
+ <xsl:attribute name="href"><xsl:value-of select="$x[position() =
last()]" />index.html</xsl:attribute>
+ Home
+ </a>
+ <xsl:variable name="x" select="document('navigation.xml', /
)/project/body//category" />
+ <xsl:apply-templates select="$x/item" >
+ <xsl:with-param name="dir" select="$x/../level" />
+ <xsl:with-param name="class" select="'category'" />
+ </xsl:apply-templates>
+ </div>
+ </xsl:template>
+
<xsl:template match="a">
<a>
<xsl:attribute name="class">doclink</xsl:attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
