summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFradj Zayen2013-02-13 04:59:29 (EST)
committerSven Rottstock2013-03-11 06:35:50 (EDT)
commit32f7637928e323ad68ca4a2c6d44a6da3d9e30a3 (patch)
tree6c3e460c7d8d80548d80445e326f8dab3422ede2
parent56b69101512bad78836da430c7dc63adc32b8300 (diff)
downloadorg.eclipse.stardust.ui.web-32f7637928e323ad68ca4a2c6d44a6da3d9e30a3.zip
org.eclipse.stardust.ui.web-32f7637928e323ad68ca4a2c6d44a6da3d9e30a3.tar.gz
org.eclipse.stardust.ui.web-32f7637928e323ad68ca4a2c6d44a6da3d9e30a3.tar.bz2
Jira-ID: CRNT-27939
Model with Timer Start Event cannot be deployed in IR due to UnMarshalException git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@62959 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/js/m_timerEventIntegrationOverlay.js156
-rw-r--r--web-modeler/src/main/resources/META-INF/xhtml/views/modeler/timerEventIntegrationOverlay.html14
-rw-r--r--web-modeler/src/main/resources/bpm-modeler-client-messages_de.properties1
-rw-r--r--web-modeler/src/main/resources/bpm-modeler-client-messages_en.properties1
-rw-r--r--web-modeler/src/main/resources/bpm-modeler-client-messages_zh_CN.properties1
5 files changed, 102 insertions, 71 deletions
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 5703a2c..2ed48d8 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
@@ -57,6 +57,11 @@ define(
m_i18nUtils
.getProperty("modeler.element.properties.timerEvent.repeatCount"));
+ jQuery("label[for='fixedRateInput']")
+ .text(
+ m_i18nUtils
+ .getProperty("modeler.element.properties.timerEvent.fixedRate"));
+
this.configurationSpan = this.mapInputId("configuration");
this.configurationSpan
@@ -72,29 +77,45 @@ define(
.mapInputId("repeatIntervalInput");
this.repeatIntervalUnitSelect = this
.mapInputId("repeatIntervalUnitSelect");
+ this.fixedRateInput = this.mapInputId("fixedRateInput");
- this.initializeIntervalUnitSelect(this.repeatIntervalUnitSelect);
+ this
+ .initializeIntervalUnitSelect(this.repeatIntervalUnitSelect);
this.repeatCountInput = this.mapInputId("repeatCountInput");
-
+
this.registerForRouteChanges(this.repeatCountInput);
this.registerForRouteChanges(this.repeatIntervalInput);
this.registerForRouteChanges(this.repeatIntervalUnitSelect);
+ this.registerForRouteChanges(this.fixedRateInput);
};
/**
*
*/
TimerEventIntegrationOverlay.prototype.getEndpointUri = function() {
- var uri = "timer://test?";
-
- uri += "repeatCount";
- uri += "=";
- uri += this.repeatCountInput.val();
- uri += "&repeatInterval";
- uri += "=";
- uri += this.getIntervalInMilliseconds(this.repeatIntervalInput.val(), this.repeatIntervalUnitSelect.val());
-
+ var uri = "timer://timerEndpoint";
+ var separator = "?";
+
+ if (this.repeatCountInput.val() != null) {
+ uri += separator + "repeatCount="
+ + this.repeatCountInput.val();
+ separator = "&";
+ }
+ if (this.fixedRateInput.prop("checked") == true) {
+ uri += separator + "fixedRate=true";
+ separator = "&";
+ }
+
+ if (this.getIntervalInMilliseconds(this.repeatIntervalInput
+ .val(), this.repeatIntervalUnitSelect.val()) != null) {
+ uri += separator
+ + "period="
+ + this.getIntervalInMilliseconds(
+ this.repeatIntervalInput.val(),
+ this.repeatIntervalUnitSelect.val());
+ }
+ uri = uri.replace(/&/g, "&");
return uri;
};
@@ -107,52 +128,48 @@ define(
var parameterMappings = [];
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Message",
- "message", "String"));
- /*parameterMappings.push(this
- .createPrimitiveParameterMapping("Calendar",
- "calendar", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Fire Time",
- "fireTime", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Job Detail",
- "jobDetail", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Job Instance",
- "jobInstance", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Job Runtime",
- "jobRuntTime", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping(
- "Merged Job Data Map", "mergedJobDataMap",
- "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Next Fire Time",
- "nextFireTime", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping(
- "Previous Fire Time", "previousFireTime",
- "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping(
- "Scheduled Fire Time", "scheduledFireTime",
- "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Refire Count",
- "refireCount", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Trigger Name",
- "triggerName", "String"));
- parameterMappings.push(this
- .createPrimitiveParameterMapping("Trigger Group",
- "triggerGroup", "String"));*/
+ /*
+ * parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Message", "message",
+ * "String"));
+ */
+ /*
+ * parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Calendar", "calendar",
+ * "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Fire Time", "fireTime",
+ * "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Job Detail",
+ * "jobDetail", "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Job Instance",
+ * "jobInstance", "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Job Runtime",
+ * "jobRuntTime", "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping( "Merged Job Data Map",
+ * "mergedJobDataMap", "String"));
+ * parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Next Fire Time",
+ * "nextFireTime", "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping( "Previous Fire Time",
+ * "previousFireTime", "String"));
+ * parameterMappings.push(this
+ * .createPrimitiveParameterMapping( "Scheduled Fire Time",
+ * "scheduledFireTime", "String"));
+ * parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Refire Count",
+ * "refireCount", "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Trigger Name",
+ * "triggerName", "String")); parameterMappings.push(this
+ * .createPrimitiveParameterMapping("Trigger Group",
+ * "triggerGroup", "String"));
+ */
this.submitOverlayChanges(parameterMappings);
};
+ TimerEventIntegrationOverlay.prototype.getAdditionalRouteDefinitions = function() {
+ return "<to uri=\"ipp:direct\"/>";
+ };
/**
*
*/
@@ -164,14 +181,14 @@ define(
}
// TODO Need better URL encoding
-
- route = route.replace(/&/g, "&amp;");
- var xmlDoc = jQuery.parseXML(route);
+ // route = route.replace(/&/g, "&amp;");
+
+ var xmlDoc = jQuery
+ .parseXML("<route>" + route + "</route>");
var xmlObject = jQuery(xmlDoc);
var from = jQuery(xmlObject).find("from");
var uri = from.attr("uri");
- var uri = from.attr("uri");
var protocolAndRest = uri.split("://");
var parametersAndOptions = protocolAndRest[1].split("?");
@@ -192,20 +209,25 @@ define(
if (name == "repeatCount") {
this.repeatCountInput.val(value);
- }
- else if (name == "repeatInterval") {
- var intervalWithUnit = this.getIntervalWithUnit(value);
-
- this.repeatIntervalInput.val(intervalWithUnit.value);
- this.repeatIntervalUnitSelect.val(intervalWithUnit.unit);
+ } else if (name == "period") {
+ var intervalWithUnit = this
+ .getIntervalWithUnit(value);
+ this.repeatIntervalInput
+ .val(intervalWithUnit.value);
+ this.repeatIntervalUnitSelect
+ .val(intervalWithUnit.unit);
+ } else if (name == "fixedRate") {
+ if(value =="true")
+ this.fixedRateInput.prop("checked",
+ value == "true");
}
}
}
- this.parameterMappingsPanel.setScopeModel(this.page
- .getModel());
- this.parameterMappingsPanel
- .setParameterDefinitions(this.page.getEvent().parameterMappings);
+ // this.parameterMappingsPanel.setScopeModel(this.page
+ // .getModel());
+ // this.parameterMappingsPanel
+ // .setParameterDefinitions(this.page.getEvent().parameterMappings);
};
/**
diff --git a/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/timerEventIntegrationOverlay.html b/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/timerEventIntegrationOverlay.html
index 7efb1ec..1df1386 100644
--- a/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/timerEventIntegrationOverlay.html
+++ b/web-modeler/src/main/resources/META-INF/xhtml/views/modeler/timerEventIntegrationOverlay.html
@@ -9,8 +9,8 @@
<ul id="propertiesTabsList">
<li><a href="#configurationTab"><span class="tabLabel"
id="configuration">Configuration</span> </a></li>
- <li><a href="#parametersTab"><span class="tabLabel"
- id="parameters">Parameters</span> </a></li>
+ <!--li><a href="#parametersTab"><span class="tabLabel"
+ id="parameters">Parameters</span> </a></li-->
</ul>
<div id="configurationTab">
<table>
@@ -29,11 +29,17 @@
</td>
<td></td>
</tr>
+ <tr>
+ <td><label for="fixedRateInput">Use Fixed Rate Intervals</label>
+ </td>
+ <td><input id="fixedRateInput" type="checkbox" />
+ </td>
+ </tr>
</table>
</div>
- <div id="parametersTab">
+ <!--div id="parametersTab">
<div id="parameterMappingsPanelAnchor" />
- </div>
+ </div-->
</div>
</body>
</html>
diff --git a/web-modeler/src/main/resources/bpm-modeler-client-messages_de.properties b/web-modeler/src/main/resources/bpm-modeler-client-messages_de.properties
index 256d132..63a8830 100644
--- a/web-modeler/src/main/resources/bpm-modeler-client-messages_de.properties
+++ b/web-modeler/src/main/resources/bpm-modeler-client-messages_de.properties
@@ -571,6 +571,7 @@ modeler.element.properties.messageEvent.transacted = Transaktional
modeler.element.properties.timerEvent.title = Timer-Ereignis
modeler.element.properties.timerEvent.repeatInterval = Wiederholungsintervall
modeler.element.properties.timerEvent.repeatCount = Anzahl Wiederholungen
+modeler.element.properties.timerEvent.fixedRate=Fixed Rate
### Generic Camel Route Event Overlay ###
modeler.element.properties.genericCamelRouteEvent.title = Generisches Camel Route-Ereignis
diff --git a/web-modeler/src/main/resources/bpm-modeler-client-messages_en.properties b/web-modeler/src/main/resources/bpm-modeler-client-messages_en.properties
index 55e83e0..d3a4a14 100644
--- a/web-modeler/src/main/resources/bpm-modeler-client-messages_en.properties
+++ b/web-modeler/src/main/resources/bpm-modeler-client-messages_en.properties
@@ -604,6 +604,7 @@ modeler.element.properties.messageEvent.transacted = Transacted
modeler.element.properties.timerEvent.title = Timer Event
modeler.element.properties.timerEvent.repeatInterval = Repeat Interval
modeler.element.properties.timerEvent.repeatCount = Repeat Count
+modeler.element.properties.timerEvent.fixedRate=Fixed Rate
### Generic Camel Route Event Overlay ###
modeler.element.properties.genericCamelRouteEvent.title = Generic Camel Route Event
diff --git a/web-modeler/src/main/resources/bpm-modeler-client-messages_zh_CN.properties b/web-modeler/src/main/resources/bpm-modeler-client-messages_zh_CN.properties
index 4ddc15c..8365248 100644
--- a/web-modeler/src/main/resources/bpm-modeler-client-messages_zh_CN.properties
+++ b/web-modeler/src/main/resources/bpm-modeler-client-messages_zh_CN.properties
@@ -573,6 +573,7 @@ modeler.element.properties.messageEvent.transacted = +Transacted
### Timer Event Overlay ###
modeler.element.properties.timerEvent.repeatInterval = +Repeat Interval
modeler.element.properties.timerEvent.repeatCount = +Repeat Count
+modeler.element.properties.timerEvent.fixedRate=+Fixed Rate
### Generic Camel Route Event Overlay ###
modeler.element.properties.genericCamelRouteEvent.title = +Generic Camel Route Event