[esb-java-dev] svn commit r2114 - in
trunk/esb/java/modules/distribution/src/main/www/extensions/core:
js xslt xslt/endpoints
svn at wso2.org
svn at wso2.org
Sun Apr 29 23:40:26 PDT 2007
Author: indika
Date: Sun Apr 29 23:40:09 2007
New Revision: 2114
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_add.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/entries.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl
Log:
fixed some IE issues
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/endpoints.js Sun Apr 29 23:40:09 2007
@@ -73,7 +73,7 @@
var valueId = document.getElementById("inlineprop_value");
if (valueId != null && valueId != undefined && inlinewsdl != null && inlinewsdl != undefined) {
if (inlinewsdl instanceof Object) {
- inlinewsdlstr = new XMLSerializer().serializeToString(inlinewsdl);
+ inlinewsdlstr = xmlSerializerToString(inlinewsdl);
} else {
inlinewsdlstr = inlinewsdl;
@@ -96,11 +96,26 @@
alert("Invalid Value");
return;
}
- var parser = new DOMParser();
- var dom = parser.parseFromString(inlinevalue, "text/xml");
- if (dom.documentElement.nodeName == "parsererror") {
- alert("Error parsing XML");
- return;
+ if (window.ActiveXObject) {
+ try {
+ var doc = new ActiveXObject("Microsoft.XMLDOM");
+ doc.async = "false";
+ var hasParse = doc.loadXML(inlinevalue);
+ if (!hasParse) {
+ alert("Invalid XML configuration.. ");
+ return;
+ }
+ } catch (e) {
+ alert("Invalid XML configuration.. ");
+ return;
+ }
+ } else {
+ var parser = new DOMParser();
+ var dom = parser.parseFromString(inlinevalue, "text/xml");
+ if (dom.documentElement.nodeName == "parsererror") {
+ alert("Error parsing XML");
+ return;
+ }
}
addInLineProperties(key, inlinevalue);
var uri = document.getElementById(("endpoint_address" + key).toString());
@@ -350,9 +365,10 @@
if (ep_str != null && ep_str != undefined) {
xmlObj.setAttribute("a_ep", ep_str);
}
- processXML(xmlObj, xsltfilename, transformeddiv);
+
+ var str = transformXMLToString(xmlObj, xsltfilename, transformeddiv);
panelcontrol.innerHTML = "<div class='hd'><div class='tl'></div><span>WSO2-ESB Endpoint Editor</span><div class='tr'></div></div>"
- + "<div class='bd'><br/><h3>" + type + " Endpoint cofiguration</h3><br/><div id='divAddEndpoint' style='overflow:auto;height:200px'>" + new XMLSerializer().serializeToString(transformeddiv) + "</div>"
+ + "<div class='bd'><br/><h3>" + type + " Endpoint cofiguration</h3><br/><div id='divAddEndpoint' style='overflow:auto;height:200px'>" + str + "</div>"
+ "<div><table style='margin-left: 150px;'><tbody><tr>"
+ "<td><input type='button' class='panelbutton_default'"
+ "onclick=" + onclickfn + "('" + type + "') value='Save'></td><td></td>"
@@ -385,10 +401,10 @@
if (ep_str != null && ep_str != undefined) {
xmlObj.setAttribute("a_ep", ep_str);
}
- processXML(xmlObj, xsltfilename, transformeddiv);
+ var str = transformXMLToString(xmlObj, xsltfilename, transformeddiv);
panelcontrol.innerHTML = "<h2 id='moduleHeader'><a href='#' onclick='javascript: "
+ "showEndpoints(); return false;'>Endpoint Management</a> >  "
- + type + " Endpoint" + "</h2><br/><br/><div class='endpointcontentPaneClass'><div id='divAddEndpoint' style='overflow:auto;height:350px'>" + new XMLSerializer().serializeToString(transformeddiv) + "</div>"
+ + type + " Endpoint" + "</h2><br/><br/><div class='endpointcontentPaneClass'><div id='divAddEndpoint' style='overflow:auto;height:350px'>" + str + "</div>"
+ "<div><table style='margin-left: 150px;'><tbody><tr>"
+ "<td><input type='button' class='panelbutton_default'"
+ "onclick=" + onclickfn + "('" + type + "') value='Save'></td><td></td>"
@@ -591,7 +607,7 @@
}
}
- if (format_value != null && format_value != undefined && format_value != "Select A Value") {
+ if (format_value != null && format_value != undefined && format_value != "" && format_value != "Select A Value") {
if (format_value == "SOAP") {
format_value = "soap";
} else if (format_value == "POX") {
@@ -610,7 +626,7 @@
}
}
- if (optimize_value != null && optimize_value != undefined && optimize_value != "Select A Value") {
+ if (optimize_value != null && optimize_value != undefined && optimize_value != "" && optimize_value != "Select A Value") {
if (optimize_value == "MTOM") {
optimize_value = "mtom";
} else if (optimize_value == "SWa") {
@@ -695,7 +711,7 @@
var inlinewsdl = getInLineProperty(id);
if (inlinewsdl != null && inlinewsdl != undefined) {
if (inlinewsdl instanceof Object) {
- inlinewsdlstr = new XMLSerializer().serializeToString(inlinewsdl);
+ inlinewsdlstr = xmlSerializerToString(inlinewsdl);
} else {
inlinewsdlstr = inlinewsdl;
}
@@ -812,7 +828,7 @@
format_value = format.options[format_index].value;
}
}
- if (format_value != null && format_value != undefined && format_value != "Select A Value") {
+ if (format_value != null && format_value != undefined && format_value != "" && format_value != "Select A Value") {
if (format_value == "SOAP") {
format_value = "soap";
} else if (format_value == "POX") {
@@ -831,7 +847,7 @@
optimize_value = optimize.options[optimize_index].value;
}
}
- if (optimize_value != null && optimize_value != undefined && optimize_value != "Select A Value") {
+ if (optimize_value != null && optimize_value != undefined && optimize_value != "" && optimize_value != "Select A Value") {
if (optimize_value == "MTOM") {
optimize_value = "mtom";
} else if (optimize_value == "SWa") {
@@ -896,7 +912,7 @@
var inlinewsdl = getInLineProperty(0);
if (inlinewsdl != null && inlinewsdl != undefined) {
if (inlinewsdl instanceof Object) {
- inlinewsdlstr = new XMLSerializer().serializeToString(inlinewsdl);
+ inlinewsdlstr = xmlSerializerToString(inlinewsdl);
} else {
inlinewsdlstr = inlinewsdl;
@@ -1149,7 +1165,14 @@
clearInLineProperties();
if (childs == 0) {
var typeEle = eps.getElementsByTagName("type");
- var type = typeEle[0].textContent;
+ var type = null;
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ type = typeEle[0].textContent;
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ type = typeEle[0].text;
+ }
+
if (type == 0) {
createRootEndpointDivOnParentPanel("endpoints/addressendpoint_edit.xsl", "Address", 0, eps, "saveEndPoint", "false");
}
@@ -1176,7 +1199,12 @@
var childDivs = new Array();
for (var i = 0; i < cnodes; i++) {
if (eps.childNodes[i].nodeName == "type") {
- type = eps.childNodes[i].textContent;
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ type = eps.childNodes[i].textContent;
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ type = eps.childNodes[i].text;
+ }
}
if (eps.childNodes[i].nodeName == "endpoints") {
childDivs[childDivs.length] = eps.childNodes[i];
@@ -1201,7 +1229,7 @@
return;
}
var body_xml = '<ns1:converToEndpointData xmlns:ns1="http://org.apache.synapse/xsd">' +
- new XMLSerializer().serializeToString(ep) +
+ xmlSerializerToString(ep) +
'</ns1:converToEndpointData>';
var callURL = serverURL + "/" + ENDPOINT_MANAGEMENT + "/" + "converToEndpointData";
send("converToEndpointData", body_xml, "", callURL, "", false, convertToEndpointCallback);
@@ -1218,8 +1246,13 @@
clearInLineProperties();
if (childs == 0) {
var typeEle = eps.getElementsByTagName("type");
- var type = typeEle[0].textContent;
-
+ var type = null;
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ type = typeEle[0].textContent;
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ type = typeEle[0].text;
+ }
if (type == 0) {
createRootEndpointDiv("endpoints/addressendpoint_edit.xsl", "Address", 0, eps, "saveSendMediatorEndponit", "discardsendepsave", "true");
}
@@ -1249,7 +1282,12 @@
var childDivs = new Array();
for (var i = 0; i < cnodes; i++) {
if (eps.childNodes[i].nodeName == "type") {
- type = eps.childNodes[i].textContent;
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ type = eps.childNodes[i].textContent;
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ type = eps.childNodes[i].text;
+ }
}
if (eps.childNodes[i].nodeName == "endpoints") {
childDivs[childDivs.length] = eps.childNodes[i];
@@ -1277,7 +1315,12 @@
var childDivs = new Array();
for (var j = 0; j < nextceps; j++) {
if (cep.childNodes[j].nodeName == "type") {
- type = cep.childNodes[j].textContent;
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ type = cep.childNodes[j].textContent;
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ type = cep.childNodes[j].text;
+ }
}
if (cep.childNodes[j].nodeName == "endpoints") {
childDivs[childDivs.length] = cep.childNodes[j];
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/entries.js Sun Apr 29 23:40:09 2007
@@ -23,8 +23,8 @@
var ENTRIES_MANAGEMENT = "EntriesAdmin";
var entryaddmenu = null;
var entrytypes = ([ { text:"InLine Text",onclick: { fn:onMenuItemClickToAddEntry } },
- { text:"InLine XML",onclick: { fn:onMenuItemClickToAddEntry } },
- { text:"Source URL" ,onclick: { fn:onMenuItemClickToAddEntry }}]);
+{ text:"InLine XML",onclick: { fn:onMenuItemClickToAddEntry } },
+{ text:"Source URL" ,onclick: { fn:onMenuItemClickToAddEntry }}]);
function showEntries() {
var body_xml = '<ns1:entryDataRequest xmlns:ns1="http://org.apache.synapse/xsd">' +
@@ -51,21 +51,32 @@
if (!onError()) {
return;
}
- var data = getBody(xhReq.responseXML);
- var entry = data.getElementsByTagName("localEntry")[0] ;
- var type = entry.getAttribute("type") ;
+ var data = getBody(xhReq.responseXML);
+ var entry = null;
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ entry = data.getElementsByTagName("localEntry")[0];
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ entry = data.getElementsByTagName("syn:localEntry")[0];
+ }
+ var type = entry.getAttribute("type");
if (type == 1) {
createEntryDivOnParentPanel("entries/entry_edit.xsl", "InLineXML", entry, "saveEntry");
document.getElementById("entry_value").value =
- (new XMLSerializer()).serializeToString(entry.childNodes[0]);
+ xmlSerializerToString(entry.childNodes[0]);
}
if (type == 0) {
createEntryDivOnParentPanel("entries/entry_edit.xsl", "InLineText", entry, "saveEntry");
- document.getElementById("entry_value").value =
- entry.childNodes[0].textContent;
-
+ if (browsername.indexOf(NETSCAPE_BROWSER_NAME) != -1) {
+ document.getElementById("entry_value").value =
+ entry.childNodes[0].textContent;
+ }
+ else if (browsername.indexOf(IE_BROWSER_NAME) != -1) {
+ document.getElementById("entry_value").value =
+ entry.childNodes[0].text;
+ }
}
if (type == 2) {
createEntryDivOnParentPanel("entries/entry_edit.xsl", "SourceURL", entry, "saveEntry");
@@ -90,7 +101,7 @@
}
function showEntryPanel() {
var esbpanel = new YAHOO.widget.Panel("myPanel", {width:"800px", fixedcenter:true, visible:false
- , constraintoviewport:true, zIndex:4 });
+ , constraintoviewport:true, zIndex:4 });
esbpanel.render();
esbpanel.show();
}
@@ -113,10 +124,10 @@
panelcontrol.setAttribute("id", "myPanel");
var transformeddiv = document.createElement("div");
xmlObj.setAttribute("type", type)
- processXML(xmlObj, xsltfilename, transformeddiv);
+ var str = transformXMLToString(xmlObj, xsltfilename, transformeddiv);
panelcontrol.innerHTML = "<div class='hd'><div class='tl'></div><span>WSO2-ESB Entry Editor</span><div class='tr'></div></div>"
+ "<div class='bd'><div id='divAddEntry' style='overflow:auto;height:200px'>"
- + new XMLSerializer().serializeToString(transformeddiv) + "</div>"
+ + str + "</div>"
+ "<div><table style='margin-left: 150px;'><tbody><tr>"
+ "<td><input type='button' class='panelbutton_default'"
+ "onclick=" + onclickfn + "('" + type + "') value='Save'></td><td></td>"
@@ -133,11 +144,11 @@
var panelcontrol = document.getElementById("divEntries");
var transformeddiv = document.createElement("div");
xmlObj.setAttribute("type", type)
- processXML(xmlObj, xsltfilename, transformeddiv);
+ var str = transformXMLToString(xmlObj, xsltfilename, transformeddiv);
panelcontrol.innerHTML = "<h2 id='moduleHeader'><a href='#' onclick='javascript: "
+ "showEntries(); return false;'>Entry Management</a> > "
+ type + " Entry</h2><br/><br/><div class='endpointcontentPaneClass' ><div id='divAddEntry' style='overflow:auto;height:350px'>"
- + new XMLSerializer().serializeToString(transformeddiv) + "</div>"
+ + str + "</div>"
+ "<div><table style='margin-left: 150px;'><tbody><tr>"
+ "<td><input type='button' class='panelbutton_default'"
+ "onclick=" + onclickfn + "('" + type + "') value='Save'></td><td></td>"
@@ -190,11 +201,27 @@
inlineProp = "<![CDATA[" + entryvalue + "]]>";
}
if (entryType == "InLineXML") {
- var parser = new DOMParser();
- var dom = parser.parseFromString(entryvalue, "text/xml");
- if (dom.documentElement.nodeName == "parsererror") {
- alert("Error parsing XML");
- return;
+ if (window.ActiveXObject) {
+ try {
+ var doc = new ActiveXObject("Microsoft.XMLDOM");
+ doc.async = "false";
+ var hasParse = doc.loadXML(entryvalue);
+ if (!hasParse) {
+ alert("Invalid XML configuration.. ");
+ return;
+ }
+ } catch (e) {
+ alert("Invalid XML configuration.. ");
+ return;
+ }
+ } else {
+ var parser = new DOMParser();
+ var dom = parser.parseFromString(entryvalue, "text/xml");
+ if (dom.documentElement.nodeName == "parsererror") {
+ alert("Error parsing XML");
+ return;
+ }
+
}
entry = 'type="1"';
inlineProp = entryvalue;
@@ -247,11 +274,27 @@
inlineProp = "<![CDATA[" + entryvalue + "]]>";
}
if (entryType == "InLineXML") {
- var parser = new DOMParser();
- var dom = parser.parseFromString(entryvalue, "text/xml");
- if (dom.documentElement.nodeName == "parsererror") {
- alert("Error parsing XML");
- return;
+ if (window.ActiveXObject) {
+ try {
+ var doc = new ActiveXObject("Microsoft.XMLDOM");
+ doc.async = "false";
+ var hasParse = doc.loadXML(entryvalue);
+ if (!hasParse) {
+ alert("Invalid XML configuration.. ");
+ return;
+ }
+ } catch (e) {
+ alert("Invalid XML configuration.. ");
+ return;
+ }
+ } else {
+ var parser = new DOMParser();
+ var dom = parser.parseFromString(entryvalue, "text/xml");
+ if (dom.documentElement.nodeName == "parsererror") {
+ alert("Error parsing XML");
+ return;
+ }
+
}
entry = 'type="1"';
inlineProp = entryvalue;
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_add.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_add.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_add.xsl Sun Apr 29 23:40:09 2007
@@ -73,8 +73,8 @@
<xsl:attribute name="id"><xsl:value-of select="concat('endpoint_format', at index)"/></xsl:attribute>
<xsl:attribute name="class">esb-edit</xsl:attribute>
<xsl:element name="option">Select A Value</xsl:element>
- <xsl:element name="option">SOAP</xsl:element>
- <xsl:element name="option">POX</xsl:element>
+ <option value="SOAP">SOAP</option>
+ <option value="POX">POX</option>
</xsl:element>
</td>
</tr>
@@ -87,8 +87,8 @@
<xsl:attribute name="id"><xsl:value-of select="concat('endpoint_optimize', at index)"/></xsl:attribute>
<xsl:attribute name="class">esb-edit</xsl:attribute>
<xsl:element name="option">Select A Value</xsl:element>
- <xsl:element name="option">SWa</xsl:element>
- <xsl:element name="option">MTOM</xsl:element>
+ <option value="SWa">SWa</option>
+ <option value="MTOM">MTOM</option>
</xsl:element>
</td>
</tr>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_edit.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_edit.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/endpoints/addressendpoint_edit.xsl Sun Apr 29 23:40:09 2007
@@ -108,17 +108,17 @@
<xsl:attribute name="id"><xsl:value-of select="concat('endpoint_format', at index)"/></xsl:attribute>
<xsl:attribute name="class">esb-edit</xsl:attribute>
<xsl:if test="endpointDefinition/forcePOX/child::text() ='true'">
- <xsl:element name="option">POX</xsl:element>
- <xsl:element name="option">SOAP</xsl:element>
+ <option value="POX">POX</option>
+ <option value="SOAP">SOAP</option>
</xsl:if>
<xsl:if test="endpointDefinition/forceSOAP/child::text() ='true'">
- <xsl:element name="option">SOAP</xsl:element>
- <xsl:element name="option">POX</xsl:element>
+ <option value="SOAP">SOAP</option>
+ <option value="POX">POX</option>
</xsl:if>
<xsl:if test="(endpointDefinition/forcePOX/child::text() ='false')and (endpointDefinition/forceSOAP/child::text() ='false')">
<xsl:element name="option">Select A Value</xsl:element>
- <xsl:element name="option">SOAP</xsl:element>
- <xsl:element name="option">POX</xsl:element>
+ <option value="SOAP">SOAP</option>
+ <option value="POX">POX</option>
</xsl:if>
</xsl:element>
@@ -133,17 +133,17 @@
<xsl:attribute name="id"><xsl:value-of select="concat('endpoint_optimize', at index)"/></xsl:attribute>
<xsl:attribute name="class">esb-edit</xsl:attribute>
<xsl:if test="endpointDefinition/useMTOM/child::text() ='true'">
- <xsl:element name="option">MTOM</xsl:element>
- <xsl:element name="option">SWa</xsl:element>
+ <option value="MTOM">MTOM</option>
+ <option value="SWa">SWa</option>
</xsl:if>
<xsl:if test="endpointDefinition/useSwa/child::text() ='true'">
- <xsl:element name="option">SWa</xsl:element>
- <xsl:element name="option">MTOM</xsl:element>
+ <option value="SWa">SWa</option>
+ <option value="MTOM">MTOM</option>
</xsl:if>
<xsl:if test="(endpointDefinition/useSwa/child::text() ='false')and (endpointDefinition/useMTOM/child::text() ='false')">
<xsl:element name="option">Select A Value</xsl:element>
- <xsl:element name="option">SWa</xsl:element>
- <xsl:element name="option">MTOM</xsl:element>
+ <option value="SWa">SWa</option>
+ <option value="MTOM">MTOM</option>
</xsl:if>
</xsl:element>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/entries.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/entries.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/entries.xsl Sun Apr 29 23:40:09 2007
@@ -87,7 +87,7 @@
</xsl:otherwise>
</xsl:choose>
</div>
- <input name="addEntry" type="button" class='panelbutton_default' value="Add" onclick="javascript:addEntry('event');return false;"/>
+ <input name="addEntry" type="button" class='panelbutton_default' value="Add" onclick="javascript:addEntry(event);return false;"/>
</fieldset>
</xsl:template>
</xsl:stylesheet>
Modified: trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl
==============================================================================
--- trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl (original)
+++ trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/viewlog.xsl Sun Apr 29 23:40:09 2007
@@ -32,21 +32,21 @@
<xsl:text>View</xsl:text>
</td>
<td>
- <xsl:element name="select" style="padding:5px">
+ <xsl:element name="select">
<xsl:attribute name="onchange">javascript:viewSingleLogLevel(); return false;</xsl:attribute>
<xsl:attribute name="id">logLevelID</xsl:attribute>
<xsl:attribute name="class">log-select</xsl:attribute>
<xsl:if test="@level">
<xsl:element name="option"><xsl:value-of select="@level"/></xsl:element>
</xsl:if>
- <xsl:element name="option">ALL</xsl:element>
- <xsl:element name="option">INFO</xsl:element>
- <xsl:element name="option">WARN</xsl:element>
- <xsl:element name="option">ERROR</xsl:element>
- <xsl:element name="option">DEBUG</xsl:element>
- <xsl:element name="option">TRACE</xsl:element>
- <xsl:element name="option">FATAL</xsl:element>
- </xsl:element>
+ <option value="ALL">ALL</option>
+ <option value="INFO">INFO</option>
+ <option value="WARN">WARN</option>
+ <option value="ERROR">ERROR</option>
+ <option value="DEBUG">DEBUG</option>
+ <option value="TRACE">TRACE</option>
+ <option value="FATAL">FATAL</option>
+ </xsl:element>
</td>
<td style="width:440px;"></td>
<td>
More information about the Esb-java-dev
mailing list