* Merge

.gitignore

@@ -6,4 +6,5 @@
 /bin
 /engine-core-api/target
 /engine-core-api/bin
+/engine-core-impl/target
 /engine-core-impl/target

engine-core-api/src/main/java/de/hpi/oryxengine/processstructure/Node.java

@@ -3,11 +3,6 @@
 import java.util.ArrayList;
 
 import de.hpi.oryxengine.activity.Activity;
-<<<<<<< HEAD:src/main/java/de/hpi/oryxengine/processstructure/Node.java
-=======
-import de.hpi.oryxengine.navigator.Navigator;
-import de.hpi.oryxengine.processInstance.ProcessInstance;
->>>>>>> remotes/origin/modular-maven-setup:engine-core-api/src/main/java/de/hpi/oryxengine/processstructure/Node.java
 import de.hpi.oryxengine.routingBehaviour.RoutingBehaviour;
 
 /**

engine-core-impl/pom.xml

@@ -16,7 +16,6 @@
             <groupId>de.hpi.oryxengine</groupId>
             <artifactId>engine-core-api</artifactId>
             <version>${project.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.testng</groupId>

engine-core-impl/src/main/java/de/hpi/oryxengine/example/ExampleProcessForReview.java

@@ -6,20 +6,13 @@
 import de.hpi.oryxengine.activity.impl.MailingVariable;
 import de.hpi.oryxengine.activity.impl.PrintingVariableActivity;
 import de.hpi.oryxengine.activity.impl.StartActivity;
-<<<<<<< HEAD:src/main/java/de/hpi/oryxengine/example/ExampleProcessForReview.java
-import de.hpi.oryxengine.navigator.impl.NavigatorImpl;
-import de.hpi.oryxengine.processInstanceImpl.ProcessInstanceImpl;
-import de.hpi.oryxengine.processstructure.impl.NodeImpl;
-import de.hpi.oryxengine.routingBehaviour.RoutingBehaviour;
-import de.hpi.oryxengine.routingBehaviour.impl.TakeAllBehaviour;
-=======
 import de.hpi.oryxengine.navigator.NavigatorImpl;
 import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
 import de.hpi.oryxengine.processstructure.Node;
 import de.hpi.oryxengine.processstructure.NodeImpl;
 import de.hpi.oryxengine.routingBehaviour.BPMNTakeAllBehaviour;
 import de.hpi.oryxengine.routingBehaviour.RoutingBehaviour;
->>>>>>> remotes/origin/modular-maven-setup:engine-core-impl/src/main/java/de/hpi/oryxengine/example/ExampleProcessForReview.java
+import de.hpi.oryxengine.routingBehaviour.impl.TakeAllBehaviour;
 
 /**
  * The Class that holds the example process that needs as review process for the engine.

engine-core-impl/src/main/java/de/hpi/oryxengine/example/SimpleExampleProcess.java

@@ -3,16 +3,9 @@
 import org.apache.log4j.Logger;
 
 import de.hpi.oryxengine.activity.impl.AutomatedDummyActivity;
-<<<<<<< HEAD:src/main/java/de/hpi/oryxengine/example/SimpleExampleProcess.java
-import de.hpi.oryxengine.navigator.impl.NavigatorImpl;
-import de.hpi.oryxengine.processInstanceImpl.ProcessInstanceImpl;
-import de.hpi.oryxengine.processstructure.impl.NodeImpl;
-=======
 import de.hpi.oryxengine.navigator.NavigatorImpl;
 import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
-import de.hpi.oryxengine.processstructure.Node;
 import de.hpi.oryxengine.processstructure.NodeImpl;
->>>>>>> remotes/origin/modular-maven-setup:engine-core-impl/src/main/java/de/hpi/oryxengine/example/SimpleExampleProcess.java
 
 public class SimpleExampleProcess {
 

engine-core-impl/src/main/java/de/hpi/oryxengine/navigator/NavigatorImpl.java

@@ -1,25 +1,14 @@
 package de.hpi.oryxengine.navigator;
 
-<<<<<<< HEAD:src/main/java/de/hpi/oryxengine/navigator/impl/NavigatorImpl.java
-=======
-import de.hpi.oryxengine.navigator.Navigator;
-import de.hpi.oryxengine.processDefinition.AbstractProcessDefinitionImpl;
-import de.hpi.oryxengine.processInstance.ProcessInstance;
-import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
-
->>>>>>> remotes/origin/modular-maven-setup:engine-core-impl/src/main/java/de/hpi/oryxengine/navigator/NavigatorImpl.java
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 
-import de.hpi.oryxengine.navigator.Navigator;
-import de.hpi.oryxengine.processDefinitionImpl.AbstractProcessDefinitionImpl;
+import de.hpi.oryxengine.processDefinition.AbstractProcessDefinitionImpl;
 import de.hpi.oryxengine.processInstance.ProcessInstance;
-import de.hpi.oryxengine.processInstanceImpl.ProcessInstanceImpl;
-
-
+import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
 
 
 /**

engine-core-impl/src/main/java/de/hpi/oryxengine/processDefinition/AbstractProcessDefinitionImpl.java

@@ -9,13 +9,8 @@ public class AbstractProcessDefinitionImpl implements ProcessDefinition {
 
     // TODO [Gerardo] Was ist denn hieran abstrakt
 
-<<<<<<< HEAD:src/main/java/de/hpi/oryxengine/processDefinitionImpl/AbstractProcessDefinitionImpl.java
-    private ArrayList<NodeImpl> startNodes;
-    private String id;
-=======
     protected ArrayList<Node> startNodes;
     protected String id;
->>>>>>> remotes/origin/modular-maven-setup:engine-core-impl/src/main/java/de/hpi/oryxengine/processDefinition/AbstractProcessDefinitionImpl.java
 
     public void setStartNodes(ArrayList<Node> nodes) {
 

engine-core-impl/src/main/java/de/hpi/oryxengine/processDefinitionImpl/ProcessDefinitionImpl.java

@@ -2,10 +2,11 @@
 
 import java.util.ArrayList;
 
-import de.hpi.oryxengine.processstructure.impl.NodeImpl;
+import de.hpi.oryxengine.processDefinition.AbstractProcessDefinitionImpl;
+import de.hpi.oryxengine.processstructure.Node;
 
 public class ProcessDefinitionImpl extends AbstractProcessDefinitionImpl {
-    public ProcessDefinitionImpl(ArrayList<NodeImpl> startNodes) {
+    public ProcessDefinitionImpl(ArrayList<Node> startNodes) {
 
         this.setStartNodes(startNodes);
     }

engine-core-impl/src/main/java/de/hpi/oryxengine/processInstance/ProcessInstanceImpl.java

@@ -23,13 +23,8 @@ public class ProcessInstanceImpl implements ProcessInstance {
     public ProcessInstanceImpl(AbstractProcessDefinitionImpl processDefinition, Integer startNumber) {
 
         // choose a start Node from the possible List of Nodes
-<<<<<<< HEAD:src/main/java/de/hpi/oryxengine/processInstanceImpl/ProcessInstanceImpl.java
-        // TODO how to choose the start node?
-        ArrayList<NodeImpl> startNodes = processDefinition.getStartNodes();
-=======
         // TODO: how to choose the start node?
         ArrayList<Node> startNodes = processDefinition.getStartNodes();
->>>>>>> remotes/origin/modular-maven-setup:engine-core-impl/src/main/java/de/hpi/oryxengine/processInstance/ProcessInstanceImpl.java
         currentNode = startNodes.get(startNumber);
 
     }

engine-core-impl/src/test/java/de/hpi/oryxengine/NavigatorTest/NavigatorTest.java

@@ -9,22 +9,13 @@
 import org.testng.annotations.Test;
 
 import de.hpi.oryxengine.activity.impl.AutomatedDummyActivity;
-<<<<<<< HEAD:src/test/java/de/hpi/oryxengine/NavigatorTest/NavigatorTest.java
-import de.hpi.oryxengine.navigator.impl.NavigatorImpl;
-import de.hpi.oryxengine.processInstanceImpl.ProcessInstanceImpl;
-import de.hpi.oryxengine.processstructure.impl.NodeImpl;
-import de.hpi.oryxengine.routingBehaviour.RoutingBehaviour;
-import de.hpi.oryxengine.routingBehaviour.impl.TakeAllBehaviour;
-import de.hpi.oryxengine.routingBehaviour.impl.EmptyRoutingBehaviour;
-=======
 import de.hpi.oryxengine.navigator.NavigatorImpl;
 import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
-import de.hpi.oryxengine.processstructure.Node;
 import de.hpi.oryxengine.processstructure.NodeImpl;
-import de.hpi.oryxengine.routingBehaviour.BPMNTakeAllBehaviour;
 import de.hpi.oryxengine.routingBehaviour.EmptyRoutingBehaviour;
 import de.hpi.oryxengine.routingBehaviour.RoutingBehaviour;
->>>>>>> remotes/origin/modular-maven-setup:engine-core-impl/src/test/java/de/hpi/oryxengine/NavigatorTest/NavigatorTest.java
+import de.hpi.oryxengine.routingBehaviour.impl.TakeAllBehaviour;
+
 
 public class NavigatorTest {
 

engine-core-impl/src/test/java/de/hpi/oryxengine/routingBehaviour/BPMNAndJoinTest.java

@@ -1,19 +1,18 @@
 package de.hpi.oryxengine.routingBehaviour;
 
 import static org.mockito.Mockito.mock;
+import static org.testng.Assert.assertEquals;
 
 import java.util.List;
 
-import static org.testng.Assert.*;
-
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import de.hpi.oryxengine.activity.Activity;
 import de.hpi.oryxengine.processInstance.ProcessInstance;
-import de.hpi.oryxengine.processInstanceImpl.ProcessInstanceImpl;
+import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
 import de.hpi.oryxengine.processstructure.Node;
-import de.hpi.oryxengine.processstructure.impl.NodeImpl;
+import de.hpi.oryxengine.processstructure.NodeImpl;
 import de.hpi.oryxengine.routingBehaviour.impl.AndJoinBehaviour;
 import de.hpi.oryxengine.routingBehaviour.impl.TakeAllBehaviour;
 

engine-core-impl/src/test/java/de/hpi/oryxengine/routingBehaviour/BPMNTakeAllBehaviourTest.java

@@ -1,17 +1,17 @@
 package de.hpi.oryxengine.routingBehaviour;
 
 import static org.mockito.Mockito.mock;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
 
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import de.hpi.oryxengine.activity.Activity;
 import de.hpi.oryxengine.processInstance.ProcessInstance;
-import de.hpi.oryxengine.processInstanceImpl.ProcessInstanceImpl;
+import de.hpi.oryxengine.processInstance.ProcessInstanceImpl;
 import de.hpi.oryxengine.processstructure.Node;
-import de.hpi.oryxengine.processstructure.impl.NodeImpl;
+import de.hpi.oryxengine.processstructure.NodeImpl;
 import de.hpi.oryxengine.routingBehaviour.impl.TakeAllBehaviour;
 
 public class BPMNTakeAllBehaviourTest {
@@ -21,9 +21,7 @@ public class BPMNTakeAllBehaviourTest {
 
     @BeforeClass
     public void setUp() {
-
         instance = simpleInstance();
-
     }
 
     @Test