Author: ruwan
Date: Mon Jan 14 00:47:06 2008
New Revision: 12195
Log:
Fixing the Aggregate mediator UI as per the changes in the synapse code
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/aggregate_mediator.js
Mon Jan 14 00:47:06 2008
@@ -28,14 +28,6 @@
}
}
- var invalidElem = mediator.getElementsByTagName("invalidate");
- if (invalidElem == undefined || invalidElem.length == 0) {
- invalidElem = mediator.getElementsByTagName("syn:invalidate");
- if (invalidElem == undefined || invalidElem.length == 0) {
- mediator.appendChild(createesbelement("<syn:invalidate " +
syn_ns_declaration + "/>"));
- }
- }
-
setnodepositions(internalmodel.sequence);
}
@@ -50,9 +42,7 @@
var complete_max = document.getElementById("complete_max");
var complete_min = document.getElementById("complete_min");
var aggregate_expr = document.getElementById("aggregate_expr");
- var invalidate_time = document.getElementById("invalidate_time");
var on_complete = document.getElementById("on_complete");
- var on_invalidate = document.getElementById("on_invalidate");
if (corelate_expr != null && corelate_expr != undefined &&
corelate_expr.value != undefined && corelate_expr.value != "") {
var corelateOnElem = mediator.getElementsByTagName("corelateOn");
@@ -141,36 +131,7 @@
}
}
}
-
- if (invalidate_time != null && invalidate_time != undefined &&
invalidate_time.value != undefined && invalidate_time.value != "") {
- var invalidateElem = mediator.getElementsByTagName("invalidate");
- if (invalidateElem.length != 0) {
- invalidateElem[0].setAttribute("timeout", invalidate_time.value);
- } else {
- invalidateElem = mediator.getElementsByTagName("syn:invalidate");
- if (invalidateElem.length != 0) {
- invalidateElem[0].setAttribute("timeout",
invalidateElem.value);
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate
timeout='" + invalidate_time.value + "' " + syn_ns_declaration + "/>"));
- }
- }
- }
-
- if (on_invalidate != null && on_invalidate != undefined &&
on_invalidate.value != undefined && on_invalidate.value != "") {
- var invalidateElem2 = mediator.getElementsByTagName("invalidate");
- if (invalidateElem2.length != 0) {
- invalidateElem2[0].setAttribute("sequence", on_invalidate.value);
- removeunwantedchilds(invalidateElem2[0]);
- } else {
- invalidateElem2 = mediator.getElementsByTagName("syn:invalidate");
- if (invalidateElem2.length != 0) {
- invalidateElem2[0].setAttribute("sequencec",
on_invalidate.value);
- removeunwantedchilds(invalidateElem2[0]);
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate
sequence='" + on_invalidate.value + "' " + syn_ns_declaration + "/>"));
- }
- }
- }
+
return true;
};
@@ -203,7 +164,7 @@
}
mediatorelementstring["aggregate"] = function aggregatestring() {
- return "<syn:aggregate
xmlns:syn='http://ws.apache.org/ns/synapse'><syn:corelateOn/><syn:completeCondition/><syn:onComplete/><syn:invalidate/></syn:aggregate>";
+ return "<syn:aggregate
xmlns:syn='http://ws.apache.org/ns/synapse'><syn:corelateOn/><syn:completeCondition/><syn:onComplete/></syn:aggregate>";
};
function oncompletefromregistry() {
@@ -255,55 +216,4 @@
mediator.getElementsByTagName("syn:onComplete")[0].removeAttribute("sequence");
}
editmediator(position);
-}
-
-function oninvalidatefromregistry() {
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
- collectdata["aggregate"](mediator, false);
- registrybrowser("setinvalidatefromregistry", "dicardregistrybrowser", "",
1, "registryPanel");
-}
-
-function setinvalidatefromregistry() {
-
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
-
- if (mediator.getElementsByTagName("invalidate")[0] != undefined) {
-
mediator.getElementsByTagName("invalidate")[0].setAttribute("sequence",
getRegistryKey());
- } else if (mediator.getElementsByTagName("syn:invalidate")[0] !=
undefined) {
-
mediator.getElementsByTagName("syn:invalidate")[0].setAttribute("sequence",
getRegistryKey());
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate sequence='" +
getRegistryKey() + "' xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
- }
-
- dicardregistrybrowser(1);
-
- editmediator(position);
-}
-
-function aggregateinvalidatetoref() {
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
- collectdata["aggregate"](mediator, false);
- if (mediator.getElementsByTagName("invalidate")[0] != undefined) {
-
mediator.getElementsByTagName("invalidate")[0].setAttribute("sequence", "");
- } else if (mediator.getElementsByTagName("syn:invalidate")[0] !=
undefined) {
-
mediator.getElementsByTagName("syn:invalidate")[0].setAttribute("sequence", "");
- } else {
- mediator.appendChild(createesbelement("<syn:invalidate sequence=''
xmlns:syn='http://ws.apache.org/ns/synapse'/>"));
- }
- editmediator(position);
-}
-
-function aggregateinvalidatetoinline() {
- var position = geteditingmediatorposition();
- var mediator = getnestedmediator(internalmodel.sequence, position);
- collectdata["aggregate"](mediator, false);
- if (mediator.getElementsByTagName("invalidate")[0] != undefined) {
-
mediator.getElementsByTagName("invalidate")[0].removeAttribute("sequence");
- } else if (mediator.getElementsByTagName("syn:invalidate")[0] !=
undefined) {
-
mediator.getElementsByTagName("syn:invalidate")[0].removeAttribute("sequence");
- }
- editmediator(position);
}
\ No newline at end of file
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_edit.xsl
Mon Jan 14 00:47:06 2008
@@ -88,15 +88,6 @@
</td>
</tr>
- <tr>
- <td style="width: 200px;">Invalidation Timeout </td>
- <td colspan="2">
- <input type="text" id="invalidate_time"
class="esb-edit">
- <xsl:attribute name="value"><xsl:value-of
select="syn:invalidate/@timeout"/></xsl:attribute>
- </input>
- </td>
- </tr>
-
</tbody>
</table>
@@ -137,43 +128,6 @@
</xsl:otherwise>
</xsl:choose>
- <div class="sub-small-title">On Invalidate </div>
-
- <xsl:choose>
- <xsl:when test="syn:invalidate/@sequence">
- <input type="button" value="Specify In-line"
onclick="javascript: aggregateoninvalidatetoinline(); return false;"
class="panelbutton_default"/>
- <table border="0" cellpadding="0" cellspacing="0"
class="data-table">
- <tbody>
- <tr>
- <td style="width: 200px;">Sequence Ref </td>
- <td>
- <input type="text" class="esb-edit"
id="on_invalidate" disabled="true">
- <xsl:attribute name="value">
- <xsl:value-of
select="syn:invalidate/@sequence"/>
- </xsl:attribute>
- </input>
- <img
src="extensions/core/images/registry_picker.gif" align="middle" hspace="20"
title="Registry Browser" onclick="javascript:oninvalidatefromregistry(); return
false;"/>
- </td>
- </tr>
- </tbody>
- </table>
- </xsl:when>
- <xsl:otherwise>
- <input type="button" value="Specify Reference"
onclick="javascript: aggregateinvalidatetoref(); return false;"
style="margin-top:5px;margin-bottom:5px;" class="panelbutton_default" />
- <xsl:if test="count(syn:invalidate/child::*)=0">
- <xsl:call-template name="add_mediator_control">
- <xsl:with-param name="head_pos"
-
select="concat(concat(syn:invalidate/@esb_med_pos, '.'),
count(syn:invalidate/child::*))"/>
- </xsl:call-template>
- </xsl:if>
- <xsl:for-each select="syn:invalidate">
- <div class='indent'>
- <xsl:apply-templates/>
- </div>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
-
</div>
<!--</xsl:for-each>-->
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/aggregate_view.xsl
Mon Jan 14 00:47:06 2008
@@ -52,10 +52,6 @@
<td style="width: 200px;">Corelation Expression </td>
<td><xsl:value-of
select="syn:corelateOn/@expression"/></td>
</tr>
- <tr>
- <td style="width: 200px;">Invalidation Timeout </td>
- <td><xsl:value-of select="syn:invalidate/@timeout"/></td>
- </tr>
</tbody>
</table>
@@ -83,30 +79,6 @@
</xsl:otherwise>
</xsl:choose>
- <div class="sub-small-title">On Invalidate </div>
-
- <xsl:choose>
- <xsl:when test="syn:invalidate/@sequence">
- <table border="0" cellpadding="0" cellspacing="0"
class="data-table">
- <tbody>
- <tr>
- <td style="width: 200px;">Sequence Ref </td>
- <td><xsl:value-of
select="syn:invalidate/@sequence"/></td>
- </tr>
- </tbody>
- </table>
- </xsl:when>
- <xsl:otherwise>
- <xsl:for-each select="syn:invalidate">
- <div class='indent'>
- <xsl:apply-templates/>
- </div>
- </xsl:for-each>
- </xsl:otherwise>
- </xsl:choose>
-
-
-
<!--</xsl:for-each>-->
</div>
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
