From 41aa968be60e75937c596ad6489a7df60e920f3c Mon Sep 17 00:00:00 2001
From: fmittag <fmittag@gmx.net>
Date: Fri, 25 Nov 2011 14:25:44 +0100
Subject: [PATCH] merge remote-tracking branch 'origin/gwt' into gwt-5  2

---
 .../impl/SwissTimingAdapterPersistenceImpl.java          | 7 ++++---
 .../bin/com/sap/sailing/gwt/ui/test/TestConsole.gwt.xml  | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 java/com.sap.sailing.gwt.ui.test/bin/com/sap/sailing/gwt/ui/test/TestConsole.gwt.xml

diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
index c7cc1a768e6..d8c5611b152 100755
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
@@ -18,6 +18,7 @@ import com.sap.sailing.domain.swisstimingadapter.SailMasterMessage;
 import com.sap.sailing.domain.swisstimingadapter.SwissTimingConfiguration;
 import com.sap.sailing.domain.swisstimingadapter.SwissTimingFactory;
 import com.sap.sailing.domain.swisstimingadapter.persistence.SwissTimingAdapterPersistence;
+import com.sap.sailing.mongodb.MongoDBService;
 
 public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPersistence {
 
@@ -37,11 +38,11 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
 
     private long lastMessageCount;
 
-    public SwissTimingAdapterPersistenceImpl(DB db, SwissTimingFactory swissTimingFactory) {
+    public SwissTimingAdapterPersistenceImpl(MongoDBService mongoDBService, SwissTimingFactory swissTimingFactory) {
         super();
-        this.database = db;
+        this.database = mongoDBService.getDB();
         this.swissTimingFactory = swissTimingFactory;
-        lastMessageCountCollection = db.getCollection(CollectionNames.LAST_MESSAGE_COUNT.name());
+        lastMessageCountCollection = database.getCollection(CollectionNames.LAST_MESSAGE_COUNT.name());
         init();
     }
 
diff --git a/java/com.sap.sailing.gwt.ui.test/bin/com/sap/sailing/gwt/ui/test/TestConsole.gwt.xml b/java/com.sap.sailing.gwt.ui.test/bin/com/sap/sailing/gwt/ui/test/TestConsole.gwt.xml
new file mode 100644
index 00000000000..9eb6b78e16d
--- /dev/null
+++ b/java/com.sap.sailing.gwt.ui.test/bin/com/sap/sailing/gwt/ui/test/TestConsole.gwt.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.4.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.4.0/distro-source/core/src/gwt-module.dtd">
+<module>
+	<inherits name="com.google.gwt.user.User" />
+	<inherits name="com.sap.sailing.gwt.ui.AdminConsole" />
+	<source path="client"/>
+	
+	<servlet path='/testsailing' class='com.sap.sailing.gwt.ui.test.TestSailingServiceImpl'/>
+</module>
\ No newline at end of file