ACT-261: changed dashes to camelcase to match the other constructs

modules/activiti-engine/src/main/java/org/activiti/engine/impl/bpmn/parser/BpmnParse.java

@@ -610,7 +610,7 @@ public class BpmnParse extends Parse {
         language = ScriptingEngines.DEFAULT_SCRIPTING_LANGUAGE;
       }
 
-      resultVariableName = scriptTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "result-variable-name");
+      resultVariableName = scriptTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "resultVariableName");
     }
     
     activity.setActivityBehavior(new ScriptTaskActivity(script, language, resultVariableName));
@@ -631,7 +631,7 @@ public class BpmnParse extends Parse {
     String type = serviceTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "type");
     String className = serviceTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "class");
     String expression = serviceTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "expression");
-    String resultVariableName = serviceTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "result-variable-name");
+    String resultVariableName = serviceTaskElement.attributeNS(BpmnParser.BPMN_EXTENSIONS_NS, "resultVariableName");
     String implementation = serviceTaskElement.attribute("implementation");
     String operationRef = serviceTaskElement.attribute("operationRef");
     List<FieldDeclaration> fieldDeclarations = parseFieldDeclarationsOnServiceTask(serviceTaskElement);
@@ -645,7 +645,7 @@ public class BpmnParse extends Parse {
     
     } else if (className != null && className.trim().length() > 0) {
       if (resultVariableName != null) {
-        addError("'result-variable-name' not supported for service tasks using 'class'", serviceTaskElement);
+        addError("'resultVariableName' not supported for service tasks using 'class'", serviceTaskElement);
       }
 
       activity.setActivityBehavior(new ServiceTaskDelegateActivityBehaviour(className, fieldDeclarations));
@@ -780,7 +780,7 @@ public class BpmnParse extends Parse {
     String stringElementText = null;
     
     if(attributeValue != null && childElement != null) {
-      addError("Can't use attribute '" + attributeName + "' and element '" + elementName + "' toghether, only use one", element);
+      addError("Can't use attribute '" + attributeName + "' and element '" + elementName + "' together, only use one", element);
     } else if (childElement != null) {
       stringElementText = childElement.getText();
       if (stringElementText == null || stringElementText.length() == 0) {

modules/activiti-engine/src/test/java/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.java

@@ -69,7 +69,7 @@ public class JavaServiceTaskTest extends ActivitiInternalTestCase {
       repositoryService.createDeployment().addClasspathResource("org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testIllegalUseOfResultVariableName.bpmn20.xml").deploy();
       fail();
     } catch (ActivitiException e) {
-      assertTrue(e.getMessage().contains("result-variable-name"));
+      assertTrue(e.getMessage().contains("resultVariableName"));
     }
   }
 

modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/scripttask/ScriptTaskTest.testSetScriptResultToProcessVariable.bpmn20.xml

@@ -23,11 +23,11 @@
   
     <startEvent id="theStart" />
 
-    <scriptTask id="theScriptTaskWithExistingProcessVariableName" scriptFormat="juel" activiti:result-variable-name="existingProcessVariableName">
+    <scriptTask id="theScriptTaskWithExistingProcessVariableName" scriptFormat="juel" activiti:resultVariableName="existingProcessVariableName">
       <script>#{echo}</script>
     </scriptTask>
 
-    <scriptTask id="theScriptTaskWithNewProcessVariableName" scriptFormat="juel" activiti:result-variable-name="newProcessVariableName">
+    <scriptTask id="theScriptTaskWithNewProcessVariableName" scriptFormat="juel" activiti:resultVariableName="newProcessVariableName">
       <script>#{echo}</script>
     </scriptTask>
 

modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/ExpressionServiceTaskTest.testSetServiceResultToProcessVariables.bpmn20.xml

@@ -16,7 +16,7 @@
                       targetRef="valueExpressionServiceWithResultVariableNameSet"/>
 
         <serviceTask id="valueExpressionServiceWithResultVariableNameSet"
-                     activiti:result-variable-name="result"
+                     activiti:resultVariableName="result"
                      activiti:expression="#{bean.value}"/>
 
         <sequenceFlow sourceRef="valueExpressionServiceWithResultVariableNameSet"

modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/JavaServiceTaskTest.testIllegalUseOfResultVariableName.bpmn20.xml

@@ -14,7 +14,7 @@
     
     <serviceTask id="javaService" 
                  activiti:class="org.activiti.examples.bpmn.servicetask.ToUppercase" 
-                 activiti:result-variable-name="var"
+                 activiti:resultVariableName="var"
             />
     
     <sequenceFlow id="flow2" sourceRef="javaService" targetRef="waitState" />

modules/activiti-engine/src/test/resources/org/activiti/examples/bpmn/servicetask/MethodExpressionServiceTaskTest.testSetServiceResultToProcessVariables.bpmn20.xml

@@ -16,7 +16,7 @@
                       targetRef="methodExpressionServiceWithResultVariableNameSet"/>
 
         <serviceTask id="methodExpressionServiceWithResultVariableNameSet"
-                     activiti:result-variable-name="result"
+                     activiti:resultVariableName="result"
                      activiti:expression="#{okReturningService.invoke()}"/>
 
         <sequenceFlow sourceRef="methodExpressionServiceWithResultVariableNameSet"

modules/activiti-spring/src/test/resources/org/activiti/spring/test/jpa/JPASpringTest.bpmn20.xml

@@ -11,7 +11,7 @@
     
     <serviceTask id='createLoanRequest' name='Create loan request' 
       activiti:expression="${loanRequestBean.newLoanRequest(customerName, amount)}" 
-      activiti:result-variable-name="loanRequest"/>    
+      activiti:resultVariableName="loanRequest"/>    
     <sequenceFlow id='flow2' sourceRef='createLoanRequest' targetRef='approveTask' />
     
     <userTask id="approveTask" name="Approve request" />

userguide/src/en/chapters/ch07-BPMN.xml

@@ -1397,11 +1397,11 @@ List<Task> tasks = taskService.createTaskQuery().assignee("kermit&quo
 
 		    <para>
 		      The return value of a script task can be assigned to an already existing or to a new process variable by
-              specifying the process variable name as a literal value for the <emphasis>'activiti:result-variable-name'</emphasis> attribute
+              specifying the process variable name as a literal value for the <emphasis>'activiti:resultVariableName'</emphasis> attribute
               of a script task definition. Any existing value for a specific process variable will be overwritten by the result
               value of the script execution. When not specifying a result variable name, the script result value gets ignored.
 <programlisting>
-&lt;scriptTask id=&quot;theScriptTask&quot; name=&quot;Execute script&quot; scriptFormat=&quot;juel&quot; activiti:result-variable-name=&quot;myVar&quot;&gt;
+&lt;scriptTask id=&quot;theScriptTask&quot; name=&quot;Execute script&quot; scriptFormat=&quot;juel&quot; activiti:resultVariableName=&quot;myVar&quot;&gt;
   &lt;script&gt;#{echo}&lt;/script&gt;
 &lt;/scriptTask&gt;</programlisting>
 
@@ -1666,13 +1666,13 @@ public class ReverseStringsFieldInjected extends BpmnJavaDelegation {
 
          <para>
            The return value of a service execution (for service task using expression only) can be assigned to an already existing or to a new process variable by
-           specifying the process variable name as a literal value for the <emphasis>'activiti:result-variable-name'</emphasis> attribute
+           specifying the process variable name as a literal value for the <emphasis>'activiti:resultVariableName'</emphasis> attribute
            of a service task definition. Any existing value for a specific process variable will be overwritten by the result
            value of the service execution. When not specifying a result variable name, the service execution result value gets ignored.
 <programlisting>
 &lt;serviceTask id=&quot;aMethodExpressionServiceTask&quot;
     activiti:expression=&quot;#{myService.doSomething()}&quot;
-    activiti:result-variable-name=&quot;myVar&quot;
+    activiti:resultVariableName=&quot;myVar&quot;
 /&gt;
 </programlisting>
              

userguide/src/en/chapters/ch09-JPA.xml

@@ -235,7 +235,7 @@ assertEquals("updatedValue", ((FieldAccessJPAEntity)updatedEntity).getValue());
                <itemizedlist>
                 <listitem>
                   <para>Service task that creates a new LoanRequest, using the existing <literal>LoanRequestBean</literal> using variables received
-                  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>
+                  when starting the process (e.g. could come from a start form). The created entity is stored as a variable, using <literal>activiti:resultVariableName</literal>
                   which stores the expression result as a variable.
                   </para>
                 </listitem>
@@ -269,7 +269,7 @@ assertEquals("updatedValue", ((FieldAccessJPAEntity)updatedEntity).getValue());
     
     &lt;serviceTask id='createLoanRequest' name='Create loan request' 
       activiti:expression=&quot;${loanRequestBean.newLoanRequest(customerName, amount)}&quot; 
-      activiti:result-variable-name=&quot;loanRequest&quot;/&gt;    
+      activiti:resultVariableName=&quot;loanRequest&quot;/&gt;    
     &lt;sequenceFlow id='flow2' sourceRef='createLoanRequest' targetRef='approveTask' /&gt;
     
     &lt;userTask id=&quot;approveTask&quot; name=&quot;Approve request&quot; /&gt;