[jboss-svn-commits] JBL Code SVN: r19691 - in labs/jbosslabs/labs-3.0-build: services/credential/src/main/java/org/jboss/labs/auth and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 22 15:59:06 EDT 2008
Author: szimano
Date: 2008-04-22 15:59:05 -0400 (Tue, 22 Apr 2008)
New Revision: 19691
Modified:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java
labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/AuthHelper.java
labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java
labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java
labs/jbosslabs/labs-3.0-build/thirdparty/pom.xml
Log:
portal switched off, common roles in credentials
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java 2008-04-22 19:58:53 UTC (rev 19690)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java 2008-04-22 19:59:05 UTC (rev 19691)
@@ -28,6 +28,7 @@
import javax.ejb.Local;
+import org.jboss.labs.core.model.auth.ProjectRole;
import org.jboss.labs.core.model.auth.User;
import org.jboss.labs.core.model.auth.UserRole;
import org.jboss.labs.exception.auth.NoSuchRoleForUserException;
@@ -213,14 +214,18 @@
public void removeUser(Principal user) throws NoSuchUserException;
/**
- * Gets common role that users are added to when added to a project. Used by
- * other services - provided for coherence.
+ * Gets common role that users are added to when added to a project or when
+ * promoted to higher access. Used by other services - provided for
+ * coherence.
*
* @param projectID
* Project id.
+ * @param projectRole
+ * Project role type
* @return UserRole object for a project. Will get created if needed.
*/
- public UserRole getCommonRoleForProject(String projectID);
+ public UserRole getCommonRoleForProject(String projectID,
+ ProjectRole projectRole);
/**
* Gets all members of a role
@@ -251,8 +256,10 @@
/**
* This will change user's details (merge it with database).
*
- * @param user User to modify
- * @throws NoSuchUserException If user doesn't exist
+ * @param user
+ * User to modify
+ * @throws NoSuchUserException
+ * If user doesn't exist
*/
public void updateUser(User user) throws NoSuchUserException;
}
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/AuthHelper.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/AuthHelper.java 2008-04-22 19:58:53 UTC (rev 19690)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/AuthHelper.java 2008-04-22 19:59:05 UTC (rev 19691)
@@ -26,6 +26,7 @@
import java.security.NoSuchAlgorithmException;
import org.apache.log4j.Logger;
+import org.jboss.labs.core.model.auth.ProjectRole;
public class AuthHelper {
@@ -85,8 +86,9 @@
return getServiceID(serviceRole) + "." + serviceRole.toString();
}
- public static String getCommonProjectId(String projectId) {
- return projectId + COMMON_ROLE_SUFIX;
+ public static String getCommonProjectId(String projectId,
+ ProjectRole projectRole) {
+ return projectId + "_" + projectRole.toString() + COMMON_ROLE_SUFIX;
}
}
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java 2008-04-22 19:58:53 UTC (rev 19690)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java 2008-04-22 19:59:05 UTC (rev 19691)
@@ -40,6 +40,7 @@
import org.jboss.labs.auth.RoleBinderService;
import org.jboss.labs.auth.UserService;
import org.jboss.labs.core.model.auth.ProjectID;
+import org.jboss.labs.core.model.auth.ProjectRole;
import org.jboss.labs.core.model.auth.User;
import org.jboss.labs.core.model.auth.UserRole;
import org.jboss.labs.exception.LabsException;
@@ -379,14 +380,14 @@
*
* @see org.jboss.labs.auth.UserService#getCommonRoleForProject(java.lang.String)
*/
- public UserRole getCommonRoleForProject(String projectId) {
+ public UserRole getCommonRoleForProject(String projectId, ProjectRole projectRole) {
UserRole u = null;
-
+
try {
- u = getUserRole(AuthHelper.getCommonProjectId(projectId));
+ u = getUserRole(AuthHelper.getCommonProjectId(projectId, projectRole));
} catch (NoSuchUserRoleException e) {
- u = new UserRole(AuthHelper.getCommonProjectId(projectId),
- "Common role for project: " + projectId);
+ u = new UserRole(AuthHelper.getCommonProjectId(projectId, projectRole),
+ projectRole.toString()+" role for project: " + projectId);
try {
addUserRole(u);
} catch (RoleExistsException e1) {
@@ -455,4 +456,5 @@
manager.merge(user);
}
+
}
Modified: labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java 2008-04-22 19:58:53 UTC (rev 19690)
+++ labs/jbosslabs/labs-3.0-build/services/project-service/src/main/java/org/jboss/labs/core/service/impl/ProjectServiceEventListenerBean.java 2008-04-22 19:59:05 UTC (rev 19691)
@@ -27,6 +27,7 @@
import org.jboss.annotation.ejb.Service;
import org.jboss.labs.auth.RoleBinderService;
import org.jboss.labs.auth.UserService;
+import org.jboss.labs.core.model.auth.ProjectRole;
import org.jboss.labs.events.ProjectEvents;
import org.jboss.labs.events.service.EventsService;
import org.jboss.labs.exception.auth.NoSuchUserException;
@@ -96,7 +97,7 @@
log.info("Project contributor added: " + username + " project: " + projectId);
try {
userService.addUserRoleToUser(userService.getUserByLogin(username),
- userService.getCommonRoleForProject(projectId));
+ userService.getCommonRoleForProject(projectId, ProjectRole.CONTRIBUTOR));
} catch (NoSuchUserException e) {
// shouldn't happen
throw new IllegalStateException(e);
Modified: labs/jbosslabs/labs-3.0-build/thirdparty/pom.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/thirdparty/pom.xml 2008-04-22 19:58:53 UTC (rev 19690)
+++ labs/jbosslabs/labs-3.0-build/thirdparty/pom.xml 2008-04-22 19:59:05 UTC (rev 19691)
@@ -13,7 +13,7 @@
<packaging>pom</packaging>
<modules>
<module>jboss-as</module>
- <module>portal</module>
+ <!--module>portal</module-->
<module>as-libs</module>
</modules>
-</project>
\ No newline at end of file
+</project>
More information about the jboss-svn-commits
mailing list