Index: lams_admin/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.7 -r1.8
--- lams_admin/web/WEB-INF/lams.tld 18 Oct 2006 09:15:07 -0000 1.7
+++ lams_admin/web/WEB-INF/lams.tld 16 Nov 2006 05:10:01 -0000 1.8
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java,v
diff -u -r1.2 -r1.3
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java 8 Sep 2006 01:39:32 -0000 1.2
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/MultiLinesOutputTag.java 16 Nov 2006 05:13:06 -0000 1.3
@@ -5,6 +5,7 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.tagext.SimpleTagSupport;
+import org.apache.commons.lang.StringEscapeUtils;
import org.apache.commons.lang.StringUtils;
/**
* JSP tag. It converts text from \n or \r\n to <BR> before rendering.
@@ -21,6 +22,8 @@
private String value;
+ private boolean escapeXml;
+
@Override
public void doTag() throws JspException, IOException {
if(StringUtils.isEmpty(value))
@@ -30,7 +33,17 @@
// if(os.toLowerCase().indexOf("win") != -1)
// value = value.replaceAll("\r\n","
");
// else
+
+ if (escapeXml) {
+ String[] lines = value.split("\n");
+ value = new String();
+ for(String line: lines) {
+ value += StringEscapeUtils.escapeXml(line) + "
";
+ }
+ } else {
value = value.replaceAll("\n","
");
+ }
+
getJspContext().getOut().write(value.toString());
}
@@ -45,5 +58,16 @@
public void setValue(String value) {
this.value = value;
}
-
+
+ /**
+ * @jsp.attribute required="false" rtexprvalue="true" description="escape xml characters?
+ *
+ */
+ public boolean getEscapeXml() {
+ return this.escapeXml;
+ }
+
+ public void setEscapeXml(boolean escapeXml) {
+ this.escapeXml = escapeXml;
+ }
}
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.31 -r1.32
--- lams_central/web/WEB-INF/lams.tld 18 Oct 2006 09:14:04 -0000 1.31
+++ lams_central/web/WEB-INF/lams.tld 16 Nov 2006 05:10:02 -0000 1.32
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_learning/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.14 -r1.15
--- lams_learning/web/WEB-INF/lams.tld 19 Oct 2006 03:20:26 -0000 1.14
+++ lams_learning/web/WEB-INF/lams.tld 16 Nov 2006 05:09:59 -0000 1.15
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_monitoring/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.8 -r1.9
--- lams_monitoring/web/WEB-INF/lams.tld 19 Oct 2006 03:20:50 -0000 1.8
+++ lams_monitoring/web/WEB-INF/lams.tld 16 Nov 2006 05:10:01 -0000 1.9
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_chat/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.14 -r1.15
--- lams_tool_chat/web/WEB-INF/lams.tld 19 Oct 2006 03:21:06 -0000 1.14
+++ lams_tool_chat/web/WEB-INF/lams.tld 16 Nov 2006 05:10:00 -0000 1.15
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_forum/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.15 -r1.16
--- lams_tool_forum/web/WEB-INF/lams.tld 19 Oct 2006 03:21:24 -0000 1.15
+++ lams_tool_forum/web/WEB-INF/lams.tld 16 Nov 2006 05:10:00 -0000 1.16
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_lamc/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.13 -r1.14
--- lams_tool_lamc/web/WEB-INF/lams.tld 19 Oct 2006 03:21:45 -0000 1.13
+++ lams_tool_lamc/web/WEB-INF/lams.tld 16 Nov 2006 05:10:01 -0000 1.14
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_laqa/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.15 -r1.16
--- lams_tool_laqa/web/WEB-INF/lams.tld 19 Oct 2006 03:22:01 -0000 1.15
+++ lams_tool_laqa/web/WEB-INF/lams.tld 16 Nov 2006 05:10:00 -0000 1.16
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.12 -r1.13
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 19 Oct 2006 03:22:15 -0000 1.12
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 16 Nov 2006 05:10:02 -0000 1.13
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_nb/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.16 -r1.17
--- lams_tool_nb/web/WEB-INF/lams.tld 19 Oct 2006 03:22:25 -0000 1.16
+++ lams_tool_nb/web/WEB-INF/lams.tld 16 Nov 2006 05:10:01 -0000 1.17
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_notebook/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.7 -r1.8
--- lams_tool_notebook/web/WEB-INF/lams.tld 19 Oct 2006 03:22:38 -0000 1.7
+++ lams_tool_notebook/web/WEB-INF/lams.tld 16 Nov 2006 05:09:59 -0000 1.8
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_sbmt/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.16 -r1.17
--- lams_tool_sbmt/web/WEB-INF/lams.tld 19 Oct 2006 03:22:47 -0000 1.16
+++ lams_tool_sbmt/web/WEB-INF/lams.tld 16 Nov 2006 05:10:01 -0000 1.17
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_scribe/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.4 -r1.5
--- lams_tool_scribe/web/WEB-INF/lams.tld 19 Oct 2006 03:22:58 -0000 1.4
+++ lams_tool_scribe/web/WEB-INF/lams.tld 16 Nov 2006 05:10:02 -0000 1.5
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.5 -r1.6
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld 19 Oct 2006 03:24:39 -0000 1.5
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld 16 Nov 2006 05:10:02 -0000 1.6
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_tool_vote/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.9 -r1.10
--- lams_tool_vote/web/WEB-INF/lams.tld 19 Oct 2006 03:23:19 -0000 1.9
+++ lams_tool_vote/web/WEB-INF/lams.tld 16 Nov 2006 05:10:00 -0000 1.10
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+
Index: lams_www/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.4 -r1.5
--- lams_www/web/WEB-INF/lams.tld 19 Oct 2006 03:23:41 -0000 1.4
+++ lams_www/web/WEB-INF/lams.tld 16 Nov 2006 05:10:02 -0000 1.5
@@ -60,7 +60,15 @@
true
+
+ converts text from \n or \r\n to <BR> before rendering
+ escapeXml
+ false
+ true
+
+
+