Merge remote-tracking branch 'origin/master' into simulator

java/com.sap.sailing.server.test/.gitignore

@@ -1 +1 @@
-/bin
+/bin

java/com.sap.sailing.server.test/META-INF/MANIFEST.MF

@@ -1,20 +1,20 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Test
-Bundle-SymbolicName: com.sap.sailing.server.test
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: SAP
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: com.sap.sailing.server,
- com.sap.sailing.domain,
- com.sap.sailing.domain.tractracadapter,
- com.sap.sailing.domain.swisstimingadapter,
- com.sap.sailing.domain.common,
- com.sap.sailing.expeditionconnector,
- com.sap.sailing.operationaltransformation,
- com.sap.sailing.mongodb,
- com.mongodb.driver;bundle-version="2.6.2"
-Import-Package: junit.framework;version="4.8.1",
- org.junit;version="4.8.1",
- com.tractrac.clientmodule,
- org.json.simple
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Test
+Bundle-SymbolicName: com.sap.sailing.server.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Require-Bundle: com.sap.sailing.server,
+ com.sap.sailing.domain,
+ com.sap.sailing.domain.tractracadapter,
+ com.sap.sailing.domain.swisstimingadapter,
+ com.sap.sailing.domain.common,
+ com.sap.sailing.expeditionconnector,
+ com.sap.sailing.operationaltransformation,
+ com.sap.sailing.mongodb,
+ com.mongodb.driver;bundle-version="2.6.2"
+Import-Package: junit.framework;version="4.8.1",
+ org.junit;version="4.8.1",
+ com.tractrac.clientmodule,
+ org.json.simple

java/com.sap.sailing.server.test/pom.xml

@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>root</artifactId>
-    <groupId>com.sap.sailing</groupId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>com.sap.sailing.server.test</artifactId>
-  <packaging>eclipse-test-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>root</artifactId>
+    <groupId>com.sap.sailing</groupId>
+    <version>1.0.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>com.sap.sailing.server.test</artifactId>
+  <packaging>eclipse-test-plugin</packaging>
+</project>

java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/OperationalTransformationTest.java

@@ -18,7 +18,7 @@ import com.sap.sailing.operationaltransformation.PeerImpl;
 import com.sap.sailing.server.RacingEventService;
 import com.sap.sailing.server.impl.RacingEventServiceImpl;
 import com.sap.sailing.server.operationaltransformation.AddColumnToLeaderboard;
-import com.sap.sailing.server.operationaltransformation.AddLeaderboard;
+import com.sap.sailing.server.operationaltransformation.CreateLeaderboard;
 import com.sap.sailing.server.operationaltransformation.MoveLeaderboardColumnUp;
 import com.sap.sailing.server.operationaltransformation.OperationalTransformer;
 import com.sap.sailing.server.operationaltransformation.RacingEventServiceOperation;
@@ -48,7 +48,7 @@ public class OperationalTransformationTest {
 
     @Test
     public void testAddLeaderboard() {
-        RacingEventServiceOperation addLeaderboardOp = new AddLeaderboard(LEADERBOARDNAME, new int[] { 5 });
+        RacingEventServiceOperation addLeaderboardOp = new CreateLeaderboard(LEADERBOARDNAME, new int[] { 5 });
         server.apply(addLeaderboardOp);
         server.waitForNotRunning();
         replica.waitForNotRunning();