diff --git a/java/com.sap.sailing.server/SailingServer (Proxy).launch b/java/com.sap.sailing.server/SailingServer (Proxy).launch index c0b5ac9942b..6212c937b01 100644 --- a/java/com.sap.sailing.server/SailingServer (Proxy).launch +++ b/java/com.sap.sailing.server/SailingServer (Proxy).launch @@ -33,6 +33,6 @@ - + diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java index 3bad4e2ef26..41fd1dcb39e 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java @@ -8,11 +8,11 @@ import org.apache.shiro.SecurityUtils; import org.junit.BeforeClass; import org.junit.Test; -import com.sap.sse.security.Activator; import com.sap.sse.security.SecurityServiceImpl; import com.sap.sse.security.UsernamePasswordRealm; +import com.sap.sse.security.impl.Activator; +import com.sap.sse.security.shared.UserStore; import com.sap.sse.security.userstore.mongodb.UserStoreImpl; -import com.sap.sse.security.userstore.shared.UserStore; public class LoginTest { @BeforeClass diff --git a/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF b/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF index 3cceef3d950..82af743ab5f 100644 --- a/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security.ui/META-INF/MANIFEST.MF @@ -13,7 +13,7 @@ Bundle-ClassPath: WEB-INF/classes/ Require-Bundle: javax.servlet;bundle-version="2.5.0", com.sap.sse.gwt;bundle-version="1.0.0", com.google.gwt.osgi;bundle-version="2.6.0", - com.sap.sse.security;bundle-version="1.0.0", + com.sap.sse.security, org.json.simple, com.sap.sailing.domain.common, com.sap.sse.common, diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java index 37c959ef3c1..6713ffb3287 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/server/UserManagementServiceImpl.java @@ -32,7 +32,12 @@ import com.sap.sse.security.DefaultRoles; import com.sap.sse.security.SecurityService; import com.sap.sse.security.SessionUtils; import com.sap.sse.security.Social; -import com.sap.sse.security.UserManagementException; +import com.sap.sse.security.shared.Account; +import com.sap.sse.security.shared.SocialUserAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UserManagementException; +import com.sap.sse.security.shared.UsernamePasswordAccount; +import com.sap.sse.security.shared.Account.AccountType; import com.sap.sse.security.ui.oauth.client.CredentialDTO; import com.sap.sse.security.ui.oauth.client.SocialUserDTO; import com.sap.sse.security.ui.oauth.shared.OAuthException; @@ -41,11 +46,6 @@ import com.sap.sse.security.ui.shared.SuccessInfo; import com.sap.sse.security.ui.shared.UserDTO; import com.sap.sse.security.ui.shared.UserManagementService; import com.sap.sse.security.ui.shared.UsernamePasswordAccountDTO; -import com.sap.sse.security.userstore.shared.Account; -import com.sap.sse.security.userstore.shared.Account.AccountType; -import com.sap.sse.security.userstore.shared.SocialUserAccount; -import com.sap.sse.security.userstore.shared.User; -import com.sap.sse.security.userstore.shared.UsernamePasswordAccount; public class UserManagementServiceImpl extends RemoteServiceServlet implements UserManagementService { private static final long serialVersionUID = 4458564336368629101L; @@ -129,7 +129,7 @@ public class UserManagementServiceImpl extends RemoteServiceServlet implements U u = getSecurityService().createSimpleUser(name, email, password); } catch (UserManagementException e) { logger.log(Level.SEVERE, "Error creating user "+name, e); - throw e; + throw new UserManagementException(e.getMessage()); } if (u == null) { return null; diff --git a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/shared/UserManagementService.java b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/shared/UserManagementService.java index fc83ed18dbc..7c37c2f7e5f 100644 --- a/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/shared/UserManagementService.java +++ b/java/com.sap.sse.security.ui/src/main/java/com/sap/sse/security/ui/shared/UserManagementService.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.Map; import com.google.gwt.user.client.rpc.RemoteService; -import com.sap.sse.security.UserManagementException; +import com.sap.sse.security.shared.UserManagementException; import com.sap.sse.security.ui.oauth.client.CredentialDTO; import com.sap.sse.security.ui.oauth.shared.OAuthException; diff --git a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/Register.gwt.xml b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/Register.gwt.xml index 07941d78ead..495d22b0b14 100644 --- a/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/Register.gwt.xml +++ b/java/com.sap.sse.security.ui/src/main/resources/com/sap/sse/security/ui/Register.gwt.xml @@ -24,6 +24,7 @@ --> + diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/Activator.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/Activator.java index a3609ef481a..b9dae3377c1 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/Activator.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/Activator.java @@ -6,7 +6,7 @@ import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; -import com.sap.sse.security.userstore.shared.UserStore; +import com.sap.sse.security.shared.UserStore; public class Activator implements BundleActivator { diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/DomainObjectFactory.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/DomainObjectFactory.java index 4743e56a632..8bc975f2595 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/DomainObjectFactory.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/DomainObjectFactory.java @@ -2,7 +2,7 @@ package com.sap.sse.security.userstore.mongodb; import java.util.Map; -import com.sap.sse.security.userstore.shared.User; +import com.sap.sse.security.shared.User; public interface DomainObjectFactory { diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java index f40b0a6797d..74b7677dd8a 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/MongoObjectFactory.java @@ -2,7 +2,7 @@ package com.sap.sse.security.userstore.mongodb; import java.util.Map; -import com.sap.sse.security.userstore.shared.User; +import com.sap.sse.security.shared.User; public interface MongoObjectFactory { diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java index 634e5c4d500..ed9d7fcd4da 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/UserStoreImpl.java @@ -9,10 +9,10 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import com.sap.sse.security.SocialSettingsKeys; -import com.sap.sse.security.UserManagementException; -import com.sap.sse.security.userstore.shared.Account; -import com.sap.sse.security.userstore.shared.User; -import com.sap.sse.security.userstore.shared.UserStore; +import com.sap.sse.security.shared.Account; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UserManagementException; +import com.sap.sse.security.shared.UserStore; public class UserStoreImpl implements UserStore { private static final Logger logger = Logger.getLogger(UserStoreImpl.class.getName()); diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java index 1f51fb75ede..7a8f2b647a6 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/DomainObjectFactoryImpl.java @@ -17,14 +17,14 @@ import com.mongodb.DB; import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.sap.sse.security.Social; +import com.sap.sse.security.shared.Account; +import com.sap.sse.security.shared.SocialUserAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UsernamePasswordAccount; +import com.sap.sse.security.shared.Account.AccountType; import com.sap.sse.security.userstore.mongodb.CollectionNames; import com.sap.sse.security.userstore.mongodb.DomainObjectFactory; import com.sap.sse.security.userstore.mongodb.FieldNames; -import com.sap.sse.security.userstore.shared.Account; -import com.sap.sse.security.userstore.shared.Account.AccountType; -import com.sap.sse.security.userstore.shared.SocialUserAccount; -import com.sap.sse.security.userstore.shared.User; -import com.sap.sse.security.userstore.shared.UsernamePasswordAccount; public class DomainObjectFactoryImpl implements DomainObjectFactory { private static final Logger logger = Logger.getLogger(DomainObjectFactoryImpl.class.getName()); diff --git a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java index 20480d1e15c..a354e929085 100644 --- a/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java +++ b/java/com.sap.sse.security.userstore.mongodb/src/com/sap/sse/security/userstore/mongodb/impl/MongoObjectFactoryImpl.java @@ -11,14 +11,14 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; import com.mongodb.WriteConcern; import com.sap.sse.security.Social; +import com.sap.sse.security.shared.Account; +import com.sap.sse.security.shared.SocialUserAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UsernamePasswordAccount; +import com.sap.sse.security.shared.Account.AccountType; import com.sap.sse.security.userstore.mongodb.CollectionNames; import com.sap.sse.security.userstore.mongodb.FieldNames; import com.sap.sse.security.userstore.mongodb.MongoObjectFactory; -import com.sap.sse.security.userstore.shared.Account; -import com.sap.sse.security.userstore.shared.SocialUserAccount; -import com.sap.sse.security.userstore.shared.User; -import com.sap.sse.security.userstore.shared.Account.AccountType; -import com.sap.sse.security.userstore.shared.UsernamePasswordAccount; public class MongoObjectFactoryImpl implements MongoObjectFactory { diff --git a/java/com.sap.sse.security/META-INF/MANIFEST.MF b/java/com.sap.sse.security/META-INF/MANIFEST.MF index ac077e88c52..ce9ec729e56 100644 --- a/java/com.sap.sse.security/META-INF/MANIFEST.MF +++ b/java/com.sap.sse.security/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Security Bundle-SymbolicName: com.sap.sse.security Bundle-Version: 1.0.0.qualifier -Bundle-Activator: com.sap.sse.security.Activator +Bundle-Activator: com.sap.sse.security.impl.Activator Bundle-Vendor: SAP Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Import-Package: javax.mail;version="1.4.0", @@ -29,7 +29,7 @@ Require-Bundle: javax.servlet;bundle-version="2.5.0", org.apache.commons.beanutils;bundle-version="1.8.0" Web-ContextPath: /security Export-Package: com.sap.sse.security, - com.sap.sse.security.userstore.shared, + com.sap.sse.security.shared, org.apache.shiro, org.apache.shiro.authc, org.apache.shiro.authz, diff --git a/java/com.sap.sse.security/src/com/sap/sse/Security.gwt.xml b/java/com.sap.sse.security/resources/com/sap/sse/Security.gwt.xml similarity index 86% rename from java/com.sap.sse.security/src/com/sap/sse/Security.gwt.xml rename to java/com.sap.sse.security/resources/com/sap/sse/Security.gwt.xml index c4712ff09d7..9222876ed95 100755 --- a/java/com.sap.sse.security/src/com/sap/sse/Security.gwt.xml +++ b/java/com.sap.sse.security/resources/com/sap/sse/Security.gwt.xml @@ -1,5 +1,5 @@ - + diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java b/java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java index 418d593b302..5e625e48bcb 100755 --- a/java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/AbstractUserStoreBasedRealm.java @@ -11,7 +11,8 @@ import org.apache.shiro.realm.AuthorizingRealm; import org.osgi.framework.BundleContext; import org.osgi.util.tracker.ServiceTracker; -import com.sap.sse.security.userstore.shared.UserStore; +import com.sap.sse.security.impl.Activator; +import com.sap.sse.security.shared.UserStore; public abstract class AbstractUserStoreBasedRealm extends AuthorizingRealm { private static final Logger logger = Logger.getLogger(AbstractUserStoreBasedRealm.class.getName()); diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/OAuthRealm.java b/java/com.sap.sse.security/src/com/sap/sse/security/OAuthRealm.java index ecaa424a172..2f46aa6af95 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/OAuthRealm.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/OAuthRealm.java @@ -38,9 +38,10 @@ import org.scribe.model.Verb; import org.scribe.model.Verifier; import org.scribe.oauth.OAuthService; +import com.sap.sse.security.shared.SocialUserAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UserManagementException; // GWT has similar class. -import com.sap.sse.security.userstore.shared.SocialUserAccount; -import com.sap.sse.security.userstore.shared.User; public class OAuthRealm extends AbstractUserStoreBasedRealm { private static final Logger logger = Logger.getLogger(OAuthRealm.class.getName()); diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java index d64daf584cc..7e65e31dbd9 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java @@ -11,8 +11,9 @@ import javax.servlet.ServletContext; import org.apache.shiro.cache.CacheManager; import org.apache.shiro.mgt.SecurityManager; -import com.sap.sse.security.userstore.shared.SocialUserAccount; -import com.sap.sse.security.userstore.shared.User; +import com.sap.sse.security.shared.SocialUserAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UserManagementException; public interface SecurityService { diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java index 7d7ced1e74f..0012b534716 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityServiceImpl.java @@ -61,10 +61,11 @@ import org.scribe.model.Token; import org.scribe.oauth.OAuthService; import com.google.gwt.user.server.rpc.RemoteServiceServlet; -import com.sap.sse.security.userstore.shared.SocialUserAccount; -import com.sap.sse.security.userstore.shared.User; -import com.sap.sse.security.userstore.shared.UserStore; -import com.sap.sse.security.userstore.shared.UsernamePasswordAccount; +import com.sap.sse.security.shared.SocialUserAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UserManagementException; +import com.sap.sse.security.shared.UserStore; +import com.sap.sse.security.shared.UsernamePasswordAccount; public class SecurityServiceImpl extends RemoteServiceServlet implements SecurityService { diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SessionCacheManager.java b/java/com.sap.sse.security/src/com/sap/sse/security/SessionCacheManager.java index c9f4ccc3722..3463017b110 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/SessionCacheManager.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/SessionCacheManager.java @@ -4,6 +4,8 @@ import org.apache.shiro.cache.Cache; import org.apache.shiro.cache.CacheException; import org.apache.shiro.cache.CacheManager; +import com.sap.sse.security.impl.Activator; + /** * Obtains the singleton cache manager instance from the singleton {@link SecurityService} instance. Using an instance * of this class as the cache manager in your Shiro configuration as in diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/UsernamePasswordRealm.java b/java/com.sap.sse.security/src/com/sap/sse/security/UsernamePasswordRealm.java index ec9801e7c36..6b63a94ea04 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/UsernamePasswordRealm.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/UsernamePasswordRealm.java @@ -13,9 +13,10 @@ import org.apache.shiro.authz.SimpleAuthorizationInfo; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.util.ByteSource; -import com.sap.sse.security.userstore.shared.Account.AccountType; -import com.sap.sse.security.userstore.shared.User; -import com.sap.sse.security.userstore.shared.UsernamePasswordAccount; +import com.sap.sse.security.shared.User; +import com.sap.sse.security.shared.UserManagementException; +import com.sap.sse.security.shared.UsernamePasswordAccount; +import com.sap.sse.security.shared.Account.AccountType; public class UsernamePasswordRealm extends AbstractUserStoreBasedRealm { diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/Activator.java b/java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java similarity index 92% rename from java/com.sap.sse.security/src/com/sap/sse/security/Activator.java rename to java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java index df600eaac2b..bdafd790551 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/Activator.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java @@ -1,4 +1,4 @@ -package com.sap.sse.security; +package com.sap.sse.security.impl; import java.io.File; import java.io.FileReader; @@ -12,7 +12,10 @@ import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; -import com.sap.sse.security.userstore.shared.UserStore; +import com.sap.sse.security.SecurityService; +import com.sap.sse.security.SecurityServiceImpl; +import com.sap.sse.security.UsernamePasswordRealm; +import com.sap.sse.security.shared.UserStore; public class Activator implements BundleActivator { private static final Logger logger = Logger.getLogger(Activator.class.getName()); @@ -36,11 +39,11 @@ public class Activator implements BundleActivator { UsernamePasswordRealm.setTestUserStore(theTestUserStore); } - static BundleContext getContext() { + public static BundleContext getContext() { return context; } - static SecurityService getSecurityService() { + public static SecurityService getSecurityService() { return securityService; } diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/jaxrs/api/SecurityResource.java b/java/com.sap.sse.security/src/com/sap/sse/security/jaxrs/api/SecurityResource.java index 9e45ef06dcd..5d1c93d8851 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/jaxrs/api/SecurityResource.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/jaxrs/api/SecurityResource.java @@ -11,8 +11,8 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.Status; -import com.sap.sse.security.UserManagementException; import com.sap.sse.security.jaxrs.AbstractSecurityResource; +import com.sap.sse.security.shared.UserManagementException; @Path("/restsecurity") public class SecurityResource extends AbstractSecurityResource { diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/Account.java b/java/com.sap.sse.security/src/com/sap/sse/security/shared/Account.java similarity index 91% rename from java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/Account.java rename to java/com.sap.sse.security/src/com/sap/sse/security/shared/Account.java index 4988107a59e..83329bcdced 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/Account.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/shared/Account.java @@ -1,4 +1,4 @@ -package com.sap.sse.security.userstore.shared; +package com.sap.sse.security.shared; public interface Account { diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/SocialUserAccount.java b/java/com.sap.sse.security/src/com/sap/sse/security/shared/SocialUserAccount.java similarity index 95% rename from java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/SocialUserAccount.java rename to java/com.sap.sse.security/src/com/sap/sse/security/shared/SocialUserAccount.java index 743accb1d5f..448fd2c4eb4 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/SocialUserAccount.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/shared/SocialUserAccount.java @@ -1,4 +1,4 @@ -package com.sap.sse.security.userstore.shared; +package com.sap.sse.security.shared; import java.util.HashMap; import java.util.Map; diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/User.java b/java/com.sap.sse.security/src/com/sap/sse/security/shared/User.java similarity index 94% rename from java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/User.java rename to java/com.sap.sse.security/src/com/sap/sse/security/shared/User.java index 2e84e15f86a..dd1ce7fa86e 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/User.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/shared/User.java @@ -1,4 +1,4 @@ -package com.sap.sse.security.userstore.shared; +package com.sap.sse.security.shared; import java.util.Arrays; import java.util.Collection; @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import com.sap.sse.security.userstore.shared.Account.AccountType; +import com.sap.sse.security.shared.Account.AccountType; public class User { diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/UserManagementException.java b/java/com.sap.sse.security/src/com/sap/sse/security/shared/UserManagementException.java similarity index 52% rename from java/com.sap.sse.security/src/com/sap/sse/security/UserManagementException.java rename to java/com.sap.sse.security/src/com/sap/sse/security/shared/UserManagementException.java index a28fcad258a..24194df3af9 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/UserManagementException.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/shared/UserManagementException.java @@ -1,6 +1,8 @@ -package com.sap.sse.security; +package com.sap.sse.security.shared; -public class UserManagementException extends Exception { +import java.io.Serializable; + +public class UserManagementException extends Exception implements Serializable { private static final long serialVersionUID = 7555799541580565866L; @@ -8,11 +10,16 @@ public class UserManagementException extends Exception { public static final String USER_ALREADY_EXISTS = "User already exists."; public static final String INVALID_CREDENTIALS = "Invalid Credentials."; - public UserManagementException(String message) { - super(message); - } + public UserManagementException() {} // for GWT serialization - public UserManagementException(String message, Throwable cause) { - super(message, cause); + private String message; + + @Override + public String getMessage() { + return message; + } + + public UserManagementException(String message) { + this.message = message; } } diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/UserStore.java b/java/com.sap.sse.security/src/com/sap/sse/security/shared/UserStore.java similarity index 89% rename from java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/UserStore.java rename to java/com.sap.sse.security/src/com/sap/sse/security/shared/UserStore.java index 5f275da8336..446821cb0db 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/UserStore.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/shared/UserStore.java @@ -1,11 +1,9 @@ -package com.sap.sse.security.userstore.shared; +package com.sap.sse.security.shared; import java.util.Collection; import java.util.Map; import java.util.Set; -import com.sap.sse.security.UserManagementException; - public interface UserStore { String getName(); diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/UsernamePasswordAccount.java b/java/com.sap.sse.security/src/com/sap/sse/security/shared/UsernamePasswordAccount.java similarity index 95% rename from java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/UsernamePasswordAccount.java rename to java/com.sap.sse.security/src/com/sap/sse/security/shared/UsernamePasswordAccount.java index f984c780603..25ef04a59b9 100644 --- a/java/com.sap.sse.security/src/com/sap/sse/security/userstore/shared/UsernamePasswordAccount.java +++ b/java/com.sap.sse.security/src/com/sap/sse/security/shared/UsernamePasswordAccount.java @@ -1,4 +1,4 @@ -package com.sap.sse.security.userstore.shared; +package com.sap.sse.security.shared; public class UsernamePasswordAccount implements Account {