Author: markt
Date: Tue Aug 3 12:20:57 2010
New Revision: 981841
URL: http://svn.apache.org/viewvc?rev=981841&view=rev
Log:
Provide Javadoc for Servlet, JSP & EL
Provide external links to JAX-RPC Javadoc
Added:
tomcat/trunk/webapps/docs/elapi/
tomcat/trunk/webapps/docs/elapi/index.html (with props)
tomcat/trunk/webapps/docs/jspapi/
tomcat/trunk/webapps/docs/jspapi/index.html (with props)
tomcat/trunk/webapps/docs/servletapi/
tomcat/trunk/webapps/docs/servletapi/index.html (with props)
Modified:
tomcat/trunk/build.xml
tomcat/trunk/webapps/docs/api/index.html
tomcat/trunk/webapps/docs/project.xml
Modified: tomcat/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=981841&r1=981840&r2=981841&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Aug 3 12:20:57 2010
@@ -1133,9 +1133,9 @@
</target>
- <target name="extras-webservices"
- depends="extras-prepare,compile,build-manifests"
- description="Build web services extras package">
+ <target name="extras-webservices-prepare"
+ depends="extras-prepare"
+ description="Prepare to build web services extras package">
<antcall target="downloadfile">
<param name="sourcefile" value="${jaxrpc-lib.loc}"/>
@@ -1153,6 +1153,11 @@
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
+ </target>
+
+ <target name="extras-webservices"
+ depends="extras-webservices-prepare,compile,build-manifests"
+ description="Build web services extras package">
<!-- Compile web services classes components -->
<javac srcdir="java" destdir="${tomcat.classes}"
@@ -1335,8 +1340,60 @@ Apache Tomcat ${version} native binaries
</target>
- <target name="javadoc" depends="dist-source,extras-prepare"
+ <target name="javadoc" depends="dist-source,extras-webservices-prepare"
description="Create the Tomcat javadoc" >
+ <javadoc packagenames="javax.servlet.*"
+ excludepackagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/servletapi"
+ version="true"
+ windowtitle="Servlet 3.0 API Documentation - Apache Tomcat ${version}"
+ doctitle="Servlet 3.0 API - Apache Tomcat ${version}"
+ header="<b>Servlet 3.0 - Apache Tomcat ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ encoding="ISO-8859-1"
+ additionalparam="-breakiterator"
+ maxmemory="256m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
+ <javadoc packagenames="javax.servlet.jsp.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/jspapi"
+ version="true"
+ windowtitle="JSP 2.2 API Documentation - Apache Tomcat ${version}"
+ doctitle="JSP 2.2 API - Apache Tomcat ${version}"
+ header="<b>JSP 2.2 - Apache Tomcat ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ encoding="ISO-8859-1"
+ additionalparam="-breakiterator"
+ maxmemory="256m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
+ <javadoc packagenames="javax.el.*"
+ sourcepath="${tomcat.dist}/src/java"
+ destdir="${tomcat.dist}/webapps/docs/elapi"
+ version="true"
+ windowtitle="EL 2.2 API Documentation - Apache Tomcat ${version}"
+ doctitle="EL 2.2 API - Apache Tomcat ${version}"
+ header="<b>EL 2.2 - Apache Tomcat ${version}</b>"
+ bottom="Copyright &#169; 2000-${year} Apache Software Foundation.
All Rights Reserved."
+ encoding="ISO-8859-1"
+ additionalparam="-breakiterator"
+ maxmemory="256m" >
+ <classpath>
+ <path refid="compile.classpath"/>
+ <path refid="tomcat.webservices.classpath"/>
+ <path location="${ant.core.lib}"/>
+ </classpath>
+ </javadoc>
<javadoc packagenames="org.apache.*"
sourcepath="${tomcat.dist}/src/java"
destdir="${tomcat.dist}/webapps/docs/api"
@@ -1353,7 +1410,12 @@ Apache Tomcat ${version} native binaries
<path refid="tomcat.webservices.classpath"/>
<path location="${ant.core.lib}"/>
</classpath>
+ <link href="../servletapi"/>
+ <link href="../jspapi"/>
+ <link href="../elapi"/>
<link href="http://java.sun.com/j2se/1.6.0/docs/api/"/>
+ <link href="http://commons.apache.org/io/api-release/"/>
+ <link href="http://download-llnw.oracle.com/javaee/6/api/"/>
</javadoc>
</target>
Modified: tomcat/trunk/webapps/docs/api/index.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/api/index.html?rev=981841&r1=981840&r2=981841&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/api/index.html (original)
+++ tomcat/trunk/webapps/docs/api/index.html Tue Aug 3 12:20:57 2010
@@ -23,11 +23,12 @@
<body>
-Tomcat's internal javadoc is no longer installed by default. Download and
install
+Tomcat's internal javadoc is not installed by default. Download and install
the "fulldocs" package to get it.
You can also access the javadoc online in the Tomcat
-<a href="http://tomcat.apache.org/tomcat-7.0-doc/";>documentation bundle</a>.
+<a href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/";>
+documentation bundle</a>.
</body>
</html>
Added: tomcat/trunk/webapps/docs/elapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/elapi/index.html?rev=981841&view=auto
==============================================================================
--- tomcat/trunk/webapps/docs/elapi/index.html (added)
+++ tomcat/trunk/webapps/docs/elapi/index.html Tue Aug 3 12:20:57 2010
@@ -0,0 +1,34 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en"
"http://www.w3.org/TR/REC-html40/strict.dtd";>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>API docs</title>
+</head>
+
+<body>
+
+The EL Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+<a href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/";>
+documentation bundle</a>.
+
+</body>
+</html>
Propchange: tomcat/trunk/webapps/docs/elapi/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Added: tomcat/trunk/webapps/docs/jspapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jspapi/index.html?rev=981841&view=auto
==============================================================================
--- tomcat/trunk/webapps/docs/jspapi/index.html (added)
+++ tomcat/trunk/webapps/docs/jspapi/index.html Tue Aug 3 12:20:57 2010
@@ -0,0 +1,34 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en"
"http://www.w3.org/TR/REC-html40/strict.dtd";>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>API docs</title>
+</head>
+
+<body>
+
+The JSP Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+<a href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/";>
+documentation bundle</a>.
+
+</body>
+</html>
Propchange: tomcat/trunk/webapps/docs/jspapi/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: tomcat/trunk/webapps/docs/project.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/project.xml?rev=981841&r1=981840&r2=981841&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/project.xml (original)
+++ tomcat/trunk/webapps/docs/project.xml Tue Aug 3 12:20:57 2010
@@ -72,7 +72,10 @@
<menu name="Reference">
<item name="Release Notes" href="RELEASE-NOTES.txt"/>
<item name="Configuration" href="config/index.html"/>
- <item name="Javadocs" href="api/index.html"/>
+ <item name="Tomcat Javadocs" href="api/index.html"/>
+ <item name="Servlet Javadocs" href="servletapi/index.html"/>
+ <item name="JSP 2.2 Javadocs" href="jspapi/index.html"/>
+ <item name="EL 2.2 Javadocs" href="elapi/index.html"/>
<item name="JK 1.2 Documentation"
href="http://tomcat.apache.org/connectors-doc/"/>
</menu>
Added: tomcat/trunk/webapps/docs/servletapi/index.html
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/servletapi/index.html?rev=981841&view=auto
==============================================================================
--- tomcat/trunk/webapps/docs/servletapi/index.html (added)
+++ tomcat/trunk/webapps/docs/servletapi/index.html Tue Aug 3 12:20:57 2010
@@ -0,0 +1,34 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en"
"http://www.w3.org/TR/REC-html40/strict.dtd";>
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <title>API docs</title>
+</head>
+
+<body>
+
+The Servlet Javadoc is not installed by default. Download and install
+the "fulldocs" package to get it.
+
+You can also access the javadoc online in the Tomcat
+<a href="http://tomcat.apache.org/tomc...@version_major_minor@-doc/";>
+documentation bundle</a>.
+
+</body>
+</html>
Propchange: tomcat/trunk/webapps/docs/servletapi/index.html
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
