[jboss-svn-commits] JBL Code SVN: r18585 - 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
Mon Feb 25 15:34:07 EST 2008
Author: szimano
Date: 2008-02-25 15:34:07 -0500 (Mon, 25 Feb 2008)
New Revision: 18585
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/RoleBinderService.java
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/AuthenticationServiceImpl.java
labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.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/credential/src/main/resources/META-INF/persistence.xml
labs/jbosslabs/labs-3.0-build/services/credential/src/test/java/org/jboss/labs/test/auth/UserTest.java
Log:
credential system bugfixes, JBLAB-901
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-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/AuthenticationService.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -24,9 +24,12 @@
import java.security.Principal;
+import javax.ejb.Local;
+
import org.jboss.labs.core.model.auth.CustomID;
import org.jboss.labs.exception.auth.NoSuchUserException;
+ at Local
public interface AuthenticationService {
/**
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-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/RoleBinderService.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -24,6 +24,8 @@
import java.security.Principal;
+import javax.ejb.Local;
+
import org.jboss.labs.auth.custom.CustomIDProvider;
import org.jboss.labs.core.model.auth.CustomID;
import org.jboss.labs.core.model.auth.ProjectID;
@@ -40,6 +42,7 @@
* @author tomaszszymanski
*
*/
+ at Local
public interface RoleBinderService {
/**
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-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/core/core-api/src/main/java/org/jboss/labs/auth/UserService.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -25,6 +25,8 @@
import java.security.Principal;
import java.util.Set;
+import javax.ejb.Local;
+
import org.jboss.labs.core.model.auth.User;
import org.jboss.labs.core.model.auth.UserRole;
import org.jboss.labs.exception.auth.NoSuchRoleForUserException;
@@ -37,6 +39,7 @@
* @author tomaszszymanski
*
*/
+ at Local
public interface UserService {
/**
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-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/AuthHelper.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -54,4 +54,8 @@
public static <E extends Enum<E>> String getServiceID(E serviceRole) {
return serviceRole.getDeclaringClass().getCanonicalName();
}
+
+ public static <E extends Enum<E>> String getServiceRoleID(E serviceRole) {
+ return getServiceID(serviceRole) + "." + serviceRole.toString();
+ }
}
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java 2008-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/AuthenticationServiceImpl.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -27,7 +27,6 @@
import java.util.List;
import javax.ejb.EJB;
-import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -44,7 +43,6 @@
import org.jboss.labs.core.model.auth.UserRole;
import org.jboss.labs.exception.auth.NoSuchUserException;
- at Local
@Stateless
public class AuthenticationServiceImpl implements AuthenticationService {
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java 2008-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/RoleBinderServiceImpl.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -27,7 +27,6 @@
import java.util.TreeSet;
import javax.ejb.EJB;
-import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
@@ -53,7 +52,6 @@
import org.jboss.labs.exception.auth.NoSuchUserRoleException;
@Stateless
- at Local
public class RoleBinderServiceImpl implements RoleBinderService {
@PersistenceContext(name = "auth_model")
@@ -116,7 +114,7 @@
ServiceRole sr = service.getServiceRole(role);
if (sr == null) {
- sr = new ServiceRole(AuthHelper.getServiceID(role), service);
+ sr = new ServiceRole(AuthHelper.getServiceRoleID(role), service);
manager.persist(sr);
service.addServiceRole(sr);
@@ -172,7 +170,7 @@
public <E extends Enum<E>> ServiceRole getServiceRole(E serviceRole)
throws NoSuchServiceRoleException {
ServiceRole serviceRoleEn = manager.find(ServiceRole.class, AuthHelper
- .getServiceID(serviceRole));
+ .getServiceRoleID(serviceRole));
if (serviceRoleEn == null) {
throw new NoSuchServiceRoleException(
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-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/java/org/jboss/labs/auth/impl/UserServiceImpl.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -29,7 +29,6 @@
import java.util.TreeSet;
import javax.annotation.PostConstruct;
-import javax.ejb.Local;
import javax.ejb.Stateless;
import javax.interceptor.Interceptors;
import javax.persistence.EntityManager;
@@ -39,7 +38,6 @@
import org.jboss.labs.auth.AuthHelper;
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.User;
import org.jboss.labs.core.model.auth.UserRole;
import org.jboss.labs.exception.LabsException;
@@ -53,7 +51,6 @@
import com.google.inject.Inject;
@Stateless
- at Local
@Interceptors({LabsInjectionInterceptor.class})
public class UserServiceImpl implements UserService {
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/main/resources/META-INF/persistence.xml
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/main/resources/META-INF/persistence.xml 2008-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/main/resources/META-INF/persistence.xml 2008-02-25 20:34:07 UTC (rev 18585)
@@ -5,7 +5,7 @@
<properties>
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQL5Dialect" />
<!-- property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /-->
- <property name="hibernate.hbm2ddl.auto" value="create-drop" />
+ <property name="hibernate.hbm2ddl.auto" value="update" />
</properties>
<class>org.jboss.labs.core.model.auth.AuthID</class>
<class>org.jboss.labs.core.model.auth.Binding</class>
Modified: labs/jbosslabs/labs-3.0-build/services/credential/src/test/java/org/jboss/labs/test/auth/UserTest.java
===================================================================
--- labs/jbosslabs/labs-3.0-build/services/credential/src/test/java/org/jboss/labs/test/auth/UserTest.java 2008-02-25 18:09:08 UTC (rev 18584)
+++ labs/jbosslabs/labs-3.0-build/services/credential/src/test/java/org/jboss/labs/test/auth/UserTest.java 2008-02-25 20:34:07 UTC (rev 18585)
@@ -14,6 +14,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.apache.log4j.Logger;
import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
import org.jboss.labs.auth.UserService;
import org.jboss.labs.core.model.auth.User;
@@ -25,106 +26,105 @@
/*
* JBoss Labs. http://labs.jboss.com/jbosslabs
*
- * Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
+ * Copyright © 2008 Red Hat Middleware, LLC. All rights reserved.
*
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, v. 2.1.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT A WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License, v.2.1 along with this distribution; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
*
- * Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik,
- * Tomasz Szymanski, Adam Warski, Pawel Wrzeszcz
+ * Red Hat Author(s): Bob McWhirter, Przemyslaw Dej, Ryszard Kozmik, Tomasz
+ * Szymanski, Adam Warski, Pawel Wrzeszcz
*/
/**
* @author tomaszszymanski
- *
+ *
*/
public class UserTest extends TestCase {
- public UserTest()
- {
- super("UserTest");
- }
+
+ public static final Logger log = Logger.getLogger(UserTest.class);
-
+ public UserTest() {
+ super("UserTest");
+ }
+ public static Test suite() throws Exception {
+ TestSuite suite = new TestSuite();
+ suite.addTestSuite(UserTest.class);
- public static Test suite() throws Exception
- {
- TestSuite suite = new TestSuite();
- suite.addTestSuite(UserTest.class);
+ // setup test so that embedded JBoss is started/stopped once for all
+ // tests here.
+ TestSetup wrapper = new TestSetup(suite) {
+ protected void setUp() {
+ startupEmbeddedJboss();
+ }
+ protected void tearDown() {
+ shutdownEmbeddedJboss();
+ }
+ };
- // setup test so that embedded JBoss is started/stopped once for all tests here.
- TestSetup wrapper = new TestSetup(suite)
- {
- protected void setUp()
- {
- startupEmbeddedJboss();
- }
+ return wrapper;
+ }
- protected void tearDown()
- {
- shutdownEmbeddedJboss();
- }
- };
+ public static void startupEmbeddedJboss() {
+ EJB3StandaloneBootstrap.boot(null);
+ EJB3StandaloneBootstrap.scanClasspath();
+ }
- return wrapper;
- }
+ public static void shutdownEmbeddedJboss() {
+ EJB3StandaloneBootstrap.shutdown();
+ }
- public static void startupEmbeddedJboss()
- {
- EJB3StandaloneBootstrap.boot(null);
- EJB3StandaloneBootstrap.scanClasspath("target/classes");
- }
+ public void testEJBs() throws Exception {
- public static void shutdownEmbeddedJboss()
- {
- EJB3StandaloneBootstrap.shutdown();
- }
+ InitialContext ctx = getInitialContext();
- public void testEJBs() throws Exception
- {
+ }
- InitialContext ctx = getInitialContext();
+ public void testEntityManager() throws Exception {
+ // This is a transactionally aware EntityManager and must be accessed
+ // within a JTA transaction
+ // Why aren't we using javax.persistence.Persistence? Well, our
+ // persistence.xml file uses
+ // jta-datasource which means that it is created by the EJB
+ // container/embedded JBoss.
+ // using javax.persistence.Persistence will just cause us an error
+ //EntityManager em = (EntityManager) getInitialContext().lookup(
+ // "java:/EntityManagers/auth_model");
- }
+ //UserService us = (UserService) getInitialContext().lookup(
+ // "UserServiceImpl/local");
- public void testEntityManager() throws Exception
- {
- // This is a transactionally aware EntityManager and must be accessed within a JTA transaction
- // Why aren't we using javax.persistence.Persistence? Well, our persistence.xml file uses
- // jta-datasource which means that it is created by the EJB container/embedded JBoss.
- // using javax.persistence.Persistence will just cause us an error
- //EntityManager em = (EntityManager) getInitialContext().lookup("java:/EntityManagers/auth_model");
+ //System.out.println(us);
- //UserService us = (UserService)getInitialContext().lookup("UserServiceImpl/local");
-
- // Obtain JBoss transaction
- TransactionManager tm = (TransactionManager) getInitialContext().lookup("java:/TransactionManager");
+ // Obtain JBoss transaction
+ TransactionManager tm = (TransactionManager) getInitialContext()
+ .lookup("java:/TransactionManager");
- }
+ }
- public static InitialContext getInitialContext() throws Exception
- {
- Hashtable props = getInitialContextProperties();
- return new InitialContext(props);
- }
+ public static InitialContext getInitialContext() throws Exception {
+ Hashtable props = getInitialContextProperties();
+ return new InitialContext(props);
+ }
- private static Hashtable getInitialContextProperties()
- {
- Hashtable props = new Hashtable();
- props.put("java.naming.factory.initial", "org.jnp.interfaces.LocalOnlyContextFactory");
- props.put("java.naming.factory.url.pkgs", "org.jboss.naming:org.jnp.interfaces");
- return props;
- }
+ private static Hashtable getInitialContextProperties() {
+ Hashtable props = new Hashtable();
+ props.put("java.naming.factory.initial",
+ "org.jnp.interfaces.LocalOnlyContextFactory");
+ props.put("java.naming.factory.url.pkgs",
+ "org.jboss.naming:org.jnp.interfaces");
+ return props;
+ }
}
More information about the jboss-svn-commits
mailing list