Author: swd847 Date: 2010-10-07 05:13:56 -0400 (Thu, 07 Oct 2010) New Revision: 13805 Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManaged.java modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManagedPersistenceContextCreated.java modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/DefaultTransaction.java modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/SeamApplicationException.java modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/Transactional.java modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/DefaultTransactionLiteral.java modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/TransactionScopedLiteral.java modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextBeanLifecycle.java Log: minor javadoc updates Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManaged.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManaged.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManaged.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -43,16 +43,15 @@ * &#064;SomeQualifier * EntityManagerFactory emf; * </pre> - * - * will create a conversation scoped seam managed persistence context that is + * <p/> + * Will create a conversation scoped seam managed persistence context that is * conversation scoped with the qualifier @SomeQualifier. - * + * <p/> * This field still produces the EntityManagerFactory with qualifier + * &#064;SomeQualifier, however the scope for the producer field is changed to + * {@link Dependent}, as the specification does not allow resource producer + * fields to have a scope other than Dependent * - * @SomeQualifier, however the scope for the producer field is changed to - * {@link Dependent}, as the specification does not allow - * resource producer fields to have a scope other than Dependent - * * @author Stuart Douglas * */ Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManagedPersistenceContextCreated.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManagedPersistenceContextCreated.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/SeamManagedPersistenceContextCreated.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -22,11 +22,22 @@ package org.jboss.seam.persistence; import javax.persistence.EntityManager; +import javax.persistence.EntityTransaction; +import org.jboss.seam.persistence.transaction.SeamTransaction; + /** - * event that is fired when the SMPC is created. This allows you to configure - * the SMPC before it is used, e.g. by enabling hibernate filters + * Event that is fired when the SMPC is created. This allows you to configure + * the SMPC before it is used, e.g. by enabling Hibernate filters. + * <p/> + * NOTE: If you are using {@link EntityTransaction} you must not attempt to + * access the current {@link SeamTransaction} from observers for this event, as + * an infinite loop will result. + * <p/> + * NOTE: The entityManger property is the unproxied EntityManager, not the seam + * proxy. * + * * @author Stuart Douglas <stuart(a)baileyroberts.com.au&gt; * */ Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/DefaultTransaction.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/DefaultTransaction.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/DefaultTransaction.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -13,9 +13,9 @@ * Qualifier that is used to denote the SeamTransaction implementation that is * used by the transaction interceptor and other seam transaction services. * - * A qualifier is nessesary to prevent the seam provided {@link UserTransaction} + * A qualifier is necessary to prevent the seam provided {@link UserTransaction} * wrapper {@link SeamTransaction} from conflicting with the container provided - * builtin UserTransaction + * built-in UserTransaction * * @author Stuart Douglas * Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/SeamApplicationException.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/SeamApplicationException.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/SeamApplicationException.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -13,9 +13,9 @@ * Seam Annotation for identifying an Exception class as an Application * Exception, which does not cause a transaction rollback. * - * This will NOT control the behaviour of EJB container managed transactions. To + * This will NOT control the behavior of EJB container managed transactions. To * avoid confusion, it is recommended that this annotation is only used outside - * an EE environment when @{link {@link ApplicationException} is not availible. + * an EE environment when @{link {@link ApplicationException} is not available. * */ @Target(ElementType.TYPE) Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/Transactional.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/Transactional.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/Transactional.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -31,10 +31,10 @@ * Demarcates transaction boundaries * * Note that is you are using seam managed transactions seam will automatically - * manage your transactions for you, rendering this unnessesary + * manage your transactions for you, rendering this unnecessary * - * Note that this annotation is not actually an interceptor binding. It is - * replaced by an interceptor binding at runtime by a portable extension in the + * Note that this annotation is not actually an intercepter binding. It is + * replaced by an intercepter binding at runtime by a portable extension in the * ProcessAnnotatedType phase * * Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/DefaultTransactionLiteral.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/DefaultTransactionLiteral.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/DefaultTransactionLiteral.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -1,5 +1,23 @@ -/** - * +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY 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 along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.seam.persistence.transaction.literal; Modified: modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/TransactionScopedLiteral.java =================================================================== --- modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/TransactionScopedLiteral.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/api/src/main/java/org/jboss/seam/persistence/transaction/literal/TransactionScopedLiteral.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -1,5 +1,23 @@ -/** - * +/* + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc., and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY 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 along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.jboss.seam.persistence.transaction.literal; @@ -13,6 +31,6 @@ { } - TransactionScopedLiteral INSTANCE = new TransactionScopedLiteral(); + public static TransactionScopedLiteral INSTANCE = new TransactionScopedLiteral(); } \ No newline at end of file Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextBeanLifecycle.java =================================================================== --- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextBeanLifecycle.java 2010-10-07 08:45:26 UTC (rev 13804) +++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextBeanLifecycle.java 2010-10-07 09:13:56 UTC (rev 13805) @@ -123,7 +123,7 @@ EntityManager proxy = (EntityManager) proxyConstructor.newInstance(handler); arg0.push(proxy); getPersistenceProvider(entityManager).setFlushMode(proxy, getFlushMode()); - manager.fireEvent(new SeamManagedPersistenceContextCreated(proxy), qualifiers); + manager.fireEvent(new SeamManagedPersistenceContextCreated(entityManager), qualifiers); return proxy; }