You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/11/13 23:41:04 UTC
svn commit: r474581 -
/incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
Author: awiner
Date: Mon Nov 13 15:41:03 2006
New Revision: 474581
URL: http://svn.apache.org/viewvc?view=rev&rev=474581
Log:
Fix improper generation of JSP 1.2 DTD at top of some JSP 2.1 syntax files
Modified:
incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
Modified: incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?view=diff&rev=474581&r1=474580&r2=474581
==============================================================================
--- incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ incubator/adffaces/branches/faces-1_2-061031/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Mon Nov 13 15:41:03 2006
@@ -202,10 +202,14 @@
TransformerFactory transFactory = TransformerFactory.newInstance();
Transformer identity = transFactory.newTransformer();
- identity.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC,
- _JSP_TAG_LIBRARY_DOCTYPE_PUBLIC);
- identity.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM,
- _JSP_TAG_LIBRARY_DOCTYPE_SYSTEM);
+ if (!_is12())
+ {
+ identity.setOutputProperty(OutputKeys.DOCTYPE_PUBLIC,
+ _JSP_TAG_LIBRARY_DOCTYPE_PUBLIC);
+ identity.setOutputProperty(OutputKeys.DOCTYPE_SYSTEM,
+ _JSP_TAG_LIBRARY_DOCTYPE_SYSTEM);
+ }
+
identity.transform(mergedSource, mergedResult);
targetFile.setReadOnly();
@@ -279,6 +283,7 @@
stream.writeCharacters("\n");
if (!_is12())
stream.writeDTD(dtd);
+
stream.writeCharacters("\n");
stream.writeStartElement("taglib");
if (_is12())