eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-08 20:12:23 +00:00
Code Activity

upgraded target platform to newer MongoDB driver from org.eclipse.orbit;

Browse Source 
A 3.x driver is required to connect to Microsoft Azure Cosmos. Upgrading
the target platform accordingly requires further upgrades, including Hamcrest
and JUnit libraries. This, in turn, deprecates or obsoletes numerous APIs,
parts of which that caused compilation *errors* I've replaced by their new
counterparts. Several more warnings still remain and need to be tackled by
replacing the usages to their new counterparts.
This commit is contained in:
Axel Uhl committed 2018-12-10 03:00:59 +01:00
1 parent 0814d43350
commit d8c2cf8cd3
30 files changed
+102 -111
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.igtimiadapter.persistence/META-INF/MANIFEST.MF
+1 -1
View File
@@ -7,7 +7,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.sap.sse.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0"
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sailing.domain.igtimiadapter.persistence
Import-Package: org.osgi.framework
Bundle-Activator: com.sap.sailing.domain.igtimiadapter.persistence.impl.Activator
java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
+2 -2
View File
@@ -8,14 +8,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: com.sap.sailing.domain.persistence.impl.Activator
Require-Bundle: com.sap.sse.mongodb,
com.sap.sailing.domain,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.common,
com.sap.sailing.domain.shared.android,
com.sap.sailing.server.gateway.serialization,
com.sap.sse.common,
com.sap.sse,
com.sap.sailing.server.gateway.serialization.shared.android,
com.sap.sse.shared.android
com.sap.sse.shared.android,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sailing.domain.persistence,
com.sap.sailing.domain.persistence.impl;
x-friends:="com.sap.sailing.domain.persistence.test,
java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF
-1
View File
@@ -11,7 +11,6 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
org.mockito.mockito-core;bundle-version="1.9.5",
org.objenesis;bundle-version="1.3.0",
org.hamcrest;bundle-version="1.1.0",
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.common
Import-Package: com.sap.sailing.domain.abstractlog.regatta.events,
com.sap.sailing.domain.base,
java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
+2 -2
View File
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.sap.sailing.domain.shared.android,
com.sap.sailing.domain,
com.sap.sailing.domain.common,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.racelogtrackingadapter,
com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
@@ -17,6 +16,7 @@ Require-Bundle: com.sap.sailing.domain.shared.android,
org.hamcrest;bundle-version="1.1.0",
org.junit;bundle-version="4.8.2",
com.sap.sse.common,
com.sap.sailing.server.gateway.serialization.shared.android
com.sap.sailing.server.gateway.serialization.shared.android,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
Automatic-Module-Name: com.sap.sailing.domain.racelogtrackingadapter.testsupport
java/com.sap.sailing.domain.racelogtrackingadapter/META-INF/MANIFEST.MF
+2 -2
View File
@@ -13,12 +13,12 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.persistence,
com.sap.sailing.server,
com.googlecode.java-diff-utils;bundle-version="1.3.0",
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.common,
com.sap.sse.replication,
com.sap.sse,
com.sap.sailing.server.gateway.serialization.shared.android,
com.sap.sse.mail
com.sap.sse.mail,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Import-Package: com.google.zxing;version="3.1.0",
com.mongodb,
com.sap.sse.concurrent,
java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
+2 -2
View File
@@ -7,13 +7,13 @@ Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: com.sap.sailing.domain.swisstimingadapter,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.mongodb,
com.sap.sailing.domain,
com.sap.sailing.domain.common,
com.sap.sse.common,
com.sap.sailing.domain.persistence,
com.sap.sse
com.sap.sse,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sailing.domain.swisstimingadapter.persistence,
com.sap.sailing.domain.swisstimingadapter.persistence.impl;x-friends:="com.sap.sailing.domain.swisstimingadapter.test,com.sap.sailing.mongodb.test"
Import-Package: org.osgi.framework,
java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Fragment-Host: com.sap.sailing.domain.swisstimingadapter
Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.udpconnector,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.mongodb,
com.googlecode.java-diff-utils;bundle-version="1.3.0",
com.sap.sailing.server,
@@ -19,7 +18,8 @@ Require-Bundle: com.sap.sailing.domain,
org.junit;bundle-version="4.8.2",
org.hamcrest.core;bundle-version="1.1.0",
com.sap.sse,
com.sap.sse.common
com.sap.sse.common,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Bundle-ClassPath: resources/,
.
Import-Package: com.sap.sailing.server
java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/ManeuverLossOnPenaltyCircleTest.java
+2 -2
View File
@@ -12,7 +12,7 @@ import java.text.ParseException;
import java.util.Optional;
import java.util.stream.StreamSupport;
import org.hamcrest.number.IsGreaterThan;
import static org.hamcrest.number.OrderingComparison.greaterThan;
import org.junit.Before;
import org.junit.Test;
@@ -56,6 +56,6 @@ public class ManeuverLossOnPenaltyCircleTest extends OnlineTracTracBasedTest {
Competitor canottieri = getCompetitorByName("Club Canottieri Roggero di Lauria");
final Iterable<Maneuver> maneuversCanottieri = getTrackedRace().getManeuvers(canottieri, getTrackedRace().getStartOfRace(), getTrackedRace().getEndOfRace(), /* waitForLatest */ true);
final Optional<Maneuver> penaltyCircleCanottieri = StreamSupport.stream(maneuversCanottieri.spliterator(), /* parallel */ false).filter(m->m.getType()==ManeuverType.PENALTY_CIRCLE).findAny();
assertThat(penaltyCircleCanottieri.get().getManeuverLoss().getProjectedDistanceLost(), new IsGreaterThan<>(new MeterDistance(30)));
assertThat(penaltyCircleCanottieri.get().getManeuverLoss().getProjectedDistanceLost(), greaterThan(new MeterDistance(30)));
}
}
java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
+3 -3
View File
@@ -6,14 +6,14 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.mongodb,
Require-Bundle: com.sap.sse.mongodb,
com.sap.sailing.domain.tractracadapter,
com.sap.sailing.domain,
com.sap.sailing.domain.common,
com.sap.sse.common,
com.sap.sailing.domain.persistence,
com.sap.sse
com.sap.sse,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sailing.domain.tractracadapter.persistence,
com.sap.sailing.domain.tractracadapter.persistence.impl;x-friends:="com.sap.sailing.mongodb.test"
Import-Package: org.osgi.framework,
java/com.sap.sailing.expeditionconnector.persistence/META-INF/MANIFEST.MF
+2 -2
View File
@@ -12,9 +12,9 @@ Require-Bundle: com.sap.sailing.domain.persistence,
com.sap.sailing.domain.common,
com.sap.sse.common,
com.sap.sse.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.expeditionconnector.common,
com.sap.sailing.server.gateway.serialization.shared.android,
com.sap.sse
com.sap.sse,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sailing.expeditionconnector.persistence
Automatic-Module-Name: com.sap.sailing.expeditionconnector.persistence
java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+2 -2
View File
@@ -10,7 +10,6 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.server,
com.sap.sailing.domain.tractracadapter,
com.sap.sse.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.swisstimingadapter,
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.swisstimingadapter.persistence,
@@ -58,7 +57,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.expeditionconnector,
com.sap.sailing.expeditionconnector.common,
org.mp4parser.isoparser;bundle-version="1.9.37",
com.sap.sse.datamining.ui
com.sap.sse.datamining.ui,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Bundle-Activator: com.sap.sailing.gwt.ui.server.Activator
Bundle-ActivationPolicy: lazy
Import-Package: javax.servlet;version="3.1.0",
java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
+3 -3
View File
@@ -5,8 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.media.persistence.test
Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.mongodb,
Require-Bundle: com.sap.sse.mongodb,
org.json.simple;bundle-version="1.1.0",
org.hamcrest.core;bundle-version="1.1.0",
org.junit;bundle-version="4.8.2",
@@ -14,5 +13,6 @@ Require-Bundle: org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.gwt.ui;bundle-version="1.0.0",
com.sap.sailing.domain.common;bundle-version="1.0.0",
org.hamcrest;bundle-version="1.1.0",
com.sap.sse.common
com.sap.sse.common,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Automatic-Module-Name: com.sap.sailing.media.persistence.test
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadBoatsTest.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class StoreAndLoadBoatsTest extends AbstractMongoDBTest {
private void dropBoatCollection() {
DB db = getMongoService().getDB();
DBCollection boatCollection = db.getCollection(CollectionNames.BOATS.name());
boatCollection.setWriteConcern(WriteConcern.SAFE); // ensure that the drop() has happened
boatCollection.setWriteConcern(WriteConcern.ACKNOWLEDGED); // ensure that the drop() has happened
boatCollection.drop();
}
java/com.sap.sailing.mongodb.test/src/com/sap/sailing/mongodb/test/StoreAndLoadCompetitorsTest.java
+2 -2
View File
@@ -75,10 +75,10 @@ public class StoreAndLoadCompetitorsTest extends AbstractMongoDBTest {
private void dropCompetitorAndBoatsCollection() {
DB db = getMongoService().getDB();
DBCollection competitorCollection = db.getCollection(CollectionNames.COMPETITORS.name());
competitorCollection.setWriteConcern(WriteConcern.SAFE); // ensure that the drop() has happened
competitorCollection.setWriteConcern(WriteConcern.ACKNOWLEDGED); // ensure that the drop() has happened
competitorCollection.drop();
DBCollection boatsCollection = db.getCollection(CollectionNames.BOATS.name());
boatsCollection.setWriteConcern(WriteConcern.SAFE); // ensure that the drop() has happened
boatsCollection.setWriteConcern(WriteConcern.ACKNOWLEDGED); // ensure that the drop() has happened
boatsCollection.drop();
}
java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -9,11 +9,11 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
org.junit;bundle-version="4.8.2",
org.openqa.selenium.osgi;bundle-version="3.13.0",
com.sap.sse.mongodb;bundle-version="1.0.0",
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.common,
com.sap.sse.common,
jcl.over.slf4j;bundle-version="1.6.4";resolution:=optional,
slf4j.api;bundle-version="1.6.4";resolution:=optional
slf4j.api;bundle-version="1.6.4";resolution:=optional,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Bundle-ClassPath: lib/cglib-nodep-2.2.3.jar,
.
Automatic-Module-Name: com.sap.sailing.selenium.test
java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -9,7 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Fragment-Host: com.sap.sailing.server.gateway.serialization
Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
com.sap.sailing.domain.common;bundle-version="1.0.0",
org.hamcrest;bundle-version="1.1.0",
org.junit;bundle-version="4.8.2",
com.sap.sailing.domain.shared.android,
org.json.simple,
@@ -17,3 +16,5 @@ Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
org.objenesis;bundle-version="1.3.0",
com.sap.sse.common,
com.sap.sse.shared.android
Import-Package: org.hamcrest;version="1.1.0",
org.hamcrest.core;version="1.1.0"
java/com.sap.sailing.server.gateway.test.support/META-INF/MANIFEST.MF
+1 -1
View File
@@ -12,7 +12,7 @@ Require-Bundle: javax.servlet;bundle-version="3.1.0",
com.sap.sse.mongodb;bundle-version="1.0.0",
com.sap.sse.common,
com.sap.sse,
org.mongodb.mongo-java-driver;bundle-version="2.13.0"
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Bundle-ClassPath: .
Web-ContextPath: /sailingserver/test-support
Import-Package: org.osgi.framework,
java/com.sap.sailing.server.gateway/META-INF/MANIFEST.MF
+2 -2
View File
@@ -25,7 +25,6 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.domain.persistence,
com.sap.sse.mongodb,
com.sap.sailing.domain.racelogtrackingadapter,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
javax.servlet;bundle-version="3.1.0",
com.sap.sailing.domain.common,
com.sap.sailing.udpconnector,
@@ -61,7 +60,8 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.nmeaconnector,
com.sap.sailing.geocoding,
com.googlecode.java-diff-utils,
com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0",
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Bundle-ClassPath: .
Web-ContextPath: /sailingserver
Export-Package: com.sap.sailing.server.gateway,
java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -12,7 +12,6 @@ Require-Bundle: com.sap.sailing.server,
com.sap.sailing.domain,
com.sap.sailing.domain.test,
com.sap.sse.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.tractracadapter,
com.tractrac.clientmodule;bundle-version="2.0.0",
@@ -30,5 +29,6 @@ Require-Bundle: com.sap.sailing.server,
com.sap.sse.shared.android,
com.sap.sailing.server.gateway,
javax.ws.rs,
com.sap.sailing.server.testsupport
com.sap.sailing.server.testsupport,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Automatic-Module-Name: com.sap.sailing.server.replication.test
java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
+2 -2
View File
@@ -17,7 +17,6 @@ Require-Bundle: com.sap.sailing.server,
com.sap.sailing.expeditionconnector,
com.sap.sailing.declination,
com.sap.sse.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.common,
com.sap.sailing.udpconnector,
@@ -34,5 +33,6 @@ Require-Bundle: com.sap.sailing.server,
com.sap.sse.security,
org.apache.shiro.web;bundle-version="1.2.2",
org.apache.shiro.core;bundle-version="1.2.2",
javax.servlet;bundle-version="3.1.0"
javax.servlet;bundle-version="3.1.0",
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Automatic-Module-Name: com.sap.sailing.server.testsupport
java/com.sap.sailing.server/META-INF/MANIFEST.MF
+2 -2
View File
@@ -20,7 +20,6 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.expeditionconnector,
com.sap.sailing.declination,
com.sap.sse.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sailing.domain.persistence,
com.sap.sailing.domain.common,
com.sap.sailing.udpconnector,
@@ -39,7 +38,8 @@ Require-Bundle: com.sap.sailing.domain,
org.apache.shiro.web;bundle-version="1.2.2",
org.apache.shiro.core;bundle-version="1.2.2",
javax.servlet;bundle-version="3.1.0",
com.sap.sse.mail
com.sap.sse.mail,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Bundle-ClassPath: .
Export-Package: com.sap.sailing.server,
com.sap.sailing.server.impl;
java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch
+2 -2
View File
@@ -22,7 +22,7 @@
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<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.VM_ARGUMENTS" value="-ea -Dosgi.java.profile=file:///${project_loc:java}/target/configuration/JavaSE-11.profile --add-modules=ALL-SYSTEM -Djavax.xml.bind.JAXBContextFactory=com.sun.xml.bind.v2.ContextFactory -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -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 -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Drestore.tracked.races=false"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Dosgi.java.profile=file:///${project_loc:java}/target/configuration/JavaSE-11.profile --add-modules=ALL-SYSTEM -Djavax.xml.bind.JAXBContextFactory=com.sun.xml.bind.v2.ContextFactory -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -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 -Dpersistentcompetitors.clear=false -Dpolardata.source.url=https://www.sapsailing.com -Drestore.tracked.races=false -Dmongo.uri=mongodb://c0a7791e-0ee0-4-231-b9ee:gKGqx2EerxYDyrKP7mLt7bumsjYJBbReoHXqyDIMaTGQfRHUcGX6ZNBMTsLuT79lfYtxbeVRFWTWR3Q0nMeXTQ==@c0a7791e-0ee0-4-231-b9ee.documents.azure.com:10255/winddb?ssl=true&amp;replicaSet=globaldb"/>
<stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
<stringAttribute key="pde.version" value="3.3"/>
<stringAttribute key="profilingTraceType-ALLOCATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%INCREASE_COUNT%CTX_KEY%8192%CTX_ENTRY%KEY_MIN_SIZE%CTX_KEY%32%CTX_ENTRY%KEY_MAX_SIZE%CTX_KEY%65536%CTX_ENTRY%KEY_INC_LINE_NRS%CTX_KEY%true%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%CLASS_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ADAPTIVE%CTX_KEY%false%CTX_ENTRY%"/>
@@ -32,7 +32,7 @@
<stringAttribute key="profilingTraceType-PERFORMANCE_HOTSPOT_TRACE" value="KEY_IGNORE_SLEEPING_THREADS%CTX_KEY%false%CTX_ENTRY%KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%true%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
<stringAttribute key="profilingTraceType-SYNCHRONIZATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%"/>
<booleanAttribute key="show_selected_only" value="false"/>
<stringAttribute key="target_bundles" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.rabbitmq.client@default:default,com.sun.activation.javax.activation@default:default,com.sun.istack.commons-runtime@default:default,com.sun.jersey.contribs.jersey-multipart@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,com.sun.xml.bind.jaxb-impl@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,javax.xml.stream@default:default,javax.xml.ws@default:default,javax.xml@default:default,jaxb-api@default:default,jcl.over.slf4j@default:default,lz4-java@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.aws-java-sdk@default:default,org.apache.servicemix.bundles.ehcache@default:default,org.apache.servicemix.bundles.scribe@default:default,org.apache.servicemix.bundles.zxing@default:default,org.apache.shiro.core@default:default,org.apache.shiro.ehcache@default:default,org.apache.shiro.web@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot@3:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hyperic.sigar@default:default,org.jdom@default:default,org.jvnet.mimepull@default:default,org.mongodb.mongo-java-driver@default:default,org.objectweb.asm@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
<stringAttribute key="target_bundles" value="com.fasterxml.jackson.core.jackson-annotations@default:default,com.fasterxml.jackson.core.jackson-core@default:default,com.fasterxml.jackson.core.jackson-databind@default:default,com.rabbitmq.client@default:default,com.sun.activation.javax.activation@default:default,com.sun.istack.commons-runtime@default:default,com.sun.jersey.contribs.jersey-multipart@default:default,com.sun.jersey@default:default,com.sun.mail.javax.mail@default:default,com.sun.xml.bind.jaxb-impl@default:default,jackson-core-asl@default:default,jackson-jaxrs@default:default,jackson-mapper-asl@default:default,javax.servlet@default:default,javax.validation@default:default,javax.ws.rs@default:default,javax.xml.stream@default:default,javax.xml.ws@default:default,javax.xml@default:default,jaxb-api@default:default,jcl.over.slf4j@default:default,lz4-java@default:default,org.apache.commons.beanutils@default:default,org.apache.commons.codec@default:default,org.apache.commons.collections@default:default,org.apache.commons.fileupload@default:default,org.apache.commons.io@default:default,org.apache.commons.lang@default:default,org.apache.commons.math@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.httpcomponents.httpclient@default:default,org.apache.httpcomponents.httpcore@default:default,org.apache.poi.ooxml.schemas@default:default,org.apache.poi.ooxml@default:default,org.apache.poi@default:default,org.apache.servicemix.bundles.aws-java-sdk@default:default,org.apache.servicemix.bundles.ehcache@default:default,org.apache.servicemix.bundles.scribe@default:default,org.apache.servicemix.bundles.zxing@default:default,org.apache.shiro.core@default:default,org.apache.shiro.ehcache@default:default,org.apache.shiro.web@default:default,org.apache.xmlbeans@default:default,org.dom4j@default:default,org.eclipse.equinox.cm@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.jetty.client@default:default,org.eclipse.jetty.deploy@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.jmx@default:default,org.eclipse.jetty.osgi.boot@3:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.websocket.api@default:default,org.eclipse.jetty.websocket.client@default:default,org.eclipse.jetty.websocket.common@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.orbit.mongodb@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.hyperic.sigar@default:default,org.jdom@default:default,org.jvnet.mimepull@default:default,org.objectweb.asm@default:default,routeconverter@default:default,slf4j.api@default:default,slf4j.jdk14@default:false"/>
<booleanAttribute key="tracing" value="false"/>
<booleanAttribute key="useCustomFeatures" value="false"/>
<booleanAttribute key="useDefaultConfigArea" value="false"/>
java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+49 -51
View File
@@ -8,14 +8,55 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.generator" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.integration" version="1.1.0.v201303031500"/>
<unit id="org.hamcrest.library" version="1.1.0.v20090501071000"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
<unit id="org.junit" version="4.8.2.v4_8_2_v20130308-0413"/>
<unit id="org.junit.source" version="4.8.2.v4_8_2_v20130308-0413"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
<unit id="org.junit" version="4.12.0.v201504281640"/>
<unit id="org.junit.source" version="4.12.0.v201504281640"/>
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.9.2.v20180207-1730"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.9.2.v20180207-1730"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.9.2.v20180207-1730"/>
<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="javax.xml.ws" version="2.1.0.v200902101523"/>
<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.fileupload" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.fileupload.source" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.2.6.v201311072007"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.2.5.v201311072007"/>
<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
<unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
<unit id="org.dom4j" version="1.6.1.v20170815-1500"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<unit id="org.eclipse.orbit.mongodb" version="3.2.2.v20170222-2110"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180905201904/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.8.201802270002"/>
@@ -69,49 +110,6 @@
<repository location="http://download.eclipse.org/releases/oxygen/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0.v201504151636"/>
<unit id="com.fasterxml.jackson.core.jackson-core" version="2.5.0.v201504151636"/>
<unit id="com.fasterxml.jackson.core.jackson-databind" version="2.5.0.v201504151636"/>
<unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
<unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
<unit id="javax.servlet" version="3.1.0.v201410161800"/>
<unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
<unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
<unit id="javax.validation.source" version="1.0.0.GA_v201205091237"/>
<unit id="javax.xml" version="1.3.4.v201005080400"/>
<unit id="javax.xml.bind" version="2.2.0.v201105210648"/>
<unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="javax.xml.ws" version="2.1.0.v200902101523"/>
<unit id="org.apache.commons.beanutils" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.beanutils.source" version="1.8.0.v201205091237"/>
<unit id="org.apache.commons.codec" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.codec.source" version="1.6.0.v201305230611"/>
<unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.collections.source" version="3.2.2.v201511171945"/>
<unit id="org.apache.commons.fileupload" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.fileupload.source" version="1.2.2.v20111214-1400"/>
<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.io.source" version="2.2.0.v201405211200"/>
<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.lang.source" version="2.6.0.v201404270220"/>
<unit id="org.apache.commons.math" version="2.1.0.v201105210652"/>
<unit id="org.apache.httpcomponents.httpclient" version="4.2.6.v201311072007"/>
<unit id="org.apache.httpcomponents.httpclient.source" version="4.2.6.v201311072007"/>
<unit id="org.apache.httpcomponents.httpcore" version="4.2.5.v201311072007"/>
<unit id="org.apache.httpcomponents.httpcore.source" version="4.2.5.v201311072007"/>
<unit id="org.apache.poi" version="3.9.0.v201405241750"/>
<unit id="org.apache.poi.ooxml" version="3.9.0.v201405241905"/>
<unit id="org.apache.poi.ooxml.schemas" version="3.9.0.v201405241750"/>
<unit id="org.apache.xmlbeans" version="2.3.0.v201605172150"/>
<unit id="org.dom4j" version="1.6.1.v201312101416"/>
<unit id="org.jdom" version="1.1.1.v201101151400"/>
<unit id="org.jdom.source" version="1.1.1.v201101151400"/>
<unit id="org.objectweb.asm" version="5.0.1.v201404251740"/>
<unit id="org.objectweb.asm.source" version="5.0.1.v201404251740"/>
<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
@@ -258,7 +256,7 @@
<plugin id="org.junit.source"/>
<plugin id="org.jvnet.mimepull"/>
<plugin id="org.mockito.mockito-core"/>
<plugin id="org.mongodb.mongo-java-driver"/>
<plugin id="org.eclipse.orbit.mongodb"/>
<plugin id="org.objectweb.asm"/>
<plugin id="org.objectweb.asm.source"/>
<plugin id="org.objenesis"/>
java/com.sap.sse.feature.runtime/feature.xml
-7
View File
@@ -235,13 +235,6 @@
version="1.10.73.1"
unpack="false"/>
<plugin
id="org.mongodb.mongo-java-driver"
download-size="0"
install-size="0"
version="2.13.0.RELEASE"
unpack="false"/>
<plugin
id="com.sun.mail.javax.mail"
download-size="0"
java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
+1 -1
View File
@@ -22,5 +22,5 @@ Require-Bundle: org.apache.servicemix.bundles.aws-java-sdk;bundle-version="1.9.8
com.sap.sse.operationaltransformation,
com.sap.sse,
org.apache.commons.io,
org.mongodb.mongo-java-driver;bundle-version="2.13.0"
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Automatic-Module-Name: com.sap.sse.filestorage
java/com.sap.sse.mongodb/META-INF/MANIFEST.MF
+1 -1
View File
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: SAP
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: com.sap.sse.common,
org.mongodb.mongo-java-driver;bundle-version="2.13.0"
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sse.mongodb
Bundle-ActivationPolicy: lazy
Import-Package: com.sap.sailing.util,
java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -11,10 +11,10 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
com.sap.sse.security.userstore.mongodb,
com.sap.sse.mongodb,
com.rabbitmq.client,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.replication.testsupport,
com.sap.sse.mail.replication.testsupport,
org.objenesis;bundle-version="2.1.0",
org.mockito.mockito-core;bundle-version="1.10.14"
org.mockito.mockito-core;bundle-version="1.10.14",
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Import-Package: org.osgi.util.tracker;version="1.5.1"
Automatic-Module-Name: com.sap.sse.security.replication.test
java/com.sap.sse.security.test/META-INF/MANIFEST.MF
+2 -2
View File
@@ -8,8 +8,8 @@ Fragment-Host: com.sap.sse.security
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.junit;bundle-version="4.8.2",
com.sap.sse.security.userstore.mongodb,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
com.sap.sse.mongodb,
com.sap.sse.mail
com.sap.sse.mail,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Import-Package: org.apache.shiro.session.mgt
Automatic-Module-Name: com.sap.sse.security.test
java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
+2 -2
View File
@@ -10,12 +10,12 @@ Import-Package: org.osgi.framework;version="1.3.0"
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
Require-Bundle: com.sap.sse.security,
org.mongodb.mongo-java-driver;bundle-version="2.13.0",
org.apache.shiro.core;bundle-version="1.2.2",
com.sap.sse.mongodb,
com.sap.sse.common,
com.sap.sse.security.common,
com.sap.sse.shared.android
com.sap.sse.shared.android,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
Export-Package: com.sap.sse.security.userstore.mongodb,
com.sap.sse.security.userstore.mongodb.impl;x-friends:="com.sap.sse.security.test"
Automatic-Module-Name: com.sap.sse.security.userstore.mongodb
java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java
+4 -4
View File
@@ -47,7 +47,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
dbUser.put(FieldNames.User.ACCOUNTS.name(), createAccountMapObject(user.getAllAccounts()));
dbUser.put(FieldNames.User.ROLES.name(), user.getRoles());
dbUser.put(FieldNames.User.PERMISSIONS.name(), user.getPermissions());
usersCollection.update(query, dbUser, /* upsrt */true, /* multi */false, WriteConcern.SAFE);
usersCollection.update(query, dbUser, /* upsrt */true, /* multi */false, WriteConcern.ACKNOWLEDGED);
}
@Override
@@ -92,7 +92,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
dbSettings.put(FieldNames.Settings.NAME.name(), FieldNames.Settings.VALUES.name());
dbSettings.put(FieldNames.Settings.MAP.name(), createSettingsMapObject(settings));
settingCollection.update(query, dbSettings, /* upsrt */true, /* multi */false, WriteConcern.SAFE);
settingCollection.update(query, dbSettings, /* upsrt */true, /* multi */false, WriteConcern.ACKNOWLEDGED);
}
@Override
@@ -109,7 +109,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
DBObject query = new BasicDBObject(FieldNames.Preferences.USERNAME.name(), username);
DBObject update = new BasicDBObject(FieldNames.Preferences.KEYS_AND_VALUES.name(), dbSettings);
update.put(FieldNames.Preferences.USERNAME.name(), username);
settingCollection.update(query, update, /* upsrt */true, /* multi */false, WriteConcern.SAFE);
settingCollection.update(query, update, /* upsrt */true, /* multi */false, WriteConcern.ACKNOWLEDGED);
}
@Override
@@ -121,7 +121,7 @@ public class MongoObjectFactoryImpl implements MongoObjectFactory {
dbSettingTypes.put(FieldNames.Settings.NAME.name(), FieldNames.Settings.TYPES.name());
dbSettingTypes.put(FieldNames.Settings.MAP.name(), createSettingTypesMapObject(settingTypes));
settingCollection.update(query, dbSettingTypes, /* upsrt */true, /* multi */false, WriteConcern.SAFE);
settingCollection.update(query, dbSettingTypes, /* upsrt */true, /* multi */false, WriteConcern.ACKNOWLEDGED);
}
private DBObject createSettingsMapObject(Map<String, Object> settings) {