Author: indika
Date: Wed Jan 9 21:40:09 2008
New Revision: 12091
Log:
fix for ESB-JAVA 414
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl
Modified:
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
(original)
+++
branches/esb/java/1.6/esb/java/modules/core/src/main/java/org/wso2/esb/ServiceBusManager.java
Wed Jan 9 21:40:09 2008
@@ -101,12 +101,12 @@
this(ServiceBusConfiguration.getInstance());
if
(XmlConfigurationFactory.getXmlConfiguration(ServiceBusConstants.ESB_WEB_XML_KEY)
== null) {
try {
- String server_web_xml =
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML);
- if (server_web_xml == null || "".equals(server_web_xml)) {
- server_web_xml = "conf" + File.separator +
ServiceBusConstants.ESB_SERVER_WEB_XML;
+ String serverWebXML =
System.getProperty(ServiceBusConstants.ESB_SERVER_WEB_XML);
+ if (serverWebXML == null || "".equals(serverWebXML)) {
+ serverWebXML = "conf" + File.separator +
ServiceBusConstants.ESB_SERVER_WEB_XML;
}
XmlConfigurationFactory.init(ServiceBusConstants.ESB_WEB_XML_KEY,
- server_web_xml, ServiceBusConstants.ESB_XML_NAMESPACE);
+ serverWebXML, ServiceBusConstants.ESB_XML_NAMESPACE);
} catch (ServerException e) {
log.error("Error loading server-web.xml", e);
}
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/js/mediators/callout_mediator.js
Wed Jan 9 21:40:09 2008
@@ -266,6 +266,24 @@
showNameSpaceEditor(position, attribute, inputID)
}
+function calloutsourcekeyfromregistry(position) {
+ var panelId = ("mypanel" + position).toString();
+ registrybrowser("savecalloutsourcekeyfromregistry",
"dicardregistrybrowser", position, 1, panelId);
+}
+
+function savecalloutsourcekeyfromregistry(position) {
+ var regKey = getRegistryKey();
+ var divcontrol = document.getElementById("registryPanel");
+ divcontrol.innerHTML = "";
+ if (regKey != null && regKey != undefined) {
+ var xquerykeyinput = document.getElementById("source_key");
+ if (xquerykeyinput != null && xquerykeyinput != undefined) {
+ xquerykeyinput.value = regKey;
+ }
+ }
+}
+
+
mediatorelementstring["callout"] = function logstring() {
return "<syn:callout xmlns:syn='http://ws.apache.org/ns/synapse'
source_xpath='0' target_xpath='0'><syn:source/><syn:target/></syn:callout>";
};
Modified:
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl
==============================================================================
---
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl
(original)
+++
branches/esb/java/1.6/esb/java/modules/distribution/src/main/www/extensions/core/xslt/mediators/callout_edit.xsl
Wed Jan 9 21:40:09 2008
@@ -135,7 +135,17 @@
</xsl:attribute>
</input>
</td>
- <td/>
+ <td>
+ <xsl:element name="img">
+ <xsl:attribute name="src">
+
extensions/core/images/registry_picker.gif
+ </xsl:attribute>
+ <xsl:attribute name="title">Registry
Browser</xsl:attribute>
+ <xsl:attribute name="onClick">
+
javascript:calloutsourcekeyfromregistry('<xsl:value-of
select="@esb_med_pos"/>');return false;
+ </xsl:attribute>
+ </xsl:element>
+ </td>
</tr>
</tbody>
</table>
_______________________________________________
Esb-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
