升级Tomcat版本 apache-tomcat-7.0.77
diff --git a/tomcat-uid/webapps/docs/appdev/sample/build.xml b/tomcat-uid/webapps/docs/appdev/sample/build.xml
index ffbb584..2162535 100644
--- a/tomcat-uid/webapps/docs/appdev/sample/build.xml
+++ b/tomcat-uid/webapps/docs/appdev/sample/build.xml
@@ -17,7 +17,7 @@
<!--
General purpose build script for web applications and web services,
- including enhanced support for deploying directly to a Tomcat 6
+ including enhanced support for deploying directly to a Tomcat
based server.
This build script assumes that the source code of your web application
@@ -103,7 +103,7 @@
Defaults to "build".
catalina.home The directory in which you have installed
- a binary distribution of Tomcat 6. This will
+ a binary distribution of Tomcat. This will
be used by the "deploy" target.
dist.home The name of the base directory in which
@@ -111,7 +111,7 @@
Defaults to "dist".
manager.password The login password of a user that is assigned the
- "manager" role (so that he or she can execute
+ "manager-script" role (so that he or she can execute
commands via the "/manager" web application)
manager.url The URL of the "/manager" web application on the
@@ -119,7 +119,7 @@
applications and web services.
manager.username The login username of a user that is assigned the
- "manager" role (so that he or she can execute
+ "manager-script" role (so that he or she can execute
commands via the "/manager" web application)
-->
@@ -131,7 +131,7 @@
<property name="catalina.home" value="../../../.."/> <!-- UPDATE THIS! -->
<property name="dist.home" value="${basedir}/dist"/>
<property name="docs.home" value="${basedir}/docs"/>
- <property name="manager.url" value="http://localhost:8080/manager"/>
+ <property name="manager.url" value="http://localhost:8080/manager/text"/>
<property name="src.home" value="${basedir}/src"/>
<property name="web.home" value="${basedir}/web"/>
@@ -148,7 +148,7 @@
* Being copied into the "/WEB-INF/lib" directory during execution
of the "deploy" target.
- Because we will automatically include all of the Java classes that Tomcat 6
+ Because we will automatically include all of the Java classes that Tomcat
exposes to web applications, we will not need to explicitly list any of those
dependencies. You only need to worry about external dependencies for JAR
files that you are going to include inside your "/WEB-INF/lib" directory.
@@ -202,10 +202,10 @@
<!--
These properties define custom tasks for the Ant build tool that interact
- with the "/manager" web application installed with Tomcat 6. Before they
+ with the "/manager" web application installed with Tomcat. Before they
can be successfully utilized, you must perform the following steps:
- - Copy the file "lib/catalina-ant.jar" from your Tomcat 6
+ - Copy the file "lib/catalina-ant.jar" from your Tomcat
installation into the "lib" directory of your Ant installation.
- Create a "build.properties" file in your application's top-level
@@ -346,7 +346,7 @@
<!--
- The "install" target tells the specified Tomcat 6 installation to dynamically
+ The "install" target tells the specified Tomcat installation to dynamically
install this web application and make it available for execution. It does
*not* cause the existence of this web application to be remembered across
Tomcat restarts; if you restart the server, you will need to re-install all
@@ -404,7 +404,7 @@
<!--
- The "list" target asks the specified Tomcat 6 installation to list the
+ The "list" target asks the specified Tomcat installation to list the
currently running web applications, either loaded at startup time or
installed dynamically. It is useful to determine whether or not the
application you are currently developing has been installed.
@@ -464,7 +464,7 @@
<!--
- The "reload" signals the specified application Tomcat 6 to shut itself down
+ The "reload" signals the specified application Tomcat to shut itself down
and reload. This can be useful when the web application context is not
reloadable and you have updated classes or property files in the
/WEB-INF/classes directory or when you have added or updated jar files in the
@@ -472,7 +472,7 @@
NOTE: The /WEB-INF/web.xml web application configuration file is not reread
on a reload. If you have made changes to your web.xml file you must stop
- then start the web application.
+ then start the web application.
-->
@@ -491,7 +491,7 @@
<!--
- The "remove" target tells the specified Tomcat 6 installation to dynamically
+ The "remove" target tells the specified Tomcat installation to dynamically
remove this web application from service.
NOTE: This is the logical opposite of the "install" target.
diff --git a/tomcat-uid/webapps/docs/appdev/sample/index.html b/tomcat-uid/webapps/docs/appdev/sample/index.html
index 87e3a61..a3db667 100644
--- a/tomcat-uid/webapps/docs/appdev/sample/index.html
+++ b/tomcat-uid/webapps/docs/appdev/sample/index.html
@@ -21,26 +21,26 @@
</head>
<body>
<h2>Sample Application</h2>
- <p>
- The example app has been packaged as a war file and can be downloaded
- <a href="sample.war">here</a> (Note: make sure your browser doesn't
+ <p>
+ The example app has been packaged as a war file and can be downloaded
+ <a href="sample.war">here</a> (Note: make sure your browser doesn't
change file extension or append a new one).
</p>
- <p>
- The easiest way to run this application is simply to move the war file
- to your <b>CATALINA_HOME/webapps</b> directory. Tomcat will automatically
- expand and deploy the application for you. You can view it with the
- following URL (assuming that you're running tomcat on port 8080
+ <p>
+ The easiest way to run this application is simply to move the war file
+ to your <b>CATALINA_HOME/webapps</b> directory. Tomcat will automatically
+ expand and deploy the application for you. You can view it with the
+ following URL (assuming that you're running tomcat on port 8080
as is the default):
<br />
<a href="http://localhost:8080/sample">http://localhost:8080/sample</a>
</p>
<p>
- If you just want to browse the contents, you can unpack the war file
+ If you just want to browse the contents, you can unpack the war file
with the <b>jar</b> command.
- <source>
- jar -xvf sample.war
- </source>
</p>
+ <pre>
+ jar -xvf sample.war
+ </pre>
</body>
</html>
\ No newline at end of file
diff --git a/tomcat-uid/webapps/docs/appdev/sample/src/mypackage/Hello.java b/tomcat-uid/webapps/docs/appdev/sample/src/mypackage/Hello.java
index 8c79077..47bba7c 100644
--- a/tomcat-uid/webapps/docs/appdev/sample/src/mypackage/Hello.java
+++ b/tomcat-uid/webapps/docs/appdev/sample/src/mypackage/Hello.java
@@ -5,21 +5,20 @@
* 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.
*/
-
package mypackage;
import java.io.IOException;
import java.io.PrintWriter;
-import java.util.Enumeration;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
@@ -37,6 +36,7 @@
public final class Hello extends HttpServlet {
+ private static final long serialVersionUID = 1L;
/**
* Respond to a GET request for the content produced by
@@ -48,34 +48,35 @@
* @exception IOException if an input/output error occurs
* @exception ServletException if a servlet error occurs
*/
+ @Override
public void doGet(HttpServletRequest request,
HttpServletResponse response)
throws IOException, ServletException {
- response.setContentType("text/html");
- PrintWriter writer = response.getWriter();
+ response.setContentType("text/html");
+ PrintWriter writer = response.getWriter();
- writer.println("<html>");
- writer.println("<head>");
- writer.println("<title>Sample Application Servlet Page</title>");
- writer.println("</head>");
- writer.println("<body bgcolor=white>");
+ writer.println("<html>");
+ writer.println("<head>");
+ writer.println("<title>Sample Application Servlet Page</title>");
+ writer.println("</head>");
+ writer.println("<body bgcolor=white>");
- writer.println("<table border=\"0\">");
- writer.println("<tr>");
- writer.println("<td>");
- writer.println("<img src=\"images/tomcat.gif\">");
- writer.println("</td>");
- writer.println("<td>");
- writer.println("<h1>Sample Application Servlet</h1>");
- writer.println("This is the output of a servlet that is part of");
- writer.println("the Hello, World application.");
- writer.println("</td>");
- writer.println("</tr>");
- writer.println("</table>");
+ writer.println("<table border=\"0\">");
+ writer.println("<tr>");
+ writer.println("<td>");
+ writer.println("<img src=\"images/tomcat.gif\">");
+ writer.println("</td>");
+ writer.println("<td>");
+ writer.println("<h1>Sample Application Servlet</h1>");
+ writer.println("This is the output of a servlet that is part of");
+ writer.println("the Hello, World application.");
+ writer.println("</td>");
+ writer.println("</tr>");
+ writer.println("</table>");
- writer.println("</body>");
- writer.println("</html>");
+ writer.println("</body>");
+ writer.println("</html>");
}
diff --git a/tomcat-uid/webapps/docs/appdev/sample/web/WEB-INF/web.xml b/tomcat-uid/webapps/docs/appdev/sample/web/WEB-INF/web.xml
index 58daf30..7fe1af0 100644
--- a/tomcat-uid/webapps/docs/appdev/sample/web/WEB-INF/web.xml
+++ b/tomcat-uid/webapps/docs/appdev/sample/web/WEB-INF/web.xml
@@ -22,8 +22,8 @@
<display-name>Hello, World Application</display-name>
<description>
- This is a simple web application with a source code organization
- based on the recommendations of the Application Developer's Guide.
+ This is a simple web application with a source code organization
+ based on the recommendations of the Application Developer's Guide.
</description>
<servlet>
diff --git a/tomcat-uid/webapps/docs/appdev/sample/web/images/tomcat.gif b/tomcat-uid/webapps/docs/appdev/sample/web/images/tomcat.gif
index 32f7d80..f2aa6f8 100644
--- a/tomcat-uid/webapps/docs/appdev/sample/web/images/tomcat.gif
+++ b/tomcat-uid/webapps/docs/appdev/sample/web/images/tomcat.gif
Binary files differ
diff --git a/tomcat-uid/webapps/docs/appdev/sample/web/index.html b/tomcat-uid/webapps/docs/appdev/sample/web/index.html
index 7be5ae7..1cbcd63 100644
--- a/tomcat-uid/webapps/docs/appdev/sample/web/index.html
+++ b/tomcat-uid/webapps/docs/appdev/sample/web/index.html
@@ -34,10 +34,10 @@
</tr>
</table>
-<p>To prove that they work, you can execute either of the following links:
+<p>To prove that they work, you can execute either of the following links:</p>
<ul>
-<li>To a <a href="hello.jsp">JSP page</a>.
-<li>To a <a href="hello">servlet</a>.
+<li>To a <a href="hello.jsp">JSP page</a>.</li>
+<li>To a <a href="hello">servlet</a>.</li>
</ul>
</body>
