Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@jomarko
jomarko committed Nov 29, 2024
1 parent e1225b6 commit d095410
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 204 deletions.
102 changes: 0 additions & 102 deletions jbpm/jbpm-tests/src/test/bpmn/org/jbpm/bpmn2/flow/BPMN2-IntegerStructureRef.bpmn2
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
=======
<?xml version="1.0" encoding="UTF-8"?>
>>>>>>> 5dd444ead5 (kie-issues#1613: Add `CI :: License headers` GitHub Actions workflow (#3714))
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
Expand All @@ -21,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<<<<<<< HEAD

<definitions id="Definition"
typeLanguage="http://www.java.com/javaTypes"
Expand Down Expand Up @@ -72,103 +67,6 @@

</process>

=======
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:bpsim="http://www.bpsim.org/schemas/1.0" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:drools="http://www.jboss.org/drools" id="_ISbTACW5ED2lG5gYh56IOg" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd http://www.jboss.org/drools drools.xsd http://www.bpsim.org/schemas/1.0 bpsim.xsd http://www.omg.org/spec/DD/20100524/DC DC.xsd http://www.omg.org/spec/DD/20100524/DI DI.xsd " exporter="jBPM Process Modeler" exporterVersion="2.0" targetNamespace="http://www.omg.org/bpmn20">
<bpmn2:itemDefinition id="_testItem" structureRef="Integer"/>
<bpmn2:itemDefinition id="__2_SkippableInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_PriorityInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_CommentInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_DescriptionInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_CreatedByInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_TaskNameInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_GroupIdInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_ContentInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotStartedReassignInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotCompletedReassignInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotStartedNotifyInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotCompletedNotifyInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_testHTOutputXItem" structureRef=""/>
<bpmn2:collaboration id="_ADB1FB6D-9362-4FF4-8820-9F37A12954E4" name="Default Collaboration">
<bpmn2:participant id="_F05B6A8C-254A-4850-833B-0FCFD48A2BCB" name="Pool Participant" processRef="IntegerStructureRef"/>
</bpmn2:collaboration>
<bpmn2:process id="IntegerStructureRef" drools:packageName="org.jbpm.bpmn2.flow" drools:version="1.0" drools:adHoc="false" name="IntegerStructureRef" isExecutable="true" processType="Private">
<bpmn2:property id="test" itemSubjectRef="_testItem" name="test"/>
<bpmn2:sequenceFlow id="_1-_2" sourceRef="_1" targetRef="_2"/>
<bpmn2:sequenceFlow id="_2-_3" sourceRef="_2" targetRef="_3"/>
<bpmn2:sequenceFlow id="_3-_4" sourceRef="_3" targetRef="_4"/>
<bpmn2:startEvent id="_1" name="StartProcess">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[StartProcess]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:outgoing>_1-_2</bpmn2:outgoing>
</bpmn2:startEvent>
<bpmn2:userTask id="_2" name="User Task">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[User Task]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:incoming>_1-_2</bpmn2:incoming>
<bpmn2:outgoing>_2-_3</bpmn2:outgoing>
<bpmn2:ioSpecification>
<bpmn2:dataInput id="_2_TaskNameInputX" drools:dtype="Object" itemSubjectRef="__2_TaskNameInputXItem" name="TaskName"/>
<bpmn2:dataInput id="_2_SkippableInputX" drools:dtype="Object" itemSubjectRef="__2_SkippableInputXItem" name="Skippable"/>
<bpmn2:dataOutput id="_2_testHTOutputX" drools:dtype="" itemSubjectRef="__2_testHTOutputXItem" name="testHT"/>
<bpmn2:inputSet>
<bpmn2:dataInputRefs>_2_TaskNameInputX</bpmn2:dataInputRefs>
<bpmn2:dataInputRefs>_2_SkippableInputX</bpmn2:dataInputRefs>
</bpmn2:inputSet>
<bpmn2:outputSet>
<bpmn2:dataOutputRefs>_2_testHTOutputX</bpmn2:dataOutputRefs>
</bpmn2:outputSet>
</bpmn2:ioSpecification>
<bpmn2:dataInputAssociation>
<bpmn2:targetRef>_2_TaskNameInputX</bpmn2:targetRef>
<bpmn2:assignment>
<bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[Task]]></bpmn2:from>
<bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_2_TaskNameInputX]]></bpmn2:to>
</bpmn2:assignment>
</bpmn2:dataInputAssociation>
<bpmn2:dataInputAssociation>
<bpmn2:targetRef>_2_SkippableInputX</bpmn2:targetRef>
<bpmn2:assignment>
<bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[false]]></bpmn2:from>
<bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_2_SkippableInputX]]></bpmn2:to>
</bpmn2:assignment>
</bpmn2:dataInputAssociation>
<bpmn2:dataOutputAssociation>
<bpmn2:sourceRef>_2_testHTOutputX</bpmn2:sourceRef>
<bpmn2:targetRef>test</bpmn2:targetRef>
</bpmn2:dataOutputAssociation>
<bpmn2:potentialOwner id="_ISdIMCW5ED2lG5gYh56IOg">
<bpmn2:resourceAssignmentExpression id="_ISdIMSW5ED2lG5gYh56IOg">
<bpmn2:formalExpression>john</bpmn2:formalExpression>
</bpmn2:resourceAssignmentExpression>
</bpmn2:potentialOwner>
</bpmn2:userTask>
<bpmn2:scriptTask id="_3" name="Script" scriptFormat="http://www.java.com/java">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[Script]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:incoming>_2-_3</bpmn2:incoming>
<bpmn2:outgoing>_3-_4</bpmn2:outgoing>
<bpmn2:script>System.out.println("Result "+test);</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:endEvent id="_4" name="End">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[End]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:incoming>_3-_4</bpmn2:incoming>
<bpmn2:terminateEventDefinition/>
</bpmn2:endEvent>
</bpmn2:process>
>>>>>>> 5dd444ead5 (kie-issues#1613: Add `CI :: License headers` GitHub Actions workflow (#3714))
<bpmndi:BPMNDiagram>
<bpmndi:BPMNPlane bpmnElement="StructureRef" >
<bpmndi:BPMNShape bpmnElement="_1" >
Expand Down
102 changes: 0 additions & 102 deletions jbpm/jbpm-tests/src/test/bpmn/org/jbpm/bpmn2/flow/BPMN2-ObjectStructureRef.bpmn2
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="UTF-8"?>
=======
<?xml version="1.0" encoding="UTF-8"?>
>>>>>>> 5dd444ead5 (kie-issues#1613: Add `CI :: License headers` GitHub Actions workflow (#3714))
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
Expand All @@ -21,7 +17,6 @@
~ specific language governing permissions and limitations
~ under the License.
-->
<<<<<<< HEAD

<definitions id="Definition"
typeLanguage="http://www.java.com/javaTypes"
Expand Down Expand Up @@ -72,103 +67,6 @@

</process>

=======
<bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:bpsim="http://www.bpsim.org/schemas/1.0" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:drools="http://www.jboss.org/drools" id="_MTswECW5ED2lY6_ultl44A" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd http://www.jboss.org/drools drools.xsd http://www.bpsim.org/schemas/1.0 bpsim.xsd http://www.omg.org/spec/DD/20100524/DC DC.xsd http://www.omg.org/spec/DD/20100524/DI DI.xsd " exporter="jBPM Process Modeler" exporterVersion="2.0" targetNamespace="http://www.omg.org/bpmn20">
<bpmn2:itemDefinition id="_testItem" structureRef="org.jbpm.bpmn2.objects.Person"/>
<bpmn2:itemDefinition id="__2_SkippableInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_PriorityInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_CommentInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_DescriptionInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_CreatedByInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_TaskNameInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_GroupIdInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_ContentInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotStartedReassignInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotCompletedReassignInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotStartedNotifyInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_NotCompletedNotifyInputXItem" structureRef="Object"/>
<bpmn2:itemDefinition id="__2_testHTOutputXItem" structureRef=""/>
<bpmn2:collaboration id="_C4244210-EF3E-43F6-8266-DF7578F62ABC" name="Default Collaboration">
<bpmn2:participant id="_F53E69B8-FA7C-4199-8C7F-CA2153A39CEB" name="Pool Participant" processRef="ObjectStructureRef"/>
</bpmn2:collaboration>
<bpmn2:process id="ObjectStructureRef" drools:packageName="org.jbpm.bpmn2.flow" drools:version="1.0" drools:adHoc="false" name="ObjectStructureRef" isExecutable="true" processType="Private">
<bpmn2:property id="test" itemSubjectRef="_testItem" name="test"/>
<bpmn2:sequenceFlow id="_1-_2" sourceRef="_1" targetRef="_2"/>
<bpmn2:sequenceFlow id="_2-_3" sourceRef="_2" targetRef="_3"/>
<bpmn2:sequenceFlow id="_3-_4" sourceRef="_3" targetRef="_4"/>
<bpmn2:startEvent id="_1" name="StartProcess">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[StartProcess]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:outgoing>_1-_2</bpmn2:outgoing>
</bpmn2:startEvent>
<bpmn2:userTask id="_2" name="User Task">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[User Task]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:incoming>_1-_2</bpmn2:incoming>
<bpmn2:outgoing>_2-_3</bpmn2:outgoing>
<bpmn2:ioSpecification>
<bpmn2:dataInput id="_2_TaskNameInputX" drools:dtype="Object" itemSubjectRef="__2_TaskNameInputXItem" name="TaskName"/>
<bpmn2:dataInput id="_2_SkippableInputX" drools:dtype="Object" itemSubjectRef="__2_SkippableInputXItem" name="Skippable"/>
<bpmn2:dataOutput id="_2_testHTOutputX" drools:dtype="" itemSubjectRef="__2_testHTOutputXItem" name="testHT"/>
<bpmn2:inputSet>
<bpmn2:dataInputRefs>_2_TaskNameInputX</bpmn2:dataInputRefs>
<bpmn2:dataInputRefs>_2_SkippableInputX</bpmn2:dataInputRefs>
</bpmn2:inputSet>
<bpmn2:outputSet>
<bpmn2:dataOutputRefs>_2_testHTOutputX</bpmn2:dataOutputRefs>
</bpmn2:outputSet>
</bpmn2:ioSpecification>
<bpmn2:dataInputAssociation>
<bpmn2:targetRef>_2_TaskNameInputX</bpmn2:targetRef>
<bpmn2:assignment>
<bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[Task]]></bpmn2:from>
<bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_2_TaskNameInputX]]></bpmn2:to>
</bpmn2:assignment>
</bpmn2:dataInputAssociation>
<bpmn2:dataInputAssociation>
<bpmn2:targetRef>_2_SkippableInputX</bpmn2:targetRef>
<bpmn2:assignment>
<bpmn2:from xsi:type="bpmn2:tFormalExpression"><![CDATA[false]]></bpmn2:from>
<bpmn2:to xsi:type="bpmn2:tFormalExpression"><![CDATA[_2_SkippableInputX]]></bpmn2:to>
</bpmn2:assignment>
</bpmn2:dataInputAssociation>
<bpmn2:dataOutputAssociation>
<bpmn2:sourceRef>_2_testHTOutputX</bpmn2:sourceRef>
<bpmn2:targetRef>test</bpmn2:targetRef>
</bpmn2:dataOutputAssociation>
<bpmn2:potentialOwner id="_MTulQCW5ED2lY6_ultl44A">
<bpmn2:resourceAssignmentExpression id="_MTulQSW5ED2lY6_ultl44A">
<bpmn2:formalExpression>john</bpmn2:formalExpression>
</bpmn2:resourceAssignmentExpression>
</bpmn2:potentialOwner>
</bpmn2:userTask>
<bpmn2:scriptTask id="_3" name="Script" scriptFormat="http://www.java.com/java">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[Script]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:incoming>_2-_3</bpmn2:incoming>
<bpmn2:outgoing>_3-_4</bpmn2:outgoing>
<bpmn2:script>System.out.println("Result "+test);</bpmn2:script>
</bpmn2:scriptTask>
<bpmn2:endEvent id="_4" name="End">
<bpmn2:extensionElements>
<drools:metaData name="elementname">
<drools:metaValue><![CDATA[End]]></drools:metaValue>
</drools:metaData>
</bpmn2:extensionElements>
<bpmn2:incoming>_3-_4</bpmn2:incoming>
<bpmn2:terminateEventDefinition/>
</bpmn2:endEvent>
</bpmn2:process>
>>>>>>> 5dd444ead5 (kie-issues#1613: Add `CI :: License headers` GitHub Actions workflow (#3714))
<bpmndi:BPMNDiagram>
<bpmndi:BPMNPlane bpmnElement="StructureRef" >
<bpmndi:BPMNShape bpmnElement="_1" >
Expand Down

0 comments on commit d095410

Please sign in to comment.