You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2006/08/03 15:18:32 UTC
svn commit: r428400 - in /tomcat/tc6.0.x/trunk: ./ res/ webapps/docs/
webapps/docs/api/ webapps/docs/appdev/ webapps/docs/architecture/
webapps/docs/config/ webapps/docs/funcspecs/ webapps/examples/jsp/jsp2/el/
Author: remm
Date: Thu Aug 3 06:18:30 2006
New Revision: 428400
URL: http://svn.apache.org/viewvc?rev=428400&view=rev
Log:
- Build the docs webapp.
- Docs webapps fixes.
- Small NSIS update to version 2.18.
Modified:
tomcat/tc6.0.x/trunk/build.properties.default
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/res/tomcat.nsi
tomcat/tc6.0.x/trunk/webapps/docs/api/index.html
tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/architecture/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml
tomcat/tc6.0.x/trunk/webapps/docs/project.xml
tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
Modified: tomcat/tc6.0.x/trunk/build.properties.default
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.properties.default?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.properties.default (original)
+++ tomcat/tc6.0.x/trunk/build.properties.default Thu Aug 3 06:18:30 2006
@@ -59,9 +59,9 @@
commons-collections-src.loc=${base-jakarta.loc}/commons/collections/source/commons-collections-3.1-src.tar.gz
# ----- NSIS, version 2.0 or later -----
-nsis.home=${base.path}/nsis-2.0
+nsis.home=${base.path}/nsis-2.18
nsis.exe=${nsis.home}/makensis.exe
nsis.installoptions.dll=${nsis.home}/Plugins/InstallOptions.dll
nsis.nsexec.dll=${nsis.home}/Plugins/nsExec.dll
-nsis.nsisdl.dll=${nsis.home}/Plugins/nsisdl.dll
-nsis.loc=${base-sf.loc}/nsis/nsis20.exe
+nsis.nsisdl.dll=${nsis.home}/Plugins/NSISdl.dll
+nsis.loc=${base-sf.loc}/nsis/nsis-2.18-setup.exe
Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Aug 3 06:18:30 2006
@@ -176,6 +176,7 @@
<!-- Catalina Main JAR File -->
<jar jarfile="${catalina.jar}">
<fileset dir="${tomcat.classes}">
+ <include name="org/apache/AnnotationProcessor.class" />
<include name="org/apache/catalina/**" />
<include name="org/apache/naming/**" />
<!-- Javadoc and i18n exclusions -->
@@ -217,6 +218,7 @@
<!-- Jasper Implementation JAR File -->
<jar jarfile="${jasper.jar}">
<fileset dir="${tomcat.classes}">
+ <include name="org/apache/AnnotationProcessor.class" />
<include name="org/apache/jasper/**" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
@@ -253,7 +255,142 @@
</target>
- <target name="deploy" depends="build-only">
+ <target name="build-docs">
+
+ <copy todir="${tomcat.build}/webapps">
+ <fileset dir=".">
+ <include name="BUILDING.txt"/>
+ <include name="README.txt"/>
+ <include name="RUNNING.txt"/>
+ </fileset>
+ <fileset dir="webapps">
+ <include name="docs/images/**"/>
+ <include name="docs/**/*.html"/>
+ <include name="docs/WEB-INF/**"/>
+ <include name="docs/appdev/*.txt"/>
+ <include name="docs/appdev/sample/**"/>
+ </fileset>
+ <fileset dir="webapps">
+ <include name="docs/architecture/**"/>
+ <exclude name="docs/architecture/*.xml"/>
+ </fileset>
+ </copy>
+
+ <copy tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml"
+ file="webapps/docs/appdev/build.xml.txt"/>
+
+ <mkdir dir="${tomcat.build}/webapps/docs/funcspec" />
+
+ <!-- XSL processing -->
+ <style basedir="webapps/docs"
+ destdir="${tomcat.build}/webapps/docs"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="build.xml project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="."/>
+ </style>
+ <style basedir="webapps/docs/appdev"
+ destdir="${tomcat.build}/webapps/docs/appdev"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression=".."/>
+ </style>
+ <style basedir="webapps/docs/funcspecs"
+ destdir="${tomcat.build}/webapps/docs/funcspecs"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="../.."/>
+ </style>
+ <style basedir="webapps/docs/config"
+ destdir="${tomcat.build}/webapps/docs/config"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression=".."/>
+ </style>
+ <style basedir="webapps/docs/architecture"
+ destdir="${tomcat.build}/webapps/docs/architecture"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression=".."/>
+ </style>
+
+ <!-- Print friendly version -->
+ <mkdir dir="${tomcat.build}/webapps/docs/printer" />
+ <copy todir="${tomcat.build}/webapps/docs/printer">
+ <fileset dir=".">
+ <include name="BUILDING.txt"/>
+ <include name="README.txt"/>
+ <include name="RUNNING.txt"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${tomcat.build}/webapps/docs/appdev/printer" />
+ <copy todir="${tomcat.build}/webapps/docs/appdev/printer">
+ <fileset dir="webapps">
+ <include name="docs/appdev/*.txt"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${tomcat.build}/webapps/docs/funcspecs/printer" />
+ <mkdir dir="${tomcat.build}/webapps/docs/architecture/printer"/>
+ <mkdir dir="${tomcat.build}/webapps/docs/config/printer"/>
+
+ <style basedir="webapps/docs"
+ destdir="${tomcat.build}/webapps/docs/printer"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="build.xml project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="./.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+ <style basedir="webapps/docs/appdev"
+ destdir="${tomcat.build}/webapps/docs/appdev/printer"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+ <style basedir="webapps/docs/funcspecs"
+ destdir="${tomcat.build}/webapps/docs/funcspecs/printer"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="../../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+ <style basedir="webapps/docs/config"
+ destdir="${tomcat.build}/webapps/docs/config/printer"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+ <style basedir="webapps/docs/architecture"
+ destdir="${tomcat.build}/webapps/docs/architecture/printer"
+ extension=".html"
+ style="webapps/docs/tomcat-docs.xsl"
+ excludes="project.xml"
+ includes="*.xml">
+ <param name="relative-path" expression="../.."/>
+ <param name="project-menu" expression="nomenu"/>
+ </style>
+
+ </target>
+
+ <target name="deploy" depends="build-only,build-docs">
<copy file="${commons-logging-api.jar}" todir="${tomcat.build}/bin" />
@@ -275,11 +412,10 @@
</fileset>
</copy>
- <!-- FIXME: Copy webapps -->
+ <!-- Copy other regular webapps -->
<copy todir="${tomcat.build}/webapps">
<fileset dir="webapps">
<include name="ROOT/**"/>
- <include name="docs/**"/>
<include name="examples/**"/>
<include name="manager/**"/>
<include name="host-manager/**"/>
Modified: tomcat/tc6.0.x/trunk/res/tomcat.nsi
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/res/tomcat.nsi?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/res/tomcat.nsi (original)
+++ tomcat/tc6.0.x/trunk/res/tomcat.nsi Thu Aug 3 06:18:30 2006
@@ -4,9 +4,7 @@
;Compression options
CRCCheck on
- SetCompress force
- SetCompressor lzma
- SetDatablockOptimize on
+ SetCompressor /SOLID lzma
Name "Apache Tomcat"
Modified: tomcat/tc6.0.x/trunk/webapps/docs/api/index.html
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/api/index.html?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/api/index.html (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/api/index.html Thu Aug 3 06:18:30 2006
@@ -11,7 +11,7 @@
the "fulldocs" package to get it.
You can also access the javadoc online in the Tomcat
-<a href="http://jakarta.apache.org/tomcat/tomcat-6.0-doc/">documentation bundle</a>.
+<a href="http://tomcat.apache.org/tomcat-6.0-doc/">documentation bundle</a>.
</body>
</html>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/project.xml Thu Aug 3 06:18:30 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Application Developer's Guide"
- href="http://jakarta.apache.org/tomcat/">
+ href="http://tomcat.apache.org/">
<title>Application Developer's Guide</title>
<logo href="/images/tomcat.gif">
- The Tomcat Servlet/JSP Container
+ The Apache Tomcat Servlet/JSP Container
</logo>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/architecture/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/architecture/project.xml?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/architecture/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/architecture/project.xml Thu Aug 3 06:18:30 2006
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Tomcat Architecture"
- href="http://jakarta.apache.org/tomcat/">
+<project name="Apache Tomcat Architecture"
+ href="http://tomcat.apache.org/">
- <title>Tomcat Architecture</title>
+ <title>Apache Tomcat Architecture</title>
<logo href="/images/tomcat.gif">
- The Tomcat Servlet/JSP Container
+ The Apache Tomcat Servlet/JSP Container
</logo>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml Thu Aug 3 06:18:30 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Apache Tomcat Configuration Reference"
- href="http://jakarta.apache.org/tomcat/">
+ href="http://tomcat.apache.org/">
<title>Apache Tomcat Configuration Reference</title>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/funcspecs/project.xml Thu Aug 3 06:18:30 2006
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<project name="Catalina Functional Specifications"
- href="http://jakarta.apache.org/tomcat/">
+ href="http://tomcat.apache.org/">
<title>Catalina Functional Specifications</title>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/project.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/project.xml?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/project.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/project.xml Thu Aug 3 06:18:30 2006
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="Apache Tomcat Documentation - Top Level Directory"
- href="http://jakarta.apache.org/tomcat/">
+<project name="Apache Tomcat Documentation"
+ href="http://tomcat.apache.org/">
- <title>The Apache Tomcat 6.0 Servlet/JSP Container</title>
+ <title>Apache Tomcat 6.0</title>
<logo href="/images/tomcat.gif">
The Apache Tomcat Servlet/JSP Container
@@ -13,7 +13,7 @@
<menu name="Links">
<item name="Docs Home" href="index.html"/>
- <item name="FAQ" href="../faq" />
+ <item name="FAQ" href="http://tomcat.apache.org/faq" />
</menu>
<menu name="User Guide">
@@ -44,16 +44,15 @@
href="monitoring.html"/>
<item name="22) Logging" href="logging.html"/>
<item name="23) APR" href="apr.html"/>
- <item name="24) Asynchronous APIs" href="async.html"/>
+ <item name="24) Advanced IO" href="aio.html"/>
</menu>
<menu name="Reference">
<item name="Release Notes" href="RELEASE-NOTES.txt"/>
- <item name="Apache Tomcat Configuration" href="config/index.html"/>
+ <item name="Configuration" href="config/index.html"/>
+ <item name="Javadocs" href="api/index.html"/>
<item name="JK 1.2 Documentation"
- href="http://jakarta.apache.org/tomcat/connectors-doc/"/>
- <item name="Servlet API Javadocs" href="servletapi/index.html"/>
- <item name="JSP API Javadocs" href="jspapi/index.html"/>
+ href="http://tomcat.apache.org/connectors-doc/"/>
</menu>
<menu name="Apache Tomcat Development">
@@ -61,10 +60,8 @@
<item name="Changelog" href="changelog.html"/>
<item name="Status" href="status.html"/>
<item name="Developers" href="developers.html"/>
- <item name="Functional Specs." href="catalina/funcspecs/index.html"/>
- <item name="Apache Tomcat Javadocs" href="catalina/docs/api/index.html"/>
- <item name="Apache Jasper Javadocs" href="jasper/docs/api/index.html"/>
<item name="Architecture" href="architecture/index.html" />
+ <item name="Functional Specs." href="funcspecs/index.html"/>
</menu>
</body>
Modified: tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp?rev=428400&r1=428399&r2=428400&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp (original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/jsp/jsp2/el/implicit-objects.jsp Thu Aug 3 06:18:30 2006
@@ -71,15 +71,15 @@
</tr>
<tr>
<td>\${header["host"]}</td>
- <td>${header["host"]}</td>
+ <td>${fn:escapeXml(header["host"])} </td>
</tr>
<tr>
<td>\${header["accept"]}</td>
- <td>${header["accept"]}</td>
+ <td>${fn:escapeXml(header["accept"])} </td>
</tr>
<tr>
<td>\${header["user-agent"]}</td>
- <td>${header["user-agent"]}</td>
+ <td>${fn:escapeXml(header["user-agent"])} </td>
</tr>
</table>
</code>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org