eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-30 09:26:44 +00:00
Code Activity

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

Browse Source
This commit is contained in:
fmittag
2012-10-09 12:37:17 +02:00
parent 6de6041389 7dcb381e28
commit 4d46051800
25 changed files with 96 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/SAPSailingAnalyticsArchitecture.docx
BIN
View File
Binary file not shown.
java/com.sap.sailing.feature.p2build/raceanalysis.product
+3 -2
View File
@@ -8,8 +8,8 @@
<launcherArgs>
<programArgs>-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean</programArgs>
<vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true
-Xmx1024m -Djetty.home=configuration/jetty
<vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true
-Xmx1024m -Djetty.home=configuration/jetty
-XX:+UseMembar</vmArgs>
</launcherArgs>
@@ -39,6 +39,7 @@
<plugin id="com.sap.sailing.gwt.ui" autoStart="true" startLevel="4" />
<plugin id="com.sap.sailing.kiworesultimport" autoStart="true" startLevel="3" />
<plugin id="com.sap.sailing.server" autoStart="true" startLevel="4" />
<plugin id="com.sap.sailing.server.gateway" autoStart="true" startLevel="4" />
<plugin id="com.sap.sailing.server.replication" autoStart="true" startLevel="4" />
<plugin id="com.sap.sailing.www" autoStart="true" startLevel="4" />
<plugin id="com.sap.sailing.xcelsiusadapter" autoStart="true" startLevel="4" />
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+1
View File
@@ -7,6 +7,7 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.server,
com.sap.sailing.server.gateway,
com.sap.sailing.domain.tractracadapter,
com.sap.sailing.mongodb,
com.mongodb.driver;bundle-version="2.6.2",
java/com.sap.sailing.gwt.ui/WEB-INF/web.xml
+1 -1
View File
@@ -6,7 +6,7 @@
<filter>
<filter-name>GWTCacheControlServletFilter</filter-name>
<filter-class>com.sap.sailing.server.GWTCacheControlServletFilter</filter-class>
<filter-class>com.sap.sailing.server.gateway.GWTCacheControlServletFilter</filter-class>
</filter>
<filter-mapping>
<filter-name>GWTCacheControlServletFilter</filter-name>
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+6 -1
View File
@@ -15,8 +15,13 @@ Bundle-ActivationPolicy: lazy
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.expeditionconnector,
com.sap.sailing.declination,
com.sap.sailing.domain.tractracadapter,
com.sap.sailing.domain.persistence,
com.sap.sailing.mongodb,
com.mongodb.driver;bundle-version="2.6.2",
javax.servlet;bundle-version="2.5.0",
com.sap.sailing.domain.common,
com.sap.sailing.udpconnector
Bundle-ClassPath: .
Web-ContextPath: /gateway
Web-ContextPath: /sailingserver
Export-Package: com.sap.sailing.server.gateway
java/com.sap.sailing.server.gateway/WEB-INF/web.xml
+55 -1
View File
@@ -5,6 +5,60 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<servlet>
<servlet-name>AdminApp</servlet-name>
<servlet-class> com.sap.sailing.server.gateway.impl.AdminApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>AdminApp</servlet-name>
<url-pattern>/admin</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ModeratorApp</servlet-name>
<servlet-class> com.sap.sailing.server.gateway.impl.ModeratorApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ModeratorApp</servlet-name>
<url-pattern>/moderator</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ExpeditionThroughHttpPostServlet</servlet-name>
<servlet-class> com.sap.sailing.server.gateway.impl.ExpeditionThroughHttpPostServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ExpeditionThroughHttpPostServlet</servlet-name>
<url-pattern>/expedition</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>LeaderboardsJsonExportServlet</servlet-name>
<servlet-class> com.sap.sailing.server.gateway.impl.LeaderboardsJsonExportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LeaderboardsJsonExportServlet</servlet-name>
<url-pattern>/leaderboards</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>LeaderboardJsonExportServlet</servlet-name>
<servlet-class> com.sap.sailing.server.gateway.impl.LeaderboardJsonExportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LeaderboardJsonExportServlet</servlet-name>
<url-pattern>/leaderboard</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>LeaderboardGroupJsonExportServlet</servlet-name>
<servlet-class> com.sap.sailing.server.gateway.impl.LeaderboardGroupJsonExportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LeaderboardGroupJsonExportServlet</servlet-name>
<url-pattern>/leaderboardgroup</url-pattern>
</servlet-mapping>
<servlet id="jsp">
<servlet-name>jspServet</servlet-name>
<servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
@@ -31,7 +85,7 @@
<servlet>
<servlet-name>SimpleJspForwardServlet</servlet-name>
<servlet-class>com.sap.sailing.server.gateway.SimpleJspForwardServlet</servlet-class>
<servlet-class>com.sap.sailing.server.gateway.impl.SimpleJspForwardServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>SimpleJspForwardServlet</servlet-name>
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/AbstractHttpPostServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/AbstractHttpPostServlet.java
+1 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway;
import java.io.IOException;
@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.SailingServerHttpServlet;
/**
* Subclasses can be used to retrieve messages through an HTTP connection. The connection remains open until the client
java/com.sap.sailing.server/src/com/sap/sailing/server/GWTCacheControlServletFilter.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/GWTCacheControlServletFilter.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server;
package com.sap.sailing.server.gateway;
import java.io.IOException;
import java.util.Date;
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/HttpMessageSenderServletRequestHandler.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/HttpMessageSenderServletRequestHandler.java
+1 -1
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway;
import java.io.IOException;
import java.io.PrintWriter;
java/com.sap.sailing.server/src/com/sap/sailing/server/SailingServerHttpServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/SailingServerHttpServlet.java
+2 -1
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server;
package com.sap.sailing.server.gateway;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -13,6 +13,7 @@ import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.util.DateParser;
import com.sap.sailing.util.InvalidDateException;
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/AdminApp.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/AdminApp.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
import java.net.MalformedURLException;
@@ -47,7 +47,7 @@ import com.sap.sailing.domain.tracking.WindTrack;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.domain.tracking.impl.WindImpl;
import com.sap.sailing.domain.tractracadapter.RaceRecord;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
import com.sap.sailing.util.InvalidDateException;
public class AdminApp extends SailingServerHttpServlet {
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExpeditionThroughHttpPostServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/ExpeditionThroughHttpPostServlet.java
+4 -1
View File
@@ -1,9 +1,12 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.sap.sailing.server.gateway.AbstractHttpPostServlet;
import com.sap.sailing.server.gateway.HttpMessageSenderServletRequestHandler;
public class ExpeditionThroughHttpPostServlet extends AbstractHttpPostServlet {
private static final long serialVersionUID = 2038882388961739487L;
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ExpeditionThroughHttpPostServletHandler.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/ExpeditionThroughHttpPostServletHandler.java
+3 -1
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletResponse;
import com.sap.sailing.expeditionconnector.ExpeditionListener;
import com.sap.sailing.expeditionconnector.ExpeditionMessage;
import com.sap.sailing.server.gateway.AbstractHttpPostServlet;
import com.sap.sailing.server.gateway.HttpMessageSenderServletRequestHandler;
/**
* Clients can use this servlet to retrieve Expedition messages through an HTTP connection. The connection remains
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/LeaderboardGroupJsonExportServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardGroupJsonExportServlet.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
@@ -22,7 +22,7 @@ import com.sap.sailing.domain.leaderboard.LeaderboardGroup;
import com.sap.sailing.domain.leaderboard.RegattaLeaderboard;
import com.sap.sailing.domain.leaderboard.SettableScoreCorrection;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
public class LeaderboardGroupJsonExportServlet extends SailingServerHttpServlet {
private static final long serialVersionUID = 1351616646322956825L;
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/LeaderboardJsonExportServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardJsonExportServlet.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
import java.util.HashMap;
@@ -23,7 +23,7 @@ import com.sap.sailing.domain.common.TimePoint;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.domain.leaderboard.SettableScoreCorrection;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
public class LeaderboardJsonExportServlet extends SailingServerHttpServlet {
private static final long serialVersionUID = -2460691283231361152L;
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/LeaderboardsJsonExportServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/LeaderboardsJsonExportServlet.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
import java.util.Map;
@@ -10,7 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import org.json.simple.JSONArray;
import com.sap.sailing.domain.leaderboard.Leaderboard;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
public class LeaderboardsJsonExportServlet extends SailingServerHttpServlet {
private static final long serialVersionUID = -2193421590275280102L;
java/com.sap.sailing.server/src/com/sap/sailing/server/impl/ModeratorApp.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/ModeratorApp.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.impl;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
import java.util.Iterator;
@@ -34,7 +34,7 @@ import com.sap.sailing.domain.tracking.TrackedLeg;
import com.sap.sailing.domain.tracking.TrackedLegOfCompetitor;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.Wind;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
import com.sap.sailing.util.InvalidDateException;
public class ModeratorApp extends SailingServerHttpServlet {
java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/SimpleJspForwardServlet.java → java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/impl/SimpleJspForwardServlet.java
+2 -2
View File
@@ -1,4 +1,4 @@
package com.sap.sailing.server.gateway;
package com.sap.sailing.server.gateway.impl;
import java.io.IOException;
@@ -9,7 +9,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
public class SimpleJspForwardServlet extends SailingServerHttpServlet {
private static final long serialVersionUID = -1017961881555515288L;
java/com.sap.sailing.server.replication/META-INF/MANIFEST.MF
+1
View File
@@ -10,6 +10,7 @@ Bundle-ActivationPolicy: lazy
Export-Package: com.sap.sailing.server.replication,
com.sap.sailing.server.replication.impl;x-friends:="com.sap.sailing.server.replication.test"
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.server.gateway,
com.sap.sailing.domain.common,
com.sap.sailing.domain,
com.sap.sailing.operationaltransformation,
java/com.sap.sailing.server.replication/src/com/sap/sailing/server/replication/impl/ReplicationServlet.java
+1 -1
View File
@@ -15,7 +15,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.util.tracker.ServiceTracker;
import com.sap.sailing.server.RacingEventService;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
import com.sap.sailing.server.replication.ReplicaDescriptor;
import com.sap.sailing.server.replication.ReplicationService;
java/com.sap.sailing.server/META-INF/MANIFEST.MF
+1 -3
View File
@@ -16,8 +16,6 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.expeditionconnector,
com.sap.sailing.declination,
com.sap.sailing.mongodb,
javax.servlet;bundle-version="2.5.0",
com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.swisstimingadapter.persistence,
@@ -33,4 +31,4 @@ Export-Package: com.sap.sailing.server,
com.sap.sailing.gwt.ui.test,
com.sap.sailing.server.replication.test",
com.sap.sailing.server.operationaltransformation
Web-ContextPath: /sailingserver
java/com.sap.sailing.server/WEB-INF/web.xml
-61
View File
@@ -1,61 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<servlet>
<servlet-name>AdminApp</servlet-name>
<servlet-class>com.sap.sailing.server.impl.AdminApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>AdminApp</servlet-name>
<url-pattern>/admin</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ModeratorApp</servlet-name>
<servlet-class>com.sap.sailing.server.impl.ModeratorApp</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ModeratorApp</servlet-name>
<url-pattern>/moderator</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>ExpeditionThroughHttpPostServlet</servlet-name>
<servlet-class>com.sap.sailing.server.impl.ExpeditionThroughHttpPostServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>ExpeditionThroughHttpPostServlet</servlet-name>
<url-pattern>/expedition</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>LeaderboardsJsonExportServlet</servlet-name>
<servlet-class>com.sap.sailing.server.impl.LeaderboardsJsonExportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LeaderboardsJsonExportServlet</servlet-name>
<url-pattern>/leaderboards</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>LeaderboardJsonExportServlet</servlet-name>
<servlet-class>com.sap.sailing.server.impl.LeaderboardJsonExportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LeaderboardJsonExportServlet</servlet-name>
<url-pattern>/leaderboard</url-pattern>
</servlet-mapping>
<servlet>
<servlet-name>LeaderboardGroupJsonExportServlet</servlet-name>
<servlet-class>com.sap.sailing.server.impl.LeaderboardGroupJsonExportServlet</servlet-class>
</servlet>
<servlet-mapping>
<servlet-name>LeaderboardGroupJsonExportServlet</servlet-name>
<url-pattern>/leaderboardgroup</url-pattern>
</servlet-mapping>
</web-app>
java/com.sap.sailing.server/build.properties
+1 -2
View File
@@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
WEB-INF/
.
java/com.sap.sailing.xcelsiusadapter/META-INF/MANIFEST.MF
+1
View File
@@ -11,6 +11,7 @@ Import-Package: com.sap.sailing.gwt.ui.shared,
org.osgi.framework;version="1.6.0"
Bundle-ActivationPolicy: lazy
Require-Bundle: com.sap.sailing.server,
com.sap.sailing.server.gateway,
com.sap.sailing.domain,
com.sap.sailing.domain.tractracadapter,
com.sap.sailing.domain.common
java/com.sap.sailing.xcelsiusadapter/src/com/sap/sailing/xcelsiusadapter/XcelsiusApp.java
+1 -1
View File
@@ -6,7 +6,7 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.sap.sailing.server.SailingServerHttpServlet;
import com.sap.sailing.server.gateway.SailingServerHttpServlet;
public class XcelsiusApp extends SailingServerHttpServlet {
private static final long serialVersionUID = -6849138354941569249L;