Author: markt
Date: Sun Nov 30 15:58:56 2008
New Revision: 721936
URL: http://svn.apache.org/viewvc?rev=721936&view=rev
Log:
Fix broken URL mapping in examples
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 30 15:58:56 2008
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
+/tomcat/trunk:601180,606992,612607,630314,652744,653247,673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,709294,709816,710063,710125,710205,711126,711600,712461
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=721936&r1=721935&r2=721936&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sun Nov 30 15:58:56 2008
@@ -171,11 +171,6 @@
0: remm (risky, would it be possible to stop backporting risky changes and
behavior modifications to 6.0.x ?)
-1:
-* Fix broken URL mapping in examples
- http://svn.apache.org/viewvc?view=rev&revision=630314
- +1: markt, remm, fhanik
- -1:
-
* Clean up dist.xml
http://svn.apache.org/viewvc?rev=718360&view=rev
+1: markt, remm, fhanik, pero
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=721936&r1=721935&r2=721936&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sun Nov 30 15:58:56 2008
@@ -339,6 +339,9 @@
<fix>
Document the LifecycleListeners. (markt)
</fix>
+ <fix>
+ Fix broken URL mapping in the examples. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
Modified: tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml?rev=721936&r1=721935&r2=721936&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/examples/WEB-INF/web.xml Sun Nov 30 15:58:56
2008
@@ -223,12 +223,12 @@
Special property group for JSP Configuration JSP example.
</description>
<display-name>JSPConfiguration</display-name>
- <url-pattern>/jsp2/misc/config.jsp</url-pattern>
+ <url-pattern>/jsp/jsp2/misc/config.jsp</url-pattern>
<el-ignored>true</el-ignored>
<page-encoding>ISO-8859-1</page-encoding>
<scripting-invalid>true</scripting-invalid>
- <include-prelude>/jsp2/misc/prelude.jspf</include-prelude>
- <include-coda>/jsp2/misc/coda.jspf</include-coda>
+ <include-prelude>/jsp/jsp2/misc/prelude.jspf</include-prelude>
+ <include-coda>/jsp/jsp2/misc/coda.jspf</include-coda>
</jsp-property-group>
</jsp-config>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
