Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

fix for urls for simulation #18

Closed
wants to merge 1 commit into from

2 participants

Maciej Swiderski Tihomir Surdilovic
Maciej Swiderski
Collaborator

No description provided.

Tihomir Surdilovic
Owner

this has been added to master already - no need for pull request any more i believe

Tihomir Surdilovic tsurdilo closed this November 15, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Apr 24, 2013
Maciej Swiderski fix for urls for simulation bc627c3
This page is out of date. Refresh to see the latest.

Showing 12 changed files with 82 additions and 82 deletions. Show diff stats Hide diff stats

  1. 24  jbpm-designer-backend/src/main/java/org/jbpm/designer/web/server/SimulationServlet.java
  2. 2  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Core/main.js
  3. 8  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/simulationresults.js
  4. 14  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/simulation/default.htm
  5. 14  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/simulation/default.jsp
  6. 18  ...lient/src/main/resources/org/jbpm/designer/public/simulation/{humantaskchart.htm → humantaskchart.jsp}
  7. 0  ...signer-client/src/main/resources/org/jbpm/designer/public/simulation/{modelimage.htm → modelimage.jsp}
  8. 0  ...designer-client/src/main/resources/org/jbpm/designer/public/simulation/{pathimage.htm → pathimage.jsp}
  9. 20  ...signer-client/src/main/resources/org/jbpm/designer/public/simulation/{pathschart.htm → pathschart.jsp}
  10. 26  ...er-client/src/main/resources/org/jbpm/designer/public/simulation/{processchart.htm → processchart.jsp}
  11. 16  ...-client/src/main/resources/org/jbpm/designer/public/simulation/{processevents.htm → processevents.jsp}
  12. 22  ...designer-client/src/main/resources/org/jbpm/designer/public/simulation/{taskchart.htm → taskchart.jsp}
24  jbpm-designer-backend/src/main/java/org/jbpm/designer/web/server/SimulationServlet.java
@@ -353,7 +353,7 @@ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
353 353
 				parentJSON.put("activityinstances", aggNumActivityInstancesJSONArray);
354 354
 				parentJSON.put("htsim", aggHTSimulationJSONArray);
355 355
 				parentJSON.put("tasksim", aggTaskSimulationJSONArray);
356  
-				parentJSON.put("timeline", getTaskEventsFromAllEvents(null, allEvents, intervalUnit));
  356
+				parentJSON.put("timeline", getTaskEventsFromAllEvents(null, allEvents, intervalUnit, req.getContextPath()));
357 357
 				// event aggregations
358 358
 				JSONArray aggEventProcessSimulationJSONArray = new JSONArray();
359 359
 				int c = 0;
@@ -487,18 +487,18 @@ private String getDateString(long seDate) {
487 487
 		return retBuf.toString();
488 488
 	}
489 489
 
