提交 badeb8dd 编写于 作者: F falko.menge

Fixed several typos in the user guide

上级 4ed3459e
......@@ -136,7 +136,7 @@
</listitem>
<listitem>
<para>
The only thing left to do is calling the folowing ant target, in the build-file located in <literal>/setup</literal>:
The only thing left to do is calling the following ant target, in the build-file located in <literal>/setup</literal>:
<programlisting>db.oracle.install.driver</programlisting>
The ant-target will actually install the jdbc-driver in the maven repository to be able to use it afterward, using the command:
<programlisting>
......
......@@ -118,7 +118,7 @@ public class MyBusinessProcessTest extends ActivitiTestCase {
<emphasis>ActivitiTestCase</emphasis> (see above), including this Rule will enable the use
of the <emphasis>org.activiti.engine.test.Deployment</emphasis> annotation (see above for an explanation
of its use and configuration). Process engines are statically cached over
mutliple unit tests when using the same configuration resource.
multiple unit tests when using the same configuration resource.
</para>
<para>
Following code snippet shows an example of using the Junit 4 style of testing and the
......
......@@ -1501,7 +1501,7 @@ List&lt;Task&gt; tasks = taskService.createTaskQuery().assignee(&quot;kermit&quo
activiti:method-expr=&quot;#{printer.printMessage(execution, myVar)}&quot; /&gt;
</programlisting>
Method <literal>printMessage</literal> will be called on the object named <literal>printer</literal>. The first
parameter passed is the <literal>DelegateExecution</literal>, which is available in the epression context by default
parameter passed is the <literal>DelegateExecution</literal>, which is available in the expression context by default
available as <literal>expression</literal>. The second parameter passed, is the value of the variable with name <literal>myVar</literal>
in the current execution.
</para>
......@@ -1578,7 +1578,7 @@ public class ToUppercase extends BpmnJavaDelegation {
<title>Field injection</title>
<para>
It's possible to inject values into the fields of the delegated classes. The folowing types of injection are supported:
It's possible to inject values into the fields of the delegated classes. The following types of injection are supported:
<itemizedlist>
<listitem><para>Fixed string values.</para></listitem>
<listitem><para>Value expressions.</para></listitem>
......@@ -1710,7 +1710,7 @@ public class ReverseStringsFieldInjected extends BpmnJavaDelegation {
</itemizedlist>
</para>
<para>
The folowing process definition contains 3 event-listeners:
The following process definition contains 3 event-listeners:
<programlisting>
&lt;process id=&quot;eventListenersProcess&quot;&gt;
......@@ -1775,7 +1775,7 @@ public class ExampleEventListenerOne implements <emphasis role="bold">EventListe
<title>Field injection on event listeners</title>
<para>
When using an eventlistener that is configured with the <literal>class</literal> attribute, field injection can be applied. This is exaclty the same
When using an eventlistener that is configured with the <literal>class</literal> attribute, field injection can be applied. This is exactly the same
mechanism as used <link linkend="serviceTaskFieldInjection">Service task field injection</link>, which contains an overview of the possibilities provided by field injection.
</para>
<para>
......
......@@ -100,7 +100,7 @@ Motivation:&lt;br/&gt;
<para>
When deployed, Activiti Explorer can now use these forms. When you click to a process definition name
to start a certain process instance, the startform is first retrieved:
to start a certain process instance, the start form is first retrieved:
<programlisting>Object startForm = taskService.getRenderedStartFormByKey("vacationRequest");</programlisting>
(Note that the return value is an <emphasis>object</emphasis>, such that people can plug in their own form types
into the Activiti engine.)
......@@ -168,7 +168,7 @@ taskService.complete("taskId", variables);</programlisting>
<para>
The demo setup script installs the <emphasis>vacationRequest</emphasis> business process
as an example of using taskforms through Activiti Explorer. Please check the example
as an example of using task forms through Activiti Explorer. Please check the example
for the complete source code.
The business process mode looks as follows:
......@@ -207,7 +207,7 @@ Motivation:&lt;br/&gt;
After submitting the form, a process instance is started and now someone of the
management team needs to handle the request.
<mediaobject><imageobject><imagedata align="center" fileref="images/taskform.vacation.request.management.group.png"/></imageobject></mediaobject>
The corresponding user task has a taskform attached to it, which uses the
The corresponding user task has a task form attached to it, which uses the
variables which were given as input by the employee in the start form. These variables
are referenced as expressions and are resolved at runtime to their text representation.
<programlisting>&lt;h1&gt;Vacation Approval&lt;/h1&gt;
......
......@@ -8,7 +8,7 @@
<para>
You can use JPA-Entities as process variables, allowing you to:
<itemizedlist>
<listitem><para>Updating existing JPA-entities based on process variables, that can be filled in on a form in a usertask or generated in a serviceTask.</para></listitem>
<listitem><para>Updating existing JPA-entities based on process variables, that can be filled in on a form in a userTask or generated in a serviceTask.</para></listitem>
<listitem><para>Reusing existing domain model without having to write explicit services to fetch the entities and update the values</para></listitem>
<listitem><para>Make decisions (gateways) based on properties of existing entities.</para></listitem>
<listitem><para>...</para></listitem>
......@@ -22,7 +22,7 @@
<itemizedlist>
<listitem>
<para>
Entities should be configured using JPA-annotations, we support both field and property-access. Mapped superclasses can
Entities should be configured using JPA-annotations, we support both field and property-access. Mapped super classes can
also be used.
</para>
</listitem>
......@@ -30,7 +30,7 @@
<para>
Entity should have a primary key annotated with <literal>@Id</literal>, compound primary keys are not supported
(<literal>@EmbeddedId</literal> and <literal>@IdClass</literal>). The Id field/property can be of any type supported in the JPA-spec:
Primitive types and threir wrappers (excluding boolean), <literal>String</literal>, <literal>BigInteger</literal>, <literal>BigDecimal</literal>,
Primitive types and their wrappers (excluding boolean), <literal>String</literal>, <literal>BigInteger</literal>, <literal>BigDecimal</literal>,
<literal>java.util.Date</literal> and <literal>java.sql.Date</literal>.
</para>
</listitem>
......@@ -71,7 +71,7 @@ ProcessEngine engine = new ProcessEngineBuilder()
<para>
<emphasis role="bold"><literal>closeEntityManager: </literal></emphasis>Flag indicating that the engine should close the <literal>EntityManager</literal> instance
that was obtained from the <literal>EntityManagerFactory</literal>. Set to false when the <literal>EntityManager</literal> is container-managed
(eg. when using an Extended Persistence Context which isn't scoped to a single transaction').
(e.g. when using an Extended Persistence Context which isn't scoped to a single transaction').
</para>
</listitem>
</itemizedlist>
......@@ -121,7 +121,7 @@ ProcessEngine engine = new ProcessEngineBuilder()
<para>
<emphasis role="bold"><literal>jpaCloseEntityManager: </literal></emphasis>Flag indicating that the engine should close the <literal>EntityManager</literal> instance
that was obtained from the <literal>jpaCloseEntityManager</literal>. Set to false when the <literal>EntityManager</literal> is container-managed
(eg. when using an Extended Persistence Context which isn't scoped to a single transaction').
(e.g. when using an Extended Persistence Context which isn't scoped to a single transaction').
</para>
</listitem>
</itemizedlist>
......@@ -187,14 +187,14 @@ ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("Upda
</programlisting>
</para>
<para>
The first node in our processdefinition contains a <literal>serviceTask</literal> that will invoke the method <literal>setValue</literal> on <literal>entityToUpdate</literal>, which resolves to
The first node in our process definition contains a <literal>serviceTask</literal> that will invoke the method <literal>setValue</literal> on <literal>entityToUpdate</literal>, which resolves to
the JPA variable we set earlier when starting the process instance and will be loaded from the <literal>EntityManager</literal> associated with the current engine's context'.
<programlisting>
&lt;serviceTask id='theTask' name='updateJPAEntityTask' activiti:method-expr=&quot;${entityToUpdate.setValue('updatedValue')}&quot; /&gt;
</programlisting>
</para>
<para>
When the service-task is finished, the processinstance waits in a usertask defined in the processdefinition, which allows us to inspect the processinstance. At this point, the <literal>EntityManager</literal> has been flushed
When the service-task is finished, the process instance waits in a userTask defined in the process definition, which allows us to inspect the process instance. At this point, the <literal>EntityManager</literal> has been flushed
and the changes to the entity have been pushed to the database. When we get the value of the variable <literal>entityToUpdate</literal>, it's loaded again and we get
the entity with it's <literal>value</literal> property set to <literal>updatedValue</literal>.
<programlisting>
......@@ -223,23 +223,23 @@ assertEquals("updatedValue", ((FieldAccessJPAEntity)updatedEntity).getValue());
<section>
<title>Advanced example using Spring beans and JPA</title>
<para>
A more advanced example, <literal>JPASpringTest</literal>, can be found in <literal>activiti-spring-examples</literal>. It describes the folowing simple usecase:
A more advanced example, <literal>JPASpringTest</literal>, can be found in <literal>activiti-spring-examples</literal>. It describes the following simple use case:
<itemizedlist>
<listitem>
<para>An existing Spring-bean which uses JPA entities already exists which allows for Loan Requests to be stored.</para>
</listitem>
<listitem>
<para>Using activiti, we can use the existing entities, obtained through the existing bean, and use them as variable in our process.</para>
<para>Using Activiti, we can use the existing entities, obtained through the existing bean, and use them as variable in our process.</para>
<para>
Process is defined in the folowing steps:
Process is defined in the following steps:
<itemizedlist>
<listitem>
<para>Service task that creates a new LoanRequest, using the existing <literal>LoanRequestBean</literal> using variables received
when starting the process (eg. could come from a start form). The created entity is stored as a variable, using <literal>activiti:result-variable-name</literal>
when starting the process (e.g. could come from a start form). The created entity is stored as a variable, using <literal>activiti:result-variable-name</literal>
which stored the method-expression result as a variable.
</para>
</listitem>
<listitem><para>Usertask that allows a manager to review the request and approve/dissaprove, which is stored as a boolean variable <literal>approvedByManager</literal></para></listitem>
<listitem><para>UserTask that allows a manager to review the request and approve/disapprove, which is stored as a boolean variable <literal>approvedByManager</literal></para></listitem>
<listitem><para>ServiceTask that updates the loan request entity so the entity is in sync with the process.</para></listitem>
<listitem>
<para>Depending on the value of the entity property <literal>approved</literal>, an exclusive gateway is used to make a decision
......@@ -298,8 +298,8 @@ assertEquals("updatedValue", ((FieldAccessJPAEntity)updatedEntity).getValue());
</programlisting>
</para>
<para>Although the example above is quite simple, it shows the power of using JPA combined with Spring and parameterised method-expressions. The process requires
no custom java-code at all (except for the Spring-bean offcourse) and speeds up development drastically.
<para>Although the example above is quite simple, it shows the power of using JPA combined with Spring and parametrized method-expressions. The process requires
no custom java-code at all (except for the Spring-bean off course) and speeds up development drastically.
</para>
</section>
</section>
......
......@@ -63,7 +63,7 @@
</listitem>
<listitem>
<para>
Support for the activiti extensions: Java class configuration, assignee and candidate user/group.
Support for the Activiti extensions: Java class configuration, assignee and candidate user/group.
</para>
</listitem>
<listitem>
......
......@@ -30,7 +30,7 @@
The repositories are plugged in as repository connectors.
You'll find the configuration as an XML string in
the table <literal>CYCLE_CONFIG</literal> in the Activiti database,
which you can access as decribed in <xref linkend="checking.database"/>.
which you can access as described in <xref linkend="checking.database"/>.
Here is the default configuration for the user kermit:
</para>
......
......@@ -239,8 +239,8 @@
<title>List Process Definitions</title>
<para>
Returns details about the deployed process definitions that can be sorted by "id", "name", "version" or
"deploymentTime". The name of the BPMN2.0 xml process diagram is givenin the "resourceName" attribute and can,
in combination with the "deploymentId" attribute, be retreived from the GET Deployment Resource REST API call
"deploymentTime". The name of the BPMN2.0 XML process diagram is given in the "resourceName" attribute and can,
in combination with the "deploymentId" attribute, be retrieved from the GET Deployment Resource REST API call
above. If the process has a start form it is given in the "startFormResourceKey" attribute.
The start form for a process can be retrieved from the GET Start Process Form REST API call.
</para>
......@@ -618,7 +618,7 @@
<title>Login</title>
<para>
Authenticates a user. If user and password doesn't match a response with status 403 is returned.
If authentication is succesful a response with status 200 is returned.
If authentication is successful, a response with status 200 is returned.
</para>
<itemizedlist>
<listitem>
......@@ -756,7 +756,7 @@
</section>
<section>
<title>List Groups's Users</title>
<title>List Group Users</title>
<para>
Returns details about a group's users that can be sorted by "id", "firstName", "lastName" or "email".
</para>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册