You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/10/28 12:40:01 UTC
cvs commit: avalon/framework/site/xdocs/principals navigation.xml
mcconnell 2003/10/28 03:40:01
Modified: framework/site/etc site.jsl
framework/site/xdocs navigation.xml
framework/site/xdocs/cop navigation.xml
framework/site/xdocs/principals navigation.xml
Log:
Update <item> links to map into New Avalon.
Revision Changes Path
1.2 +60 -2 avalon/framework/site/etc/site.jsl
Index: site.jsl
===================================================================
RCS file: /home/cvs/avalon/framework/site/etc/site.jsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- site.jsl 21 Aug 2003 18:08:38 -0000 1.1
+++ site.jsl 28 Oct 2003 11:40:01 -0000 1.2
@@ -1,5 +1,53 @@
<?xml version="1.0"?>
-<!-- stylesheet to be used -->
+
+<!--
+ ============================================================================
+ The Apache Software License, Version 1.1
+ ============================================================================
+
+ Copyright (C) 1999-2002 The Apache Software Foundation. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without modifica-
+ tion, are permitted provided that the following conditions are met:
+
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ 3. The end-user documentation included with the redistribution, if any, must
+ include the following acknowledgment: "This product includes software
+ developed by the Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself, if
+ and wherever such third-party acknowledgments normally appear.
+
+ 4. The names "Jakarta", "Apache Avalon", "Avalon Framework" and
+ "Apache Software Foundation" must not be used to endorse or promote
+ products derived from this software without prior written
+ permission. For written permission, please contact apache@apache.org.
+
+ 5. Products derived from this software may not be called "Apache", nor may
+ "Apache" appear in their name, without prior written permission of the
+ Apache Software Foundation.
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
+ DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This software consists of voluntary contributions made by many individuals
+ on behalf of the Apache Software Foundation. For more information on the
+ Apache Software Foundation, please see http://www.apache.org/.
+-->
+
<jsl:stylesheet select="$doc"
xmlns:define="jelly:define"
xmlns:j="jelly:core"
@@ -78,12 +126,21 @@
</j:if>
</td>
+ <td>
+ <div align="right" id="login">
+ <a href='http://apachecon.com/2003/US/index.html'>
+ <img border='0' src='http://www.apache.org/~ceki/ac2003/ac2003-150.gif'/>
+ </a>
+ </div>
+ </td>
+
+
<!-- project logo and link -->
+ <!--
<td>
<div align="right" id="login">
<j:set var="logo" value="${pom.logo}"/>
<j:if test="${logo != null and logo != ''}">
- <!-- set image to relative or complete -->
<j:set var="image" value="${pom.logo}"/>
<j:if test="${!image.startsWith('http://')}">
<j:set var="image" value="${relativePath}${image}"/>
@@ -95,6 +152,7 @@
</j:if>
</div>
</td>
+ -->
</tr>
</table>
</div>
1.2 +5 -5 avalon/framework/site/xdocs/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/framework/site/xdocs/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 21 Aug 2003 18:08:39 -0000 1.1
+++ navigation.xml 28 Oct 2003 11:40:01 -0000 1.2
@@ -6,11 +6,11 @@
<body>
<links>
- <item name="Home" href="http://avalon.apache.org/"/>
- <item name="Framework" href="http://avalon.apache.org/framework/"/>
- <item name="Components" href="http://avalon.apache.org/components"/>
- <item name="Containers" href="http://avalon.apache.org/containers/"/>
- <item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
+ <item name="Apache" href="http://apache.org/"/>
+ <item name="Avalon" href="http://avalon.apache.org/"/>
+ <item name="Framework" href="http://avalon.apache.org/product/framework/"/>
+ <item name="Containers" href="http://avalon.apache.org/product/containers/"/>
+ <item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Avalon Framework">
1.2 +5 -5 avalon/framework/site/xdocs/cop/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/framework/site/xdocs/cop/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 21 Aug 2003 18:08:43 -0000 1.1
+++ navigation.xml 28 Oct 2003 11:40:01 -0000 1.2
@@ -6,11 +6,11 @@
<body>
<links>
- <item name="Home" href="http://avalon.apache.org/"/>
- <item name="Framework" href="http://avalon.apache.org/framework/"/>
- <item name="Components" href="http://avalon.apache.org/components"/>
- <item name="Containers" href="http://avalon.apache.org/containers/"/>
- <item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
+ <item name="Apache" href="http://apache.org/"/>
+ <item name="Avalon" href="http://avalon.apache.org/"/>
+ <item name="Framework" href="http://avalon.apache.org/product/framework/"/>
+ <item name="Containers" href="http://avalon.apache.org/product/containers/"/>
+ <item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Avalon Framework">
1.2 +5 -5 avalon/framework/site/xdocs/principals/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/avalon/framework/site/xdocs/principals/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 21 Aug 2003 18:08:44 -0000 1.1
+++ navigation.xml 28 Oct 2003 11:40:01 -0000 1.2
@@ -6,11 +6,11 @@
<body>
<links>
- <item name="Home" href="http://avalon.apache.org/"/>
- <item name="Framework" href="http://avalon.apache.org/framework/"/>
- <item name="Components" href="http://avalon.apache.org/components"/>
- <item name="Containers" href="http://avalon.apache.org/containers/"/>
- <item name="Sandbox" href="http://avalon.apache.org/sandbox/"/>
+ <item name="Apache" href="http://apache.org/"/>
+ <item name="Avalon" href="http://avalon.apache.org/"/>
+ <item name="Framework" href="http://avalon.apache.org/product/framework/"/>
+ <item name="Containers" href="http://avalon.apache.org/product/containers/"/>
+ <item name="Components" href="http://avalon.apache.org/product/components/"/>
</links>
<menu name="About Avalon Framework">
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org