mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-03 17:49:40 +00:00
merge from master 2
This commit is contained in:
1 parent
f28f57cb39
commit
3c7ee638b6
5 files changed
+22
-10
No files matched your search
@@ -20,16 +20,28 @@ Require-Bundle: com.sap.sailing.domain,
|
|||||||
com.sap.sailing.geocoding,
|
com.sap.sailing.geocoding,
|
||||||
com.sap.sailing.server.replication,
|
com.sap.sailing.server.replication,
|
||||||
com.googlecode.java-diff-utils;bundle-version="1.3.0",
|
com.googlecode.java-diff-utils;bundle-version="1.3.0",
|
||||||
com.sap.sailing.freg.resultimport
|
com.sap.sailing.freg.resultimport,
|
||||||
com.sap.sailing.simulator
|
com.sap.sailing.simulator;bundle-version="1.0.0"
|
||||||
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
|
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
Export-Package: com.sap.sailing.gwt.ui.client;x-friends:="com.sap.sailing.gwt.ui.test",
|
Export-Package: com.sap.sailing.gwt.ui.adminconsole;x-friends:="com.sap.sailing.gwt.ui.test",
|
||||||
com.sap.sailing.gwt.ui.adminconsole;x-friends:="com.sap.sailing.gwt.ui.test",
|
com.sap.sailing.gwt.ui.client;x-friends:="com.sap.sailing.gwt.ui.test",
|
||||||
com.sap.sailing.gwt.ui.leaderboard;x-friends:="com.sap.sailing.gwt.ui.test",
|
com.sap.sailing.gwt.ui.leaderboard;x-friends:="com.sap.sailing.gwt.ui.test",
|
||||||
com.sap.sailing.gwt.ui.leaderboardedit;x-friends:="com.sap.sailing.gwt.ui.test",
|
com.sap.sailing.gwt.ui.leaderboardedit;x-friends:="com.sap.sailing.gwt.ui.test",
|
||||||
com.sap.sailing.gwt.ui.server;x-friends:="com.sap.sailing.gwt.ui.test",
|
com.sap.sailing.gwt.ui.server;x-friends:="com.sap.sailing.gwt.ui.test",
|
||||||
com.sap.sailing.gwt.ui.shared;x-friends:="com.sap.sailing.gwt.ui.test"
|
com.sap.sailing.gwt.ui.shared;uses:="com.sap.sailing.domain.common,com.sap.sailing.domain.common.impl,com.google.gwt.user.client.rpc",
|
||||||
|
com.sap.sailing.gwt.ui.simulator;
|
||||||
|
uses:="com.google.gwt.maps.client,
|
||||||
|
com.sap.sailing.gwt.ui.shared.panels,
|
||||||
|
com.sap.sailing.gwt.ui.client,
|
||||||
|
com.sap.sailing.gwt.ui.shared.racemap,
|
||||||
|
com.sap.sailing.gwt.ui.shared.windpattern,
|
||||||
|
com.sap.sailing.gwt.ui.shared,
|
||||||
|
com.google.gwt.maps.client.geom,
|
||||||
|
com.sap.sailing.domain.common,
|
||||||
|
com.sap.sailing.gwt.ui.simulator.util,
|
||||||
|
com.google.gwt.maps.client.overlay,
|
||||||
|
com.google.gwt.user.client.ui"
|
||||||
Import-Package: javax.jms;version="1.1.0",
|
Import-Package: javax.jms;version="1.1.0",
|
||||||
javax.servlet;version="2.5.0",
|
javax.servlet;version="2.5.0",
|
||||||
javax.servlet.http;version="2.5.0",
|
javax.servlet.http;version="2.5.0",
|
||||||
|
|||||||
+1
-1
@@ -326,7 +326,7 @@ public interface StringMessages extends Messages {
|
|||||||
String mixed();
|
String mixed();
|
||||||
String maps();
|
String maps();
|
||||||
String startEnd();
|
String startEnd();
|
||||||
String course();
|
String racecourse();
|
||||||
String summary();
|
String summary();
|
||||||
String replay();
|
String replay();
|
||||||
String display();
|
String display();
|
||||||
|
|||||||
+1
-1
@@ -321,7 +321,7 @@ opportunistic=Opportunistic
|
|||||||
mixed=Mixed
|
mixed=Mixed
|
||||||
maps=Maps
|
maps=Maps
|
||||||
startEnd=Start-End
|
startEnd=Start-End
|
||||||
course=Course
|
racecourse=Course
|
||||||
summary=Summary
|
summary=Summary
|
||||||
replay=Replay
|
replay=Replay
|
||||||
display=Display
|
display=Display
|
||||||
|
|||||||
+1
-1
@@ -322,7 +322,7 @@ opportunistic=Opportunistic
|
|||||||
mixed=Mixed
|
mixed=Mixed
|
||||||
maps=Maps
|
maps=Maps
|
||||||
startEnd=Start-End
|
startEnd=Start-End
|
||||||
course=Course
|
racecourse=Course
|
||||||
summary=Summary
|
summary=Summary
|
||||||
replay=Replay
|
replay=Replay
|
||||||
display=Display
|
display=Display
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
</listAttribute>
|
</listAttribute>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
|
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dexpedition.udp.port=2010 -Xmx6000m -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -XX:+UseMembar"/>
|
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dmongo.port=10200 -Dexpedition.udp.port=2010 -Xmx6000m -Dhttp.proxyHost=proxy.wdf.sap.corp -Dhttp.proxyPort=8080 -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -XX:+UseMembar"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
|
||||||
<stringAttribute key="pde.version" value="3.3"/>
|
<stringAttribute key="pde.version" value="3.3"/>
|
||||||
<booleanAttribute key="show_selected_only" value="false"/>
|
<booleanAttribute key="show_selected_only" value="false"/>
|
||||||
@@ -25,6 +25,6 @@
|
|||||||
<booleanAttribute key="tracing" value="false"/>
|
<booleanAttribute key="tracing" value="false"/>
|
||||||
<booleanAttribute key="useCustomFeatures" value="false"/>
|
<booleanAttribute key="useCustomFeatures" value="false"/>
|
||||||
<booleanAttribute key="useDefaultConfigArea" value="false"/>
|
<booleanAttribute key="useDefaultConfigArea" value="false"/>
|
||||||
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@default:default,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.ess40.resultimport@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.operationaltransformation@default:default,com.sap.sailing.server.replication@default:default,com.sap.sailing.server@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.www.events@default:default,com.sap.sailing.www@default:default,com.sap.sailing.xcelsiusadapter@default:default,com.tractrac.clientmodule@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default"/>
|
<stringAttribute key="workspace_bundles" value="com.google.gwt.osgi@default:default,com.googlecode.java-diff-utils@default:default,com.mongodb.driver@default:default,com.sap.sailing.declination@default:default,com.sap.sailing.domain.common@default:default,com.sap.sailing.domain.persistence@default:default,com.sap.sailing.domain.swisstimingadapter.persistence@default:default,com.sap.sailing.domain.swisstimingadapter@default:default,com.sap.sailing.domain.tractracadapter.persistence@default:default,com.sap.sailing.domain.tractracadapter@default:default,com.sap.sailing.domain@default:default,com.sap.sailing.expeditionconnector@default:default,com.sap.sailing.freg.resultimport@default:default,com.sap.sailing.geocoding@default:default,com.sap.sailing.gwt.ui@default:default,com.sap.sailing.kiworesultimport@default:default,com.sap.sailing.mongodb@default:default,com.sap.sailing.operationaltransformation@default:default,com.sap.sailing.server.replication@default:default,com.sap.sailing.server@default:default,com.sap.sailing.simulator@default:default,com.sap.sailing.udpconnector@default:default,com.sap.sailing.www.events@default:default,com.sap.sailing.www@default:default,com.sap.sailing.xcelsiusadapter@default:default,com.tractrac.clientmodule@default:default,org.json.simple@default:default,org.moxieapps.gwt.highcharts@default:default"/>
|
||||||
<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/>
|
<stringAttribute key="yk-options" value=" additional-options2=onexit\=snapshot "/>
|
||||||
</launchConfiguration>
|
</launchConfiguration>
|
||||||
Reference in new issue
Block a user