490  
-	private String getIcon(SimulationEvent se) {
  490
+	private String getIcon(SimulationEvent se, String contextPath) {
491 491
 		if(se != null) {
492 492
 			if(se instanceof ActivitySimulationEvent) {
493  
-				return "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/activity.png";
  493
+				return contextPath + "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/activity.png";
494 494
 			} else if(se instanceof EndSimulationEvent) {
495  
-				return "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/endevent.png";
  495
+				return contextPath + "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/endevent.png";
496 496
 			} else if(se instanceof GatewaySimulationEvent) {
497  
-				return "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/gateway.png";
  497
+				return contextPath + "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/gateway.png";
498 498
 			} else if(se instanceof HumanTaskActivitySimulationEvent) {
499  
-				return "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/humantask.png";
  499
+				return contextPath + "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/humantask.png";
500 500
 			} else if(se instanceof StartSimulationEvent) {
501  
-				return "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/startevent.png";
  501
+				return contextPath + "/org.jbpm.designer.jBPMDesigner/images/simulation/timeline/startevent.png";
502 502
 			} else {
503 503
 				return "";
504 504
 			}
@@ -507,7 +507,7 @@ private String getIcon(SimulationEvent se) {
507 507
 		}
508 508
 	}
509 509
 
510  
-	private JSONObject getTaskEventsFromAllEvents(AggregatedSimulationEvent event, List<SimulationEvent> allEvents, String intervalUnit) throws Exception {
  510
+	private JSONObject getTaskEventsFromAllEvents(AggregatedSimulationEvent event, List<SimulationEvent> allEvents, String intervalUnit, String contextPath) throws Exception {
511 511
 		JSONObject allEventsObject = new JSONObject();
512 512
 		allEventsObject.put("headline", "Simulation Events");
513 513
 		allEventsObject.put("type","default");
@@ -520,10 +520,10 @@ private JSONObject getTaskEventsFromAllEvents(AggregatedSimulationEvent event, L
520 520
 					String seActivityId = getSingleEventActivityId(se);
521 521
 					String eventActivitytId = getAggregatedEventActivityId(event);
522 522
 					if(eventActivitytId.equals(seActivityId)) {
523  
-						allEventsDataArray.put(getTimelineEventObject(se, intervalUnit));
  523
+						allEventsDataArray.put(getTimelineEventObject(se, intervalUnit, contextPath));
524 524
 					}
525 525
 				} else {
526  
-					allEventsDataArray.put(getTimelineEventObject(se, intervalUnit));
  526
+					allEventsDataArray.put(getTimelineEventObject(se, intervalUnit, contextPath));
527 527
 				}
528 528
 			}
529 529
 		}
@@ -533,7 +533,7 @@ private JSONObject getTaskEventsFromAllEvents(AggregatedSimulationEvent event, L
533 533
 		return allEventsObject;
534 534
 	}
535 535
 
536  
-	private JSONObject getTimelineEventObject(SimulationEvent se, String intervalUnit) throws Exception{
  536
+	private JSONObject getTimelineEventObject(SimulationEvent se, String intervalUnit, String contextPath) throws Exception{
537 537
 		JSONObject seObject = new JSONObject();
538 538
 		seObject.put("id", se.getUUID().toString());
539 539
 		seObject.put("startDate", getDateString(se.getStartTime()));
@@ -552,7 +552,7 @@ private JSONObject getTimelineEventObject(SimulationEvent se, String intervalUni
552 552
 		seObject.put("tag", "");
553 553
 		JSONObject seAsset = new JSONObject();
554 554
 		seAsset.put("media", "");
555  
-		seAsset.put("thumbnail", getIcon(se));
  555
+		seAsset.put("thumbnail", getIcon(se, contextPath));
556 556
 		seAsset.put("credit", "");
557 557
 		seAsset.put("caption", "");
558 558
 		seObject.put("asset", seAsset);
2  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Core/main.js
@@ -261,7 +261,7 @@ ORYX.Editor = {
261 261
 			    autoScroll: true,
262 262
 			    autoEl : {
263 263
 			        tag : "iframe",
264  
-			        src : ORYX.BASE_FILE_PATH + 'simulation/default.htm',
  264
+			        src : ORYX.BASE_FILE_PATH + 'simulation/default.jsp',
265 265
 			        width: "100%",
266 266
 			            height: "500",
267 267
 			            frameborder: "0",
8  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/js/Plugins/simulationresults.js
@@ -227,7 +227,7 @@ ORYX.Plugins.SimulationResults = Clazz.extend({
227 227
 		ORYX.EDITOR.simulationChartTitle = "Process Simulation Results";
228 228
 		ORYX.EDITOR.simulationChartId = jsonObj[0].id;
229 229
 		ORYX.EDITOR.simulationChartNodeName = jsonObj[0].name;
230  
-		Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH + "simulation/processchart.htm";
  230
+		Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH + "simulation/processchart.jsp";
231 231
 
232 232
 	},
233 233
 	showTaskAveragesGraph : function(nodeid, jsonstr) {
@@ -242,7 +242,7 @@ ORYX.Plugins.SimulationResults = Clazz.extend({
242 242
 				ORYX.EDITOR.simulationChartTitle = "Task Simulation Results";
243 243
 				ORYX.EDITOR.simulationChartId = innerWrapper[0].id;
244 244
 				ORYX.EDITOR.simulationChartNodeName = innerWrapper[0].name;
245  
-				Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH + "simulation/taskchart.htm";
  245
+				Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH + "simulation/taskchart.jsp";
246 246
 			}
247 247
 		}
248 248
 	},
@@ -256,7 +256,7 @@ ORYX.Plugins.SimulationResults = Clazz.extend({
256 256
 				ORYX.EDITOR.simulationChartTitle = "Human Task Simulation Results";
257 257
 				ORYX.EDITOR.simulationChartId = inner.id;
258 258
 				ORYX.EDITOR.simulationChartNodeName = inner.name;
259  
-				Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH + "simulation/humantaskchart.htm";
  259
+				Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH + "simulation/humantaskchart.jsp";
260 260
 			}
261 261
 		}
262 262
 	},
@@ -273,7 +273,7 @@ ORYX.Plugins.SimulationResults = Clazz.extend({
273 273
 	},
274 274
 	pathSvgGenerated : function() {
275 275
 		ORYX.EDITOR.simulationPathSVG = DataManager.serialize(ORYX.EDITOR.getCanvas().getSVGRepresentation(false));
276  
-		Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH+ "simulation/pathschart.htm";
  276
+		Ext.getDom('simchartframe').src = ORYX.BASE_FILE_PATH+ "simulation/pathschart.jsp";
277 277
 		this.facade.raiseEvent({
278 278
             type: ORYX.CONFIG.EVENT_SIMULATION_CLEAR_PATH_SVG
279 279
 		});
14  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/simulation/default.htm
... ...
@@ -1,14 +0,0 @@
1  
-<!DOCTYPE html>
2  
-<html>
3  
-<head>
4  
-<meta charset="utf-8">
5  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
6  
-</head>
7  
-<body>
8  
-<center>
9  
-<br/>
10  
-	<img src="/org.jbpm.designer.jBPMDesigner/images/simulation/sampleicon.png" alt="Sample Simulation Chart"/>
11  
-	<div style="font-family: Arial Black;font-size: 14px;color:#A0A0A0;"><center>Run Process Simulation to view results</center></div>
12  
-</center>
13  
-</body>
14  
-</html>
14  jbpm-designer-client/src/main/resources/org/jbpm/designer/public/simulation/default.jsp
... ...
@@ -0,0 +1,14 @@
  1
+<!DOCTYPE html>
  2
+<html>
  3
+<head>
  4
+<meta charset="utf-8">
  5
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
  6
+</head>
  7
+<body>
  8
+<center>
  9
+<br/>
  10
+	<img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/sampleicon.png" alt="Sample Simulation Chart"/>
  11
+	<div style="font-family: Arial Black;font-size: 14px;color:#A0A0A0;"><center>Run Process Simulation to view results</center></div>
  12
+</center>
  13
+</body>
  14
+</html>
18  ...bpm/designer/public/simulation/humantaskchart.htm → ...bpm/designer/public/simulation/humantaskchart.jsp
@@ -2,12 +2,12 @@
2 2
 <html>
3 3
 <head>
4 4
 <meta charset="utf-8">
5  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
6  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
7  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
8  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
9  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
10  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
  5
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
  6
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
  7
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
  8
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
  9
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
  10
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
11 11
 <script>
12 12
 function clearChart() {
13 13
 	document.getElementById('chartcontent1').innerHTML = "<svg id='chart1' style='height:400px;width:400px'></svg>";
@@ -19,9 +19,9 @@
19 19
 <body onload="showBarCharts();">
20 20
 <center>
21 21
 <div style="margin:20;padding:0;">
22  
-	<!-- <div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div> -->
23  
-	<div class="tableicon"><a href="#" onclick="clearChart(); showTables(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Tables"/></a></div>
24  
-    <div class="hbcharticon"><a href="#" onclick="clearChart(); showBarCharts(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/hbarcharticon.png" title="Bar Charts"/></a></div>
  22
+	<!-- <div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div> -->
  23
+	<div class="tableicon"><a href="#" onclick="clearChart(); showTables(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Tables"/></a></div>
  24
+    <div class="hbcharticon"><a href="#" onclick="clearChart(); showBarCharts(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/hbarcharticon.png" title="Bar Charts"/></a></div>
25 25
     <div class="charttitle"><script>document.write(parent.ORYX.EDITOR.simulationChartTitle +  " (" + parent.ORYX.EDITOR.simulationChartNodeName + ")");</script></div>
26 26
 </div><br/>
27 27
 <div class="outterchart">
0  ...rg/jbpm/designer/public/simulation/modelimage.htm → ...rg/jbpm/designer/public/simulation/modelimage.jsp
File renamed without changes
0  ...org/jbpm/designer/public/simulation/pathimage.htm → ...org/jbpm/designer/public/simulation/pathimage.jsp
File renamed without changes
20  ...rg/jbpm/designer/public/simulation/pathschart.htm → ...rg/jbpm/designer/public/simulation/pathschart.jsp
@@ -2,12 +2,12 @@
2 2
 <html>
3 3
 <head>
4 4
 <meta charset="utf-8">
5  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
6  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
7  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
8  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
9  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
10  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
  5
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
  6
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
  7
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
  8
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
  9
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
  10
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
11 11
 <script>
12 12
 function clearChart() {
13 13
 	var cnt = "<h2>Path Image</h2> \
@@ -25,9 +25,9 @@
25 25
 <body onload="showPieChart();">
26 26
 <center>
27 27
 <div style="margin:20;padding:0;">
28  
-	<!-- <div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div> -->
29  
-	<div class="tableicon"><a href="#" onclick="clearChart(); showTable(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Table"/></a></div>
30  
-    <div class="pcharticon"><a href="#" onclick="clearChart(); showPieChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/piecharticon.png" title="Pie Chart"/></a></div>
  28
+	<!-- <div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div> -->
  29
+	<div class="tableicon"><a href="#" onclick="clearChart(); showTable(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Table"/></a></div>
  30
+    <div class="pcharticon"><a href="#" onclick="clearChart(); showPieChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/piecharticon.png" title="Pie Chart"/></a></div>
31 31
     <div class="charttitle"><script>document.write(parent.ORYX.EDITOR.simulationChartTitle);</script></div>
32 32
 </div><br/>
33 33
 <div id="outterchart" class="outterchart">
@@ -135,7 +135,7 @@
135 135
 		}
136 136
 		
137 137
 		function displayPathImage() {
138  
-			document.getElementById('chartcontent1').innerHTML = "<iframe id='processimageframe' src='/org.jbpm.designer.jBPMDesigner/simulation/pathimage.htm' width='100%' height='300' scrolling='auto' frameBorder='0'></iframe>";
  138
+			document.getElementById('chartcontent1').innerHTML = "<iframe id='processimageframe' src='<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/simulation/pathimage.jsp' width='100%' height='300' scrolling='auto' frameBorder='0'></iframe>";
139 139
 		}
140 140
 </script>
141 141
 </body>
26  .../jbpm/designer/public/simulation/processchart.htm → .../jbpm/designer/public/simulation/processchart.jsp
@@ -2,12 +2,12 @@
2 2
 <html>
3 3
 <head>
4 4
 <meta charset="utf-8">
5  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
6  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
7  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
8  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
9  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
10  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
  5
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
  6
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
  7
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
  8
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
  9
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
  10
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
11 11
 <script>
12 12
 function clearChart() {
13 13
 	var cnt = "<h2>Execution Times</h2> \
@@ -36,12 +36,12 @@
36 36
 <body onload="showBarChart();">
37 37
 <center>
38 38
 <div style="margin:20;padding:0;">
39  
-	<div class="lcharticon"><a href="#" onclick="clearChartForLine(); showLineChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/linecharticon.png" title="Line Chart"/></a></div>
40  
-	<div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div>
41  
-	<div class="tableicon"><a href="#" onclick="clearChart(); showTable(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Table"/></a></div>
42  
-    <div class="pcharticon"><a href="#" onclick="clearChart(); showPieChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/piecharticon.png" title="Pie Chart"/></a></div>
43  
-    <div class="hbcharticon"><a href="#" onclick="clearChart(); showHBarChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/hbarcharticon.png" title="Horizontal Bar Chart"/></a></div>
44  
-    <div class="bcharticon"><a href="#" onclick="clearChart(); showBarChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/barcharticon.png" title="Bar Chart"/></a></div>
  39
+	<div class="lcharticon"><a href="#" onclick="clearChartForLine(); showLineChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/linecharticon.png" title="Line Chart"/></a></div>
  40
+	<div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div>
  41
+	<div class="tableicon"><a href="#" onclick="clearChart(); showTable(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Table"/></a></div>
  42
+    <div class="pcharticon"><a href="#" onclick="clearChart(); showPieChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/piecharticon.png" title="Pie Chart"/></a></div>
  43
+    <div class="hbcharticon"><a href="#" onclick="clearChart(); showHBarChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/hbarcharticon.png" title="Horizontal Bar Chart"/></a></div>
  44
+    <div class="bcharticon"><a href="#" onclick="clearChart(); showBarChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/barcharticon.png" title="Bar Chart"/></a></div>
45 45
     <div class="charttitle"><script>document.write(parent.ORYX.EDITOR.simulationChartTitle +  " (" + parent.ORYX.EDITOR.simulationChartNodeName + ")");</script></div>
46 46
 </div><br/>
47 47
 <div id="outterchart" class="outterchart">
@@ -306,7 +306,7 @@ <h2 id="chart2label">Activity Instances</h2>
306 306
 			var cont = "<div style='margin:0;padding:0;'> \
307 307
 				<div class='tlineswitch'><a href='#' onclick='document.getElementById(\"processevents\").contentWindow.switchDisplay(\"chart\"); return false;'>Chart</a> | <a href='#' onclick='document.getElementById(\"processevents\").contentWindow.switchDisplay(\"model\"); return false;'>Model</a></div> \
308 308
 				</div> \
309  
-				<iframe id='processevents' name='' src='/org.jbpm.designer.jBPMDesigner/simulation/processevents.htm' width='100%' height='500' scrolling='no' frameBorder='0'></iframe> \
  309
+				<iframe id='processevents' name='' src='<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/simulation/processevents.jsp' width='100%' height='500' scrolling='no' frameBorder='0'></iframe> \
310 310
 				";
311 311
 			
312 312
 			document.getElementById('outterchart').innerHTML = cont;
16  ...jbpm/designer/public/simulation/processevents.htm → ...jbpm/designer/public/simulation/processevents.jsp
@@ -2,13 +2,13 @@
2 2
 <html>
3 3
 <head>
4 4
 	<meta charset="utf-8">
5  
-	<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/timeline.css" rel="stylesheet" type="text/css">
6  
-	<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/timeline-ext.css" rel="stylesheet" type="text/css">
7  
-	<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
8  
-	<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
9  
-	<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
10  
-	<script src="/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
11  
-	<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/timeline-min.js" type="text/javascript"></script>
  5
+	<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/timeline.css" rel="stylesheet" type="text/css">
  6
+	<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/timeline-ext.css" rel="stylesheet" type="text/css">
  7
+	<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
  8
+	<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
  9
+	<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
  10
+	<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
  11
+	<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/timeline-min.js" type="text/javascript"></script>
12 12
 </head>
13 13
 <body>
14 14
 <div id="timeline-embed">
@@ -34,7 +34,7 @@
34 34
 			cnt = "<svg id='chart' style='height:290px;width:400px'></svg>";
35 35
 			document.getElementById('chartcontent').innerHTML = cnt;
36 36
 		} else if(displayType == "model") {
37  
-            cnt = "<iframe id='processeventmodelframe' name='processeventmodelframe' src='/org.jbpm.designer.jBPMDesigner/simulation/modelimage.htm' width='100%' height='300' scrolling='auto' frameBorder='0'></iframe>";
  37
+            cnt = "<iframe id='processeventmodelframe' name='processeventmodelframe' src='<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/simulation/modelimage.jsp' width='100%' height='300' scrolling='auto' frameBorder='0'></iframe>";
38 38
             document.getElementById('chartcontent').innerHTML = cnt;
39 39
         }
40 40
 	}
22  ...org/jbpm/designer/public/simulation/taskchart.htm → ...org/jbpm/designer/public/simulation/taskchart.jsp
@@ -2,12 +2,12 @@
2 2
 <html>
3 3
 <head>
4 4
 <meta charset="utf-8">
5  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
6  
-<link href="/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
7  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
8  
-<script src="/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
9  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
10  
-<script src="/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
  5
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/nv-core.css" rel="stylesheet" type="text/css">
  6
+<link href="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/css/simulation/simulationcharts.css" rel="stylesheet" type="text/css">
  7
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/d3.v2.min.js"></script>
  8
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/js/simulation/nv.min.js"></script>
  9
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/jquery-1.7.2.min.js" type="text/javascript"></script>
  10
+<script src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/lib/handlebars-1.0.0.beta.6.js" type="text/javascript"></script>
11 11
 <script>
12 12
 function clearChart() {
13 13
 	document.getElementById('chartcontent').innerHTML = "<svg id='chart' style='height:400px;width:400px'></svg>";
@@ -17,11 +17,11 @@
17 17
 <body onload="showBarChart();">
18 18
 <center>
19 19
 <div style="margin:20;padding:0;">
20  
-	<!-- <div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div> -->
21  
-	<div class="tableicon"><a href="#" onclick="clearChart(); showTable(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Table"/></a></div>
22  
-    <div class="pcharticon"><a href="#" onclick="clearChart(); showPieChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/piecharticon.png" title="Pie Chart"/></a></div>
23  
-    <div class="hbcharticon"><a href="#" onclick="clearChart(); showHBarChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/hbarcharticon.png" title="Horizontal Bar Chart"/></a></div>
24  
-    <div class="bcharticon"><a href="#" onclick="clearChart(); showBarChart(); return false;"><img src="/org.jbpm.designer.jBPMDesigner/images/simulation/barcharticon.png" title="Bar Chart"/></a></div>
  20
+	<!-- <div class="timelineicon"><a href="#" onclick="clearChart(); showTimeline(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/timelineicon.png" title="Timeline"/></a></div> -->
  21
+	<div class="tableicon"><a href="#" onclick="clearChart(); showTable(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/tableicon.png" title="Table"/></a></div>
  22
+    <div class="pcharticon"><a href="#" onclick="clearChart(); showPieChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/piecharticon.png" title="Pie Chart"/></a></div>
  23
+    <div class="hbcharticon"><a href="#" onclick="clearChart(); showHBarChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/hbarcharticon.png" title="Horizontal Bar Chart"/></a></div>
  24
+    <div class="bcharticon"><a href="#" onclick="clearChart(); showBarChart(); return false;"><img src="<%=request.getContextPath()%>/org.jbpm.designer.jBPMDesigner/images/simulation/barcharticon.png" title="Bar Chart"/></a></div>
25 25
     <div class="charttitle"><script>document.write(parent.ORYX.EDITOR.simulationChartTitle +  " (" + parent.ORYX.EDITOR.simulationChartNodeName + ")");</script></div>
26 26
 </div><br/>
27 27
 <div class="outterchart">
Commit_comment_tip

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.