tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r481139 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Date Fri, 01 Dec 2006 03:53:56 GMT
Author: markt
Date: Thu Nov 30 19:53:53 2006
New Revision: 481139

URL: http://svn.apache.org/viewvc?view=rev&rev=481139
Log:
Fix bug 41074. Make jsp:plugin output XHTML compliant

Modified:
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=481139&r1=481138&r2=481139
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Nov 30 19:53:53 2006
@@ -164,6 +164,9 @@
         An alternative character (0xe000) from the unicode private use range
         is now used. (markt)
       </fix>
+      <fix>
+        <bug>41057</bug>: Make jsp:plugin output XHTML compliant. (markt)
+      </fix>
     </changelog>
   </subsection> 
   <subsection name="Webapps">

Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?view=diff&rev=481139&r1=481138&r2=481139
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java Thu Nov 30 19:53:53
2006
@@ -1361,10 +1361,10 @@
                     // 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.write( \"<param name=\\\""
                                 + escape(name)
                                 + "\\\" value=\\\"\" + "
                                 + attributeValue(
@@ -1455,9 +1455,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);
 
@@ -1482,31 +1482,31 @@
                 "out.write(" + quote(s0) + s1 + s2 + " + " + quote(s3) + ");");
             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-"
@@ -1520,7 +1520,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));
@@ -1528,9 +1528,9 @@
             /*
              * Netscape style plugin part
              */
-            out.printil("out.write(" + quote("<COMMENT>") + ");");
+            out.printil("out.write(" + quote("<comment>") + ");");
             out.printil("out.write(\"\\n\");");
-            s0 = "<EMBED"
+            s0 = "<embed"
                     + makeAttr(
                         "type",
                         "application/x-java-"
@@ -1562,7 +1562,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\");");
 
             /*
@@ -1573,13 +1573,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());



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


Mime
View raw message