summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFradj Zayen2013-02-04 10:30:09 (EST)
committerSven Rottstock2013-03-11 06:31:06 (EDT)
commit9527d61798f032983098956816b57a5b4dc48b57 (patch)
treeeee68492a062dff43f1d3f04989d73d51bb30004
parent020b75818d86cbac0b5cf0a6a426e0aa0bfc6883 (diff)
downloadorg.eclipse.stardust.ui.web-9527d61798f032983098956816b57a5b4dc48b57.zip
org.eclipse.stardust.ui.web-9527d61798f032983098956816b57a5b4dc48b57.tar.gz
org.eclipse.stardust.ui.web-9527d61798f032983098956816b57a5b4dc48b57.tar.bz2
Jira-ID: CRNT-27860
Model with JMS Start Event is not getting deployed git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@62761 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js58
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/views/modeler/messageEventIntegrationOverlay.html15
2 files changed, 56 insertions, 17 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 4810ef7..c6ab2de 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
@@ -49,14 +49,17 @@ define(
page, id) {
this.initializeEventIntegrationOverlay(page, id);
- jQuery("label[for='typeSelect']")
- .text(
- m_i18nUtils
- .getProperty("modeler.element.properties.messageEvent.type"));
jQuery("label[for='nameInput']")
.text(
m_i18nUtils
.getProperty("modeler.element.properties.messageEvent.name"));
+ jQuery("label[for='typeSelect']")
+ .text(
+ m_i18nUtils
+ .getProperty("modeler.element.properties.messageEvent.type"));
+
+ /*
+
jQuery("label[for='preserveQoSInput']")
.text(
m_i18nUtils
@@ -69,12 +72,15 @@ define(
.text(
m_i18nUtils
.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
@@ -83,16 +89,21 @@ 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.registerForRouteChanges(this.typeSelect);
this.registerForRouteChanges(this.nameInput);
+
+ /*
this.registerForRouteChanges(this.selectorInput);
this.registerForRouteChanges(this.transactedInput);
this.registerForRouteChanges(this.preserveQoSInput);
+ */
};
/**
@@ -104,7 +115,7 @@ define(
uri += this.typeSelect.val();
uri += ":";
uri += this.nameInput.val();
-
+/*
var separator = "?";
if (this.clientIdInput.val() != null && this.clientIdInput.val().length != 0) {
@@ -122,7 +133,7 @@ define(
uri += this.transactedInput.prop("checked");
uri += separator + "preserveMessageQos=";
uri += this.preserveQoSInput.prop("checked");
-
+*/
return uri;
};
@@ -141,7 +152,20 @@ define(
this.submitOverlayChanges(parameterMappings);
};
+ MessageEventIntegrationOverlay.prototype.getRouteContent = function()
+ {
+ var route = "<from uri=\"";
+
+ route += this.getEndpointUri();
+ route += "\"/>";
+ route += this.getAdditionalRouteDefinitions();
+ return route;
+ };
+
+ MessageEventIntegrationOverlay.prototype.getAdditionalRouteDefinitions = function() {
+ return "<to uri=\"ipp:direct\"/>";
+ };
/**
*
*/
@@ -156,7 +180,7 @@ define(
route = route.replace(/&/g, "&amp;");
- var xmlDoc = jQuery.parseXML(route);
+ var xmlDoc = jQuery.parseXML("<route>"+route+"</route>");
var xmlObject = jQuery(xmlDoc);
var from = jQuery(xmlObject).find("from");
var uri = from.attr("uri");
@@ -170,18 +194,22 @@ define(
this.typeSelect.val(sourceParts[1]);
var clientName = "";
+
for ( var i = 2; i < sourceParts.length; ++i) {
if (i > 2) {
clientName += ":";
}
-
clientName += sourceParts[i];
}
this.nameInput.val(clientName);
+
+ /* parsing the last part of the URI*/
+
- var nameValues = sourceAndProperties[1].split("&");
+ if(sourceAndProperties[1] != null){
+ var nameValues = sourceAndProperties[1].split('&');
for ( var n = 0; n < nameValues.length; ++n) {
var nameValue = nameValues[n].split("=");
@@ -203,6 +231,7 @@ define(
value == "true");
}
}
+ }/* end URI parsing*/
}
this.parameterMappingsPanel.setScopeModel(this.page
@@ -234,4 +263,5 @@ define(
return true;
};
}
- }); \ No newline at end of file
+ });
+ \ No newline at end of file
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 bcde35a..41c924c 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,17 +13,26 @@
id="parameters">Parameters</span> </a></li>
</ul>
<div id="configurationTab">
+ <!--table>
+ <tr>
+ <td><label for="jmsComponentIdInput">Jms Component ID</label>
+ </td>
+ <td><input id="jmsComponentIdInput" type="text" style="width: 200px;"/>
+ </td>
+ </tr>
+ </table-->
<table>
<tr>
<td><select id="typeSelect">
<option value="queue">Queue</option>
- <option value="topic">Topic</option>
+ <!--option value="topic">Topic</option-->
</select>
</td>
- <td><input id="nameInput" type="text" style="width: 200px;" />
+ <td><input id="nameInput" type="text" style="width: 200px;" onfocus="if(this.value == 'Please specify ...') {this.value=''}"/>
</td>
</tr>
</table>
+ <!--
<table style="margin-top: 10px;">
<tr>
<td><label for="clientIdInput">Client ID</label>
@@ -52,7 +61,7 @@
</td>
<td></td>
</tr>
- </table>
+ </table>-->
</div>
<div id="parametersTab">
<div id="parameterMappingsPanelAnchor" />