You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2013/07/07 15:56:51 UTC

svn commit: r1500431 - in /tomcat/tc7.0.x/trunk: ./ test/webapp-2.4/WEB-INF/web.xml webapps/docs/changelog.xml

Author: markt
Date: Sun Jul  7 13:56:50 2013
New Revision: 1500431

URL: http://svn.apache.org/r1500431
Log: (empty)

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1500371

Modified: tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml?rev=1500431&r1=1500430&r2=1500431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml (original)
+++ tomcat/tc7.0.x/trunk/test/webapp-2.4/WEB-INF/web.xml Sun Jul  7 13:56:50 2013
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-                      http://java.sun.com/xml/ns/javaee/web-app_2_4.xsd"
+  xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+                      http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
   version="2.4">
   <display-name>Tomcat Servlet 2.4 Tests</display-name>
   <description>

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1500431&r1=1500430&r2=1500431&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jul  7 13:56:50 2013
@@ -89,6 +89,14 @@
       </add>
     </changelog>
   </subsection>
+  <subsection>
+    <changelog>
+      <fix>
+        <bug>55204</bug>: Correct namespace used in Servlet 2.4 test web 
+        application. Patch provided by Jeremy Boynes. (markt)
+      </fix>
+    </changelog>
+  </subsection>
 </section>
 <section name="Tomcat 7.0.42 (markt)" rtext="2013-07-05">
   <subsection name="Catalina">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org