Author: markt
Date: Thu Dec 7 18:34:01 2006
New Revision: 483787
URL: http://svn.apache.org/viewvc?view=rev&rev=483787
Log:
Port fix for bug 41074. Make jsp:plugin output XHTML compliant
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=diff&rev=483787&r1=483786&r2=483787
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Thu Dec
7 18:34:01 2006
@@ -1385,9 +1385,9 @@
// Double check that this is now the correct behavior.
if (ie) {
// We want something of the form
- // out.println( "<PARAM name=\"blah\"
+ // out.println( "<param name=\"blah\"
// value=\"" + ... + "\">" );
- out.printil("out.write( \"<PARAM name=\\\""
+ out.printil("out.write( \"<param name=\\\""
+ escape(name)
+ "\\\" value=\\\"\" + "
+ attributeValue(n.getValue(), false,
@@ -1469,9 +1469,9 @@
// dynamically. Double-check if this generation is correct.
// IE style plugin
- // <OBJECT ...>
+ // <object ...>
// First compose the runtime output string
- String s0 = "<OBJECT"
+ String s0 = "<object"
+ makeAttr("classid", ctxt.getOptions().getIeClassId())
+ makeAttr("name", name);
@@ -1494,29 +1494,29 @@
+ ");");
out.printil("out.write(\"\\n\");");
- // <PARAM > for java_code
- s0 = "<PARAM name=\"java_code\"" + makeAttr("value", code) + '>';
+ // <param > for java_code
+ s0 = "<param name=\"java_code\"" + makeAttr("value", code) + '>';
out.printil("out.write(" + quote(s0) + ");");
out.printil("out.write(\"\\n\");");
- // <PARAM > for java_codebase
+ // <param > for java_codebase
if (codebase != null) {
- s0 = "<PARAM name=\"java_codebase\""
+ s0 = "<param name=\"java_codebase\""
+ makeAttr("value", codebase) + '>';
out.printil("out.write(" + quote(s0) + ");");
out.printil("out.write(\"\\n\");");
}
- // <PARAM > for java_archive
+ // <param > for java_archive
if (archive != null) {
- s0 = "<PARAM name=\"java_archive\""
+ s0 = "<param name=\"java_archive\""
+ makeAttr("value", archive) + '>';
out.printil("out.write(" + quote(s0) + ");");
out.printil("out.write(\"\\n\");");
}
- // <PARAM > for type
- s0 = "<PARAM name=\"type\""
+ // <param > for type
+ s0 = "<param name=\"type\""
+ makeAttr("value", "application/x-java-"
+ type
+ ";"
@@ -1526,7 +1526,7 @@
out.printil("out.write(\"\\n\");");
/*
- * generate a <PARAM> for each <jsp:param> in the plugin body
+ * generate a <param> for each <jsp:param> in the plugin body
*/
if (n.getBody() != null)
n.getBody().visit(new ParamVisitor(true));
@@ -1534,7 +1534,7 @@
/*
* Netscape style plugin part
*/
- out.printil("out.write(" + quote("<COMMENT>") + ");");
+ out.printil("out.write(" + quote("<comment>") + ");");
out.printil("out.write(\"\\n\");");
s0 = "<EMBED"
+ makeAttr("type", "application/x-java-"
@@ -1563,7 +1563,7 @@
out.printil("out.write(" + quote("/>") + ");");
out.printil("out.write(\"\\n\");");
- out.printil("out.write(" + quote("<NOEMBED>") + ");");
+ out.printil("out.write(" + quote("<noembed>") + ");");
out.printil("out.write(\"\\n\");");
/*
@@ -1574,13 +1574,13 @@
out.printil("out.write(\"\\n\");");
}
- out.printil("out.write(" + quote("</NOEMBED>") + ");");
+ out.printil("out.write(" + quote("</noembed>") + ");");
out.printil("out.write(\"\\n\");");
- out.printil("out.write(" + quote("</COMMENT>") + ");");
+ out.printil("out.write(" + quote("</comment>") + ");");
out.printil("out.write(\"\\n\");");
- out.printil("out.write(" + quote("</OBJECT>") + ");");
+ out.printil("out.write(" + quote("</object>") + ");");
out.printil("out.write(\"\\n\");");
n.setEndJavaLine(out.getJavaLine());
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?view=diff&rev=483787&r1=483786&r2=483787
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Dec 7 18:34:01 2006
@@ -23,6 +23,13 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>41057</bug>: Make jsp:plugin output XHTML compliant. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.4 (remm)">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
