Moved several classes from com.sap.sse.security to

com.sap.sse.security.interface to allow
com.sap.sse.security.userstore.mongodb to to depend on
com.sap.sse.security anymore

java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/OfflineSerializationTest.java

@@ -47,7 +47,7 @@ import com.sap.sse.common.Color;
 import com.sap.sse.common.Duration;
 import com.sap.sse.common.Util;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.shared.impl.User;

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/SailingService.java

@@ -134,7 +134,7 @@ import com.sap.sse.gwt.client.media.ImageDTO;
 import com.sap.sse.gwt.client.media.ImageResizingTaskDTO;
 import com.sap.sse.gwt.client.media.VideoDTO;
 import com.sap.sse.gwt.client.replication.RemoteReplicationService;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.ui.shared.SuccessInfo;
 
 /**
@@ -587,7 +587,7 @@ public interface SailingService extends RemoteService, FileStorageManagementGwtS
 
     /**
      * Adds public tag as {@link RaceLogTagEvent} to {@link RaceLog} and private tag to
-     * {@link com.sap.sse.security.UserStore UserStore}.
+     * {@link com.sap.sse.security.interfaces.UserStore UserStore}.
      * 
      * @param leaderboardName
      *            required to identify {@link RaceLog}, must <b>NOT</b> be <code>null</code>

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonJsonDeSerializer.java

@@ -9,7 +9,7 @@ import com.google.gwt.json.client.JSONObject;
 import com.google.gwt.json.client.JSONString;
 
 /**
- * Serializes and deserializes {@link TagButton tag-buttons} to save them in the {@link com.sap.sse.security.UserStore
+ * Serializes and deserializes {@link TagButton tag-buttons} to save them in the {@link com.sap.sse.security.interfaces.UserStore
  * UserStore}.
  */
 public class TagButtonJsonDeSerializer {

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagButtonPanel.java

@@ -53,7 +53,7 @@ public class TagButtonPanel extends FlowPanel {
 
     /**
      * Loads all {@link TagButton tag-buttons} of {@link UserService#getCurrentUser() current user} from
-     * {@link com.sap.sse.security.UserStore UserStore} and displays them.
+     * {@link com.sap.sse.security.interfaces.UserStore UserStore} and displays them.
      */
     protected void loadAllTagButtons() {
         tagButtonsPanel.clear();
@@ -89,7 +89,7 @@ public class TagButtonPanel extends FlowPanel {
 
     /**
      * Stores {@link TaggingPanel#getTagButtons() local copy} of {@link TagButton tag-buttons} of the
-     * {@link UserService#getCurrentUser() current user} in {@link com.sap.sse.security.UserStore UserStore}.
+     * {@link UserService#getCurrentUser() current user} in {@link com.sap.sse.security.interfaces.UserStore UserStore}.
      */
     protected void storeAllTagButtons() {
         TagButtonJsonDeSerializer serializer = new TagButtonJsonDeSerializer();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagCell.java

@@ -237,7 +237,7 @@ public class TagCell extends AbstractCell<TagDTO> {
     /**
      * Asks user for confirmation if user presses the delete button on the {@link TagCell}. If user confirms deletion,
      * {@link TagDTO tag} will be deleted from {@link TaggingPanel} including
-     * {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog} or {@link com.sap.sse.security.UserStore
+     * {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog} or {@link com.sap.sse.security.interfaces.UserStore
      * UserStore}, depending on where the tag is saved. Also allows users to edit {@link TagDTO tags}, by putting
      * {@link TaggingPanel} into state {@link TaggingPanel.State#EDIT_TAG edit} when user presses the edit button.
      */

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TagFooterPanel.java

@@ -18,7 +18,7 @@ public class TagFooterPanel extends FlowPanel {
     private final TagButtonPanel tagButtonPanel;
 
     /**
-     * Creates footer panel and loads {@link TagButton tag-buttons} from {@link com.sap.sse.security.UserStore
+     * Creates footer panel and loads {@link TagButton tag-buttons} from {@link com.sap.sse.security.interfaces.UserStore
      * UserStore}.
      * 
      * @param taggingPanel
@@ -97,14 +97,14 @@ public class TagFooterPanel extends FlowPanel {
     }
 
     /**
-     * Loads all {@link TagButton tag-buttons} from {@link com.sap.sse.security.UserStore UserStore} and displays them.
+     * Loads all {@link TagButton tag-buttons} from {@link com.sap.sse.security.interfaces.UserStore UserStore} and displays them.
      */
     protected void loadAllTagButtons() {
         tagButtonPanel.loadAllTagButtons();
     }
 
     /**
-     * Stores all {@link TagButton tag-buttons} into {@link com.sap.sse.security.UserStore UserStore}.
+     * Stores all {@link TagButton tag-buttons} into {@link com.sap.sse.security.interfaces.UserStore UserStore}.
      */
     protected void storeAllTagButtons() {
         tagButtonPanel.storeAllTagButtons();

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/raceboard/tagging/TaggingPanel.java

@@ -56,7 +56,7 @@ import com.sap.sse.security.ui.shared.SuccessInfo;
  * shown at the {@link com.sap.sailing.gwt.ui.raceboard.RaceBoardPanel RaceBoard}. Tags consist of a title and optional
  * a comment and/or image. Tag-Buttons allow users to preset tags which are used more frequently. Public tags will be
  * stored as an {@link com.sap.sailing.domain.abstractlog.race.RaceLogEvent RaceLogEvent}, private tags will be stored
- * in the {@link com.sap.sse.security.UserStore UserStore}.
+ * in the {@link com.sap.sse.security.interfaces.UserStore UserStore}.
  * 
  * @author Julian Rendl, Henri Kohlberg
  */
@@ -336,7 +336,7 @@ public class TaggingPanel extends ComponentWithoutSettings
     /**
      * Sends request to {@link SailingServiceAsync SailingService} to add the given tag to the
      * {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog} if the parameter <code>isVisibleForPublic</code>
-     * is set to <code>true</code>. Otherwise tag will be stored in the {@link com.sap.sse.security.UserStore
+     * is set to <code>true</code>. Otherwise tag will be stored in the {@link com.sap.sse.security.interfaces.UserStore
      * UserStore}. <br/>
      * Checks parameters for valid values and replaces optional parameters with value <code>null</code> by default
      * values: <code>comment</code> and <code>imageURL</code> will be replaced by an empty string,

java/com.sap.sailing.server.gateway.test/src/com/sap/sailing/server/gateway/test/jaxrs/RegattasResourceTest.java

@@ -49,7 +49,7 @@ import com.sap.sse.common.TimePoint;
 import com.sap.sse.common.impl.MillisecondsTimePoint;
 import com.sap.sse.security.ActionWithResult;
 import com.sap.sse.security.SecurityService;
-import com.sap.sse.security.UserImpl;
+import com.sap.sse.security.interfaces.UserImpl;
 import com.sap.sse.security.shared.Account;
 import com.sap.sse.security.shared.impl.User;
 

java/com.sap.sailing.server.gateway/src/com/sap/sailing/server/gateway/jaxrs/api/TagsResource.java

@@ -53,7 +53,7 @@ public class TagsResource extends AbstractSailingServerResource {
 
     /**
      * Loads public tags from {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog} and private tags from
-     * {@link com.sap.sse.security.UserStore UserStore} in case current user is logged in. Only loads tags when
+     * {@link com.sap.sse.security.interfaces.UserStore UserStore} in case current user is logged in. Only loads tags when
      * parameters <code>leaderboardName</code>, <code>raceColumnName</code> and <code>fleetName</code> can identify
      * {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog}.
      * 

java/com.sap.sailing.server.interface/src/com/sap/sailing/server/interfaces/TaggingService.java

@@ -47,7 +47,7 @@ public interface TaggingService {
      * @param visibleForPublic
      *            when set to <code>true</code>, tag will be saved in
      *            {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog} (visible for every user), otherwise
-     *            tag will be saved in {@link com.sap.sse.security.UserStore UserStore} (only visible for the creator)
+     *            tag will be saved in {@link com.sap.sse.security.interfaces.UserStore UserStore} (only visible for the creator)
      * @param raceTimepoint
      *            timepoint in race when user created tag, must <b>NOT</b> be <code>null</code>
      * @throws AuthorizationException
@@ -68,7 +68,7 @@ public interface TaggingService {
 
     /**
      * Removes public {@link TagDTO tag} from {@link com.sap.sailing.domain.abstractlog.race.RaceLog RaceLog} and
-     * private {@link TagDTO tag} from {@link com.sap.sse.security.UserStore UserStore}.
+     * private {@link TagDTO tag} from {@link com.sap.sse.security.interfaces.UserStore UserStore}.
      * 
      * @param leaderboardName
      *            required to identify {@link RaceLog}, must <b>NOT</b> be <code>null</code>

java/com.sap.sailing.server.replication.test/src/com/sap/sailing/server/replication/test/MediaReplicationTest.java

@@ -48,7 +48,7 @@ import com.sap.sse.common.media.MimeType;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
 import com.sap.sse.security.SecurityService;
-import com.sap.sse.security.UserImpl;
+import com.sap.sse.security.interfaces.UserImpl;
 import com.sap.sse.security.shared.WithQualifiedObjectIdentifier;
 import com.sap.sse.security.shared.impl.User;
 import com.sap.sse.security.shared.impl.UserGroupImpl;

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java

@@ -59,10 +59,10 @@ import com.sap.sse.mail.queue.MailQueue;
 import com.sap.sse.mail.queue.impl.ExecutorMailQueue;
 import com.sap.sse.osgi.CachedOsgiTypeBasedServiceFinderFactory;
 import com.sap.sse.replication.Replicable;
-import com.sap.sse.security.PreferenceConverter;
 import com.sap.sse.security.RolePrototypeProvider;
 import com.sap.sse.security.SecurityInitializationCustomizer;
 import com.sap.sse.security.SecurityService;
+import com.sap.sse.security.interfaces.PreferenceConverter;
 import com.sap.sse.security.shared.HasPermissionsProvider;
 import com.sap.sse.util.ClearStateTestSupport;
 import com.sap.sse.util.ServiceTrackerFactory;

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/GenericJSONPreferenceConverter.java

@@ -3,7 +3,7 @@ package com.sap.sailing.server.impl;
 import java.util.function.Supplier;
 
 import com.sap.sse.common.settings.generic.GenericSerializableSettings;
-import com.sap.sse.security.PreferenceConverter;
+import com.sap.sse.security.interfaces.PreferenceConverter;
 import com.sap.sse.shared.settings.SettingsToJsonSerializer;
 
 public class GenericJSONPreferenceConverter<PREF extends GenericSerializableSettings> implements PreferenceConverter<PREF> {

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/AbstractBoatClassNotificationSet.java

@@ -10,7 +10,7 @@ import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.server.impl.preferences.model.BoatClassNotificationPreference;
 import com.sap.sailing.server.impl.preferences.model.BoatClassNotificationPreferences;
 import com.sap.sse.security.PreferenceObjectBasedNotificationSet;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 
 /**
  * {@link PreferenceObjectBasedNotificationSet} for associations of {@link BoatClass} to a set of users to notify about

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/AbstractCompetitorNotificationSet.java

@@ -10,7 +10,7 @@ import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.server.impl.preferences.model.CompetitorNotificationPreference;
 import com.sap.sailing.server.impl.preferences.model.CompetitorNotificationPreferences;
 import com.sap.sse.security.PreferenceObjectBasedNotificationSet;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 
 /**
  * {@link PreferenceObjectBasedNotificationSet} for associations of {@link Competitor} to a set of users to notify about

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/BoatClassResultsNotificationSet.java

@@ -4,7 +4,7 @@ import org.osgi.framework.BundleContext;
 
 import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.server.impl.preferences.model.BoatClassNotificationPreference;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 
 /**
  * Notification set that defines the association of a {@link BoatClass} to the set of Users that need to be notified

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/BoatClassUpcomingRaceNotificationSet.java

@@ -4,7 +4,7 @@ import org.osgi.framework.BundleContext;
 
 import com.sap.sailing.domain.base.BoatClass;
 import com.sap.sailing.server.impl.preferences.model.BoatClassNotificationPreference;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 
 /**
  * Notification set that defines the association of a {@link BoatClass} to the set of Users that need to be notified

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/CompetitorResultsNotificationSet.java

@@ -4,7 +4,7 @@ import org.osgi.framework.BundleContext;
 
 import com.sap.sailing.domain.base.Competitor;
 import com.sap.sailing.server.impl.preferences.model.CompetitorNotificationPreference;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 
 /**
  * Notification set that defines the association of a {@link Competitor} to the set of Users that need to be notified

java/com.sap.sailing.server/src/com/sap/sailing/server/notification/impl/SailingNotificationServiceImpl.java

@@ -35,7 +35,7 @@ import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.i18n.impl.ResourceBundleStringMessagesImpl;
 import com.sap.sse.mail.queue.MailQueue;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 
 public class SailingNotificationServiceImpl implements SailingNotificationService {
     public static final String STRING_MESSAGES_BASE_NAME = "stringmessages/StringMessages";

java/com.sap.sailing.server/src/com/sap/sailing/server/tagging/TagDTODeSerializer.java

@@ -206,7 +206,7 @@ public class TagDTODeSerializer {
 
     /**
      * Combines <code>leaderboardName</code>, <code>raceColumnName</code> and <code>fleetName</code> to a unique key.
-     * Used to store private tags in {@link com.sap.sse.security.UserStore UserStore}.
+     * Used to store private tags in {@link com.sap.sse.security.interfaces.UserStore UserStore}.
      * 
      * @param leaderboardName
      *            leaderboard name

java/com.sap.sse.security.interface/META-INF/MANIFEST.MF

@@ -12,6 +12,8 @@ Import-Package: org.apache.shiro.session;version="1.2.2",
  org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.sap.sse.mongodb,
+ org.apache.shiro.core;bundle-version="1.2.2",
  com.sap.sse.common,
- com.sap.sse.security.common;visibility:=reexport
+ com.sap.sse.security.common;visibility:=reexport,
+ org.eclipse.osgi
 Export-Package: com.sap.sse.security.interfaces

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/AccessControlStore.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import java.util.Set;
 

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/Credential.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import java.io.Serializable;
 

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/OAuthToken.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import org.apache.shiro.authc.AuthenticationToken;
 

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/PreferenceConverter.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 /**
  * Converter to be used by {@link UserStore} to convert preference objects to/from Strings.

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/PreferenceConverterRegistrationManager.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/PreferenceObjectListener.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 /**
  * Listener used by UserStore to notify about changes of stored preference objects.

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/SimpleSaltedAuthenticationInfo.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import org.apache.shiro.authc.SaltedAuthenticationInfo;
 import org.apache.shiro.subject.PrincipalCollection;

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/Social.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 public enum Social {
     PROVIDER,

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/SocialSettingsKeys.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 public enum SocialSettingsKeys {
 

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserGroupProvider.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import com.sap.sse.security.shared.impl.User;
 import com.sap.sse.security.shared.impl.UserGroup;

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserImpl.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import java.io.IOException;
 import java.io.ObjectOutputStream;

java/com.sap.sse.security.interface/src/com/sap/sse/security/interfaces/UserStore.java

@@ -1,4 +1,4 @@
-package com.sap.sse.security;
+package com.sap.sse.security.interfaces;
 
 import java.util.Map;
 import java.util.Set;

java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java

@@ -7,9 +7,9 @@ import com.sap.sse.common.mail.MailException;
 import com.sap.sse.mongodb.MongoDBService;
 import com.sap.sse.replication.testsupport.AbstractServerReplicationTestSetUp;
 import com.sap.sse.replication.testsupport.AbstractServerWithSingleServiceReplicationTest;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.SecurityService;
 import com.sap.sse.security.impl.SecurityServiceImpl;
+import com.sap.sse.security.interfaces.AccessControlStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.userstore.mongodb.AccessControlStoreImpl;

java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityReplicationLeadingToEmailReplicationTest.java

@@ -19,9 +19,9 @@ import com.sap.sse.mail.MailService;
 import com.sap.sse.mail.impl.MailServiceImpl;
 import com.sap.sse.mail.replication.testsupport.AbstractMailServiceReplicationTest;
 import com.sap.sse.replication.testsupport.AbstractServerWithMultipleServicesReplicationTest;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.SecurityService;
 import com.sap.sse.security.impl.SecurityServiceImpl;
+import com.sap.sse.security.interfaces.AccessControlStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.userstore.mongodb.AccessControlStoreImpl;

java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityServiceInitialLoadTest.java

@@ -10,10 +10,10 @@ import org.junit.Test;
 
 import com.sap.sse.common.mail.MailException;
 import com.sap.sse.replication.testsupport.AbstractServerWithSingleServiceReplicationTest;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.SecurityService;
-import com.sap.sse.security.UserStore;
 import com.sap.sse.security.impl.SecurityServiceImpl;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.userstore.mongodb.AccessControlStoreImpl;

java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java

@@ -21,12 +21,12 @@ import org.junit.Before;
 import org.junit.Test;
 
 import com.sap.sse.common.mail.MailException;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.BearerAuthenticationToken;
 import com.sap.sse.security.SecurityService;
-import com.sap.sse.security.UserStore;
 import com.sap.sse.security.impl.Activator;
 import com.sap.sse.security.impl.SecurityServiceImpl;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.shared.WildcardPermission;

java/com.sap.sse.security.test/src/com/sap/sse/security/test/AccessControlStoreTest.java

@@ -17,9 +17,9 @@ 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;
-import com.sap.sse.security.UserImpl;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserImpl;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.QualifiedObjectIdentifier;
 import com.sap.sse.security.shared.RoleDefinition;
 import com.sap.sse.security.shared.TypeRelativeObjectIdentifier;

java/com.sap.sse.security.test/src/com/sap/sse/security/test/JavaIoSerializablePreferenceConverter.java

@@ -7,7 +7,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Base64;
 
-import com.sap.sse.security.PreferenceConverter;
+import com.sap.sse.security.interfaces.PreferenceConverter;
 
 public class JavaIoSerializablePreferenceConverter<T> implements PreferenceConverter<T> {
     @Override

java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java

@@ -19,10 +19,10 @@ import com.mongodb.client.MongoDatabase;
 import com.sap.sse.common.Util;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.SecurityService;
 import com.sap.sse.security.impl.Activator;
 import com.sap.sse.security.impl.SecurityServiceImpl;
+import com.sap.sse.security.interfaces.AccessControlStore;
 import com.sap.sse.security.shared.PermissionChecker;
 import com.sap.sse.security.shared.RoleDefinition;
 import com.sap.sse.security.shared.UserGroupManagementException;

java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionCheckerTest.java

@@ -18,9 +18,9 @@ import org.junit.Test;
 
 import com.sap.sailing.domain.common.security.SecuredDomainType;
 import com.sap.sse.security.AbstractCompositeAuthorizingRealm;
-import com.sap.sse.security.AccessControlStore;
-import com.sap.sse.security.UserStore;
 import com.sap.sse.security.UsernamePasswordRealm;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.AdminRole;
 import com.sap.sse.security.shared.HasPermissions;
 import com.sap.sse.security.shared.HasPermissions.DefaultActions;

java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java

@@ -20,8 +20,8 @@ import com.sap.sse.common.Util;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
 import com.sap.sse.security.PreferenceObjectBasedNotificationSet;
-import com.sap.sse.security.UserImpl;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserImpl;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.shared.impl.User;

java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreTest.java

@@ -6,7 +6,7 @@ import static org.junit.Assert.assertNull;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;
 import com.sap.sse.security.userstore.mongodb.UserStoreImpl;

java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java

@@ -26,8 +26,8 @@ import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
-import com.sap.sse.security.UserImpl;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserImpl;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.RoleDefinition;
 import com.sap.sse.security.shared.RoleDefinitionImpl;
 import com.sap.sse.security.shared.SecurityUser;

java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/SecurityDTOFactory.java

@@ -11,7 +11,7 @@ import java.util.Set;
 
 import com.sap.sse.common.Util;
 import com.sap.sse.security.SecurityService;
-import com.sap.sse.security.Social;
+import com.sap.sse.security.interfaces.Social;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.Account;
 import com.sap.sse.security.shared.Account.AccountType;

java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java

@@ -34,8 +34,8 @@ import com.sap.sse.common.mail.MailException;
 import com.sap.sse.gwt.client.ServerInfoDTO;
 import com.sap.sse.security.Action;
 import com.sap.sse.security.ActionWithResult;
-import com.sap.sse.security.Credential;
 import com.sap.sse.security.SecurityService;
+import com.sap.sse.security.interfaces.Credential;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.HasPermissions.DefaultActions;
 import com.sap.sse.security.shared.OwnershipAnnotation;

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/AccessControlStoreImpl.java

@@ -8,8 +8,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import com.sap.sse.concurrent.LockUtil;
 import com.sap.sse.concurrent.LockUtil.RunnableWithResult;
 import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
-import com.sap.sse.security.AccessControlStore;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.OwnershipAnnotation;
 import com.sap.sse.security.shared.QualifiedObjectIdentifier;

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/DomainObjectFactory.java

@@ -3,8 +3,8 @@ package com.sap.sse.security.userstore.mongodb;
 import java.util.Map;
 import java.util.UUID;
 
-import com.sap.sse.security.UserGroupProvider;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserGroupProvider;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.OwnershipAnnotation;
 import com.sap.sse.security.shared.RoleDefinition;

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java

@@ -18,11 +18,11 @@ import com.sap.sse.common.Util;
 import com.sap.sse.common.Util.Pair;
 import com.sap.sse.concurrent.LockUtil;
 import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
-import com.sap.sse.security.PreferenceConverter;
-import com.sap.sse.security.PreferenceObjectListener;
-import com.sap.sse.security.SocialSettingsKeys;
-import com.sap.sse.security.UserImpl;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.PreferenceConverter;
+import com.sap.sse.security.interfaces.PreferenceObjectListener;
+import com.sap.sse.security.interfaces.SocialSettingsKeys;
+import com.sap.sse.security.interfaces.UserImpl;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.Account;
 import com.sap.sse.security.shared.AdminRole;
 import com.sap.sse.security.shared.PredefinedRoles;

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/Activator.java

@@ -8,9 +8,9 @@ import org.osgi.framework.ServiceRegistration;
 
 import com.sap.sse.ServerInfo;
 import com.sap.sse.mongodb.MongoDBService;
-import com.sap.sse.security.AccessControlStore;
-import com.sap.sse.security.PreferenceConverterRegistrationManager;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.PreferenceConverterRegistrationManager;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.userstore.mongodb.AccessControlStoreImpl;
 import com.sap.sse.security.userstore.mongodb.UserStoreImpl;
 

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java

@@ -19,10 +19,10 @@ import org.bson.types.Binary;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.sap.sse.common.Util;
-import com.sap.sse.security.Social;
-import com.sap.sse.security.UserGroupProvider;
-import com.sap.sse.security.UserImpl;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.Social;
+import com.sap.sse.security.interfaces.UserGroupProvider;
+import com.sap.sse.security.interfaces.UserImpl;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.Account;
 import com.sap.sse.security.shared.Account.AccountType;

java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java

@@ -17,7 +17,7 @@ import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.IndexOptions;
 import com.mongodb.client.model.UpdateOptions;
-import com.sap.sse.security.Social;
+import com.sap.sse.security.interfaces.Social;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.Account;
 import com.sap.sse.security.shared.Account.AccountType;

java/com.sap.sse.security/src/com/sap/sse/security/AbstractCompositeAuthorizingRealm.java

@@ -20,6 +20,8 @@ import org.osgi.framework.BundleContext;
 import org.osgi.util.tracker.ServiceTracker;
 
 import com.sap.sse.security.impl.Activator;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.OwnershipAnnotation;
 import com.sap.sse.security.shared.PermissionChecker;

java/com.sap.sse.security/src/com/sap/sse/security/BearerTokenRealm.java

@@ -5,6 +5,7 @@ import org.apache.shiro.authc.AuthenticationInfo;
 import org.apache.shiro.authc.AuthenticationToken;
 import org.apache.shiro.authc.SaltedAuthenticationInfo;
 
+import com.sap.sse.security.interfaces.SimpleSaltedAuthenticationInfo;
 import com.sap.sse.security.shared.impl.User;
 
 /**

java/com.sap.sse.security/src/com/sap/sse/security/OAuthRealm.java

@@ -33,6 +33,10 @@ import org.scribe.model.Verb;
 import org.scribe.model.Verifier;
 import org.scribe.oauth.OAuthService;
 
+import com.sap.sse.security.interfaces.Credential;
+import com.sap.sse.security.interfaces.OAuthToken;
+import com.sap.sse.security.interfaces.Social;
+import com.sap.sse.security.interfaces.SocialSettingsKeys;
 import com.sap.sse.security.shared.SocialUserAccount;
 import com.sap.sse.security.shared.UserGroupManagementException;
 import com.sap.sse.security.shared.UserManagementException;

java/com.sap.sse.security/src/com/sap/sse/security/PreferenceObjectBasedNotificationSet.java

@@ -19,6 +19,9 @@ import com.sap.sse.common.Stoppable;
 import com.sap.sse.common.Util;
 import com.sap.sse.concurrent.LockUtil;
 import com.sap.sse.concurrent.NamedReentrantReadWriteLock;
+import com.sap.sse.security.interfaces.PreferenceConverter;
+import com.sap.sse.security.interfaces.PreferenceObjectListener;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.impl.User;
 
 /**

java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java

@@ -17,6 +17,8 @@ import org.osgi.framework.BundleContext;
 import com.sap.sse.common.mail.MailException;
 import com.sap.sse.replication.ReplicableWithObjectInputStream;
 import com.sap.sse.security.impl.ReplicableSecurityService;
+import com.sap.sse.security.interfaces.Credential;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.operations.SecurityOperation;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.HasPermissions;

java/com.sap.sse.security/src/com/sap/sse/security/UsernamePasswordRealm.java

@@ -8,6 +8,7 @@ import org.apache.shiro.authc.UsernamePasswordToken;
 
 import com.sap.sse.security.shared.Account.AccountType;
 import com.sap.sse.security.shared.impl.User;
+import com.sap.sse.security.interfaces.SimpleSaltedAuthenticationInfo;
 import com.sap.sse.security.shared.UsernamePasswordAccount;
 
 public class UsernamePasswordRealm extends AbstractCompositeAuthorizingRealm {

java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java

@@ -18,12 +18,12 @@ import org.osgi.util.tracker.ServiceTrackerCustomizer;
 import com.sap.sse.ServerInfo;
 import com.sap.sse.mail.MailService;
 import com.sap.sse.replication.Replicable;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.RolePrototypeProvider;
 import com.sap.sse.security.SecurityInitializationCustomizer;
 import com.sap.sse.security.SecurityService;
-import com.sap.sse.security.UserStore;
 import com.sap.sse.security.UsernamePasswordRealm;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.shared.HasPermissionsProvider;
 import com.sap.sse.security.shared.QualifiedObjectIdentifier;
 import com.sap.sse.security.shared.RoleDefinition;

java/com.sap.sse.security/src/com/sap/sse/security/impl/ObjectInputStreamResolvingAgainstSecurityCache.java

@@ -3,7 +3,7 @@ package com.sap.sse.security.impl;
 import java.io.IOException;
 import java.io.InputStream;
 
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.util.ObjectInputStreamResolvingAgainstCache;
 
 public class ObjectInputStreamResolvingAgainstSecurityCache extends ObjectInputStreamResolvingAgainstCache<UserStore> {

java/com.sap.sse.security/src/com/sap/sse/security/impl/PermissionConverter.java

@@ -5,7 +5,7 @@ import java.util.Set;
 
 import org.apache.shiro.authz.Permission;
 
-import com.sap.sse.security.AccessControlStore;
+import com.sap.sse.security.interfaces.AccessControlStore;
 import com.sap.sse.security.shared.WildcardPermission;
 import com.sap.sse.security.shared.impl.PermissionToObjectIdConverter;
 

java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java

@@ -84,23 +84,23 @@ import com.sap.sse.replication.OperationsToMasterSender;
 import com.sap.sse.replication.OperationsToMasterSendingQueue;
 import com.sap.sse.replication.ReplicationMasterDescriptor;
 import com.sap.sse.replication.ReplicationService;
-import com.sap.sse.security.AccessControlStore;
 import com.sap.sse.security.Action;
 import com.sap.sse.security.ActionWithResult;
 import com.sap.sse.security.BearerAuthenticationToken;
 import com.sap.sse.security.ClientUtils;
-import com.sap.sse.security.Credential;
 import com.sap.sse.security.GithubApi;
 import com.sap.sse.security.InstagramApi;
 import com.sap.sse.security.OAuthRealm;
-import com.sap.sse.security.OAuthToken;
 import com.sap.sse.security.SecurityService;
 import com.sap.sse.security.SessionCacheManager;
 import com.sap.sse.security.SessionUtils;
-import com.sap.sse.security.Social;
-import com.sap.sse.security.SocialSettingsKeys;
-import com.sap.sse.security.UserImpl;
-import com.sap.sse.security.UserStore;
+import com.sap.sse.security.interfaces.AccessControlStore;
+import com.sap.sse.security.interfaces.Credential;
+import com.sap.sse.security.interfaces.OAuthToken;
+import com.sap.sse.security.interfaces.Social;
+import com.sap.sse.security.interfaces.SocialSettingsKeys;
+import com.sap.sse.security.interfaces.UserImpl;
+import com.sap.sse.security.interfaces.UserStore;
 import com.sap.sse.security.persistence.PersistenceFactory;
 import com.sap.sse.security.shared.AccessControlListAnnotation;
 import com.sap.sse.security.shared.Account;