March 2008 - seam-commits - Jboss List Archives

Seam SVN: r7711 - trunk/src/main/org/jboss/seam/framework.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 13:51:39 -0400 (Wed, 26 Mar 2008) New Revision: 7711 Modified: trunk/src/main/org/jboss/seam/framework/EntityIdentifier.java Log: one more Modified: trunk/src/main/org/jboss/seam/framework/EntityIdentifier.java =================================================================== --- trunk/src/main/org/jboss/seam/framework/EntityIdentifier.java 2008-03-26 17:50:29 UTC (rev 7710) +++ trunk/src/main/org/jboss/seam/framework/EntityIdentifier.java 2008-03-26 17:51:39 UTC (rev 7711) @@ -10,7 +10,7 @@ { public EntityIdentifier(Object entity, EntityManager entityManager) { - super(PersistenceProvider.instance().getBeanClass(entity), PersistenceProvider.instance().getId(entity, entityManager)); + super(PersistenceProvider.instance().getBeanClass(entityManager, entity), PersistenceProvider.instance().getId(entity, entityManager)); }

17 years, 9 months

1
0
0 / 0

Seam SVN: r7710 - in trunk/src/main/org/jboss/seam: util and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 13:50:29 -0400 (Wed, 26 Mar 2008) New Revision: 7710 Added: trunk/src/main/org/jboss/seam/persistence/AbstractPersistenceProvider.java trunk/src/main/org/jboss/seam/persistence/JpaPersistenceProvider.java Modified: trunk/src/main/org/jboss/seam/persistence/EntityManagerProxy.java trunk/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java trunk/src/main/org/jboss/seam/persistence/PersistenceProvider.java trunk/src/main/org/jboss/seam/util/Reflections.java Log: First pass at runtime persistence provider detection Added: trunk/src/main/org/jboss/seam/persistence/AbstractPersistenceProvider.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/AbstractPersistenceProvider.java (rev 0) +++ trunk/src/main/org/jboss/seam/persistence/AbstractPersistenceProvider.java 2008-03-26 17:50:29 UTC (rev 7710) @@ -0,0 +1,147 @@ +package org.jboss.seam.persistence; + +import java.lang.reflect.Method; +import java.util.Date; + +import javax.persistence.EntityManager; +import javax.persistence.OptimisticLockException; +import javax.transaction.Synchronization; + +import org.jboss.seam.Entity; + +/** + * Provides a default implementation of PersistenceProvider methods where possible + * + * Other methods must be implemented + * + * @author Pete Muir + * + */ +public abstract class AbstractPersistenceProvider +{ + + /** + * Set the flush mode to manual-only flushing. Called when + * an atomic persistence context is required. + */ + public abstract void setFlushModeManual(EntityManager entityManager); + + /** + * Does the persistence context have unflushed changes? If + * it does not, persistence context replication can be + * optimized. + * + * @return true to indicate that there are unflushed changes + */ + public abstract boolean isDirty(EntityManager entityManager); + + /** + * Get the value of the entity identifier attribute. + * + * @param bean a managed entity instance + */ + public Object getId(Object bean, EntityManager entityManager) + { + return Entity.forClass( bean.getClass() ).getIdentifier(bean); + } + + /** + * Get the name of the entity + * + * @param bean + * @param entityManager + * + * @throws IllegalArgumentException if the passed object is not an entity + */ + public String getName(Object bean, EntityManager entityManager) throws IllegalArgumentException + { + return Entity.forClass(bean.getClass()).getName(); + } + + /** + * Get the value of the entity version attribute. + * + * @param bean a managed entity instance + */ + public Object getVersion(Object bean, EntityManager entityManager) + { + return Entity.forClass( bean.getClass() ).getVersion(bean); + } + + public void checkVersion(Object bean, EntityManager entityManager, Object oldVersion, Object version) + { + boolean equal; + if (oldVersion instanceof Date) + { + equal = ( (Date) oldVersion ).getTime() == ( (Date) version ).getTime(); + } + else + { + equal = oldVersion.equals(version); + } + if ( !equal ) + { + throw new OptimisticLockException("current database version number does not match passivated version number"); + } + } + + /** + * Enable a Filter. This is here just especially for Hibernate, + * since we well know that other products don't have such cool + * features. + */ + public abstract void enableFilter(Filter filter, EntityManager entityManager); + + /** + * Register a Synchronization with the current transaction. + */ + public abstract boolean registerSynchronization(Synchronization sync, EntityManager entityManager); + + /** + * Wrap the delegate before returning it to the application + */ + public Object proxyDelegate(Object delegate) + { + return delegate; + } + + /** + * Wrap the entityManager before returning it to the application + */ + public EntityManager proxyEntityManager(EntityManager entityManager) + { + return new EntityManagerProxy(entityManager); + } + + /** + * Returns the class of an entity bean instance + * + * @param bean The entity bean instance + * @return The class of the entity bean + */ + public Class getBeanClass(Object bean) + { + return Entity.forClass(bean.getClass()).getBeanClass(); + } + + public Method getPostLoadMethod(Class beanClass, EntityManager entityManager) + { + return Entity.forClass(beanClass).getPostLoadMethod(); + } + + public Method getPrePersistMethod(Class beanClass, EntityManager entityManager) + { + return Entity.forClass(beanClass).getPrePersistMethod(); + } + + public Method getPreUpdateMethod(Class beanClass, EntityManager entityManager) + { + return Entity.forClass(beanClass).getPreUpdateMethod(); + } + + public Method getPreRemoveMethod(Class beanClass, EntityManager entityManager) + { + return Entity.forClass(beanClass).getPreRemoveMethod(); + } + +} \ No newline at end of file Property changes on: trunk/src/main/org/jboss/seam/persistence/AbstractPersistenceProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/org/jboss/seam/persistence/EntityManagerProxy.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/EntityManagerProxy.java 2008-03-26 15:27:37 UTC (rev 7709) +++ trunk/src/main/org/jboss/seam/persistence/EntityManagerProxy.java 2008-03-26 17:50:29 UTC (rev 7710) @@ -92,7 +92,7 @@ public Object getDelegate() { - return PersistenceProvider.instance().proxyDelegate( delegate.getDelegate() ); + return PersistenceProvider.instance().proxyDelegate( delegate, delegate.getDelegate() ); } public FlushModeType getFlushMode() Modified: trunk/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-03-26 15:27:37 UTC (rev 7709) +++ trunk/src/main/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2008-03-26 17:50:29 UTC (rev 7710) @@ -1,4 +1,5 @@ package org.jboss.seam.persistence; +import static org.jboss.seam.ScopeType.STATELESS; import static org.jboss.seam.annotations.Install.FRAMEWORK; import java.lang.reflect.Constructor; @@ -23,6 +24,7 @@ import org.hibernate.event.PostLoadEventListener; import org.hibernate.metadata.ClassMetadata; import org.hibernate.type.VersionType; +import org.jboss.seam.Component; import org.jboss.seam.ScopeType; import org.jboss.seam.Seam; import org.jboss.seam.annotations.Install; @@ -40,11 +42,11 @@ * @author Pete Muir * */ -@Name("org.jboss.seam.persistence.persistenceProvider") +@Name("org.jboss.seam.persistence.hibernatePersistenceProvider") @Scope(ScopeType.STATELESS) @BypassInterceptors @Install(precedence=FRAMEWORK, classDependencies={"org.hibernate.Session", "javax.persistence.EntityManager"}) -public class HibernatePersistenceProvider extends PersistenceProvider +public class HibernatePersistenceProvider extends AbstractPersistenceProvider { private static Log log = Logging.getLog(HibernatePersistenceProvider.class); @@ -121,10 +123,6 @@ { return proxySession( (Session) delegate ); } - catch (NotHibernateException nhe) - { - return super.proxyDelegate(delegate); - } catch (Exception e) { throw new RuntimeException("could not proxy delegate", e); @@ -134,27 +132,13 @@ @Override public void setFlushModeManual(EntityManager entityManager) { - try - { - getSession(entityManager).setFlushMode(FlushMode.MANUAL); - } - catch (NotHibernateException nhe) - { - super.setFlushModeManual(entityManager); - } + getSession(entityManager).setFlushMode(FlushMode.MANUAL); } @Override public boolean isDirty(EntityManager entityManager) { - try - { - return getSession(entityManager).isDirty(); - } - catch (NotHibernateException nhe) - { - return super.isDirty(entityManager); - } + return getSession(entityManager).isDirty(); } @Override @@ -164,10 +148,6 @@ { return getSession(entityManager).getIdentifier(bean); } - catch (NotHibernateException nhe) - { - return super.getId(bean, entityManager); - } catch (TransientObjectException e) { return super.getId(bean, entityManager); @@ -177,63 +157,32 @@ @Override public Object getVersion(Object bean, EntityManager entityManager) { - try - { - return getVersion( bean, getSession(entityManager) ); - } - catch (NotHibernateException nhe) - { - return super.getVersion(bean, entityManager); - } + return getVersion( bean, getSession(entityManager) ); } @Override public void checkVersion(Object bean, EntityManager entityManager, Object oldVersion, Object version) { - try - { - checkVersion(bean, getSession(entityManager), oldVersion, version); - } - catch (NotHibernateException nhe) - { - super.checkVersion(bean, entityManager, oldVersion, version); - } + checkVersion(bean, getSession(entityManager), oldVersion, version); } @Override public void enableFilter(Filter f, EntityManager entityManager) { - try + org.hibernate.Filter filter = getSession(entityManager).enableFilter( f.getName() ); + for ( Map.Entry<String, ValueExpression> me: f.getParameters().entrySet() ) { - org.hibernate.Filter filter = getSession(entityManager).enableFilter( f.getName() ); - for ( Map.Entry<String, ValueExpression> me: f.getParameters().entrySet() ) - { - filter.setParameter( me.getKey(), me.getValue().getValue() ); - } - filter.validate(); + filter.setParameter( me.getKey(), me.getValue().getValue() ); } - catch (NotHibernateException nhe) - { - super.enableFilter(f, entityManager); - } - } @Override public boolean registerSynchronization(Synchronization sync, EntityManager entityManager) { - try - { - //TODO: just make sure that a Hibernate JPA EntityTransaction - // delegates to the Hibernate Session transaction - getSession(entityManager).getTransaction().registerSynchronization(sync); - return true; - } - catch (NotHibernateException nhe) - { - return super.registerSynchronization(sync, entityManager); - } - + //TODO: just make sure that a Hibernate JPA EntityTransaction + // delegates to the Hibernate Session transaction + getSession(entityManager).getTransaction().registerSynchronization(sync); + return true; } @Override @@ -243,10 +192,6 @@ { return getSession(entityManager).getEntityName(bean); } - catch (NotHibernateException nhe) - { - return super.getName(bean, entityManager); - } catch (TransientObjectException e) { return super.getName(bean, entityManager); @@ -424,23 +369,12 @@ private Session getSession(EntityManager entityManager) { - Object delegate = entityManager.getDelegate(); - if ( delegate instanceof Session ) - { - return (Session) delegate; - } - else - { - throw new NotHibernateException(); - } + return (Session) entityManager.getDelegate(); } - /** - * Occurs when Hibernate is in the classpath, but this particular - * EntityManager is not from Hibernate - * - * @author Gavin King - * - */ - static class NotHibernateException extends IllegalArgumentException {} + public static HibernatePersistenceProvider instance() + { + return (HibernatePersistenceProvider) Component.getInstance(HibernatePersistenceProvider.class, STATELESS); + } + } Added: trunk/src/main/org/jboss/seam/persistence/JpaPersistenceProvider.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/JpaPersistenceProvider.java (rev 0) +++ trunk/src/main/org/jboss/seam/persistence/JpaPersistenceProvider.java 2008-03-26 17:50:29 UTC (rev 7710) @@ -0,0 +1,59 @@ +package org.jboss.seam.persistence; + +import static org.jboss.seam.ScopeType.STATELESS; +import static org.jboss.seam.annotations.Install.BUILT_IN; + +import javax.persistence.EntityManager; +import javax.transaction.Synchronization; + +import org.jboss.seam.Component; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.intercept.BypassInterceptors; + +/** + * PersistenceProvider for any JPA implementation. Many methods are unusable + * or use naive implementations + * + * @author Gavin King + * @author Pete Muir + * + */ +@Name("org.jboss.seam.persistence.jpaPersistenceProvider") +@Scope(STATELESS) +@BypassInterceptors +@Install(precedence=BUILT_IN, classDependencies="javax.persistence.EntityManager") +public class JpaPersistenceProvider extends AbstractPersistenceProvider +{ + + @Override + public void enableFilter(Filter filter, EntityManager entityManager) + { + throw new UnsupportedOperationException("You must use Hibernate to use Filters"); + } + + @Override + public boolean isDirty(EntityManager entityManager) + { + return true; + } + + @Override + public boolean registerSynchronization(Synchronization sync, EntityManager entityManager) + { + return false; + } + + @Override + public void setFlushModeManual(EntityManager entityManager) + { + throw new UnsupportedOperationException("You must use Hibernate to use Manual Flush Mode"); + } + + public static JpaPersistenceProvider instance() + { + return (JpaPersistenceProvider) Component.getInstance(JpaPersistenceProvider.class, STATELESS); + } + +} Property changes on: trunk/src/main/org/jboss/seam/persistence/JpaPersistenceProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/src/main/org/jboss/seam/persistence/PersistenceProvider.java =================================================================== --- trunk/src/main/org/jboss/seam/persistence/PersistenceProvider.java 2008-03-26 15:27:37 UTC (rev 7709) +++ trunk/src/main/org/jboss/seam/persistence/PersistenceProvider.java 2008-03-26 17:50:29 UTC (rev 7710) @@ -1,11 +1,10 @@ package org.jboss.seam.persistence; import static org.jboss.seam.annotations.Install.BUILT_IN; +import static org.jboss.seam.util.Reflections.isInstanceOf; import java.lang.reflect.Method; -import java.util.Date; import javax.persistence.EntityManager; -import javax.persistence.OptimisticLockException; import javax.transaction.Synchronization; import org.jboss.seam.Component; @@ -17,9 +16,8 @@ import org.jboss.seam.annotations.intercept.BypassInterceptors; /** * Abstraction layer for persistence providers (JPA implementations). - * This class provides a working base implementation that can be - * optimized for performance and non-standardized features by extending - * and overriding the methods. + * This class delegates to either the generic JpaPersistenceProvider or a more + * specific one if available. * * The methods on this class are a great todo list for the next rev * of the JPA spec ;-) @@ -40,7 +38,7 @@ */ public void setFlushModeManual(EntityManager entityManager) { - throw new UnsupportedOperationException("For use of FlushMode.MANUAL, please use Hibernate as the persistence provider or use a custom PersistenceProvider"); + getPersistenceProvider(entityManager).setFlushModeManual(entityManager); } /** * Does the persistence context have unflushed changes? If @@ -51,7 +49,7 @@ */ public boolean isDirty(EntityManager entityManager) { - return true; //best we can do! + return getPersistenceProvider(entityManager).isDirty(entityManager); } /** @@ -61,7 +59,7 @@ */ public Object getId(Object bean, EntityManager entityManager) { - return Entity.forClass( bean.getClass() ).getIdentifier(bean); + return getPersistenceProvider(entityManager).getId(bean, entityManager); } /** @@ -74,7 +72,7 @@ */ public String getName(Object bean, EntityManager entityManager) throws IllegalArgumentException { - return Entity.forClass(bean.getClass()).getName(); + return getPersistenceProvider(entityManager).getName(bean, entityManager); } /** @@ -84,24 +82,12 @@ */ public Object getVersion(Object bean, EntityManager entityManager) { - return Entity.forClass( bean.getClass() ).getVersion(bean); + return getPersistenceProvider(entityManager).getVersion(bean, entityManager); } public void checkVersion(Object bean, EntityManager entityManager, Object oldVersion, Object version) { - boolean equal; - if (oldVersion instanceof Date) - { - equal = ( (Date) oldVersion ).getTime() == ( (Date) version ).getTime(); - } - else - { - equal = oldVersion.equals(version); - } - if ( !equal ) - { - throw new OptimisticLockException("current database version number does not match passivated version number"); - } + getPersistenceProvider(entityManager).checkVersion(bean, entityManager, oldVersion, version); } /** * Enable a Filter. This is here just especially for Hibernate, @@ -110,7 +96,7 @@ */ public void enableFilter(Filter filter, EntityManager entityManager) { - throw new UnsupportedOperationException("For filters, please use Hibernate as the persistence provider"); + getPersistenceProvider(entityManager).enableFilter(filter, entityManager); } /** @@ -118,7 +104,7 @@ */ public boolean registerSynchronization(Synchronization sync, EntityManager entityManager) { - return false; //best we can do! + return getPersistenceProvider(entityManager).registerSynchronization(sync, entityManager); } public static PersistenceProvider instance() @@ -129,15 +115,22 @@ /** * Wrap the delegate before returning it to the application */ + @Deprecated public Object proxyDelegate(Object delegate) { - return delegate; + return getPersistenceProvider(delegate).proxyDelegate(delegate); } + + public Object proxyDelegate(EntityManager entityManager, Object delegate) + { + return getPersistenceProvider(entityManager).proxyDelegate(delegate); + } + /** * Wrap the entityManager before returning it to the application */ public EntityManager proxyEntityManager(EntityManager entityManager) { - return new EntityManagerProxy(entityManager); + return getPersistenceProvider(entityManager).proxyEntityManager(entityManager); } /** @@ -146,29 +139,71 @@ * @param bean The entity bean instance * @return The class of the entity bean */ + @Deprecated public Class getBeanClass(Object bean) { return Entity.forClass(bean.getClass()).getBeanClass(); } + public Class getBeanClass(EntityManager entityManager, Object bean) + { + return getPersistenceProvider(entityManager).getBeanClass(bean); + } + public Method getPostLoadMethod(Class beanClass, EntityManager entityManager) { - return Entity.forClass(beanClass).getPostLoadMethod(); + return getPersistenceProvider(entityManager).getPostLoadMethod(beanClass, entityManager); } public Method getPrePersistMethod(Class beanClass, EntityManager entityManager) { - return Entity.forClass(beanClass).getPrePersistMethod(); + return getPersistenceProvider(entityManager).getPrePersistMethod(beanClass, entityManager); } public Method getPreUpdateMethod(Class beanClass, EntityManager entityManager) { - return Entity.forClass(beanClass).getPreUpdateMethod(); + return getPersistenceProvider(entityManager).getPreUpdateMethod(beanClass, entityManager); } public Method getPreRemoveMethod(Class beanClass, EntityManager entityManager) { - return Entity.forClass(beanClass).getPreRemoveMethod(); + return getPersistenceProvider(entityManager).getPreRemoveMethod(beanClass, entityManager); } + /** + * Do runtime detection of PersistenceProvider + */ + private AbstractPersistenceProvider getPersistenceProvider(EntityManager entityManager) + { + // Work around EJBTHREE-912 (don't you just love random NPEs!) + if (isInstanceOf(entityManager.getClass(), "org.jboss.ejb3.entity.HibernateSession")) + { + return HibernatePersistenceProvider.instance(); + } + else if(isInstanceOf(entityManager.getDelegate().getClass(), "org.hibernate.Session")) + { + return HibernatePersistenceProvider.instance(); + } + else + { + return JpaPersistenceProvider.instance(); + } + } + + /** + * Do runtime detection of PersistenceProvider + */ + @Deprecated + private AbstractPersistenceProvider getPersistenceProvider(Object delegate) + { + if (isInstanceOf(delegate.getClass(), "org.hibernate.Session")) + { + return HibernatePersistenceProvider.instance(); + } + else + { + return JpaPersistenceProvider.instance(); + } + } + } Modified: trunk/src/main/org/jboss/seam/util/Reflections.java =================================================================== --- trunk/src/main/org/jboss/seam/util/Reflections.java 2008-03-26 15:27:37 UTC (rev 7709) +++ trunk/src/main/org/jboss/seam/util/Reflections.java 2008-03-26 17:50:29 UTC (rev 7710) @@ -326,19 +326,31 @@ } for (Class c = clazz; c != Object.class; c = c.getSuperclass()) { - if (name.equals(c.getName())) + if (instanceOf(c, name)) { return true; } } - for (Class c : clazz.getInterfaces()) + return false; + } + + private static boolean instanceOf(Class clazz, String name) + { + if (name.equals(clazz.getName())) { - if (name.equals(c.getName())) + return true; + } + else + { + boolean found = false; + Class[] interfaces = clazz.getInterfaces(); + for (int i = 0; i < interfaces.length && !found; i++) { - return true; + found = instanceOf(interfaces[i], name); } + return found; } - return false; + } }

17 years, 9 months

1
0
0 / 0

Seam SVN: r7709 - trunk/src/main/org/jboss/seam/security.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-03-26 11:27:37 -0400 (Wed, 26 Mar 2008) New Revision: 7709 Modified: trunk/src/main/org/jboss/seam/security/Identity.java Log: changed logic for already logged in test Modified: trunk/src/main/org/jboss/seam/security/Identity.java =================================================================== --- trunk/src/main/org/jboss/seam/security/Identity.java 2008-03-26 13:07:38 UTC (rev 7708) +++ trunk/src/main/org/jboss/seam/security/Identity.java 2008-03-26 15:27:37 UTC (rev 7709) @@ -212,7 +212,7 @@ { try { - if (isLoggedIn(false) && isCredentialsSet()) + if (isLoggedIn(false)) { if (Events.exists()) Events.instance().raiseEvent(EVENT_ALREADY_LOGGED_IN); return "loggedIn";

17 years, 9 months

1
0
0 / 0

Seam SVN: r7708 - trunk/examples/seamspace/resources/WEB-INF.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-03-26 09:07:38 -0400 (Wed, 26 Mar 2008) New Revision: 7708 Modified: trunk/examples/seamspace/resources/WEB-INF/components.xml Log: updated configuration Modified: trunk/examples/seamspace/resources/WEB-INF/components.xml =================================================================== --- trunk/examples/seamspace/resources/WEB-INF/components.xml 2008-03-26 13:07:11 UTC (rev 7707) +++ trunk/examples/seamspace/resources/WEB-INF/components.xml 2008-03-26 13:07:38 UTC (rev 7708) @@ -26,9 +26,11 @@ <security:rule-based-permission-resolver security-rules="#{securityRules}"/> - <identity-management:jpa-identity-store name="identityStore" account-class="org.jboss.seam.example.seamspace.MemberAccount"/> + <identity-management:jpa-identity-store account-class="org.jboss.seam.example.seamspace.MemberAccount"/> -  <security:jpa-permission-store name="accountPermissionStore" permission-class="org.jboss.seam.example.seamspace.Permission"/>

17 years, 9 months

1
0
0 / 0

Seam SVN: r7707 - in trunk/src/main: org/jboss/seam/security/management and 1 other directory.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-03-26 09:07:11 -0400 (Wed, 26 Mar 2008) New Revision: 7707 Modified: trunk/src/main/META-INF/components.xml trunk/src/main/org/jboss/seam/security/management/IdentityManager.java trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java Log: fixed configuration issues Modified: trunk/src/main/META-INF/components.xml =================================================================== --- trunk/src/main/META-INF/components.xml 2008-03-26 12:24:34 UTC (rev 7706) +++ trunk/src/main/META-INF/components.xml 2008-03-26 13:07:11 UTC (rev 7707) @@ -15,6 +15,7 @@ <import>org.jboss.seam.jms</import> <import>org.jboss.seam.mail</import> <import>org.jboss.seam.security</import> + <import>org.jboss.seam.security.management</import> <import>org.jboss.seam.captcha</import> </components> Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-03-26 12:24:34 UTC (rev 7706) +++ trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-03-26 13:07:11 UTC (rev 7707) @@ -24,11 +24,10 @@ * @author Shane Bryzak */ @Scope(APPLICATION) -@Name("org.jboss.seam.security.identityManager") +@Name("org.jboss.seam.security.management.identityManager") @Install(precedence = BUILT_IN) public class IdentityManager { - public static final String IDENTITY_STORE_COMPONENT_NAME = "identityStore"; public static final String ACCOUNT_PERMISSION_NAME = "seam.account"; public static final String PERMISSION_CREATE = "create"; @@ -38,7 +37,7 @@ private static final LogProvider log = Logging.getLogProvider(IdentityManager.class); - private IdentityStore userIdentityStore; + private IdentityStore identityStore; private IdentityStore roleIdentityStore; @Create @@ -48,26 +47,16 @@ } protected void initIdentityStore() - { - if (userIdentityStore == null) + { + if (roleIdentityStore == null && identityStore != null) { - userIdentityStore = (IdentityStore) Component.getInstance(IDENTITY_STORE_COMPONENT_NAME, true); - } - - if (roleIdentityStore == null) - { - roleIdentityStore = (IdentityStore) Component.getInstance(IDENTITY_STORE_COMPONENT_NAME, true); - } - - if (roleIdentityStore == null && userIdentityStore != null) - { - roleIdentityStore = userIdentityStore; + roleIdentityStore = identityStore; } - if (userIdentityStore == null || roleIdentityStore == null) + if (identityStore == null || roleIdentityStore == null) { - log.warn("no identity store available - please install an IdentityStore with the name '" + - IDENTITY_STORE_COMPONENT_NAME + "' if identity management is required."); + log.warn("no identity store available - please configure an identityStore if identity " + + "management is required."); } } @@ -97,37 +86,37 @@ public boolean createUser(String name, String password, String firstname, String lastname) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_CREATE); - return userIdentityStore.createUser(name, password, firstname, lastname); + return identityStore.createUser(name, password, firstname, lastname); } public boolean deleteUser(String name) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_DELETE); - return userIdentityStore.deleteUser(name); + return identityStore.deleteUser(name); } public boolean enableUser(String name) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_UPDATE); - return userIdentityStore.enableUser(name); + return identityStore.enableUser(name); } public boolean disableUser(String name) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_UPDATE); - return userIdentityStore.disableUser(name); + return identityStore.disableUser(name); } public boolean changePassword(String name, String password) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_UPDATE); - return userIdentityStore.changePassword(name, password); + return identityStore.changePassword(name, password); } public boolean isUserEnabled(String name) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_READ); - return userIdentityStore.isUserEnabled(name); + return identityStore.isUserEnabled(name); } public boolean grantRole(String name, String role) @@ -157,7 +146,7 @@ public boolean userExists(String name) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_READ); - return userIdentityStore.userExists(name); + return identityStore.userExists(name); } public boolean roleExists(String name) @@ -168,7 +157,7 @@ public List<String> listUsers() { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_READ); - List<String> users = userIdentityStore.listUsers(); + List<String> users = identityStore.listUsers(); Collections.sort(users, new Comparator<String>() { public int compare(String value1, String value2) { @@ -182,7 +171,7 @@ public List<String> listUsers(String filter) { Identity.instance().checkPermission(ACCOUNT_PERMISSION_NAME, PERMISSION_READ); - List<String> users = userIdentityStore.listUsers(filter); + List<String> users = identityStore.listUsers(filter); Collections.sort(users, new Comparator<String>() { public int compare(String value1, String value2) { @@ -218,17 +207,17 @@ public boolean authenticate(String username, String password) { - return userIdentityStore.authenticate(username, password); + return identityStore.authenticate(username, password); } - public IdentityStore getUserIdentityStore() + public IdentityStore getIdentityStore() { - return userIdentityStore; + return identityStore; } - public void setIdentityStore(IdentityStore userIdentityStore) + public void setIdentityStore(IdentityStore identityStore) { - this.userIdentityStore = userIdentityStore; + this.identityStore = identityStore; } public IdentityStore getRoleIdentityStore() @@ -243,7 +232,7 @@ public boolean isEnabled() { - return userIdentityStore != null && roleIdentityStore != null; + return identityStore != null && roleIdentityStore != null; } } Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-03-26 12:24:34 UTC (rev 7706) +++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-03-26 13:07:11 UTC (rev 7707) @@ -14,11 +14,14 @@ import javax.persistence.NoResultException; import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Observer; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; +import org.jboss.seam.core.Expressions; import org.jboss.seam.core.Expressions.ValueExpression; import org.jboss.seam.security.Identity; import org.jboss.seam.security.management.UserAccount.AccountType; @@ -28,6 +31,8 @@ * * @author Shane Bryzak */ +@Name("org.jboss.seam.security.management.jpaIdentityStore") +@Install(value=false) @Scope(APPLICATION) @BypassInterceptors public class JpaIdentityStore implements IdentityStore @@ -89,6 +94,11 @@ @Create public void init() { + if (entityManager == null) + { + entityManager = Expressions.instance().createValueExpression("#{entityManager}", EntityManager.class); + } + loadRoles(); if (getFirstNameField() != null) Modified: trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-03-26 12:24:34 UTC (rev 7706) +++ trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-03-26 13:07:11 UTC (rev 7707) @@ -19,6 +19,8 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.InitialLdapContext; +import org.jboss.seam.annotations.Install; +import org.jboss.seam.annotations.Name; import org.jboss.seam.annotations.Scope; import org.jboss.seam.annotations.intercept.BypassInterceptors; @@ -27,6 +29,8 @@ * * @author Shane Bryzak */ +@Name("org.jboss.seam.security.management.ldapIdentityStore") +@Install(value=false) @Scope(APPLICATION) @BypassInterceptors public class LdapIdentityStore implements IdentityStore

17 years, 9 months

1
0
0 / 0

Seam SVN: r7706 - trunk/src/main/org/jboss/seam/util.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 08:24:34 -0400 (Wed, 26 Mar 2008) New Revision: 7706 Modified: trunk/src/main/org/jboss/seam/util/Reflections.java Log: Javadoc Modified: trunk/src/main/org/jboss/seam/util/Reflections.java =================================================================== --- trunk/src/main/org/jboss/seam/util/Reflections.java 2008-03-26 12:20:25 UTC (rev 7705) +++ trunk/src/main/org/jboss/seam/util/Reflections.java 2008-03-26 12:24:34 UTC (rev 7706) @@ -315,6 +315,9 @@ } } + /** + * Check to see if clazz is an instance of name + */ public static boolean isInstanceOf(Class clazz, String name) { if (name == null)

17 years, 9 months

1
0
0 / 0

Seam SVN: r7705 - trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 08:20:25 -0400 (Wed, 26 Mar 2008) New Revision: 7705 Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java Log: Comment out failing tests Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-03-26 11:02:54 UTC (rev 7704) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/BlogTest.java 2008-03-26 12:20:25 UTC (rev 7705) @@ -5,7 +5,7 @@ public class BlogTest extends SeamTest { - @Test + //@Test public void testCreateBlog() throws Exception { // Log in first @@ -71,7 +71,7 @@ }.run(); } - @Test + //@Test public void testCreateComment() throws Exception { new FacesRequest() Modified: trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java =================================================================== --- trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java 2008-03-26 11:02:54 UTC (rev 7704) +++ trunk/examples/seamspace/src/org/jboss/seam/example/seamspace/test/RegisterTest.java 2008-03-26 12:20:25 UTC (rev 7705) @@ -8,7 +8,7 @@ public class RegisterTest extends SeamTest { - @Test + //@Test public void testRegister() throws Exception { String cid = new FacesRequest()

17 years, 9 months

1
0
0 / 0

Seam SVN: r7704 - trunk/examples/seamdiscs/view.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 07:02:54 -0400 (Wed, 26 Mar 2008) New Revision: 7704 Modified: trunk/examples/seamdiscs/view/artist.page.xml trunk/examples/seamdiscs/view/artists.page.xml trunk/examples/seamdiscs/view/disc.page.xml trunk/examples/seamdiscs/view/discs.page.xml trunk/examples/seamdiscs/view/home.page.xml trunk/examples/seamdiscs/view/login.page.xml Log: Use xsd rather than dtd Modified: trunk/examples/seamdiscs/view/artist.page.xml =================================================================== --- trunk/examples/seamdiscs/view/artist.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/artist.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,21 +1,22 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<page xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> -<page> - <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> + <param name="artistId" value="#{artistHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="cancel"> - <end-conversation/> - <redirect view-id="/artists.xhtml" /> - </rule> - <rule if-outcome="updated"> - <end-conversation/> - <redirect view-id="/artists.xhtml" /> - </rule> - <rule if-outcome="persisted"> - <end-conversation/> - <redirect view-id="/artists.xhtml" /> - </rule> + <rule if-outcome="cancel"> + <end-conversation /> + <redirect view-id="/artists.xhtml" /> + </rule> + <rule if-outcome="updated"> + <end-conversation /> + <redirect view-id="/artists.xhtml" /> + </rule> + <rule if-outcome="persisted"> + <end-conversation /> + <redirect view-id="/artists.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/artists.page.xml =================================================================== --- trunk/examples/seamdiscs/view/artists.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/artists.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,14 +1,15 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> - -<page> - <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> - <param name="type" value="#{artistHome.type}"/> +<?xml version="1.0" encoding="UTF-8"?> +<page xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> + + <param name="artistId" value="#{artistHome.id}" + converterId="javax.faces.Integer" /> + <param name="type" value="#{artistHome.type}" /> <navigation> - <rule if-outcome="artist"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/artist.xhtml"/> - </rule> + <rule if-outcome="artist"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/artist.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/disc.page.xml =================================================================== --- trunk/examples/seamdiscs/view/disc.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/disc.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,25 +1,27 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<page xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> -<page> - <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> + + <param name="discId" value="#{discHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="cancel"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> - <rule if-outcome="updated"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> - <rule if-outcome="persisted"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> - <rule if-outcome="removed"> - <end-conversation/> - <redirect view-id="/discs.xhtml" /> - </rule> + <rule if-outcome="cancel"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> + <rule if-outcome="updated"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> + <rule if-outcome="persisted"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> + <rule if-outcome="removed"> + <end-conversation /> + <redirect view-id="/discs.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/discs.page.xml =================================================================== --- trunk/examples/seamdiscs/view/discs.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/discs.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,13 +1,14 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<page xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> -<page> - <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> + <param name="discId" value="#{discHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="disc"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/disc.xhtml"/> - </rule> + <rule if-outcome="disc"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/disc.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/home.page.xml =================================================================== --- trunk/examples/seamdiscs/view/home.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/home.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,18 +1,20 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<page xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> -<page> - <param name="artistId" value="#{artistHome.id}" converterId="javax.faces.Integer"/> - <param name="discId" value="#{discHome.id}" converterId="javax.faces.Integer"/> + <param name="artistId" value="#{artistHome.id}" + converterId="javax.faces.Integer" /> + <param name="discId" value="#{discHome.id}" + converterId="javax.faces.Integer" /> <navigation> - <rule if-outcome="artist"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/artist.xhtml"/> - </rule> - <rule if-outcome="disc"> - <begin-conversation flush-mode="manual" join="true"/> - <redirect view-id="/disc.xhtml"/> - </rule> + <rule if-outcome="artist"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/artist.xhtml" /> + </rule> + <rule if-outcome="disc"> + <begin-conversation flush-mode="manual" join="true" /> + <redirect view-id="/disc.xhtml" /> + </rule> </navigation> </page> Modified: trunk/examples/seamdiscs/view/login.page.xml =================================================================== --- trunk/examples/seamdiscs/view/login.page.xml 2008-03-26 10:55:50 UTC (rev 7703) +++ trunk/examples/seamdiscs/view/login.page.xml 2008-03-26 11:02:54 UTC (rev 7704) @@ -1,11 +1,11 @@ -<!DOCTYPE page PUBLIC - "-//JBoss/Seam Pages Configuration DTD 2.1//EN" - "http://jboss.com/products/seam/pages-2.1.dtd"> +<?xml version="1.0" encoding="UTF-8"?> +<page xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.1.xsd"> -<page> <navigation from-action="#{identity.login}"> <rule if="#{identity.loggedIn}"> - <redirect view-id="/home.xhtml"/> + <redirect view-id="/home.xhtml" /> </rule> </navigation> </page>

17 years, 9 months

1
0
0 / 0

Seam SVN: r7703 - trunk/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model and 1 other directory.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 06:55:50 -0400 (Wed, 26 Mar 2008) New Revision: 7703 Modified: branches/Seam_2_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java trunk/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java Log: JJBSEAM-2768 Modified: branches/Seam_2_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java =================================================================== --- branches/Seam_2_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java 2008-03-26 10:53:05 UTC (rev 7702) +++ branches/Seam_2_0/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java 2008-03-26 10:55:50 UTC (rev 7703) @@ -1,5 +1,6 @@ package org.jboss.seam.example.seamdiscs.model; +import java.util.ArrayList; import java.util.List; import javax.persistence.CascadeType; @@ -23,6 +24,11 @@ private List<Disc> discs; private String description; + + public Artist() + { + this.discs = new ArrayList<Disc>(); + } public Integer getId() { Modified: trunk/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java =================================================================== --- trunk/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java 2008-03-26 10:53:05 UTC (rev 7702) +++ trunk/examples/seamdiscs/src/org/jboss/seam/example/seamdiscs/model/Artist.java 2008-03-26 10:55:50 UTC (rev 7703) @@ -1,5 +1,6 @@ package org.jboss.seam.example.seamdiscs.model; +import java.util.ArrayList; import java.util.List; import javax.persistence.CascadeType; @@ -23,6 +24,11 @@ private List<Disc> discs; private String description; + + public Artist() + { + this.discs = new ArrayList<Disc>(); + } public Integer getId() {

17 years, 9 months

1
0
0 / 0

Seam SVN: r7702 - trunk/src/main/org/jboss/seam/security/management.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-03-26 06:53:05 -0400 (Wed, 26 Mar 2008) New Revision: 7702 Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java Log: minor Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java =================================================================== --- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-03-26 10:50:24 UTC (rev 7701) +++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-03-26 10:53:05 UTC (rev 7702) @@ -19,7 +19,6 @@ import org.jboss.seam.annotations.intercept.BypassInterceptors; import org.jboss.seam.contexts.Contexts; import org.jboss.seam.core.Events; -import org.jboss.seam.core.Expressions; import org.jboss.seam.core.Expressions.ValueExpression; import org.jboss.seam.security.Identity; import org.jboss.seam.security.management.UserAccount.AccountType;

17 years, 9 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits March 2008