Author: upul
Date: Tue Mar 11 01:02:57 2008
New Revision: 14680
Log:
preserve cdata for db mediator sql, and also for script mediator script elements
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ConfigAdmin.java
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XMLPrettyPrinter.java
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ConfigAdmin.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ConfigAdmin.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/services/ConfigAdmin.java
Tue Mar 11 01:02:57 2008
@@ -19,7 +19,9 @@
package org.wso2.esb.services;
import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.impl.llom.factory.OMXMLBuilderFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.description.Parameter;
@@ -37,6 +39,7 @@
import org.wso2.esb.util.XMLPrettyPrinter;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLInputFactory;
import java.io.*;
import java.util.Iterator;
@@ -51,8 +54,12 @@
try {
ByteArrayOutputStream stream = new ByteArrayOutputStream();
XMLConfigurationSerializer.serializeConfiguration(getSynapseConfiguration(),
stream);
- StAXOMBuilder builder
- = new StAXOMBuilder(new
ByteArrayInputStream(stream.toByteArray()));
+ XMLInputFactory factory = XMLInputFactory.newInstance();
+
factory.setProperty("http://java.sun.com/xml/stream/properties/report-cdata-event";,
Boolean.TRUE);
+ ByteArrayInputStream byteArrayInputStream = new
ByteArrayInputStream(stream.toByteArray());
+ StAXOMBuilder builder = OMXMLBuilderFactory.createStAXOMBuilder(
+
OMAbstractFactory.getOMFactory(),factory.createXMLStreamReader(
+ byteArrayInputStream));
stream.reset();
XMLPrettyPrinter.prettify(builder.getDocumentElement(), stream);
return new String(stream.toByteArray());
Modified:
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XMLPrettyPrinter.java
==============================================================================
---
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XMLPrettyPrinter.java
(original)
+++
trunk/esb/java/modules/core/src/main/java/org/wso2/esb/util/XMLPrettyPrinter.java
Tue Mar 11 01:02:57 2008
@@ -103,8 +103,11 @@
private static final String prettyPrintStylesheet =
"<xsl:stylesheet
xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0' " +
" xmlns:xalan='http://xml.apache.org/xslt' " +
+ " xmlns:syn='http://ws.apache.org/ns/synapse'" +
" exclude-result-prefixes='xalan'>" +
- " <xsl:output method='xml' indent='yes'
xalan:indent-amount='4'/>" +
+ " <xsl:output method='xml' indent='yes'
xalan:indent-amount='4'" +
+ " cdata-section-elements='syn:sql syn:script'" +
+ " />" +
// " <xsl:strip-space elements='*'/>" +
" <xsl:template match='/'>" +
" <xsl:apply-templates/>" +
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dblookup_mediator.js
Tue Mar 11 01:02:57 2008
@@ -465,7 +465,7 @@
for (var i = 0; i < ql; i++) {
if (statementindexes[i] != null) {
var statementstr = '<syn:statement xmlns:syn="' +
SYNAPSE_NS + '" ';
- statementstr += "><syn:sql>";
+ statementstr += "><syn:sql><![CDATA[";
var sqlElem = document.getElementById("sql_id" + i);
if (sqlElem != undefined && sqlElem != null &&
sqlElem.value != undefined && sqlElem.value != "" && trim(sqlElem.value) != "")
{
statementstr += trim(sqlElem.value);
@@ -475,7 +475,7 @@
return false;
}
}
- statementstr += '</syn:sql></syn:statement>';
+ statementstr += ']]></syn:sql></syn:statement>';
var statement = createesbelement(statementstr);
statement.setAttribute("statement_index", i);
var parameterstable = document.getElementById("parameters"
+ i);
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/dbreport_mediator.js
Tue Mar 11 01:02:57 2008
@@ -466,7 +466,7 @@
for (var i = 0; i < ql; i++) {
if (statementindexes[i] != null) {
var statementstr = '<syn:statement xmlns:syn="' +
SYNAPSE_NS + '" ';
- statementstr += "><syn:sql>";
+ statementstr += "><syn:sql><![CDATA[";
var sqlElem = document.getElementById("sql_id" + i);
if (sqlElem != undefined && sqlElem != null &&
sqlElem.value != undefined && sqlElem.value != "" && trim(sqlElem.value) != "")
{
statementstr += trim(sqlElem.value);
@@ -476,7 +476,7 @@
return false;
}
}
- statementstr += '</syn:sql></syn:statement>';
+ statementstr += ']]></syn:sql></syn:statement>';
var statement = createesbelement(statementstr);
statement.setAttribute("statement_index", i);
var parameterstable = document.getElementById("parameters"
+ i);
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
