summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFradj Zayen2013-02-21 03:11:19 (EST)
committer Sven Rottstock2013-03-11 06:37:18 (EDT)
commit0defe7a4cb7c68146688593ef78a6a1e04fddabc (patch)
tree351b389efc1f974cf8b1573e5ad87f7f6a5aab00
parentd3eb4eb10e7fb70b63186f685d29fa27c2b33efa (diff)
downloadorg.eclipse.stardust.ui.web-0defe7a4cb7c68146688593ef78a6a1e04fddabc.zip
org.eclipse.stardust.ui.web-0defe7a4cb7c68146688593ef78a6a1e04fddabc.tar.gz
org.eclipse.stardust.ui.web-0defe7a4cb7c68146688593ef78a6a1e04fddabc.tar.bz2
Jira-ID: CRNT-28053
In LM pepper M11 build, for JMS and Generic Camel Route, issue rendering Parameter mapping overlay git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@63143 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_fileEventIntegrationOverlay.js100
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_messageEventIntegrationOverlay.js4
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_timerEventIntegrationOverlay.js4
3 files changed, 67 insertions, 41 deletions
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_fileEventIntegrationOverlay.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_fileEventIntegrationOverlay.js
index f7b4773..d23bf35 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_fileEventIntegrationOverlay.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_fileEventIntegrationOverlay.js
@@ -118,52 +118,59 @@ define(
*/
FileEventIntegrationOverlay.prototype.getEndpointUri = function() {
var uri = "file://";
- //if(this.fileOrDirectoryNameInput!=null && this.fileOrDirectoryNameInput.val()!="Please specify ..."){
- uri += this.fileOrDirectoryNameInput.val();
- //}
-
+ // if(this.fileOrDirectoryNameInput!=null &&
+ // this.fileOrDirectoryNameInput.val()!="Please specify
+ // ..."){
+ uri += this.fileOrDirectoryNameInput.val();
+ // }
+
var separator = "?";
-
- if(this.recursiveInput.is(":checked")== true){
- uri += separator + "recursive="+this.recursiveInput.is(":checked");
+
+ if (this.recursiveInput.is(":checked") == true) {
+ uri += separator + "recursive="
+ + this.recursiveInput.is(":checked");
separator = "&";
-
+
}
-
- if(this.getIntervalInMilliseconds(
- this.initialIntervalInput.val(),
- this.initialIntervalUnitSelect.val())!=null){
- uri += separator + "initialDelay="+this.getIntervalInMilliseconds(
+
+ if (this.getIntervalInMilliseconds(
this.initialIntervalInput.val(),
- this.initialIntervalUnitSelect.val());
+ this.initialIntervalUnitSelect.val()) != null) {
+ uri += separator
+ + "initialDelay="
+ + this.getIntervalInMilliseconds(
+ this.initialIntervalInput.val(),
+ this.initialIntervalUnitSelect.val());
separator = "&";
}
-
- if(this.getIntervalInMilliseconds(
- this.repeatIntervalInput.val(),
- this.repeatIntervalUnitSelect.val())!=null){
- uri += separator + "delay="+this.getIntervalInMilliseconds(
- this.repeatIntervalInput.val(),
- this.repeatIntervalUnitSelect.val());
+
+ if (this.getIntervalInMilliseconds(this.repeatIntervalInput
+ .val(), this.repeatIntervalUnitSelect.val()) != null) {
+ uri += separator
+ + "delay="
+ + this.getIntervalInMilliseconds(
+ this.repeatIntervalInput.val(),
+ this.repeatIntervalUnitSelect.val());
separator = "&";
}
if (this.lockBehaviorSelect.val() == "none") {
- //nothing to do
- }else{
- if (this.lockBehaviorSelect.val() == "markerFile") {
- uri += separator + "readLock=markerFile";
- separator = "&";
- }else{
- if (this.lockBehaviorSelect.val() == "changed") {
+ // nothing to do
+ } else {
+ if (this.lockBehaviorSelect.val() == "markerFile") {
+ uri += separator + "readLock=markerFile";
+ separator = "&";
+ } else {
+ if (this.lockBehaviorSelect.val() == "changed") {
uri += separator + "readLock=changed";
- separator = "&";
- }
+ separator = "&";
}
+ }
}
-
+
/*
- uri += "&consumer.alwaysConsume="
- + this.alwaysConsumeInput.prop("checked");*/
+ * uri += "&consumer.alwaysConsume=" +
+ * this.alwaysConsumeInput.prop("checked");
+ */
if (this.postProcessingSelect.val() == "noop") {
uri += "&noop=true";
@@ -172,9 +179,9 @@ define(
uri += "&noop=false";
uri += "&delete=true";
}
-
- uri=uri.replace(/&/g, "&")
-
+
+ uri = uri.replace(/&/g, "&")
+
return uri;
};
@@ -220,6 +227,11 @@ define(
FileEventIntegrationOverlay.prototype.getAdditionalRouteDefinitions = function() {
return "<to uri=\"ipp:direct\"/>";
};
+
+ FileEventIntegrationOverlay.prototype.getRouteDefinitions = function() {
+ return "<from uri=\"" + this.getEndpointUri() + "\"/>"
+ + this.getAdditionalRouteDefinitions();
+ };
/**
*
*/
@@ -232,9 +244,10 @@ define(
// TODO Need better URL encoding
- //route = route.replace(/&/g,"&amp;");
+ // route = route.replace(/&/g,"&amp;");
- var xmlDoc = jQuery.parseXML("<route>"+route+"</route>");
+ var xmlDoc = jQuery
+ .parseXML("<route>" + route + "</route>");
var xmlObject = jQuery(xmlDoc);
var from = jQuery(xmlObject).find("from");
var uri = from.attr("uri");
@@ -275,9 +288,12 @@ define(
.val(intervalWithUnit.value);
this.repeatIntervalUnitSelect
.val(intervalWithUnit.unit);
- /*} else if (name == "consumer.alwaysConsume") {
- this.alwaysConsumeInput.prop("checked",
- value == "true");*/
+ /*
+ * } else if (name ==
+ * "consumer.alwaysConsume") {
+ * this.alwaysConsumeInput.prop("checked",
+ * value == "true");
+ */
} else if (name == "noop") {
if (value == "true") {
this.postProcessingSelect
@@ -288,6 +304,8 @@ define(
this.postProcessingSelect
.val("delete");
}
+ } else if (name == "readLock") {
+ this.lockBehaviorSelect.val(value)
}
}
}
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 fea5d7a..5006026 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
@@ -172,6 +172,10 @@ define(
MessageEventIntegrationOverlay.prototype.getAdditionalRouteDefinitions = function() {
return "<to uri=\"ipp:direct\"/>";
};
+
+ MessageEventIntegrationOverlay.prototype.getRouteDefinitions= function() {
+ return "<from uri=\""+this.getEndpointUri()+"\"/>"+this.getAdditionalRouteDefinitions();
+ }
/**
*
*/
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/js/m_timerEventIntegrationOverlay.js b/web-modeler/src/main/resources/META-INF/xhtml/js/m_timerEventIntegrationOverlay.js
index 2ed48d8..a0e2c42 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/js/m_timerEventIntegrationOverlay.js
+++ b/web-modeler/src/main/resources/META-INF/xhtml/js/m_timerEventIntegrationOverlay.js
@@ -167,6 +167,10 @@ define(
this.submitOverlayChanges(parameterMappings);
};
+ TimerEventIntegrationOverlay.prototype.getRouteDefinitions= function() {
+ return "<from uri=\""+this.getEndpointUri()+"\"/>"+this.getAdditionalRouteDefinitions();
+ }
+
TimerEventIntegrationOverlay.prototype.getAdditionalRouteDefinitions = function() {
return "<to uri=\"ipp:direct\"/>";
};