eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-28 14:57:12 +00:00
Code Activity

Merge branch 'master' into structureImport; pretty broken; in particular ListEditorComposite and SailingService will need close review for phony changes

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.swisstimingadapter/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/SailingServiceImplMock.java
	java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
	java/com.sap.sailing.gwt.ui/SailingGWT Remote Profiling (Run-Mode only).launch
	java/com.sap.sailing.gwt.ui/SailingGWT.launch
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleEntryPoint.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/AdminConsoleFeatures.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/FleetListEditorComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaListComposite.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaManagementPanel.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsCreateDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/RegattaWithSeriesAndFleetsEditDialog.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/SeriesWithFleetsListEditor.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.java
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/StringMessages_ru.properties
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/SailingServiceImpl.java
	java/com.sap.sailing.manage2sail.resultimport.test/src/com/sap/sailing/manage2sail/resultimport/test/ParserTest.java
	java/com.sap.sailing.manage2sail.resultimport/src/com/sap/sailing/manage2sail/resultimport/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/SailingServer (Proxy).launch
	java/com.sap.sailing.xrr.resultimport.test/src/com/sap/sailing/xrr/resultimport/test/ParserTest.java
	java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/ScoreCorrectionProviderImpl.java
	java/com.sap.sailing.xrr.resultimport/src/com/sap/sailing/xrr/resultimport/impl/XRRParserUtil.java
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/ListEditorComposite.java
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/controls/listedit/StringListEditorComposite.java
This commit is contained in:
Axel Uhl committed 2014-12-03 10:54:12 +01:00
2 parents 938cd02b3c ed34a4c37c
commit 656118dae0
2605 files changed
+46241 -19215
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
Regular → Executable
+19 -12
View File
@@ -9,7 +9,7 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
com.sap.sailing.server,
com.sap.sailing.domain.tractracadapter,
com.sap.sailing.mongodb,
com.sap.sse.mongodb,
com.mongodb.driver;bundle-version="2.6.2",
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.persistence,
@@ -19,25 +19,32 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.resultimport,
org.moxieapps.gwt.highcharts;bundle-version="1.5.0",
com.sap.sailing.geocoding,
com.sap.sailing.server.replication,
com.sap.sse.replication,
com.googlecode.java-diff-utils;bundle-version="1.3.0",
com.sap.sailing.freg.resultimport,
com.sap.sailing.domain.swisstimingreplayadapter,
com.sap.sailing.simulator;bundle-version="1.0.0",
com.sap.sailing.simulator,
com.google.gwt.osgi;bundle-version="2.6.0",
com.sap.sailing.domain.igtimiadapter,
com.sap.sailing.xrr.resultimport,
com.sap.sailing.datamining.shared;bundle-version="1.0.0",
com.sap.sailing.datamining;bundle-version="1.0.0",
com.sap.sse.gwt;bundle-version="1.0.0",
com.sap.sailing.domain.racelogtrackingadapter;bundle-version="1.0.0",
com.sap.sailing.manage2sail;bundle-version="1.0.0",
com.sap.sse.common;bundle-version="1.0.0",
com.sap.sse.datamining.shared;bundle-version="1.0.0",
com.sap.sse.datamining;bundle-version="1.0.0",
com.sap.sailing.datamining.shared,
com.sap.sailing.datamining,
com.sap.sse.gwt,
com.sap.sailing.domain.racelogtrackingadapter,
com.sap.sailing.manage2sail,
com.sap.sse.common,
com.sap.sse.datamining.shared,
com.sap.sse.datamining,
com.sap.sailing.xrr.schema,
com.sap.sailing.xrr.structureimportCopy,
com.sap.sailing.xrr.schema
com.sap.sse.security,
com.sap.sse.security.ui,
org.apache.shiro.web;bundle-version="1.2.2",
org.apache.shiro.ehcache;bundle-version="1.2.3",
com.sap.sse.gwt.adminconsole,
com.sap.sse.operationaltransformation,
com.sap.sse,
com.sap.sse.security.common
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
Bundle-ActivationPolicy: lazy
Import-Package: javax.jms;version="1.1.0",