[jboss-svn-commits] JBL Code SVN: r18125 - in labs/jbosslabs/labs-3.0-build: core/core-api/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
Fri Jan 25 13:03:08 EST 2008
Author: szimano
Date: 2008-01-25 13:03:08 -0500 (Fri, 25 Jan 2008)
New Revision: 18125
Modified:
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/ServiceHelper.java
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/AuthenticationService.java
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java
labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java
labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java
labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/RoleBinderImpl.java
labs/jbosslabs/labs-3.0-build/services/foo-service/src/main/java/org/jboss/labs/FooServiceImpl.java
Log:
no more enums in auth JBLAB-901
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/ServiceHelper.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/ServiceHelper.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/ServiceHelper.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -7,10 +7,11 @@
import org.jboss.labs.exception.service.LabsServiceResolveException;
public class ServiceHelper {
-
- public static <E extends Enum<E>> RoleBinderService<E> getRoleBinder() throws LabsServiceResolveException {
+
+ public static RoleBinderService getRoleBinder()
+ throws LabsServiceResolveException {
try {
- return (RoleBinderService<E>) new InitialContext()
+ return (RoleBinderService) new InitialContext()
.lookup("RoleBinderImpl/local");
} catch (NamingException e) {
throw new LabsServiceResolveException(e);
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/AuthenticationService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/AuthenticationService.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/AuthenticationService.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -2,9 +2,9 @@
import java.security.Principal;
-public interface AuthenticationService<E extends Enum<E>> {
+public interface AuthenticationService {
- public boolean isAllowed(Principal user, E serverRole, String serviceId);
+ public <E extends Enum<E>> boolean isAllowed(Principal user, E serverRole, String serviceId);
public boolean isAllowed(Principal user, String customId, String serviceId);
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -8,17 +8,17 @@
* @author tomaszszymanski
*
*/
-public interface RoleBinderService<E extends Enum<E>> {
+public interface RoleBinderService {
/**
* @param <E>
* @param serviceRoleList
* @param serviceId
*/
- public void exposeServiceRoles(E[] serviceRoleList, String serviceId);
+ public <E extends Enum<E>> void exposeServiceRoles(E[] serviceRoleList, String serviceId);
public void registerCustomIDProvider(CustomIDProvider provider, String serviceId);
- public void bindRolesWithProject(E serviceRole, Role role, String projectId, String serviceId);
+ public <E extends Enum<E>> void bindRolesWithProject(E serviceRole, Role role, String projectId, String serviceId);
- public void bindRolesWithId(E serviceRole, Role role, String customId, String serviceId);
+ public <E extends Enum<E>> void bindRolesWithId(E serviceRole, Role role, String customId, String serviceId);
}
Modified: labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/injection/LabsGuiceModule.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -12,7 +12,7 @@
public void configure(Binder binder) {
binder.bind(FooService.class).toProvider(new JNDIProvider<FooService>("FooServiceImpl/local"));
- binder.bind(new TypeLiteral<RoleBinderService<?>>(){}).toProvider( new JNDIProvider<RoleBinderService<?>>("RoleBinderImpl/local"));
+ binder.bind(RoleBinderService.class).toProvider( new JNDIProvider<RoleBinderService>("RoleBinderImpl/local"));
binder.bind(AuthenticationService.class).toProvider(new JNDIProvider<AuthenticationService>("AuthenticationServiceImpl/local"));
binder.bind(ProjectService.class).toProvider(new JNDIProvider<ProjectService>("ProjectService/local"));
}
Modified: labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -9,9 +9,9 @@
@Local
@Stateless
-public class AuthenticationServiceImpl<E extends Enum<E>> implements AuthenticationService<E> {
+public class AuthenticationServiceImpl implements AuthenticationService {
- public boolean isAllowed(Principal user, E serverRole, String serviceId) {
+ public <E extends Enum<E>> boolean isAllowed(Principal user, E serverRole, String serviceId) {
// TODO Auto-generated method stub
return false;
}
Modified: labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/RoleBinderImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/RoleBinderImpl.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/services/authorization/src/main/java/org/jboss/labs/auth/impl/RoleBinderImpl.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -10,11 +10,11 @@
@Stateless
@Local
-public class RoleBinderImpl<E extends Enum<E>> implements RoleBinderService<E> {
+public class RoleBinderImpl implements RoleBinderService {
private final static Logger log = Logger.getLogger(RoleBinderImpl.class);
- public void exposeServiceRoles(E[] roleList, String serviceId) {
+ public <E extends Enum<E>> void exposeServiceRoles(E[] roleList, String serviceId) {
// TODO Auto-generated method stub
for (E role : roleList) {
@@ -28,13 +28,13 @@
}
- public void bindRolesWithId(E serviceRole, Role role, String customId,
+ public <E extends Enum<E>> void bindRolesWithId(E serviceRole, Role role, String customId,
String serviceId) {
// TODO Auto-generated method stub
}
- public void bindRolesWithProject(E serviceRole, Role role,
+ public <E extends Enum<E>> void bindRolesWithProject(E serviceRole, Role role,
String projectId, String serviceId) {
// TODO Auto-generated method stub
Modified: labs/jbosslabs/labs-3.0-build/services/foo-service/src/main/java/org/jboss/labs/FooServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/foo-service/src/main/java/org/jboss/labs/FooServiceImpl.java 2008-01-25 17:18:13 UTC (rev 18124)
+++ labs/jbosslabs/labs-3.0-build/services/foo-service/src/main/java/org/jboss/labs/FooServiceImpl.java 2008-01-25 18:03:08 UTC (rev 18125)
@@ -25,17 +25,17 @@
private EntityManager em;
@EJB
- private RoleBinderService<FooRoleList> roleBinder;
+ private RoleBinderService roleBinder;
- /*@Inject
- private RoleBinder<FooRoleList> roleBinderInject;*/
+ @Inject
+ private RoleBinderService roleBinderInject;
private final static Logger log = Logger.getLogger(FooServiceImpl.class);
@PostConstruct
public void contructor() {
roleBinder.exposeServiceRoles(FooRoleList.values(), FooServiceImpl.class.getName());
- //log.info(roleBinderInject);
+ log.info(roleBinderInject);
}
public FooEntity sayFoo() {
More information about the jboss-svn-commits
mailing list