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

Merge branch 'permission-vertical' into bug4813

Browse Source 
# Conflicts:
#	java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
#	java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/EventsResource.java
This commit is contained in:
Thomas Wiese committed 2018-12-18 13:32:12 +01:00
2 parents 23e0ce4d81 cd2eafc80e
commit 475356f8b8
493 files changed
+2904 -2260
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sse.security.test/META-INF/MANIFEST.MF
+2 -1
View File
@@ -8,9 +8,10 @@ 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,
org.eclipse.orbit.mongodb;bundle-version="3.2.2",
jcl.over.slf4j;bundle-version="1.6.4",
slf4j.api;bundle-version="1.6.4",
jcl.over.slf4j;bundle-version="1.6.4",
org.mockito.mockito-core;bundle-version="1.10.14",
java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java
+2 -2
View File
@@ -46,7 +46,7 @@ public class SecurityResourceTest {
@Before
public void setUp() throws UserManagementException, MailException, UserGroupManagementException {
PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory().getDatabase().dropDatabase();
PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory().getDatabase().drop();
ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
try {
@@ -58,7 +58,7 @@ public class SecurityResourceTest {
/* setAsActivatorSecurityService */ true);
SecurityUtils.setSecurityManager(service.getSecurityManager());
service.createSimpleUser(USERNAME, "a@b.c", PASSWORD, "The User", "SAP SE",
/* validation URL */ Locale.ENGLISH, null);
/* validation URL */ Locale.ENGLISH, null, null);
authenticatedAdmin = SecurityUtils.getSubject();
authenticatedAdmin.login(new UsernamePasswordToken(USERNAME, PASSWORD));
Session session = authenticatedAdmin.getSession();
java/com.sap.sse.security.test/src/com/sap/sse/security/test/AccessControlStoreTest.java
+2 -2
View File
@@ -13,8 +13,8 @@ import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.mongodb.client.MongoDatabase;
import com.sap.sse.mongodb.MongoDBConfiguration;
import com.sap.sse.mongodb.MongoDBService;
import com.sap.sse.security.AccessControlStore;
@@ -53,7 +53,7 @@ public class AccessControlStoreTest {
public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException {
final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
final MongoDBService service = dbConfiguration.getService();
DB db = service.getDB();
MongoDatabase db = service.getDB();
db.getCollection(CollectionNames.ACCESS_CONTROL_LISTS.name()).drop();
db.getCollection(CollectionNames.OWNERSHIPS.name()).drop();
db.getCollection(CollectionNames.ROLES.name()).drop();
java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java
+2 -2
View File
@@ -14,8 +14,8 @@ import org.apache.shiro.SecurityUtils;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.mongodb.client.MongoDatabase;
import com.sap.sse.common.Util;
import com.sap.sse.mongodb.MongoDBConfiguration;
import com.sap.sse.mongodb.MongoDBService;
@@ -44,7 +44,7 @@ public class LoginTest {
public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException, UserManagementException {
final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
final MongoDBService service = dbConfiguration.getService();
DB db = service.getDB();
MongoDatabase db = service.getDB();
db.getCollection(CollectionNames.USERS.name()).drop();
db.getCollection(CollectionNames.USER_GROUPS.name()).drop();
db.getCollection(CollectionNames.ROLES.name()).drop();
java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java
+3 -3
View File
@@ -14,8 +14,8 @@ import java.util.function.Consumer;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.mongodb.client.MongoDatabase;
import com.sap.sse.common.Util;
import com.sap.sse.mongodb.MongoDBConfiguration;
import com.sap.sse.mongodb.MongoDBService;
@@ -29,7 +29,7 @@ import com.sap.sse.security.shared.impl.UserGroup;
import com.sap.sse.security.userstore.mongodb.UserStoreImpl;
import com.sap.sse.security.userstore.mongodb.impl.CollectionNames;
import junit.framework.Assert;
import org.junit.Assert;
public class PreferenceObjectBasedNotificationSetTest {
@@ -55,7 +55,7 @@ public class PreferenceObjectBasedNotificationSetTest {
public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException, UserManagementException {
final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
final MongoDBService service = dbConfiguration.getService();
DB db = service.getDB();
MongoDatabase db = service.getDB();
db.getCollection(CollectionNames.USERS.name()).drop();
db.getCollection(CollectionNames.SETTINGS.name()).drop();
db.getCollection(CollectionNames.PREFERENCES.name()).drop();
java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserPreferenceObjectAndConverterTest.java
+3 -3
View File
@@ -7,8 +7,8 @@ import java.util.UUID;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.mongodb.client.MongoDatabase;
import com.sap.sse.mongodb.MongoDBConfiguration;
import com.sap.sse.mongodb.MongoDBService;
import com.sap.sse.security.shared.UserGroupManagementException;
@@ -16,7 +16,7 @@ import com.sap.sse.security.shared.UserManagementException;
import com.sap.sse.security.userstore.mongodb.UserStoreImpl;
import com.sap.sse.security.userstore.mongodb.impl.CollectionNames;
import junit.framework.Assert;
import org.junit.Assert;
public class UserPreferenceObjectAndConverterTest {
@@ -38,7 +38,7 @@ public class UserPreferenceObjectAndConverterTest {
public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException, UserManagementException {
final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
final MongoDBService service = dbConfiguration.getService();
DB db = service.getDB();
MongoDatabase db = service.getDB();
db.getCollection(CollectionNames.USERS.name()).drop();
db.getCollection(CollectionNames.SETTINGS.name()).drop();
db.getCollection(CollectionNames.PREFERENCES.name()).drop();
java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java
+2 -2
View File
@@ -20,8 +20,8 @@ import java.util.stream.Collectors;
import org.junit.Before;
import org.junit.Test;
import com.mongodb.DB;
import com.mongodb.MongoException;
import com.mongodb.client.MongoDatabase;
import com.sap.sse.common.Util;
import com.sap.sse.common.Util.Pair;
import com.sap.sse.mongodb.MongoDBConfiguration;
@@ -64,7 +64,7 @@ public class UserStoreWithPersistenceTest {
public void setUp() throws UnknownHostException, MongoException, UserGroupManagementException {
final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
final MongoDBService service = dbConfiguration.getService();
DB db = service.getDB();
MongoDatabase db = service.getDB();
db.getCollection(CollectionNames.USERS.name()).drop();
db.getCollection(CollectionNames.USER_GROUPS.name()).drop();
db.getCollection(CollectionNames.SETTINGS.name()).drop();