Author: ruwan
Date: Thu May 15 21:04:46 2008
New Revision: 17070
Log:
Fixing the issue ESBJAVA-460, and also the same has been fixed on the clone
mediator as well
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/clone_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/iterate_mediator.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/target.js
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_edit.xsl
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_view.xsl
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/clone_mediator.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/clone_mediator.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/clone_mediator.js
Thu May 15 21:04:46 2008
@@ -35,6 +35,8 @@
var cont_par = document.getElementById("continueParent").value;
mediator.setAttribute("continueParent", cont_par);
+
+ collectmedtargetdata(mediator);
return true;
};
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/iterate_mediator.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/iterate_mediator.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/iterate_mediator.js
Thu May 15 21:04:46 2008
@@ -18,6 +18,19 @@
* This js file is for the iterate mediator specific UI operations
*/
+initedit["iterate"] = function inititerateedit(mediator) {
+
+ var targets = mediator.getElementsByTagName("syn:target");
+ if (targets.length == 0) {
+ targets = mediator.getElementsByTagName("target");
+ }
+
+ for (var i=0; i<targets.length; i++) {
+ var target_position = targets[i].getAttribute("esb_med_pos");
+ targets[i].setAttribute("tg_pos",
parseInt(target_position.substring(target_position.lastIndexOf(".") + 1,
target_position.length)) + 1);
+ }
+}
+
collectdata["iterate"] = function collectlogdata(mediator, validate) {
var cont_par = document.getElementById("continueParent");
@@ -46,15 +59,8 @@
} else {
mediator.removeAttribute("attachPath");
}
-
- var targets = mediator.getElementsByTagName("syn:target");
- for (var k=0; k<targets.lengtgh; k++) {
- var isEditing = targets[i].getAttribute("editing");
- if (isEditing != null && isEditing != undefined &&
isEditing.getAttributeValue == "true") {
- collecttargetdata(targets[i]);
- }
- }
- alert(new XMLSerializer().serializeToString(mediator));
+
+ collectmedtargetdata(mediator);
return true;
};
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/target.js
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/target.js
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/target.js
Thu May 15 21:04:46 2008
@@ -17,20 +17,27 @@
/**
* This js file is for mediator target specific UI operations
*/
-function collecttargetdata(mediator) {
+function collectmedtargetdata(mediator) {
- var toURI = document.getElementById("toURI");
- var soapAction = document.getElementById("soapAction");
-
- if(toURI != null && toURI.value != null && toURI.value!=""){
- mediator.setAttribute("uri", toURI.value);
+ var targets = mediator.getElementsByTagName("syn:target");
+ if (targets.length == 0) {
+ targets = mediator.getElementsByTagName("target");
}
- if(soapAction != null && soapAction.value != null && soapAction.value!=""){
- mediator.setAttribute("qname", soapAction.value);
+
+ for (var j=0; j<targets.length; j++) {
+ var target_position = targets[j].getAttribute("tg_pos");
+ var toURI = document.getElementById("toURI" + target_position);
+ if (toURI != undefined && toURI != null && toURI.value != undefined) {
+ targets[j].setAttribute("to", toURI.value);
+ }
+ var soapAction = document.getElementById("soapAction" +
target_position);
+ if (soapAction != undefined && soapAction != null && soapAction.value
!= undefined) {
+ targets[j].setAttribute("soapAction", soapAction.value);
+ }
+ targets[j].setAttribute("editing", "false");
}
-
- mediator.setAttribute("editing", "false");
}
+
function addtarget() {
var position = geteditingmediatorposition();
@@ -49,6 +56,8 @@
var target_ref_type;
function settargetref(position, type) {
+ var med_edit = getnestedmediator(internalmodel.sequence,
geteditingmediatorposition());
+ collectdata[med_edit.localName](med_edit, false);
target_position = position;
target_ref_type = type;
registrybrowser("settargetreffromregistry", "dicardregistrybrowser", "",
1, "registryPanel");
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_edit.xsl
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_edit.xsl
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_edit.xsl
Thu May 15 21:04:46 2008
@@ -22,21 +22,31 @@
<xsl:template name="syn-target-edit">
+ <xsl:param name="external"/>
<xsl:variable name="position" select="@esb_med_pos"/>
- <div class="popup-box">
-
- <table style="width: 600px;">
+ <div>
+ <xsl:if test="not($external=1)">
+ <xsl:attribute name="class">popup-box</xsl:attribute>
+ </xsl:if>
+
+ <table style="width: 600px;">
<tr>
<td style="width:300px;">To URI</td>
- <td><input class="esb-edit" type="text" id="toURI" /></td>
+ <td><input class="esb-edit" type="text">
+ <xsl:attribute name="id"><xsl:value-of select="concat('toURI',
@tg_pos)"/></xsl:attribute>
+ <xsl:if test="@to"><xsl:attribute name="value"><xsl:value-of
select="@to"/></xsl:attribute></xsl:if>
+ </input></td>
</tr>
</table>
<table style="width: 600px;">
<tr>
<td style="width:300px;">Soap Action</td>
- <td><input class="esb-edit" type="text" id="soapAction" /></td>
+ <td><input class="esb-edit" type="text">
+ <xsl:attribute name="id"><xsl:value-of
select="concat('soapAction', @tg_pos)"/></xsl:attribute>
+ <xsl:if test="@soapAction"><xsl:attribute
name="value"><xsl:value-of select="@soapAction"/></xsl:attribute></xsl:if>
+ </input></td>
</tr>
</table>
Modified:
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_view.xsl
==============================================================================
---
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_view.xsl
(original)
+++
trunk/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/target_view.xsl
Thu May 15 21:04:46 2008
@@ -22,6 +22,21 @@
<xsl:template name="syn-target-view">
<div class="popup-box">
+
+ <table style="width: 600px;">
+ <tr>
+ <td style="width:300px;">To URI</td>
+ <td><xsl:value-of select="@to"/></td>
+ </tr>
+ </table>
+
+ <table style="width: 600px;">
+ <tr>
+ <td style="width:300px;">Soap Action</td>
+ <td><xsl:value-of select="@soapAction"/></td>
+ </tr>
+ </table>
+
<table style="width: 600px;"><tr>
<td style="width: 200px;"><label style="margin-left:
5px;">Mediation Sequence</label></td>
<xsl:if test="@sequence">
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
