- Fix the mapping (?).

- Copy some txt files to the right place.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@442952 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 994ea9c..81eac2c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -282,11 +282,6 @@
   <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"/>
@@ -299,6 +294,13 @@
           <exclude name="docs/architecture/*.xml"/>
         </fileset>
     </copy>
+    <copy todir="${tomcat.build}/webapps/docs">
+      <fileset dir=".">
+        <include name="BUILDING.txt"/>
+        <include name="README.txt"/>
+        <include name="RUNNING.txt"/>
+      </fileset>
+    </copy>
 
     <copy   tofile="${tomcat.build}/webapps/docs/appdev/sample/build.xml"
               file="webapps/docs/appdev/build.xml.txt"/>

diff --git a/webapps/examples/WEB-INF/web.xml b/webapps/examples/WEB-INF/web.xml
index c818879..a70d069 100644 (file)
--- a/webapps/examples/WEB-INF/web.xml
+++ b/webapps/examples/WEB-INF/web.xml
@@ -154,7 +154,7 @@
 
     <servlet-mapping>
         <servlet-name>ChatServlet</servlet-name>
-        <url-pattern>/jsp/chat</url-pattern>
+        <url-pattern>/jsp/chat/chat</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>CompressionFilterTestServlet</servlet-name>