Merge branch '7.x' into 7.x-application

# Conflicts: # exercices/source/en/chapters/ex3.xml # exercices/source/en/chapters/ex5.xml # exercices/source/fr/chapters/ex3.xml # exercices/source/fr/chapters/ex5.xml # exercices/source/fr/chapters/ex6.xml
Bonitasoft-Community · Mar 20, 2017 · dfc0df9 · dfc0df9
2 parents a1cebf6 + 4452cc7
commit dfc0df9
Show file tree

Hide file tree

Showing 43 changed files with 1,324 additions and 1,422 deletions.
diff --git a/README.md b/README.md
@@ -4,18 +4,18 @@ BPM Camp - 7.x
 Slides and exercises for the BPM Camp events.
 
 Content is available in:
-- English (Bonita BPM 7.2)
-- French (Bonita BPM 7.2)
+- English (Bonita BPM 7.4)
+- French (Bonita BPM 7.4)
 - Spanish (Bonita BPM 7.2)
 
 ##Setup instructions for slides
-1. Download [reveal.js](https://github.com/hakimel/reveal.js/) version 3.1.0
+1. Download [reveal.js version 3.4.1](https://github.com/hakimel/reveal.js/releases/tag/3.4.1)
 2. Paste the content of the `slides/THE_LANGUAGE/` folder into your `reveal.js` directory
 3. Paste the content of the `slides/theme` folder in your `reveal.js/css/theme` folder
 
 ##Setup instructions for exercises
 1. Download and install the [DEP4E eclipse plugin](http://dep4e.sourceforge.net/)
-2. Download [Ant-Contrib 1.0b2](http://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.zip/download) 
+2. Download [Ant-Contrib 1.0b2](http://sourceforge.net/projects/ant-contrib/files/ant-contrib/ant-contrib-1.0b2/ant-contrib-1.0b2-bin.zip/download)
 3. Open Eclipse preferences and navigating to `Ant / Runtime`
 4. Select the `Classpath` tab and add the Ant-Contrib JAR as an external JAR under `Global Entries`
 5. Create a docbook project from the `exercices` folder
@@ -26,5 +26,3 @@ Content is available in:
 With the exercises project set up, you may build the instructions in Eclipse:
 - as a PDF by running the Ant "PDF" target
 - as a ZIP file with corrections by running the Ant "Package as ZIP" target
-
-
diff --git a/exercices/build.xml b/exercices/build.xml
@@ -3,7 +3,7 @@
 
 	<!-- Dockbook default build properties -->
 	<property name="docbook.xml.filename" value="docbook" />
-	<property name="docbook.xml.language" value="fr" />
+	<property name="docbook.xml.language" value="en" />
 	<import file="${net.sourceforge.dep4e.resources}/ant/docbook_5-0.xml" />
 
 	<!-- Packages the BPM Camp content (except slides) as a ZIP -->
@@ -34,7 +34,7 @@
 		<!-- Build ZIP with exercises and corrections -->
 		<zip destfile="${dir.target}/${ant.project.name}-${docbook.xml.language}.zip">
 			<zipfileset dir="${dir.target}" includes="*.pdf" prefix="${ant.project.name}"/>
-			<zipfileset dir="${basedir}/corrections/${docbook.xml.language}" includes="*.bos" prefix="${ant.project.name}/Corrections"/>
+			<zipfileset dir="${basedir}/corrections/${docbook.xml.language}" includes="*" prefix="${ant.project.name}/Corrections"/>
 		</zip>
 	</target>
 </project>
diff --git a/exercices/corrections/fr/Application_Data.xml b/exercices/corrections/fr/Application_Data.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <applications xmlns="http://documentation.bonitasoft.com/application-xml-schema/1.0">
-    <application token="demandeConge" version="1.0" profile="User" homePage="status" state="ACTIVATED" layout="custompage_defaultlayout" theme="custompage_bootstrapdefaulttheme">
-        <displayName>Application de demande de conges</displayName>
+    <application token="demandeConges" version="1.0" profile="User" homePage="statut" state="ACTIVATED" layout="custompage_defaultlayout" theme="custompage_bootstrapdefaulttheme">
+        <displayName>Application de demande de congés</displayName>
         <description></description>
         <iconPath></iconPath>
         <applicationPages>
-            <applicationPage customPage="custompage_demandeCongesApp" token="status"/>
+            <applicationPage customPage="custompage_SuiviDesDemandes" token="statut"/>
         </applicationPages>
     </application>
 </applications>
diff --git a/exercices/corrections/fr/Diagramme demande de congés-1.0.bos b/exercices/corrections/fr/Diagramme demande de congés-1.0.bos
diff --git a/exercices/corrections/fr/Diagramme demande de congés-2.0.bos b/exercices/corrections/fr/Diagramme demande de congés-2.0.bos
diff --git a/exercices/corrections/fr/Diagramme demande de congés-3.0.bos b/exercices/corrections/fr/Diagramme demande de congés-3.0.bos
diff --git a/exercices/corrections/fr/Diagramme demande de congés-4.0.bos b/exercices/corrections/fr/Diagramme demande de congés-4.0.bos
diff --git a/exercices/corrections/fr/Diagramme demande de congés-5.0.bos b/exercices/corrections/fr/Diagramme demande de congés-5.0.bos
diff --git a/.../corrections/fr/page-demandeCongesApp.zip → .../corrections/fr/page-SuiviDesDemandes.zip b/.../corrections/fr/page-demandeCongesApp.zip → .../corrections/fr/page-SuiviDesDemandes.zip
diff --git a/exercices/source/en/chapters/ex1.xml b/exercices/source/en/chapters/ex1.xml
@@ -32,7 +32,7 @@
 			<listitem><para><emphasis role="bold">Create a new process diagram.</emphasis></para></listitem>
 			<listitem>
 				<para><emphasis role="bold">Set the diagram and process names.</emphasis></para>
-				<para>Click on the "Diagram / Rename" top menu.</para>
+				<para>Click on the "Diagram / Rename..." top menu.</para>
 				<para>Enter "Leave request diagram" as the diagram name and "Leave request" as the pool name.</para>
 				<para>
 					<mediaobject>
@@ -116,7 +116,7 @@
 			<listitem>
 				<para><emphasis role="bold">Validate the diagram.</emphasis></para>
 				<para>Once the transition conditions are properly set, you can re-validate the process diagram.
-				To do so, navigate to the "Validation status" tab and click on "refresh".
+				To do so, navigate to the "Validation status" tab and click on "Refresh".
 				You may safely ignore the 3 warnings related to the UI Designer.</para>
 			</listitem>
 			<listitem>
@@ -146,7 +146,7 @@
 						</imageobject>
 					</mediaobject>
 				</para>
-				<para>Submit the form of the "Validate request" task to complete your case.</para>
+				<para>Submit the form of the "Validate request" task by clicking on the "Execute" button to complete your case.</para>
 			</listitem>
 		</orderedlist>
 	</section>

diff --git a/exercices/source/en/chapters/ex2.xml b/exercices/source/en/chapters/ex2.xml
@@ -144,7 +144,7 @@
 			<listitem>
 				<para><emphasis role="bold">Declare an instance of the "LeaveRequest" BDM on your process</emphasis></para>
 				<para>Select the process pool, and navigate to the "Data / Pool variables" tab.</para>
-				<para>In the "Business variables" section, click on "Add".</para>
+				<para>In the "Business variables" section, click on "Add...".</para>
 				<para>Name the variable "request" and select the "LeaveRequest" business object.</para>
 				<para>Click on "Finish".</para>
 				<para>
@@ -242,18 +242,20 @@
 			<listitem>
 				<para><emphasis role="bold">Update the "request" BDM initialization</emphasis></para>
 				<para>Select the process pool, and navigate to the "Data / Pool variables" tab.</para>
-				<para>Select the "request" business variable and click on "Edit".</para>
+				<para>Select the "request" business variable and click on "Edit...".</para>
 				<para>Click on the "Pencil" icon next to the "Default value" field to open the expression editor.</para>
 				<para>Clear all of the generated code and replace it by the following:</para>
 				<para>
 					<programlisting language="java"><xi:include parse="text" href="../resources/code/ex2_initRequest.java"><xi:fallback><para>XINCLUDE-ERROR</para></xi:fallback></xi:include></programlisting>
 				</para>
 				<para>This will initialize the BDM from the contract data and set the process initiator as the request author.</para>
+				<para>Click on "OK" button to close the expression editor.</para>
+				<para>Click again on "OK" button to confirm the modification of the business data.</para>
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Set up the "Validate request" step contract</emphasis></para>
 				<para>Select the "Validate request" task and navigate to the "Execution / Contract / Inputs" tab.</para>
-				<para>Click on "Add" then set the input name to "isApproved" and its type to "BOOLEAN".</para>
+				<para>Click on "Add" button then set the input name to "isApproved" and its type to "BOOLEAN".</para>
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Add an operation on "Validate request" to update the request</emphasis></para>
@@ -262,7 +264,7 @@
 				<para>Select "request" as the target.</para>
 				<para>Click on the "Takes value of" link and switch to the "Use a Java method" operator type.</para>
 				<para>Select the "setIsApproved" method and click on "OK".</para>
-				<para>In the rightmost dropdown, select the "isApproved" contract input.</para>
+				<para>In the rightmost drop-down, select the "isApproved" contract input.</para>
 				<para>
 					<mediaobject>
 						<imageobject>
@@ -273,7 +275,8 @@
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Use the business data to dynamically control the process flow</emphasis></para>
-				<para>Select the transition "Yes" and click on the pencil icon next to the "Condition" dropdown to open the expression editor.</para>
+				<para>Select the transition "Yes" and navigate to the "General / General" tab.</para>
+				<para>Click on the pencil icon next to the "Condition" drop-down to open the expression editor.</para>
 				<para>In the expression editor, select "Java" as the expression type, select the "request" variable and the "isApproved" method.</para>
 				<para>
 					<mediaobject>

diff --git a/exercices/source/en/chapters/ex3.xml b/exercices/source/en/chapters/ex3.xml
@@ -42,7 +42,8 @@
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Update the form title</emphasis></para>
-				<para>Select the top most widget "Request Input" and edit the following properties:</para>
+        <para>Select the top most widget "Request Input".</para>
+        <para>In the section on the right edit the following properties:</para>
 				<informaltable frame="all">
 					<tgroup cols="2" align="left" colsep="1" rowsep="1">
 						<colspec colname='c1' colwidth="1*"/>
@@ -84,17 +85,13 @@
 							</row>
 						</thead>
 						<tbody>
-							<row>
-								<entry>Required</entry>
-								<entry>yes</entry>
-							</row>
 							<row>
 								<entry>Placeholder</entry>
-								<entry>Start date of your leave</entry>
+								<entry>mm/dd/yyyy</entry>
 							</row>
 							<row>
 								<entry>Date format</entry>
-								<entry>yyyy-MM-dd</entry>
+								<entry>MM/dd/yyyy</entry>
 							</row>
 						</tbody>
 					</tgroup>
@@ -114,10 +111,6 @@
 							</row>
 						</thead>
 						<tbody>
-							<row>
-								<entry>Required</entry>
-								<entry>yes</entry>
-							</row>
 							<row>
 								<entry>Label</entry>
 								<entry>Number of days</entry>
@@ -312,17 +305,13 @@
 								<entry>Title level</entry>
 								<entry>Level 2</entry>
 							</row>
-							<row>
-								<entry>Alignment</entry>
-								<entry>center</entry>
-							</row>
 						</tbody>
 					</tgroup>
 				</informaltable>
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Add a widget to display the requestor</emphasis></para>
-				<para>Drag an "Input" widget from the palette and drop it on the empty Form container.</para>
+				<para>Drag an "Text" widget from the palette and drop it on a new row under the form title.</para>
 				<para>Configure the widget as following:</para>
 				<informaltable frame="all">
 					<tgroup cols="2" align="left" colsep="1" rowsep="1">
@@ -335,25 +324,17 @@
 							</row>
 						</thead>
 						<tbody>
-							<row>
-								<entry>Read-only</entry>
-								<entry>yes</entry>
-							</row>
-							<row>
-								<entry>Label</entry>
-								<entry>Requestor</entry>
-							</row>
 							<row>
 								<entry>Value</entry>
-								<entry>requestor.firstname +" "+ requestor.lastname</entry>
+                <entry><code>&lt;b&gt;Requestor: &lt;/b&gt;{{requestor.firstname}} {{requestor.lastname}}</code></entry>
 							</row>
 						</tbody>
 					</tgroup>
 				</informaltable>
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Add a widget to display the leave start date</emphasis></para>
-				<para>Drag an "Date picker" widget from the palette and drop it in the Form container under the requestor widget.</para>
+				<para>Drag an "Text" widget from the palette and drop it in the Form container under the requestor widget.</para>
 				<para>Configure the widget as following:</para>
 				<informaltable frame="all">
 					<tgroup cols="2" align="left" colsep="1" rowsep="1">
@@ -366,25 +347,17 @@
 							</row>
 						</thead>
 						<tbody>
-							<row>
-								<entry>Read-only</entry>
-								<entry>yes</entry>
-							</row>
-							<row>
-								<entry>Label</entry>
-								<entry>Leave start</entry>
-							</row>
 							<row>
 								<entry>Value</entry>
-								<entry>request.leaveStart</entry>
+								<entry>&lt;b&gt;Leave start date: &lt;/b&gt;{{request.leaveStart | date : 'dd/MM/yyyy' : 'UTC'}}</entry>
 							</row>
 						</tbody>
 					</tgroup>
 				</informaltable>
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Add a widget to display the number of days</emphasis></para>
-				<para>Drag an "Input" widget from the palette and drop it on a new row under the "Start date" widget.</para>
+				<para>Drag an "Text" widget from the palette and drop it on a new row under the "Start date" widget.</para>
 				<para>Configure the widget as following:</para>
 				<informaltable frame="all">
 					<tgroup cols="2" align="left" colsep="1" rowsep="1">
@@ -397,17 +370,9 @@
 							</row>
 						</thead>
 						<tbody>
-							<row>
-								<entry>Read-only</entry>
-								<entry>yes</entry>
-							</row>
-							<row>
-								<entry>Label</entry>
-								<entry>Number of days</entry>
-							</row>
 							<row>
 								<entry>Value</entry>
-								<entry>request.dayCount</entry>
+                <entry><code>&lt;b&gt;Number of days: &lt;/b&gt; {{request.dayCount}}</code></entry>
 							</row>
 						</tbody>
 					</tgroup>
@@ -519,7 +484,7 @@
 				<para>
 					<mediaobject>
 						<imageobject>
-							<imagedata scalefit="1" width="70%" contentdepth="70%" align="center" format="png" fileref="resources/ex3_08.png" />
+							<imagedata scalefit="1" width="100%" contentdepth="100%" align="center" format="png" fileref="resources/ex3_08.png" />
 						</imageobject>
 					</mediaobject>
 				</para>

diff --git a/exercices/source/en/chapters/ex4.xml b/exercices/source/en/chapters/ex4.xml
@@ -36,8 +36,8 @@
 			<listitem>
 				<para><emphasis role="bold">Add an "Initiator manager" actor filter on the "Validator" lane.</emphasis></para>
 				<para>Select the "Validator" lane and navigate to the "General / Actor" tab.</para>
-				<para>Select the "Employee actor" from the dropdown menu.</para>
-				<para>Click on the "Set" button of the actor filter.</para>
+				<para>Select the "Employee actor" from the drop-down menu.</para>
+				<para>Click on the "Set..." button of the actor filter.</para>
 				<para>Select an "Initiator manager" filter and click on "Next".</para>
 				<para>Name the filter "requestorManager" and click on "Finish".</para>
 			</listitem>

diff --git a/exercices/source/en/chapters/ex5.xml b/exercices/source/en/chapters/ex5.xml
@@ -6,7 +6,7 @@
 	<section>
 		<title>Goal</title>
 		<para>The goal of this exercise is to demonstrate an interaction between Bonita BPM and an external system with the use of a connector.
-		In this context, we will notify the leave request initiator about his request's status with an email connector.</para>
+		In this context, we will notify the leave request initiator about his request status with an email connector.</para>
 		<warning>
 			<para>Depending on your network configuration, your firewall or the security settings of your email server you may not be able to send an email from Bonita BPM.</para>
 			<para>In order to get rid of those technical constraints, we will use a program that simulates an email server (FakeSMTP).</para>
@@ -18,7 +18,7 @@
 		<para>Obtain and start the FakeSMTP server.</para>
 		<para>Duplicate the process diagram from the previous exercise to create a 5.0 version.</para>
 		<para>Add an email connector on the "Notify request approved" and "Notify request rejected" service tasks.
-		These will send an email to the requestor with the request's validation status.</para>
+		These will send an email to the requestor with the request validation status.</para>
 		<para>The following code will be used to retrieve the requestor's email in the connector:</para>
 		<para>
 			<programlisting language="java"><xi:include parse="text" href="../resources/code/ex5_getRequestorEmail.java"><xi:fallback><para>XINCLUDE-ERROR</para></xi:fallback></xi:include></programlisting>
@@ -60,7 +60,7 @@
 							</row>
 							<row>
 								<entry>SMTP port</entry>
-								<entry>25 (Or the port number specified in FakeSMTP)</entry>
+								<entry>2525 (FakeSMTP default port or the port number specified in FakeSMTP)</entry>
 							</row>
 							<row>
 								<entry>SSL (in the "Security" section)</entry>
@@ -94,7 +94,7 @@
 			</listitem>
 			<listitem>
 				<para><emphasis role="bold">Add an email connector on the "Notify request approved" task.</emphasis></para>
-				<para>Select the task, navigate to the "Execution / Connectors in" tab and click on "Add".</para>
+				<para>Select the task, navigate to the "Execution / Connectors in" tab and click on "Add...".</para>
 				<para>Select the "Email (SMTP)" connector.</para>
 				<para>Name it "sendRequestApprovedEmail" and click on "Next".</para>
 				<para>Do not fill in the parameters but click on <guiicon><inlinegraphic fileref="resources/ex5_03.png"/></guiicon>.</para>