CRNT-24765 - Updated description and screenshots for abort and start and join

git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/documentation@56340 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b

11 files changed, 32 insertions, 18 deletions

diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-join-process.html b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-join-process.html
index bf30a48..1f06e67 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-join-process.html
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-join-process.html
@@ -136,12 +136,22 @@ the project in the @productname@ Portal:</p>
 	<li>In the toolbar, click the <strong>Suspend and Save</strong> icon</li>

 	<li>Activate another instance of <strong>Verification Check - 1</strong> process</li>

 	<li>Specify any other Tax ID and Last Name</li>

+	<li>In the toolbar, click the <strong>Suspend and Save</strong> icon</li>

 </ol>

 	

 <h3 id="join">Aborting and Joining Processes</h3>

 <ol>	

+	<li>Open the Worklist of the user Administrator</li>

+	<li>Activate the activity of which the Tax ID and Last Name matches with the another process</li>

+	

+	<p class="image"><img src="images/worklist-taxid.png" alt="Suspend and Save"> <br>

+	<strong>Figure:</strong> Worklist - Activate Activity with Same Tax ID and Last Name </p>

+	

 	<li>In the toolbar, click the down-arrow icon displayed next to the Abort icon and choose 

 	<strong>Abort Process and Join</strong> option.</li>

+	<p class="image"><img src="images/abort-join-option.png" alt="Suspend and Save"> <br>

+	<strong>Figure:</strong> Abort and Join </p>

+	

 	<p>The active process instances with matching key descriptors are displayed in the search.</p>

 	 <p class="image"><img src="images/matchall.png" alt="Active Processes Matching All Key Descriptors"> <br>

 	<strong>Figure:</strong> Active Processes Matching All Key Descriptors</p>

diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-start-process.html b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-start-process.html
index eba8835..e043cac 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-start-process.html
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/abort-and-start-process.html
@@ -72,7 +72,7 @@ appropriate declarative security.</p>
 	<strong>Import &gt; @productname@ &gt; @productnameonly@ Process Model</strong>.

 	Click <strong>Next</strong> and browse to the location of the example

 	model extracted from the zip file.</li>

-	<li>Make sure that the Bank Executive role has the <strong>Abort Process Instance</strong>

+	<li>Make sure that the Bank Executive role has the <strong>Abort Process Instances</strong>

 	permission granted for the IRA process.</li>

 	<p class="image"><img src="images/tut-ira.png" alt="IRA - Abort Process Instance"> <br>

 	<strong>Figure:</strong> IRA - Abort Process Instance</p>

diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/abort-join-option.png b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/abort-join-option.png
new file mode 100644
index 0000000..f286c59
--- a/dev/null
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/abort-join-option.png
diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/ira-details.png b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/ira-details.png
index 833946b..3a0388f 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/ira-details.png
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/ira-details.png
diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linked-pro.png b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linked-pro.png
index ee23581..d89262b 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linked-pro.png
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linked-pro.png
diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkedIRA.png b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkedIRA.png
index 5a00ca6..6f6f6c2 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkedIRA.png
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkedIRA.png
diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkp.png b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkp.png
index 41cbdcd..44c5e08 100644
--- a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkp.png
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/linkp.png
diff --git a/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/worklist-taxid.png b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/worklist-taxid.png
new file mode 100644
index 0000000..4a8e416
--- a/dev/null
+++ b/org.eclipse.stardust.docs.dev/html/handbooks/tutorial/derived-procs/images/worklist-taxid.png
diff --git a/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/abort-and-join-dialog.html b/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/abort-and-join-dialog.html
index 92e0099..4a03a35 100644
--- a/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/abort-and-join-dialog.html
+++ b/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/abort-and-join-dialog.html
@@ -89,19 +89,21 @@ and click <strong>Abort & Join</strong>.</li>
 

 

 

-<p>When any process is aborted and joined the link type for:</p>

+<p>When any process is aborted and joined the:</p>

 <ul>

-	<li>Source process instance is displayed as Joined To</li>

-	<li>Target process instance is displayed as Joined From </li>

+	<li>Source process instance is Joined To target process instance</li>

+	<li>Target process instance is Joined From source process instance </li>

 </ul>

 

-<p>If you want to view the source process details then click on the process 

-name displayed in the <strong>Process</strong> column

-of the target process.

+<p>

 The linked processes get displayed under the <strong>Linked Processes</strong> panel. 

-Notice that the status is displayed as Aborted.

-The link type of the source process instance is displayed as

-<strong>Joined To</strong>.</p>

+Notice that the status is displayed as Active of the target process.

+The link type of the target process instance is displayed as

+<strong>Joined From</strong>.

+

+If you want to view the source process details then click on the process 

+name displayed in the <strong>Process</strong> column

+of the target process.</p>

 <p>Please note that the links are established between root process of the source process instance and the 

 target process instance, which can be a sub-process.</p>

 

diff --git a/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/images/switch-link.png b/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/images/switch-link.png
index 52594ae..b1af424 100644
--- a/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/images/switch-link.png
+++ b/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/images/switch-link.png
diff --git a/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/switch-process-dialog.html b/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/switch-process-dialog.html
index 5645989..b113816 100644
--- a/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/switch-process-dialog.html
+++ b/org.eclipse.stardust.docs.enduser/html/handbooks/execution-clients/detail-views/switch-process-dialog.html
@@ -88,18 +88,20 @@ newly started process.</li>
 <strong>Linked Processes</strong> panel.</p>

 <p class="image"><img src="images/switch-link.png" alt="Linked Processes">

 <br><strong>Figure:</strong> Linked Processes</p>

-<p>When any process is aborted and started the link type for:</p>

+<p>When any process is aborted and started the:</p>

 <ul>

-	<li>Source process instance is displayed as Switched To</li>

-	<li>Target process instance is displayed as Switched From </li>

+	<li>Source process instance is Switched To target process instance</li>

+	<li>Target process instance is Switched From source process instance</li>

 </ul>

-<p>If you want to view the source process details then click on the process 

+<p>

+The linked processes get displayed under the <strong>Linked Processes</strong> panel. 

+Notice that the status is displayed as Active of the target process.

+The link type of the target process instance is displayed as

+<strong>Switched From</strong>. The term Switch stands for Abort and Start operation.

+If you want to view the source process details then click on the process 

 name displayed in the <strong>Process</strong> column

 of the target process.

-The linked processes get displayed under the <strong>Linked Processes</strong> panel. 

-Notice that the status is displayed as Aborted.

-The link type of the source process instance is displayed as

-<strong>Switched To</strong>. The term Switch stands for Abort and Start operation.</p>

+</p>

 <p>Please note that the links are established between root process of the source process instance and the 

 target process instance, which can be a sub-process.</p>