summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFradj Zayen2013-02-12 04:19:27 (EST)
committerSven Rottstock2013-03-11 06:35:29 (EDT)
commit568969ca92a1739fad0e40b004cc2d03ec1b49fd (patch)
treea56c4cd9c6fa8ee7fb92bd1eb7f749396d65c86f
parent04157c9cd4eae112e5e4c2da7190138f2bc8ba2f (diff)
downloadorg.eclipse.stardust.ui.web-568969ca92a1739fad0e40b004cc2d03ec1b49fd.zip
org.eclipse.stardust.ui.web-568969ca92a1739fad0e40b004cc2d03ec1b49fd.tar.gz
org.eclipse.stardust.ui.web-568969ca92a1739fad0e40b004cc2d03ec1b49fd.tar.bz2
reverted jms attributes, added new attribute to set jms component ID
git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@62916 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js59
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/views/modeler/messageEventIntegrationOverlay.html8
2 files changed, 44 insertions, 23 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js
index c6ab2de..fea5d7a 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js
@@ -58,7 +58,6 @@ define(
m_i18nUtils
.getProperty("modeler.element.properties.messageEvent.type"));
- /*
jQuery("label[for='preserveQoSInput']")
.text(
@@ -74,13 +73,11 @@ define(
.getProperty("modeler.element.properties.messageEvent.transacted"));
- */
- /* this.configurationSpan = this.mapInputId("configuration");*/
+ this.configurationSpan = this.mapInputId("configuration");
- /* this.configurationSpan
+ this.configurationSpan
.text(m_i18nUtils
.getProperty("modeler.element.properties.event.configuration"));
- */
this.parametersSpan = this.mapInputId("parameters");
this.parametersSpan
@@ -90,32 +87,38 @@ define(
this.typeSelect = this.mapInputId("typeSelect");
this.nameInput = this.mapInputId("nameInput");
- /*
+
this.clientIdInput = this.mapInputId("clientIdInput");
this.selectorInput = this.mapInputId("selectorInput");
this.transactedInput = this.mapInputId("transactedInput");
this.preserveQoSInput = this.mapInputId("preserveQoSInput");
- */
+
+ this.jmsComponentIdInput= this.mapInputId("jmsComponentIdInput")
+
this.registerForRouteChanges(this.typeSelect);
this.registerForRouteChanges(this.nameInput);
-
- /*
this.registerForRouteChanges(this.selectorInput);
this.registerForRouteChanges(this.transactedInput);
this.registerForRouteChanges(this.preserveQoSInput);
- */
+ this.registerForRouteChanges(this.jmsComponentIdInput);
+
};
/**
*
*/
MessageEventIntegrationOverlay.prototype.getEndpointUri = function() {
- var uri = "jms:";
+ var defaultJmsComponentId="jms";
+ if(this.jmsComponentIdInput.val() != null && this.jmsComponentIdInput.val().length != 0)
+ {
+ defaultJmsComponentId=this.jmsComponentIdInput.val();
+ }
+ var uri = defaultJmsComponentId+":";
uri += this.typeSelect.val();
uri += ":";
uri += this.nameInput.val();
-/*
+
var separator = "?";
if (this.clientIdInput.val() != null && this.clientIdInput.val().length != 0) {
@@ -128,12 +131,15 @@ define(
separator = "&";
}
- uri += separator + "transacted=";
- separator = "&";
- uri += this.transactedInput.prop("checked");
- uri += separator + "preserveMessageQos=";
- uri += this.preserveQoSInput.prop("checked");
-*/
+ if(this.transactedInput.prop("checked")== true){
+ uri += separator + "transacted=";
+ separator = "&";
+ uri += this.transactedInput.prop("checked");
+ }
+ if(this.preserveQoSInput.prop("checked")==true){
+ uri += separator + "preserveMessageQos=";
+ uri += this.preserveQoSInput.prop("checked");
+ }
return uri;
};
@@ -190,7 +196,7 @@ define(
var source = sourceAndProperties[0];
var sourceParts = source.split(":");
-
+ this.jmsComponentIdInput.val(sourceParts[0])
this.typeSelect.val(sourceParts[1]);
var clientName = "";
@@ -246,6 +252,21 @@ define(
MessageEventIntegrationOverlay.prototype.validate = function() {
this.nameInput.removeClass("error");
+ if (m_utils.isEmptyString(this.jmsComponentIdInput.val()) ||
+ this.jmsComponentIdInput.val() == m_i18nUtils
+ .getProperty("modeler.general.toBeDefined")) {
+ this.getPropertiesPanel().errorMessages
+ .push(m_i18nUtils
+ .getProperty("modeler.general.fieldMustNotBeEmpty"));
+ this.jmsComponentIdInput.addClass("error");
+ this.jmsComponentIdInput.focus();
+
+ this.getPropertiesPanel().showErrorMessages();
+
+ return false;
+ }
+
+
if (m_utils.isEmptyString(this.nameInput.val()) ||
this.nameInput.val() == m_i18nUtils
.getProperty("modeler.general.toBeDefined")) {
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/messageEventIntegrationOverlay.html b/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/messageEventIntegrationOverlay.html
index 41c924c..20b2ef7 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/messageEventIntegrationOverlay.html
+++ b/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/messageEventIntegrationOverlay.html
@@ -13,14 +13,14 @@
id="parameters">Parameters</span> </a></li>
</ul>
<div id="configurationTab">
- <!--table>
+ <table>
<tr>
<td><label for="jmsComponentIdInput">Jms Component ID</label>
</td>
<td><input id="jmsComponentIdInput" type="text" style="width: 200px;"/>
</td>
</tr>
- </table-->
+ </table>
<table>
<tr>
<td><select id="typeSelect">
@@ -32,7 +32,7 @@
</td>
</tr>
</table>
- <!--
+
<table style="margin-top: 10px;">
<tr>
<td><label for="clientIdInput">Client ID</label>
@@ -61,7 +61,7 @@
</td>
<td></td>
</tr>
- </table>-->
+ </table>
</div>
<div id="parametersTab">
<div id="parameterMappingsPanelAnchor" />