Author: kkolinko
Date: Sun Aug 26 13:36:39 2012
New Revision: 1377434
URL: http://svn.apache.org/viewvc?rev=1377434&view=rev
Log:
Merged revision 1377433 from tomcat/trunk:
Fix typos etc. in code that prints "merged" web.xml
jsp-property-group elements were printed in the wrong order,
so that XML validation against schema was failing for the merged web.xml of
"examples" webapp.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1377433
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java?rev=1377434&r1=1377433&r2=1377434&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/deploy/WebXml.java Sun Aug 26
13:36:39 2012
@@ -557,7 +557,7 @@ public class WebXml {
return messageDestinations;
}
- // locale-encoging-mapping-list
+ // locale-encoding-mapping-list
private Map<String,String> localeEncodingMappings =
new HashMap<String,String>();
public void addLocaleEncodingMapping(String locale, String encoding) {
@@ -610,7 +610,8 @@ public class WebXml {
sb.append(" xmlns:xsi=");
sb.append("\"http://www.w3.org/2001/XMLSchema-instance\"\n";);
sb.append(" xsi:schemaLocation=");
- sb.append("\"http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"\n";);
+ sb.append("\"http://java.sun.com/xml/ns/javaee"; +
+ " http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd\"\n";);
sb.append(" version=\"");
sb.append(getVersion());
sb.append("\"\n");
@@ -625,7 +626,7 @@ public class WebXml {
for (Map.Entry<String, String> entry : contextParams.entrySet()) {
sb.append(" <context-param>\n");
appendElement(sb, INDENT4, "param-name", entry.getKey());
- appendElement(sb, INDENT4, "param-valuee", entry.getValue());
+ appendElement(sb, INDENT4, "param-value", entry.getValue());
sb.append(" </context-param>\n");
}
sb.append('\n');
@@ -814,17 +815,17 @@ public class WebXml {
appendElement(sb, INDENT6, "url-pattern", urlPattern);
}
appendElement(sb, INDENT6, "el-ignored", jpg.getElIgnored());
- appendElement(sb, INDENT6, "scripting-invalid",
- jpg.getScriptingInvalid());
appendElement(sb, INDENT6, "page-encoding",
jpg.getPageEncoding());
+ appendElement(sb, INDENT6, "scripting-invalid",
+ jpg.getScriptingInvalid());
+ appendElement(sb, INDENT6, "is-xml", jpg.getIsXml());
for (String prelude : jpg.getIncludePreludes()) {
appendElement(sb, INDENT6, "include-prelude", prelude);
}
for (String coda : jpg.getIncludeCodas()) {
appendElement(sb, INDENT6, "include-coda", coda);
}
- appendElement(sb, INDENT6, "is-xml", jpg.getIsXml());
appendElement(sb, INDENT6,
"deferred-syntax-allowed-as-literal",
jpg.getDeferredSyntax());
appendElement(sb, INDENT6, "trim-directive-whitespaces",
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=1377434&r1=1377433&r2=1377434&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Aug 26 13:36:39 2012
@@ -158,6 +158,10 @@
Add several JDK libraries to the value of <code>jarsToSkip</code>
property in the <code>catalina.properties</code> file. (markt,
kkolinko)
</update>
+ <fix>
+ Fix typos etc. in the code that logs merged web.xml (as enabled by
+ <code>logEffectiveWebXml</code> option on Context). (kkolinko)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
