From 137279c30a602435c32dc4981deb0d07a64f1a86 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Fri, 5 Nov 2010 15:20:56 +0100 Subject: [PATCH] move user to sonia.scm.user.User --- .../src/main/java/sonia/scm/TypedObject.java | 50 +++++++++++++++++++ .../java/sonia/scm/repository/Repository.java | 6 ++- .../main/java/sonia/scm/{ => user}/User.java | 37 ++++++++++++-- .../web/filter/BasicAuthenticationFilter.java | 2 +- .../SecurityHttpServletRequestWrapper.java | 2 +- .../sonia/scm/web/security/Authenticator.java | 2 +- .../web/security/BasicSecurityContext.java | 2 +- .../scm/web/security/SecurityContext.java | 2 +- .../src/main/java/sonia/scm/ScmState.java | 1 + .../resources/AuthenticationResource.java | 2 +- .../scm/web/security/XmlAuthenticator.java | 2 +- .../main/webapp/resources/js/sonia.global.js | 2 +- scm-webapp/src/main/webapp/sample/sample.js | 2 +- 13 files changed, 99 insertions(+), 13 deletions(-) create mode 100644 scm-core/src/main/java/sonia/scm/TypedObject.java rename scm-core/src/main/java/sonia/scm/{ => user}/User.java (88%) diff --git a/scm-core/src/main/java/sonia/scm/TypedObject.java b/scm-core/src/main/java/sonia/scm/TypedObject.java new file mode 100644 index 0000000000..362e5247b7 --- /dev/null +++ b/scm-core/src/main/java/sonia/scm/TypedObject.java @@ -0,0 +1,50 @@ +/** + * Copyright (c) 2010, Sebastian Sdorra + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of SCM-Manager; nor the names of its + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * http://bitbucket.org/sdorra/scm-manager + * + */ + + + +package sonia.scm; + +/** + * + * @author Sebastian Sdorra + */ +public interface TypedObject +{ + + /** + * Method description + * + * + * @return + */ + public String getType(); +} diff --git a/scm-core/src/main/java/sonia/scm/repository/Repository.java b/scm-core/src/main/java/sonia/scm/repository/Repository.java index 25ad06f059..61d2b1f613 100644 --- a/scm-core/src/main/java/sonia/scm/repository/Repository.java +++ b/scm-core/src/main/java/sonia/scm/repository/Repository.java @@ -29,10 +29,13 @@ * */ + + package sonia.scm.repository; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.TypedObject; import sonia.scm.util.DateAdapter; import sonia.scm.util.Util; @@ -62,7 +65,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; "id", "type", "name", "contact", "description", "creationDate", "url", "permissions" }) -public class Repository implements Serializable +public class Repository implements TypedObject, Serializable { /** Field description */ @@ -212,6 +215,7 @@ public class Repository implements Serializable * * @return */ + @Override public String getType() { return type; diff --git a/scm-core/src/main/java/sonia/scm/User.java b/scm-core/src/main/java/sonia/scm/user/User.java similarity index 88% rename from scm-core/src/main/java/sonia/scm/User.java rename to scm-core/src/main/java/sonia/scm/user/User.java index 22d6f443f6..15b749fd5d 100644 --- a/scm-core/src/main/java/sonia/scm/User.java +++ b/scm-core/src/main/java/sonia/scm/user/User.java @@ -29,7 +29,13 @@ * */ -package sonia.scm; + + +package sonia.scm.user; + +//~--- non-JDK imports -------------------------------------------------------- + +import sonia.scm.TypedObject; //~--- JDK imports ------------------------------------------------------------ @@ -50,9 +56,9 @@ import javax.xml.bind.annotation.XmlType; @XmlAccessorType(XmlAccessType.FIELD) @XmlType(propOrder = { - "name", "displayName", "mail", "password" + "name", "displayName", "mail", "password", "type" }) -public class User implements Principal, Serializable +public class User implements TypedObject, Principal, Serializable { /** Field description */ @@ -128,6 +134,17 @@ public class User implements Principal, Serializable return password; } + /** + * Method description + * + * + * @return + */ + public String getType() + { + return type; + } + //~--- set methods ---------------------------------------------------------- /** @@ -175,6 +192,17 @@ public class User implements Principal, Serializable this.password = password; } + /** + * Method description + * + * + * @param type + */ + public void setType(String type) + { + this.type = type; + } + //~--- fields --------------------------------------------------------------- /** Field description */ @@ -188,4 +216,7 @@ public class User implements Principal, Serializable /** Field description */ private String password; + + /** Field description */ + private String type; } diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java b/scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java index caf012f2e4..19155b5150 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java +++ b/scm-web-api/src/main/java/sonia/scm/web/filter/BasicAuthenticationFilter.java @@ -37,7 +37,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Singleton; -import sonia.scm.User; +import sonia.scm.user.User; import sonia.scm.util.Util; import sonia.scm.web.security.SecurityContext; diff --git a/scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java b/scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java index 163e02476d..7f4a9aa65f 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java +++ b/scm-web-api/src/main/java/sonia/scm/web/filter/SecurityHttpServletRequestWrapper.java @@ -33,7 +33,7 @@ package sonia.scm.web.filter; //~--- non-JDK imports -------------------------------------------------------- -import sonia.scm.User; +import sonia.scm.user.User; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java b/scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java index ab5083c86f..5ba0605b32 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java +++ b/scm-web-api/src/main/java/sonia/scm/web/security/Authenticator.java @@ -34,7 +34,7 @@ package sonia.scm.web.security; //~--- non-JDK imports -------------------------------------------------------- import sonia.scm.Initable; -import sonia.scm.User; +import sonia.scm.user.User; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java b/scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java index 6f53f81757..c4602c91e4 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java +++ b/scm-web-api/src/main/java/sonia/scm/web/security/BasicSecurityContext.java @@ -36,7 +36,7 @@ package sonia.scm.web.security; import com.google.inject.Inject; import com.google.inject.servlet.SessionScoped; -import sonia.scm.User; +import sonia.scm.user.User; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-web-api/src/main/java/sonia/scm/web/security/SecurityContext.java b/scm-web-api/src/main/java/sonia/scm/web/security/SecurityContext.java index 4a3fa37125..636788a1f3 100644 --- a/scm-web-api/src/main/java/sonia/scm/web/security/SecurityContext.java +++ b/scm-web-api/src/main/java/sonia/scm/web/security/SecurityContext.java @@ -33,7 +33,7 @@ package sonia.scm.web.security; //~--- non-JDK imports -------------------------------------------------------- -import sonia.scm.User; +import sonia.scm.user.User; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-webapp/src/main/java/sonia/scm/ScmState.java b/scm-webapp/src/main/java/sonia/scm/ScmState.java index fae744b0f8..ce7dbad184 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmState.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmState.java @@ -33,6 +33,7 @@ package sonia.scm; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.user.User; import sonia.scm.repository.RepositoryType; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java index f8ff781302..da2683cbb8 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java @@ -37,7 +37,7 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import sonia.scm.ScmState; -import sonia.scm.User; +import sonia.scm.user.User; import sonia.scm.repository.RepositoryManager; import sonia.scm.repository.RepositoryType; import sonia.scm.web.security.SecurityContext; diff --git a/scm-webapp/src/main/java/sonia/scm/web/security/XmlAuthenticator.java b/scm-webapp/src/main/java/sonia/scm/web/security/XmlAuthenticator.java index 95f850086c..a72c447a60 100644 --- a/scm-webapp/src/main/java/sonia/scm/web/security/XmlAuthenticator.java +++ b/scm-webapp/src/main/java/sonia/scm/web/security/XmlAuthenticator.java @@ -40,7 +40,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.SCMContextProvider; -import sonia.scm.User; +import sonia.scm.user.User; import sonia.scm.security.EncryptionHandler; //~--- JDK imports ------------------------------------------------------------ diff --git a/scm-webapp/src/main/webapp/resources/js/sonia.global.js b/scm-webapp/src/main/webapp/resources/js/sonia.global.js index 2c350a1afa..e6da6292da 100644 --- a/scm-webapp/src/main/webapp/resources/js/sonia.global.js +++ b/scm-webapp/src/main/webapp/resources/js/sonia.global.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Sebastian Sdorra + * Copyright (c) 2010, Sebastian Sdorra * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/scm-webapp/src/main/webapp/sample/sample.js b/scm-webapp/src/main/webapp/sample/sample.js index fd69a54ac9..240eafa41f 100644 --- a/scm-webapp/src/main/webapp/sample/sample.js +++ b/scm-webapp/src/main/webapp/sample/sample.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2009, Sebastian Sdorra + * Copyright (c) 2010, Sebastian Sdorra * All rights reserved. * * Redistribution and use in source and binary forms, with or without