You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2004/03/10 11:05:07 UTC
cvs commit: cocoon-2.2/src/webapp/resources/styles main.css
cziegeler 2004/03/10 02:05:07
Modified: src/webapp/stylesheets/system linkstatus2html.xslt
error2html.xslt directory2html.xslt
xmlform2html.xslt sitemap2html.xslt xml2html.xslt
status2html.xslt
src/webapp/WEB-INF instrumentation.xconf cocoon.xconf
logkit.xconf web.xml
src/webapp/WEB-INF/classes CatalogManager.properties
src/webapp/samples sitemap.xmap samples.xml
components-samples.xml block-samples.xml
samples.xwelcome
src/webapp welcome.xml not-found.xml sitemap.xmap
welcome.xslt
src/webapp/resources/scripts main.js
src/webapp/resources/styles main.css
Log:
Update license
Revision Changes Path
1.2 +42 -24 cocoon-2.2/src/webapp/stylesheets/system/linkstatus2html.xslt
Index: linkstatus2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/linkstatus2html.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linkstatus2html.xslt 26 Mar 2003 21:21:30 -0000 1.1
+++ linkstatus2html.xslt 10 Mar 2004 10:05:06 -0000 1.2
@@ -1,33 +1,51 @@
<?xml version="1.0"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:linkstatus="http://apache.org/cocoon/linkstatus/2.0">
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- CVS $Id$ -->
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:linkstatus="http://apache.org/cocoon/linkstatus/2.0">
<xsl:template match="linkstatus:linkstatus">
- <html>
- <body>
- <table border="1">
- <tr><th>URL</th><th>referrer</th><th>content-type</th><th>status</th><th>message</th></tr>
- <xsl:apply-templates/>
- </table>
- </body>
- </html>
+ <html>
+ <body>
+ <table border="1">
+ <tr><th>URL</th><th>referrer</th><th>content-type</th><th>status</th><th>message</th></tr>
+ <xsl:apply-templates/>
+ </table>
+ </body>
+ </html>
</xsl:template>
<xsl:template match="linkstatus:link">
- <tr><xsl:attribute name = "bgcolor" ><xsl:choose>
- <xsl:when test="normalize-space(@status)='200'">#00ff00</xsl:when>
- <xsl:when test="normalize-space(@status)='404'">#ffff00</xsl:when>
- <xsl:otherwise>#ff0000</xsl:otherwise></xsl:choose>
- </xsl:attribute>
-
-
- <td><a><xsl:attribute name="href"><xsl:value-of select="@href"/></xsl:attribute>
- <xsl:value-of select="@href"/></a></td>
- <td><a><xsl:attribute name="href"><xsl:value-of select="@referrer"/></xsl:attribute>
- referrer</a></td>
- <td><xsl:value-of select="@content"/></td>
- <td><xsl:value-of select="@status"/></td>
- <td><xsl:value-of select="@message"/></td>
+ <tr>
+ <xsl:attribute name = "bgcolor">
+ <xsl:choose>
+ <xsl:when test="normalize-space(@status)='200'">#00ff00</xsl:when>
+ <xsl:when test="normalize-space(@status)='404'">#ffff00</xsl:when>
+ <xsl:otherwise>#ff0000</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <td><a href="{@href}"><xsl:value-of select="@href"/></a></td>
+ <td><a href="{@referrer}">referrer</a></td>
+ <td><xsl:value-of select="@content"/></td>
+ <td><xsl:value-of select="@status"/></td>
+ <td><xsl:value-of select="@message"/></td>
</tr>
</xsl:template>
1.11 +128 -133 cocoon-2.2/src/webapp/stylesheets/system/error2html.xslt
Index: error2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/error2html.xslt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- error2html.xslt 2 Feb 2004 16:34:26 -0000 1.10
+++ error2html.xslt 10 Mar 2004 10:05:06 -0000 1.11
@@ -1,142 +1,137 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- CVS $Id$ -->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:error="http://apache.org/cocoon/error/2.1">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:error="http://apache.org/cocoon/error/2.1">
-<xsl:param name="contextPath" select="string('/cocoon')"/>
+ <xsl:param name="contextPath"/>
-<!-- let sitemap override default page title -->
-<xsl:param name="pageTitle" select="//error:notify/error:title"/>
+ <!-- let sitemap override default page title -->
+ <xsl:param name="pageTitle" select="//error:notify/error:title"/>
-<xsl:template match="error:notify">
- <html>
- <head>
- <title>
- <xsl:value-of select="$pageTitle"/>
- </title>
- <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
- <style>
- h1 { color: #336699; text-align: left; margin: 0px 0px 30px 0px; padding: 0px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
- p.message { padding: 10px 30px 10px 30px; font-weight: bold; font-size: 130%; border-width: 1px; border-style: dashed; border-color: #336699; }
- p.description { padding: 10px 30px 20px 30px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
- p.topped { padding-top: 10px; border-width: 1px 0px 0px 0px; border-style: solid; border-color: #336699; }
- </style>
- <script src="{$contextPath}/scripts/main.js" type="text/javascript"/>
- </head>
- <body>
- <h1><xsl:value-of select="$pageTitle"/></h1>
-
- <p class="message">
- <xsl:call-template name="returns2br">
- <xsl:with-param name="string" select="error:message"/>
- </xsl:call-template>
- </p>
-
- <p class="description">
- <xsl:call-template name="returns2br">
- <xsl:with-param name="string" select="error:description"/>
- </xsl:call-template>
- </p>
-
- <xsl:apply-templates select="error:extra"/>
-
- <p class="topped">
- If you need help and this information is not enough, you
- are invited to read the
- <a href="http://cocoon.apache.org/2.1/faq/">Cocoon FAQ</a>.<br/>
- If you still don't find the answers you need,
- can send a mail to the
- <a href="http://cocoon.apache.org/community/mail-lists.html">
- Cocoon mailing lists</a>,
- remembering to:
- </p>
-
- <ul>
- <li>specify the version of Cocoon you're using, or we'll assume that you
- are talking about the latest released version;</li>
- <li>specify the platform-operating system-version-servlet container version;</li>
- <li>send any pertinent error message;</li>
- <li>send pertinent log snippets;</li>
- <li>send pertinent sitemap snippets;</li>
- <li>send pertinent parts of the page that give you problems.</li>
- </ul>
-
- <p>
- For more detailed technical information, take a look at the log
- files in the log directory of Cocoon, which is placed by default in
- the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
- If the logs don't give you enough information, you might want to increase the
- log level by changing the Logging configuration which is by default the
- <code>WEB-INF/logkit.xconf</code> file.
- </p>
-
- <p>
- If you think you found a bug, please report it to
- <a href="http://nagoya.apache.org/bugzilla/">Apache's Bugzilla</a>;
- a message will automatically be sent to the developer mailing list and you'll
- be kept in contact automatically with the further progress on that bug.
- </p>
-
- <p>
- Thanks, and sorry for the trouble if this is our fault.
- </p>
-
- <p class="topped">
- The <a href="http://cocoon.apache.org/">Apache Cocoon</a> Project
- </p>
- </body>
- </html>
-</xsl:template>
-
-<xsl:template match="error:extra">
- <xsl:choose>
- <xsl:when test="contains(@error:description,'stacktrace')">
- <p class="stacktrace">
- <span class="description"><xsl:value-of select="@error:description"/></span>
- <span class="switch" id="{@error:description}-switch" onclick="toggle('{@error:description}')">[show]</span>
- <pre id="{@error:description}" style="display: none">
- <xsl:call-template name="returns2br">
- <xsl:with-param name="string" select="."/>
- </xsl:call-template>
- </pre>
- </p>
- </xsl:when>
- <xsl:otherwise>
- <p class="extra">
- <span class="description"><xsl:value-of select="@error:description"/>: </span>
- <xsl:call-template name="returns2br">
- <xsl:with-param name="string" select="."/>
- </xsl:call-template>
- </p>
- </xsl:otherwise>
- </xsl:choose>
-</xsl:template>
-
-<xsl:template name="returns2br">
- <xsl:param name="string"/>
- <xsl:value-of select="$string"/>
- <!--
- Disabled this template since it can cause a StackOverflowError on longer
- stacktraces, and doesn't seem to be needed anyhow.
- -->
- <!--
- <xsl:variable name="return" select="'
'"/>
- <xsl:choose>
- <xsl:when test="contains($string,$return)">
- <xsl:value-of select="substring-before($string,$return)"/>
- <br/>
- <xsl:call-template name="returns2br">
- <xsl:with-param name="string" select="substring-after($string,$return)"/>
- </xsl:call-template>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$string"/>
- </xsl:otherwise>
- </xsl:choose>
- -->
-</xsl:template>
+ <xsl:template match="error:notify">
+ <html>
+ <head>
+ <title>
+ <xsl:value-of select="$pageTitle"/>
+ </title>
+ <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
+ <style>
+ h1 { color: #336699; text-align: left; margin: 0px 0px 30px 0px; padding: 0px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
+ p.message { padding: 10px 30px 10px 30px; font-weight: bold; font-size: 130%; border-width: 1px; border-style: dashed; border-color: #336699; }
+ p.description { padding: 10px 30px 20px 30px; border-width: 0px 0px 1px 0px; border-style: solid; border-color: #336699;}
+ p.topped { padding-top: 10px; border-width: 1px 0px 0px 0px; border-style: solid; border-color: #336699; }
+ pre { font-size: 120%; }
+ </style>
+ <script src="{$contextPath}/scripts/main.js" type="text/javascript"/>
+ </head>
+ <body>
+ <xsl:apply-templates select="." mode="onload"/>
+ <h1><xsl:value-of select="$pageTitle"/></h1>
+
+ <p class="message">
+ <xsl:value-of select="error:message"/>
+ </p>
+
+ <p class="description">
+ <xsl:value-of select="error:description"/>
+ </p>
+
+ <xsl:apply-templates select="error:extra"/>
+
+ <p class="topped">
+ If you need help and this information is not enough, you
+ are invited to read the
+ <a href="http://cocoon.apache.org/2.1/faq/">Cocoon FAQ</a>.<br/>
+ If you still don't find the answers you need,
+ can send a mail to the
+ <a href="http://cocoon.apache.org/community/mail-lists.html">
+ Cocoon mailing lists</a>,
+ remembering to:
+ </p>
+
+ <ul>
+ <li>specify the version of Cocoon you're using, or we'll assume that you
+ are talking about the latest released version;</li>
+ <li>specify the platform-operating system-version-servlet container version;</li>
+ <li>send any pertinent error message;</li>
+ <li>send pertinent log snippets;</li>
+ <li>send pertinent sitemap snippets;</li>
+ <li>send pertinent parts of the page that give you problems.</li>
+ </ul>
+
+ <p>
+ For more detailed technical information, take a look at the log
+ files in the log directory of Cocoon, which is placed by default in
+ the <code>WEB-INF/logs/</code> folder of your cocoon webapp context.<br/>
+ If the logs don't give you enough information, you might want to increase the
+ log level by changing the Logging configuration which is by default the
+ <code>WEB-INF/logkit.xconf</code> file.
+ </p>
+
+ <p>
+ If you think you found a bug, please report it to
+ <a href="http://nagoya.apache.org/bugzilla/">Apache's Bugzilla</a>;
+ a message will automatically be sent to the developer mailing list and you'll
+ be kept in contact automatically with the further progress on that bug.
+ </p>
+
+ <p>
+ Thanks, and sorry for the trouble if this is our fault.
+ </p>
+
+ <p class="topped">
+ The <a href="http://cocoon.apache.org/">Apache Cocoon</a> Project
+ </p>
+ </body>
+ </html>
+ </xsl:template>
+
+ <xsl:template match="error:notify" mode="onload">
+ <xsl:attribute name="onload">
+ <xsl:for-each select="error:extra[contains(@error:description,'stacktrace')]">
+ <xsl:text>toggle('</xsl:text>
+ <xsl:value-of select="@error:description"/>
+ <xsl:text>');</xsl:text>
+ </xsl:for-each>
+ </xsl:attribute>
+ </xsl:template>
+
+ <xsl:template match="error:extra">
+ <xsl:choose>
+ <xsl:when test="contains(@error:description,'stacktrace')">
+ <p class="stacktrace">
+ <span class="description"><xsl:value-of select="@error:description"/></span>
+ <span class="switch" id="{@error:description}-switch" onclick="toggle('{@error:description}')">[hide]</span>
+ <pre id="{@error:description}">
+ <xsl:value-of select="translate(.,' ','')"/>
+ </pre>
+ </p>
+ </xsl:when>
+ <xsl:otherwise>
+ <p class="extra">
+ <span class="description"><xsl:value-of select="@error:description"/>: </span>
+ <xsl:value-of select="."/>
+ </p>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
</xsl:stylesheet>
1.3 +48 -33 cocoon-2.2/src/webapp/stylesheets/system/directory2html.xslt
Index: directory2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/directory2html.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- directory2html.xslt 17 Mar 2003 00:47:43 -0000 1.2
+++ directory2html.xslt 10 Mar 2004 10:05:06 -0000 1.3
@@ -1,48 +1,63 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- CVS $Id$ -->
<xsl:stylesheet version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dir="http://apache.org/cocoon/directory/2.0">
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:dir="http://apache.org/cocoon/directory/2.0">
<xsl:template match="/">
- <html>
- <head>
- <title><xsl:value-of select="dir:directory/@name"/></title>
- <style>
- <xsl:comment>
- body { background-color: #ffffff }
- </xsl:comment>
- </style>
- </head>
- <body>
- <h1>Directory Listing of <xsl:value-of select="dir:directory/@name"/></h1>
- <table border="0">
- <tr>
- <td><a href="../"><i>parent directory</i></a></td>
- </tr>
- <tr>
- <td> </td>
- </tr>
- <xsl:apply-templates/>
- </table>
- </body>
- </html>
+ <html>
+ <head>
+ <title><xsl:value-of select="dir:directory/@name"/></title>
+ <style>
+ <xsl:comment>
+ body { background-color: #ffffff }
+ </xsl:comment>
+ </style>
+ </head>
+ <body>
+ <h1>Directory Listing of <xsl:value-of select="dir:directory/@name"/></h1>
+ <table border="0">
+ <tr>
+ <td><a href="../"><i>parent directory</i></a></td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ <xsl:apply-templates/>
+ </table>
+ </body>
+ </html>
</xsl:template>
<xsl:template match="dir:directory/dir:directory">
- <tr>
- <td><a href="{@name}/"><i><xsl:value-of select="@name"/></i></a></td>
- <td><xsl:value-of select="@date"/></td>
- </tr>
+ <tr>
+ <td><a href="{@name}/"><i><xsl:value-of select="@name"/></i></a></td>
+ <td><xsl:value-of select="@date"/></td>
+ </tr>
</xsl:template>
<xsl:template match="dir:file">
- <tr>
- <td><a href="{@name}"><xsl:value-of select="@name"/></a></td>
- <td><xsl:value-of select="@date"/></td>
- </tr>
+ <tr>
+ <td><a href="{@name}"><xsl:value-of select="@name"/></a></td>
+ <td><xsl:value-of select="@date"/></td>
+ </tr>
</xsl:template>
</xsl:stylesheet>
1.3 +14 -1 cocoon-2.2/src/webapp/stylesheets/system/xmlform2html.xslt
Index: xmlform2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/xmlform2html.xslt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlform2html.xslt 19 May 2003 10:30:26 -0000 1.2
+++ xmlform2html.xslt 10 Mar 2004 10:05:06 -0000 1.3
@@ -1,8 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
-<!--
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!--
Basic XMLForm processing stylesheet.
Converts XMLForm tags to HTML tags.
1.2 +19 -2 cocoon-2.2/src/webapp/stylesheets/system/sitemap2html.xslt
Index: sitemap2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/sitemap2html.xslt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sitemap2html.xslt 25 Mar 2003 17:10:35 -0000 1.1
+++ sitemap2html.xslt 10 Mar 2004 10:05:06 -0000 1.2
@@ -1,8 +1,25 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- CVS $Id$ -->
<xsl:stylesheet version="1.0"
- xmlns:map="http://apache.org/cocoon/sitemap/1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+ xmlns:map="http://apache.org/cocoon/sitemap/1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:template match="/">
<html>
1.8 +28 -13 cocoon-2.2/src/webapp/stylesheets/system/xml2html.xslt
Index: xml2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/xml2html.xslt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xml2html.xslt 6 Mar 2004 13:42:47 -0000 1.7
+++ xml2html.xslt 10 Mar 2004 10:05:06 -0000 1.8
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| XSLT REC Compliant Version of IE5 Default Stylesheet
@@ -15,6 +30,14 @@
<xsl:template match="/">
<HTML>
+ <xsl:call-template name="head"/>
+ <BODY>
+ <xsl:apply-templates/>
+ </BODY>
+ </HTML>
+ </xsl:template>
+
+ <xsl:template name="head">
<HEAD>
<STYLE>
BODY {background-color: white; color: black; font: monospace;}
@@ -31,21 +54,18 @@
DIV {border:0; padding:0; margin:0;}
</STYLE>
<SCRIPT><xsl:comment><![CDATA[
-
function click(event) {
var mark = event.target;
-
while ((mark.className != "b") && (mark.nodeName != "BODY")) {
mark = mark.parentNode
}
-
+
var e = mark;
-
while ((e.className != "e") && (e.nodeName != "BODY")) {
e = e.parentNode
}
-
+
if (mark.childNodes[0].nodeValue == "+") {
mark.childNodes[0].nodeValue = "-";
for (var i = 2; i < e.childNodes.length; i++) {
@@ -68,14 +88,9 @@
}
}
}
-
]]></xsl:comment>
- </SCRIPT>
+ </SCRIPT>
</HEAD>
- <BODY>
- <xsl:apply-templates/>
- </BODY>
- </HTML>
</xsl:template>
<!-- match processing instructions -->
@@ -149,7 +164,7 @@
</xsl:if>
<xsl:apply-templates select="@*"/>
<SPAN class="m">
- <xsl:text>/></xsl:text>
+ <xsl:text>/></xsl:text>
</SPAN>
</DIV>
</xsl:template>
1.7 +17 -2 cocoon-2.2/src/webapp/stylesheets/system/status2html.xslt
Index: status2html.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/stylesheets/system/status2html.xslt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- status2html.xslt 31 Jul 2003 03:51:18 -0000 1.6
+++ status2html.xslt 10 Mar 2004 10:05:06 -0000 1.7
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| Converts output of the StatusGenerator into HTML page
@@ -10,7 +25,7 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:status="http://apache.org/cocoon/status/2.0">
- <xsl:param name="contextPath" select="string('/cocoon')"/>
+ <xsl:param name="contextPath"/>
<xsl:template match="status:statusinfo">
<html>
1.3 +15 -0 cocoon-2.2/src/webapp/WEB-INF/instrumentation.xconf
Index: instrumentation.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/instrumentation.xconf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- instrumentation.xconf 17 Mar 2003 00:47:43 -0000 1.2
+++ instrumentation.xconf 10 Mar 2004 10:05:06 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<instrument logger="core.instrument">
<name>Cocoon</name>
1.43 +16 -0 cocoon-2.2/src/webapp/WEB-INF/cocoon.xconf
Index: cocoon.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/cocoon.xconf,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- cocoon.xconf 22 Feb 2004 19:11:20 -0000 1.42
+++ cocoon.xconf 10 Mar 2004 10:05:06 -0000 1.43
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<cocoon version="2.2" proxy-type="none">
<!--+
1.11 +15 -0 cocoon-2.2/src/webapp/WEB-INF/logkit.xconf
Index: logkit.xconf
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/logkit.xconf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- logkit.xconf 28 Feb 2004 11:10:40 -0000 1.10
+++ logkit.xconf 10 Mar 2004 10:05:06 -0000 1.11
@@ -1,4 +1,19 @@
<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<logkit>
<factories>
1.10 +29 -0 cocoon-2.2/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- web.xml 26 Dec 2003 18:46:23 -0000 1.9
+++ web.xml 10 Mar 2004 10:05:06 -0000 1.10
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| This is the Cocoon web-app configurations file
@@ -10,6 +25,20 @@
<web-app>
+ <!-- Context Configuration ========================================== -->
+
+ <!--+
+ | Set a context property useful to allow you to ProxyPass your
+ | web application mounted to a different URI without loosing the
+ | ability to do cookie-based sessions.
+ | WARNING: this is Jetty specific!
+ +-->
+ <!--context-param>
+ <param-name>org.mortbay.jetty.servlet.SessionPath</param-name>
+ <param-value>/some/path/to/your/webapp</param-value>
+ <description>An override of the session cookie path</description>
+ </context-param-->
+
<!-- Servlet Configuration ========================================== -->
<servlet>
1.4 +15 -0 cocoon-2.2/src/webapp/WEB-INF/classes/CatalogManager.properties
Index: CatalogManager.properties
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/WEB-INF/classes/CatalogManager.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CatalogManager.properties 5 Sep 2003 05:54:18 -0000 1.3
+++ CatalogManager.properties 10 Mar 2004 10:05:06 -0000 1.4
@@ -1,4 +1,19 @@
# CatalogManager.properties
+
+# Copyright 1999-2004 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
#
# This is the default properties file for Apache Cocoon. This facilitates local
# configuration of application-specific catalogs. You can also use cocoon.xconf
1.19 +20 -6 cocoon-2.2/src/webapp/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/sitemap.xmap,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sitemap.xmap 22 Feb 2004 19:12:01 -0000 1.18
+++ sitemap.xmap 10 Mar 2004 10:05:07 -0000 1.19
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- CVS $Id$ -->
@@ -124,7 +139,7 @@
</map:transform>
<map:serialize/>
</map:match>
-
+
<map:match pattern="clearcache.html">
<map:act type="clear-cache">
<map:generate src="status" type="status"/>
@@ -144,7 +159,7 @@
<map:serialize/>
</map:act>
</map:match>
-
+
<map:match pattern="request.html">
<map:generate type="request"/>
<map:transform src="context://stylesheets/system/xml2html.xslt"/>
@@ -152,21 +167,20 @@
</map:match>
<!-- ======================== Automount =============================== -->
+
<map:match pattern="*/**">
<map:mount uri-prefix="{1}" src="{1}/" check-reload="yes"/>
</map:match>
-
+
</map:pipeline>
<map:pipeline internal-only="true">
<map:match pattern="view-source">
<!-- colourize files that are known to be XML -->
- <!--
<map:match type="filename" pattern="((xml)|(xsp)|(xmap)|(xconf))$">
<map:generate src="common/view-source.xsp" type="serverpages"/>
<map:serialize/>
</map:match>
- -->
<!-- all other files are just send as text -->
<map:read mime-type="text/plain" src="../{request-param:filename}"/>
</map:match>
1.27 +26 -2 cocoon-2.2/src/webapp/samples/samples.xml
Index: samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/samples.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- samples.xml 7 Sep 2003 06:16:41 -0000 1.26
+++ samples.xml 10 Mar 2004 10:05:07 -0000 1.27
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| Main samples page
@@ -81,6 +96,9 @@
lines of XML markup using SOAP XSP Logicsheet. See also axis block that
integrates Axis into Cocoon.
</sample>
+ <sample href="text-wrap/" name="Text wrap">
+ Addresses the problem of wrapping long lines of text in source elements.
+ </sample>
</group>
<group name="Block Samples">
@@ -90,7 +108,13 @@
provided by the currently installed blocks.
</sample>
</group>
-
+
+ <group name="Test Pages">
+ <sample name="Anteater tests" href="test/">
+ Pages used by the anteater-tests build target, for automated testing
+ </sample>
+ </group>
+
<group name="System Tools And Pages">
<sample name="Status Page" href="status.html">
This page shows the current internal status of cocoon, along with
1.4 +16 -1 cocoon-2.2/src/webapp/samples/components-samples.xml
Index: components-samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/components-samples.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- components-samples.xml 9 Mar 2004 01:33:09 -0000 1.3
+++ components-samples.xml 10 Mar 2004 10:05:07 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- CVS $Id$ -->
1.7 +16 -1 cocoon-2.2/src/webapp/samples/block-samples.xml
Index: block-samples.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/block-samples.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- block-samples.xml 7 May 2003 19:32:42 -0000 1.6
+++ block-samples.xml 10 Mar 2004 10:05:07 -0000 1.7
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="iso-8859-1"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- CVS $Id$ -->
1.2 +16 -0 cocoon-2.2/src/webapp/samples/samples.xwelcome
Index: samples.xwelcome
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/samples/samples.xwelcome,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samples.xwelcome 9 Mar 2003 00:10:49 -0000 1.1
+++ samples.xwelcome 10 Mar 2004 10:05:07 -0000 1.2
@@ -1,3 +1,19 @@
+<?xml version="1.0"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<xwelcome xpath="/welcome" unless="message[@id='samples']">
<message id="samples">
1.4 +16 -1 cocoon-2.2/src/webapp/welcome.xml
Index: welcome.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/welcome.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- welcome.xml 17 Mar 2003 00:47:43 -0000 1.3
+++ welcome.xml 10 Mar 2004 10:05:07 -0000 1.4
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| This is a very simple XML page done just to show how a simple
1.3 +16 -1 cocoon-2.2/src/webapp/not-found.xml
Index: not-found.xml
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/not-found.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- not-found.xml 30 Apr 2003 06:55:48 -0000 1.2
+++ not-found.xml 10 Mar 2004 10:05:07 -0000 1.3
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| This a simple message page that is shown when a resource is not found.
|
1.41 +16 -1 cocoon-2.2/src/webapp/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/sitemap.xmap,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sitemap.xmap 22 Feb 2004 19:11:44 -0000 1.40
+++ sitemap.xmap 10 Mar 2004 10:05:07 -0000 1.41
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!--+
| This is the 'heart' of Cocoon. The sitemap maps URI space to
1.10 +16 -1 cocoon-2.2/src/webapp/welcome.xslt
Index: welcome.xslt
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/welcome.xslt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- welcome.xslt 28 Dec 2003 21:04:10 -0000 1.9
+++ welcome.xslt 10 Mar 2004 10:05:07 -0000 1.10
@@ -1,4 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 1999-2004 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- CVS $Id$ -->
1.2 +15 -0 cocoon-2.2/src/webapp/resources/scripts/main.js
Index: main.js
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/resources/scripts/main.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- main.js 26 Mar 2003 21:21:47 -0000 1.1
+++ main.js 10 Mar 2004 10:05:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
function toggle(id) {
var element = document.getElementById(id);
with (element.style) {
1.6 +16 -2 cocoon-2.2/src/webapp/resources/styles/main.css
Index: main.css
===================================================================
RCS file: /home/cvs/cocoon-2.2/src/webapp/resources/styles/main.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- main.css 8 May 2003 06:37:27 -0000 1.5
+++ main.css 10 Mar 2004 10:05:07 -0000 1.6
@@ -1,5 +1,19 @@
-body { background-color: white; color: black; font-family: verdana, helvetica, sanf serif; font-size: 80%; }
-td { font-size: 80%; }
+/*
+* Copyright 1999-2004 The Apache Software Foundation
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+body { background-color: white; color: black; font-family: verdana, helvetica, arial, sans-serif; font-size: 80%; }
h1 { color: #336699; text-align: center; font-size: 3em; padding-bottom: 10px; margin: 0px; }
h2 { color: #336699; }