[seam-commits] Seam SVN: r13815 - in modules/persistence/trunk: impl/src/main/java/org/jboss/seam/persistence and 24 other directories.

Author: swd847 Date: 2010-10-09 05:58:41 -0400 (Sat, 09 Oct 2010) New Revision: 13815 Added: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java modules/persistence/trunk/tests-jetty-openjpa/ modules/persistence/trunk/tests-jetty-openjpa/pom.xml modules/persistence/trunk/tests-jetty-openjpa/src/ modules/persistence/trunk/tests-jetty-openjpa/src/main/ modules/persistence/trunk/tests-jetty-openjpa/src/main/java/ modules/persistence/trunk/tests-jetty-openjpa/src/main/resources/ modules/persistence/trunk/tests-jetty-openjpa/src/test/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextCreatedEventTest.java modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextELTest.java modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextTest.java modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/JettyTestUtils.java modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/SeamMetaDataFactory.java modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/orm.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-orm.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-std.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/seam-beans.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans-transaction-interceptor.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/jetty-env.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/web.xml modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/arquillian.xml Removed: modules/persistence/trunk/impl/src/main/resources/META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ArtifactNames.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/DontRollBackException.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/EntityManagerProvider.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/HelloService.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/Hotel.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/IndexedHotel.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextObserver.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextProvider.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/MavenArtifactResolver.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextFlushModeTest.java Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextExtension.java modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextsImpl.java modules/persistence/trunk/pom.xml modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/EntityInjectionTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/HibernateSearchTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextCreatedEventTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextELTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextFlushModeTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ArtifactNames.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/DontRollBackException.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/HelloService.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/Hotel.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/IndexedHotel.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextObserver.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/MavenArtifactResolver.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeInterceptorTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeManagedBean.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionInterceptorTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionManagedBean.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionScopedTestBase.java modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/UserTransactionTestBase.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JNDIManagedPersistenceContextTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JbossHibernateSearchTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextCreatedEventTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextELTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionAttributeInterceptorTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionInterceptorTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionScopedTest.java modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/UserTransactionTest.java modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-orm.xml modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-search.xml modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence.xml modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-orm.xml modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-search.xml modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-std.xml Log: Refactor tests and add openjpa tests Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java =================================================================== --- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/HibernatePersistenceProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -176,7 +176,7 @@ { return super.getName(bean, entityManager); } - catch (TransientObjectException e) + catch (Exception e) // TODO: what should we actually do here { return super.getName(bean, entityManager); } Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextExtension.java =================================================================== --- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextExtension.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/ManagedPersistenceContextExtension.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -56,6 +56,7 @@ import org.jboss.weld.extensions.literal.AnyLiteral; import org.jboss.weld.extensions.literal.ApplicationScopedLiteral; import org.jboss.weld.extensions.literal.DefaultLiteral; +import org.jboss.weld.extensions.reflection.Reflections; import org.jboss.weld.extensions.reflection.annotated.AnnotatedTypeBuilder; import org.jboss.weld.extensions.util.service.ServiceLoader; import org.slf4j.Logger; @@ -80,6 +81,32 @@ public void beforeBeanDiscovery(@Observes BeforeBeanDiscovery event) { + // we manually add Hibernate first. + // we do not use the ServiceLoader approach for this, because it will blow + // up if Hibernate is not on the classpath + try + { + Class<?> hibernateProviderClass = Reflections.classForName("org.jboss.seam.persistence.HibernatePersistenceProvider", this.getClass().getClassLoader()); + SeamPersistenceProvider provider = (SeamPersistenceProvider) hibernateProviderClass.newInstance(); + persistenceProviders.add(provider); + } + catch (NoClassDefFoundError e) + { + log.debug("Hibernate not found on class path, HibernatePersistenceProvider not loaded."); + } + catch (ClassNotFoundException e) + { + log.debug("Hibernate not found on class path, HibernatePersistenceProvider not loaded."); + } + catch (InstantiationException e) + { + log.debug("InstantiationException creating HibernatePersistenceProvider: HibernatePersistenceProvider not loaded."); + } + catch (IllegalAccessException e) + { + log.error("IllegalAccessException creating HibernatePersistenceProvider: HibernatePersistenceProvider not loaded."); + } + ServiceLoader<SeamPersistenceProvider> providers = ServiceLoader.load(SeamPersistenceProvider.class); for (SeamPersistenceProvider i : providers) { Modified: modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextsImpl.java =================================================================== --- modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextsImpl.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/impl/src/main/java/org/jboss/seam/persistence/PersistenceContextsImpl.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -26,7 +26,9 @@ public class PersistenceContextsImpl implements Serializable, PersistenceContexts { private static final long serialVersionUID = -4897350516435283182L; + private static final Logger log = LoggerFactory.getLogger(PersistenceContextsImpl.class); + /** * persistences contexts are referenced by their qualifiers */ Deleted: modules/persistence/trunk/impl/src/main/resources/META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider =================================================================== --- modules/persistence/trunk/impl/src/main/resources/META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/impl/src/main/resources/META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider 2010-10-09 09:58:41 UTC (rev 13815) @@ -1 +0,0 @@ -org.jboss.seam.persistence.HibernatePersistenceProvider \ No newline at end of file Modified: modules/persistence/trunk/pom.xml =================================================================== --- modules/persistence/trunk/pom.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/pom.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -30,6 +30,7 @@ <module>impl</module> <module>tests-base</module> <module>tests-jetty</module> + <module>tests-jetty-openjpa</module> </modules> <properties> @@ -46,6 +47,7 @@ <jsp.version>2.2</jsp.version> <weld.version>1.1.0.Beta1</weld.version> <hsqldb.version>1.8.0.10</hsqldb.version> + <openjpa.version>2.0.0</openjpa.version> </properties> <dependencyManagement> @@ -229,6 +231,14 @@ <version>1.0-SP2</version> </dependency> + <!-- Openjpa --> + + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-all</artifactId> + <version>${openjpa.version}</version> + </dependency> + </dependencies> </dependencyManagement> @@ -323,7 +333,7 @@ <email&gt;stuart.w.douglas(a)gmail.com&lt;/email&gt; </developer> </developers> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/persist... </connection> <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/p... </developerConnection> Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/EntityInjectionTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/EntityInjectionTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/EntityInjectionTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -30,11 +30,11 @@ import javax.transaction.RollbackException; import javax.transaction.SystemException; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextProvider; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextProvider; import org.junit.Assert; import org.junit.Test; Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/HibernateSearchTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/HibernateSearchTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/HibernateSearchTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -32,11 +32,11 @@ import org.apache.lucene.queryParser.MultiFieldQueryParser; import org.apache.lucene.queryParser.ParseException; import org.hibernate.search.jpa.FullTextEntityManager; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.IndexedHotel; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextProvider; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.IndexedHotel; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextProvider; import org.junit.Assert; import org.junit.Test; Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextCreatedEventTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextCreatedEventTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextCreatedEventTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -32,12 +32,12 @@ import junit.framework.Assert; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextObserver; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextProvider; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextObserver; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextProvider; import org.junit.Test; public class ManagedPersistenceContextCreatedEventTestBase Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextELTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextELTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextELTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -30,11 +30,11 @@ import javax.transaction.SystemException; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextProvider; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextProvider; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextFlushModeTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextFlushModeTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextFlushModeTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -38,9 +38,9 @@ import org.jboss.seam.persistence.FlushModeType; import org.jboss.seam.persistence.ManagedPersistenceContext; import org.jboss.seam.persistence.PersistenceContexts; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextProvider; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextProvider; import org.junit.Test; public class ManagedPersistenceContextFlushModeTestBase Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/ManagedPersistenceContextTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -33,11 +33,11 @@ import junit.framework.Assert; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; +import org.jboss.seam.persistence.test.util.ManagedPersistenceContextProvider; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; -import org.jboss.seam.transactions.test.util.ManagedPersistenceContextProvider; import org.junit.Test; public class ManagedPersistenceContextTestBase @@ -72,7 +72,7 @@ transaction.begin(); List<Hotel> hotels = em.createQuery("select h from Hotel h").getResultList(); - Assert.assertTrue(hotels.size() == 1); + Assert.assertEquals(1, hotels.size()); transaction.rollback(); } Copied: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util (from rev 13790, modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util) Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ArtifactNames.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ArtifactNames.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ArtifactNames.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,4 +1,4 @@ -package org.jboss.seam.transactions.test.util; +package org.jboss.seam.persistence.test.util; public class ArtifactNames { Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/DontRollBackException.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/DontRollBackException.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/DontRollBackException.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,4 +1,4 @@ -package org.jboss.seam.transactions.test.util; +package org.jboss.seam.persistence.test.util; import javax.ejb.ApplicationException; Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/EntityManagerProvider.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,33 +0,0 @@ -/* - * 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.transactions.test.util; - -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -public class EntityManagerProvider -{ - @PersistenceContext - @Produces - EntityManager em; -} Copied: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java (from rev 13793, modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/EntityManagerProvider.java) =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java (rev 0) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,33 @@ +/* + * 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.test.util; + +import javax.enterprise.inject.Produces; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +public class EntityManagerProvider +{ + @PersistenceContext(unitName = "seamPersistencePu") + @Produces + EntityManager em; +} Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/HelloService.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/HelloService.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/HelloService.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -19,7 +19,7 @@ * 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.transactions.test.util; +package org.jboss.seam.persistence.test.util; public class HelloService { Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/Hotel.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/Hotel.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/Hotel.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -19,7 +19,7 @@ * 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.transactions.test.util; +package org.jboss.seam.persistence.test.util; import java.io.Serializable; import java.math.BigDecimal; @@ -51,7 +51,7 @@ @Veto public class Hotel implements Serializable { - private Long id; + private int id; private String name; private String address; private String city; @@ -105,12 +105,12 @@ @Id @GeneratedValue - public Long getId() + public int getId() { return id; } - public void setId(final Long id) + public void setId(int id) { this.id = id; } Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/IndexedHotel.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/IndexedHotel.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/IndexedHotel.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -19,7 +19,7 @@ * 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.transactions.test.util; +package org.jboss.seam.persistence.test.util; import java.io.Serializable; import java.math.BigDecimal; Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextObserver.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextObserver.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextObserver.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -19,7 +19,7 @@ * 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.transactions.test.util; +package org.jboss.seam.persistence.test.util; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextProvider.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,38 +0,0 @@ -/* - * 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.transactions.test.util; - -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; - -import org.jboss.seam.persistence.SeamManaged; - -public class ManagedPersistenceContextProvider -{ - @PersistenceUnit - @RequestScoped - @Produces - @SeamManaged - EntityManagerFactory emf; -} Copied: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java (from rev 13793, modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextProvider.java) =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java (rev 0) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,38 @@ +/* + * 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.test.util; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Produces; +import javax.persistence.EntityManagerFactory; +import javax.persistence.PersistenceUnit; + +import org.jboss.seam.persistence.SeamManaged; + +public class ManagedPersistenceContextProvider +{ + @PersistenceUnit(unitName = "seamPersistencePu") + @RequestScoped + @Produces + @SeamManaged + EntityManagerFactory emf; +} Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/MavenArtifactResolver.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/MavenArtifactResolver.java 2010-10-04 20:03:56 UTC (rev 13790) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/test/util/MavenArtifactResolver.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,4 +1,4 @@ -package org.jboss.seam.transactions.test.util; +package org.jboss.seam.persistence.test.util; import java.io.File; import java.util.ArrayList; Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeInterceptorTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeInterceptorTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeInterceptorTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -35,12 +35,12 @@ import junit.framework.Assert; +import org.jboss.seam.persistence.test.util.DontRollBackException; +import org.jboss.seam.persistence.test.util.EntityManagerProvider; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.DontRollBackException; -import org.jboss.seam.transactions.test.util.EntityManagerProvider; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; import org.junit.Test; /** Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeManagedBean.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeManagedBean.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionAttributeManagedBean.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -26,8 +26,8 @@ import javax.inject.Inject; import javax.persistence.EntityManager; -import org.jboss.seam.transactions.test.util.DontRollBackException; -import org.jboss.seam.transactions.test.util.Hotel; +import org.jboss.seam.persistence.test.util.DontRollBackException; +import org.jboss.seam.persistence.test.util.Hotel; @TransactionAttribute(TransactionAttributeType.REQUIRED) public class TransactionAttributeManagedBean Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionInterceptorTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionInterceptorTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionInterceptorTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -35,12 +35,12 @@ import junit.framework.Assert; +import org.jboss.seam.persistence.test.util.DontRollBackException; +import org.jboss.seam.persistence.test.util.EntityManagerProvider; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.DontRollBackException; -import org.jboss.seam.transactions.test.util.EntityManagerProvider; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; import org.junit.Test; /** Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionManagedBean.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionManagedBean.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionManagedBean.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,10 +24,10 @@ import javax.inject.Inject; import javax.persistence.EntityManager; +import org.jboss.seam.persistence.test.util.DontRollBackException; +import org.jboss.seam.persistence.test.util.Hotel; import org.jboss.seam.persistence.transaction.TransactionPropagation; import org.jboss.seam.persistence.transaction.Transactional; -import org.jboss.seam.transactions.test.util.DontRollBackException; -import org.jboss.seam.transactions.test.util.Hotel; @Transactional(TransactionPropagation.REQUIRED) public class TransactionManagedBean Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionScopedTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionScopedTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/TransactionScopedTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -32,10 +32,10 @@ import junit.framework.Assert; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; import org.junit.Test; public class TransactionScopedTestBase Modified: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/UserTransactionTestBase.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/UserTransactionTestBase.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/persistence/transactions/test/UserTransactionTestBase.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -35,10 +35,10 @@ import junit.framework.Assert; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; import org.jboss.seam.persistence.transaction.DefaultTransaction; import org.jboss.seam.persistence.transaction.SeamTransaction; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; import org.junit.Test; import org.junit.runner.RunWith; Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ArtifactNames.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ArtifactNames.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ArtifactNames.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,12 +0,0 @@ -package org.jboss.seam.transactions.test.util; - -public class ArtifactNames -{ - public static final String WELD_EXTENSIONS = "org.jboss.weld:weld-extensions"; - public static final String SEAM_PERSISTENCE_API = "org.jboss.seam.persistence:seam-persistence-api"; - public static final String SEAM_PERSISTENCE_IMPL = "org.jboss.seam.persistence:seam-persistence-impl"; - public static final String HIBERNATE_SEARCH = "org.hibernate:hibernate-search"; - public static final String LUCENE_CORE = "org.apache.lucene:lucene-core"; - public static final String LUCENE_ANALYZERS = "org.apache.lucene:lucene-analyzers"; - -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/DontRollBackException.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/DontRollBackException.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/DontRollBackException.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,9 +0,0 @@ -package org.jboss.seam.transactions.test.util; - -import javax.ejb.ApplicationException; - -@ApplicationException(rollback = false) -public class DontRollBackException extends Exception -{ - -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/EntityManagerProvider.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/EntityManagerProvider.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/EntityManagerProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,33 +0,0 @@ -/* - * 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.transactions.test.util; - -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -public class EntityManagerProvider -{ - @PersistenceContext(unitName = "seamPersistencePu") - @Produces - EntityManager em; -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/HelloService.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/HelloService.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/HelloService.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,30 +0,0 @@ -/* - * 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.transactions.test.util; - -public class HelloService -{ - public String sayHello() - { - return "Hello"; - } -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/Hotel.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/Hotel.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/Hotel.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,230 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, 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.transactions.test.util; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import org.jboss.weld.extensions.core.Veto; - -/** - * <p> - * <strong>Hotel</strong> is the model/entity class that represents a hotel. - * </p> - * - * @author Gavin King - * @author Dan Allen - */ -@Entity -@Table(name = "hotel") -@Veto -public class Hotel implements Serializable -{ - private Long id; - private String name; - private String address; - private String city; - private String state; - private String zip; - private String country; - private Integer stars; - private BigDecimal price; - - @Inject - private HelloService helloService; - - private boolean initalizerCalled = false; - - public Hotel() - { - } - - @Inject - public void create() - { - initalizerCalled = true; - } - - public String sayHello() - { - return helloService.sayHello(); - } - - public Hotel(final String name, final String address, final String city, final String state, final String zip, final String country) - { - this.name = name; - this.address = address; - this.city = city; - this.state = state; - this.zip = zip; - this.country = country; - } - - public Hotel(final int price, final int stars, final String name, final String address, final String city, final String state, final String zip, final String country) - { - this.price = new BigDecimal(price); - this.stars = stars; - this.name = name; - this.address = address; - this.city = city; - this.state = state; - this.zip = zip; - this.country = country; - } - - @Id - @GeneratedValue - public Long getId() - { - return id; - } - - public void setId(final Long id) - { - this.id = id; - } - - @Size(max = 50) - @NotNull - public String getName() - { - return name; - } - - public void setName(final String name) - { - this.name = name; - } - - @Size(max = 100) - @NotNull - public String getAddress() - { - return address; - } - - public void setAddress(final String address) - { - this.address = address; - } - - @Size(max = 40) - @NotNull - public String getCity() - { - return city; - } - - public void setCity(final String city) - { - this.city = city; - } - - @Size(min = 3, max = 6) - @NotNull - public String getZip() - { - return zip; - } - - public void setZip(final String zip) - { - this.zip = zip; - } - - @Size(min = 2, max = 10) - public String getState() - { - return state; - } - - public void setState(final String state) - { - this.state = state; - } - - @Size(min = 2, max = 40) - @NotNull - public String getCountry() - { - return country; - } - - public void setCountry(final String country) - { - this.country = country; - } - - @Min(1) - @Max(5) - public Integer getStars() - { - return stars; - } - - public void setStars(final Integer stars) - { - this.stars = stars; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() - { - return price; - } - - public void setPrice(final BigDecimal price) - { - this.price = price; - } - - @Transient - public String getLocation() - { - return city + ", " + state + ", " + country; - } - - @Override - public String toString() - { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } - - @Transient - public boolean isInitalizerCalled() - { - return initalizerCalled; - } - -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/IndexedHotel.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/IndexedHotel.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/IndexedHotel.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,236 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat Middleware LLC, 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.transactions.test.util; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.inject.Inject; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import org.hibernate.search.annotations.Field; -import org.hibernate.search.annotations.Index; -import org.hibernate.search.annotations.Indexed; -import org.hibernate.search.annotations.Store; -import org.jboss.weld.extensions.core.Veto; - -/** - * <p> - * <strong>Hotel</strong> is the model/entity class that represents a hotel. - * </p> - * - * @author Gavin King - * @author Dan Allen - */ -@Entity -@Table(name = "hotel") -@Indexed -@Veto -public class IndexedHotel implements Serializable -{ - private Long id; - private String name; - private String address; - private String city; - private String state; - private String zip; - private String country; - private Integer stars; - private BigDecimal price; - - @Inject - private HelloService helloService; - - private boolean initalizerCalled = false; - - public IndexedHotel() - { - } - - @Inject - public void create() - { - initalizerCalled = true; - } - - public String sayHello() - { - return helloService.sayHello(); - } - - public IndexedHotel(final String name, final String address, final String city, final String state, final String zip, final String country) - { - this.name = name; - this.address = address; - this.city = city; - this.state = state; - this.zip = zip; - this.country = country; - } - - public IndexedHotel(final int price, final int stars, final String name, final String address, final String city, final String state, final String zip, final String country) - { - this.price = new BigDecimal(price); - this.stars = stars; - this.name = name; - this.address = address; - this.city = city; - this.state = state; - this.zip = zip; - this.country = country; - } - - @Id - @GeneratedValue - public Long getId() - { - return id; - } - - public void setId(final Long id) - { - this.id = id; - } - - @Size(max = 50) - @NotNull - @Field(index = Index.TOKENIZED, store = Store.NO) - public String getName() - { - return name; - } - - public void setName(final String name) - { - this.name = name; - } - - @Size(max = 100) - @NotNull - public String getAddress() - { - return address; - } - - public void setAddress(final String address) - { - this.address = address; - } - - @Size(max = 40) - @NotNull - public String getCity() - { - return city; - } - - public void setCity(final String city) - { - this.city = city; - } - - @Size(min = 3, max = 6) - @NotNull - public String getZip() - { - return zip; - } - - public void setZip(final String zip) - { - this.zip = zip; - } - - @Size(min = 2, max = 10) - public String getState() - { - return state; - } - - public void setState(final String state) - { - this.state = state; - } - - @Size(min = 2, max = 40) - @NotNull - public String getCountry() - { - return country; - } - - public void setCountry(final String country) - { - this.country = country; - } - - @Min(1) - @Max(5) - public Integer getStars() - { - return stars; - } - - public void setStars(final Integer stars) - { - this.stars = stars; - } - - @Column(precision = 6, scale = 2) - public BigDecimal getPrice() - { - return price; - } - - public void setPrice(final BigDecimal price) - { - this.price = price; - } - - @Transient - public String getLocation() - { - return city + ", " + state + ", " + country; - } - - @Override - public String toString() - { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } - - @Transient - public boolean isInitalizerCalled() - { - return initalizerCalled; - } - -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextObserver.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextObserver.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextObserver.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,46 +0,0 @@ -/* - * 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.transactions.test.util; - -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Default; -import javax.persistence.FlushModeType; - -import org.jboss.seam.persistence.SeamManagedPersistenceContextCreated; - -@ApplicationScoped -public class ManagedPersistenceContextObserver -{ - private boolean observerRun = false; - - public void observe(@Observes @Default SeamManagedPersistenceContextCreated event) - { - observerRun = true; - event.getEntityManager().setFlushMode(FlushModeType.COMMIT); - } - - public boolean isObserverRun() - { - return observerRun; - } -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextProvider.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextProvider.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/ManagedPersistenceContextProvider.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,38 +0,0 @@ -/* - * 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.transactions.test.util; - -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManagerFactory; -import javax.persistence.PersistenceUnit; - -import org.jboss.seam.persistence.SeamManaged; - -public class ManagedPersistenceContextProvider -{ - @PersistenceUnit(unitName = "seamPersistencePu") - @RequestScoped - @Produces - @SeamManaged - EntityManagerFactory emf; -} Deleted: modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/MavenArtifactResolver.java =================================================================== --- modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/MavenArtifactResolver.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-base/src/main/java/org/jboss/seam/transactions/test/util/MavenArtifactResolver.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,164 +0,0 @@ -package org.jboss.seam.transactions.test.util; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Resolves a maven artifact present on the test classpath. - * - * @author Stuart Douglas - * - */ -public class MavenArtifactResolver -{ - - public static File resolve(String groupId, String artifactId) - { - if (groupId == null) - { - throw new IllegalArgumentException("groupId cannot be null"); - } - if (artifactId == null) - { - throw new IllegalArgumentException("artifactId cannot be null"); - } - String path = new MavenArtifactResolver(groupId.trim(), artifactId.trim(), System.getProperty("java.class.path"), File.pathSeparatorChar, File.separatorChar).resolve(); - if (path == null) - { - throw new IllegalArgumentException("Cannot locate artifact for " + groupId + ":" + artifactId); - } - return new File(path); - } - - public static File resolve(String qualifiedArtifactId) - { - String[] segments = qualifiedArtifactId.split(":"); - if (segments.length == 2) - { - return resolve(segments[0], segments[1]); - } - else - { - throw new IllegalArgumentException("Unable to parse " + qualifiedArtifactId + " as a groupId:artifactId"); - } - } - - private final String classPathSeparatorRegex; - private final char fileSeparator; - private final String groupId; - private final String artifactId; - private final String classPath; - - MavenArtifactResolver(String groupId, String artifactId, String classPath, char pathSeparator, char fileSeparator) - { - this.groupId = groupId; - this.artifactId = artifactId; - this.classPath = classPath; - this.classPathSeparatorRegex = "[^" + pathSeparator + "]*"; - this.fileSeparator = fileSeparator; - } - - String resolve() - { - Matcher matches = createFullyQualifiedMatcher(); - if (!matches.find()) - { - matches = createUnqualifiedMatcher(); - if (!matches.find()) - { - matches = createTargetClassesMatcher(); - if (!matches.find()) - { - return null; - } - else - { - String fileName = scanForArtifact(matches); - if (fileName == null) - { - return null; - } - else - { - return fileName; - } - } - } - } - return matches.group(0); - } - - private String scanForArtifact(Matcher targetClassesMatcher) - { - // Locate all target/classes in classpath and store the path to all files target/ - List<String> paths = new ArrayList<String>(); - do - { - String path = targetClassesMatcher.group(); - File target = new File(path.substring(0, path.length() - 8)); - if (target.exists()) - { - if (!target.isDirectory()) - { - throw new IllegalStateException("Found ${project.dir}/target/ but it is not a directory!"); - } - for (File file : target.listFiles()) - { - paths.add(file.getPath()); - } - } - } - while (targetClassesMatcher.find()); - return scanForArtifact(paths); - } - - String scanForArtifact(List<String> paths) - { - Pattern pattern = Pattern.compile(artifactId + "-[\\d+\\.]+(?:[\\-\\.]\\p{Alpha}*)?.jar$"); - for (String path : paths) - { - if (pattern.matcher(path).find()) - { - return path; - } - } - return null; - } - - /** - * Creates a matcher that returns any fully qualified matches of the form - * <code>com/acme/acme-core/1.0/acme-core-1.0.jar</code>. This will match - * artifacts on the classpath from the Maven repo. - */ - private Matcher createFullyQualifiedMatcher() - { - String pathString = groupId.replace('.', fileSeparator) + fileSeparator + artifactId; - Pattern p = Pattern.compile(classPathSeparatorRegex + Pattern.quote(pathString) + classPathSeparatorRegex, Pattern.CASE_INSENSITIVE); - return p.matcher(classPath); - } - - /** - * Creates a matcher that returns any unqualified matches of the form - * <code>target/acme-foo-1.0.jar</code>. This will match artifacts on the - * classpath from the reactor. - */ - private Matcher createUnqualifiedMatcher() - { - Pattern p = Pattern.compile(classPathSeparatorRegex + Pattern.quote("target" + fileSeparator + artifactId) + classPathSeparatorRegex, Pattern.CASE_INSENSITIVE); - return p.matcher(classPath); - } - - /** - * Creates a matcher that returns any unqualified matches of the form - * <code>target/acme-foo-1.0.jar</code>. This locates all - * - */ - private Matcher createTargetClassesMatcher() - { - Pattern p = Pattern.compile(classPathSeparatorRegex + Pattern.quote("target" + fileSeparator + "classes") + classPathSeparatorRegex, Pattern.CASE_INSENSITIVE); - return p.matcher(classPath); - } -} Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,8 +24,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.persistence.test.EntityInjectionTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JNDIManagedPersistenceContextTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JNDIManagedPersistenceContextTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JNDIManagedPersistenceContextTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,11 +24,11 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.persistence.test.ManagedPersistenceContextTestBase; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.HelloService; +import org.jboss.seam.persistence.test.util.Hotel; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.seam.persistence.transaction.test.util.JNDIManagedPersistenceContextProvider; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.HelloService; -import org.jboss.seam.transactions.test.util.Hotel; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JbossHibernateSearchTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JbossHibernateSearchTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/JbossHibernateSearchTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,8 +24,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.persistence.test.HibernateSearchTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; @@ -49,7 +49,6 @@ war.addWebResource("META-INF/persistence-search.xml", "classes/META-INF/persistence.xml"); war.addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml"); war.addWebResource("META-INF/services/javax.enterprise.inject.spi.Extension", "classes/META-INF/services/javax.enterprise.inject.spi.Extension"); - war.addWebResource("META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider", "classes/META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider"); return war; } Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextCreatedEventTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextCreatedEventTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextCreatedEventTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,8 +24,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.persistence.test.ManagedPersistenceContextCreatedEventTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextELTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextELTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextELTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,8 +24,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.persistence.test.ManagedPersistenceContextELTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Deleted: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextFlushModeTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextFlushModeTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextFlushModeTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -1,52 +0,0 @@ -/* - * 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.test.jboss; - -import org.jboss.arquillian.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.persistence.test.ManagedPersistenceContextFlushModeTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.runner.RunWith; - -(a)RunWith(Arquillian.class) -public class ManagedPersistenceContextFlushModeTest extends ManagedPersistenceContextFlushModeTestBase -{ - @Deployment - public static Archive<?> createTestArchive() - { - WebArchive war = ShrinkWrap.createDomain().getArchiveFactory().create(WebArchive.class, "test.war"); - war.addLibraries(MavenArtifactResolver.resolve(ArtifactNames.WELD_EXTENSIONS)); - war.addLibraries(MavenArtifactResolver.resolve(ArtifactNames.SEAM_PERSISTENCE_API)); - war.addLibraries(MavenArtifactResolver.resolve(ArtifactNames.SEAM_PERSISTENCE_IMPL)); - war.addClasses(getTestClasses()); - war.addWebResource("META-INF/persistence.xml", "classes/META-INF/persistence.xml"); - war.addWebResource(new ByteArrayAsset(new byte[0]), "beans.xml"); - war.addWebResource("META-INF/services/javax.enterprise.inject.spi.Extension", "classes/META-INF/services/javax.enterprise.inject.spi.Extension"); - war.addWebResource("META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider", "classes/META-INF/services/org.jboss.seam.persistence.SeamPersistenceProvider"); - return war; - } -} Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -24,8 +24,8 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.seam.persistence.test.ManagedPersistenceContextTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionAttributeInterceptorTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionAttributeInterceptorTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionAttributeInterceptorTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -23,10 +23,10 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.seam.persistence.transaction.TransactionInterceptor; import org.jboss.seam.persistence.transactions.test.TransactionAttributeInterceptorTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionInterceptorTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionInterceptorTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionInterceptorTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -23,10 +23,10 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.seam.persistence.transaction.TransactionInterceptor; import org.jboss.seam.persistence.transactions.test.TransactionInterceptorTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionScopedTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionScopedTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/TransactionScopedTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -2,9 +2,9 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.seam.persistence.transactions.test.TransactionScopedTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/UserTransactionTest.java =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/UserTransactionTest.java 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/java/org/jboss/seam/persistence/transaction/test/jboss/UserTransactionTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -2,9 +2,9 @@ import org.jboss.arquillian.api.Deployment; import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.util.ArtifactNames; +import org.jboss.seam.persistence.test.util.MavenArtifactResolver; import org.jboss.seam.persistence.transactions.test.UserTransactionTestBase; -import org.jboss.seam.transactions.test.util.ArtifactNames; -import org.jboss.seam.transactions.test.util.MavenArtifactResolver; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.ByteArrayAsset; Modified: modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-orm.xml =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-orm.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-orm.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -10,7 +10,7 @@ <provider>org.hibernate.ejb.HibernatePersistence</provider> <jta-data-source>java:/DefaultDS</jta-data-source> <mapping-file>META-INF/orm.xml</mapping-file> - <class>org.jboss.seam.transactions.test.util.Hotel</class> + <class>org.jboss.seam.persistence.test.util.Hotel</class> <exclude-unlisted-classes/> <properties> <!-- Properties for Hibernate (default provider for JBoss AS) --> Modified: modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-search.xml =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-search.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence-search.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -6,7 +6,7 @@ <persistence-unit name="seamPersistencePu"> <provider>org.hibernate.ejb.HibernatePersistence</provider> <jta-data-source>java:/DefaultDS</jta-data-source> - <class>org.jboss.seam.transactions.test.util.IndexedHotel</class> + <class>org.jboss.seam.persistence.test.util.IndexedHotel</class> <exclude-unlisted-classes/> <properties> <!-- Properties for Hibernate (default provider for JBoss AS) --> Modified: modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence.xml =================================================================== --- modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jboss/src/test/resources/META-INF/persistence.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -9,7 +9,7 @@ --> <provider>org.hibernate.ejb.HibernatePersistence</provider> <jta-data-source>java:/DefaultDS</jta-data-source> - <class>org.jboss.seam.transactions.test.util.Hotel</class> + <class>org.jboss.seam.persistence.test.util.Hotel</class> <exclude-unlisted-classes/> <properties> <!-- Properties for Hibernate (default provider for JBoss AS) --> Modified: modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-orm.xml =================================================================== --- modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-orm.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-orm.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -6,7 +6,7 @@ <persistence-unit name="seamPersistencePu" transaction-type="RESOURCE_LOCAL"> <provider>org.hibernate.ejb.HibernatePersistence</provider> <mapping-file>META-INF/orm.xml</mapping-file> - <class>org.jboss.seam.transactions.test.util.Hotel</class> + <class>org.jboss.seam.persistence.test.util.Hotel</class> <exclude-unlisted-classes /> <properties> <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" /> Modified: modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-search.xml =================================================================== --- modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-search.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-search.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -5,7 +5,7 @@ version="2.0"> <persistence-unit name="seamPersistencePu" transaction-type="RESOURCE_LOCAL"> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.jboss.seam.transactions.test.util.IndexedHotel</class> + <class>org.jboss.seam.persistence.test.util.IndexedHotel</class> <exclude-unlisted-classes /> <properties> <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" /> Modified: modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-std.xml =================================================================== --- modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-std.xml 2010-10-08 11:02:31 UTC (rev 13814) +++ modules/persistence/trunk/tests-jetty/src/test/resources/META-INF/persistence-std.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -10,7 +10,7 @@ --> <provider>org.hibernate.ejb.HibernatePersistence</provider> - <class>org.jboss.seam.transactions.test.util.Hotel</class> + <class>org.jboss.seam.persistence.test.util.Hotel</class> <exclude-unlisted-classes /> <properties> <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" /> @@ -18,7 +18,7 @@ <property name="javax.persistence.jdbc.password" value="" /> <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:." /> <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect" /> - + <property name="hibernate.show_sql" value="true"/> <property name="hibernate.hbm2ddl.auto" value="create-drop" /> </properties> Property changes on: modules/persistence/trunk/tests-jetty-openjpa ___________________________________________________________________ Name: svn:ignore + target .settings .project .classpath Added: modules/persistence/trunk/tests-jetty-openjpa/pom.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/pom.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/pom.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,198 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>seam-persistence-parent</artifactId> + <groupId>org.jboss.seam.persistence</groupId> + <version>3.0.0-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.persistence</groupId> + <artifactId>seam-persistence-tests-jetty-openjpa</artifactId> + <packaging>jar</packaging> + <version>3.0.0-SNAPSHOT</version> + <name>Seam Persistence Openjpa Jetty Tests</name> + + <prerequisites> + <maven>3.0</maven> + </prerequisites> + + + <dependencies> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-all</artifactId> + </dependency> + + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.interceptor</groupId> + <artifactId>jboss-interceptors-api_1.1_spec</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam.persistence</groupId> + <artifactId>seam-persistence-api</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam.persistence</groupId> + <artifactId>seam-persistence-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam.xml</groupId> + <artifactId>seam-xml-config</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam.persistence</groupId> + <artifactId>seam-persistence-tests-base</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.container</groupId> + <artifactId>arquillian-jetty-embedded-7</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-webapp</artifactId> + <scope>test</scope> + </dependency> + + <!-- plus and naming requires for using JNDI --> + + <dependency> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-plus</artifactId> + <scope>test</scope> + </dependency> + + <!-- Weld servlet, EL and JSP required for testing CDI injections --> + + <dependency> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <forkMode>pertest</forkMode> + <argLine>-javaagent:${settings.localRepository}/org/apache/openjpa/openjpa-all/2.0.0/openjpa-all-2.0.0.jar=scanDevPath=true</argLine> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/seam/modules/persist... + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/modules/p... + <url>http://fisheye.jboss.org/browse/Seam/modules/persistence/trunk/tes... + </scm> + +</project> + Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextCreatedEventTest.java =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextCreatedEventTest.java (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextCreatedEventTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,45 @@ +/* + * 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.test.openjpa; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.ManagedPersistenceContextCreatedEventTestBase; +import org.jboss.seam.persistence.test.openjpa.util.JettyTestUtils; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class ManagedPersistenceContextCreatedEventTest extends ManagedPersistenceContextCreatedEventTestBase +{ + @Deployment + public static Archive<?> createTestArchive() + { + WebArchive war = JettyTestUtils.createTestArchive(); + war.addWebResource("WEB-INF/beans.xml", "beans.xml"); + war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml"); + war.addClasses(getTestClasses()); + return war; + } + +} Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextELTest.java =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextELTest.java (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextELTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,45 @@ +/* + * 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.test.openjpa; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.ManagedPersistenceContextELTestBase; +import org.jboss.seam.persistence.test.openjpa.util.JettyTestUtils; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class ManagedPersistenceContextELTest extends ManagedPersistenceContextELTestBase +{ + @Deployment + public static Archive<?> createTestArchive() + { + WebArchive war = JettyTestUtils.createTestArchive(); + war.addWebResource("WEB-INF/beans.xml", "beans.xml"); + war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml"); + war.addClasses(getTestClasses()); + return war; + } + +} Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextTest.java =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextTest.java (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextTest.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,45 @@ +/* + * 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.test.openjpa; + +import org.jboss.arquillian.api.Deployment; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.persistence.test.ManagedPersistenceContextTestBase; +import org.jboss.seam.persistence.test.openjpa.util.JettyTestUtils; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.runner.RunWith; + +(a)RunWith(Arquillian.class) +public class ManagedPersistenceContextTest extends ManagedPersistenceContextTestBase +{ + @Deployment + public static Archive<?> createTestArchive() + { + WebArchive war = JettyTestUtils.createTestArchive(); + war.addWebResource("WEB-INF/beans.xml", "beans.xml"); + war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml"); + war.addClasses(getTestClasses()); + return war; + } + +} Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/JettyTestUtils.java =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/JettyTestUtils.java (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/JettyTestUtils.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,42 @@ +/* + * 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.test.openjpa.util; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +/** + * + * @author Stuart Douglas + * + */ +public class JettyTestUtils +{ + public static WebArchive createTestArchive() + { + WebArchive war = ShrinkWrap.createDomain().getArchiveFactory().create(WebArchive.class, "test.war"); + war.addResource("META-INF/seam-beans.xml", "seam-beans.xml"); + war.addWebResource("WEB-INF/jetty-env.xml", "jetty-env.xml"); + war.addWebResource("WEB-INF/web.xml", "web.xml"); + return war; + } +} Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/SeamMetaDataFactory.java =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/SeamMetaDataFactory.java (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/java/org/jboss/seam/persistence/test/openjpa/util/SeamMetaDataFactory.java 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,16 @@ +package org.jboss.seam.persistence.test.openjpa.util; + +import java.util.Collections; +import java.util.Set; + +import org.apache.openjpa.persistence.PersistenceMetaDataFactory; + +public class SeamMetaDataFactory extends PersistenceMetaDataFactory +{ + + public Set<String> getPersistentTypeNames(boolean arg0, ClassLoader arg1) + { + return Collections.singleton("org.jboss.seam.persistence.test.util.Hotel"); + } + +} Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/orm.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/orm.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/orm.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd" + version="1.0" + > + <persistence-unit-metadata > + <persistence-unit-defaults > + <entity-listeners> + <entity-listener class="org.jboss.seam.persistence.InjectionEventListener" > + <post-load method-name="load" /> + </entity-listener> + </entity-listeners> + </persistence-unit-defaults> + </persistence-unit-metadata> + +</entity-mappings> \ No newline at end of file Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-orm.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-orm.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-orm.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + <persistence-unit name="seamPersistencePu" transaction-type="RESOURCE_LOCAL"> + <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> + <mapping-file>META-INF/orm.xml</mapping-file> + <class>org.jboss.seam.transactions.test.util.Hotel</class> + <exclude-unlisted-classes /> + <properties> + <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" /> + <property name="javax.persistence.jdbc.user" value="sa" /> + <property name="javax.persistence.jdbc.password" value="" /> + <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:." /> + <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/> + </properties> + </persistence-unit> +</persistence> Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-std.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-std.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/persistence-std.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" + version="2.0"> + <persistence-unit name="seamPersistencePu" + transaction-type="RESOURCE_LOCAL"> + + <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider> + + <exclude-unlisted-classes /> + <properties> + <property name="javax.persistence.jdbc.driver" value="org.hsqldb.jdbcDriver" /> + <property name="javax.persistence.jdbc.user" value="sa" /> + <property name="javax.persistence.jdbc.password" value="" /> + <property name="javax.persistence.jdbc.url" value="jdbc:hsqldb:." /> + <property name="openjpa.RuntimeUnenhancedClasses" value="supported"/> + <property name="openjpa.MetaDataFactory" value="org.jboss.seam.persistence.test.openjpa.util.SeamMetaDataFactory"/> + <property name="openjpa.Sequence" value="org.apache.openjpa.jdbc.kernel.NativeJDBCSeq"/> + <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='add,deleteTableContents', ForeignKeys=true)"/> + </properties> + </persistence-unit> +</persistence> Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/seam-beans.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/seam-beans.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/META-INF/seam-beans.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:t="urn:java:org.jboss.seam.persistence.transaction" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://docs.jboss.org/cdi/beans_1_0.xsd"> + + <t:EntityTransaction> + <s:modifies /> + </t:EntityTransaction> + + <t:SeSynchronizations> + <s:modifies/> + </t:SeSynchronizations> +</beans> \ No newline at end of file Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans-transaction-interceptor.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans-transaction-interceptor.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans-transaction-interceptor.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:t="urn:java:org.jboss.seam.persistence.transaction" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://docs.jboss.org/cdi/beans_1_0.xsd"> + <interceptors> + <class>org.jboss.seam.persistence.transaction.TransactionInterceptor</class> + </interceptors> +</beans> \ No newline at end of file Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/beans.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:s="urn:java:ee" + xmlns:t="urn:java:org.jboss.seam.persistence.transaction" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://docs.jboss.org/cdi/beans_1_0.xsd"> + +</beans> \ No newline at end of file Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/jetty-env.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/jetty-env.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/jetty-env.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,15 @@ +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" + "http://jetty.mortbay.org/configure.dtd"> +<Configure id="webAppCtx" class="org.eclipse.jetty.webapp.WebAppContext"> + <New id="BeanManager" class="org.eclipse.jetty.plus.jndi.Resource"> + <Arg><Ref id="webAppCtx"/></Arg> + <Arg>BeanManager</Arg> + <Arg> + <New class="javax.naming.Reference"> + <Arg>javax.enterprise.inject.spi.BeanManager</Arg> + <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg> + <Arg/> + </New> + </Arg> + </New> +</Configure> Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/web.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/web.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/WEB-INF/web.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation=" + http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <env-entry> + <env-entry-name>name</env-entry-name> + <env-entry-type>java.lang.String</env-entry-type> + <env-entry-value>Jetty</env-entry-value> + </env-entry> + + <!-- Should be overridden by jetty-env.xml --> + <env-entry> + <env-entry-name>type</env-entry-name> + <env-entry-type>java.lang.String</env-entry-type> + <env-entry-value>Remote</env-entry-value> + </env-entry> + + <listener> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> + </listener> + + <resource-env-ref> + <resource-env-ref-name>BeanManager</resource-env-ref-name> + <resource-env-ref-type>javax.enterprise.inject.spi.BeanManager</resource-env-ref-type> + </resource-env-ref> + +</web-app> Added: modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/arquillian.xml =================================================================== --- modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/arquillian.xml (rev 0) +++ modules/persistence/trunk/tests-jetty-openjpa/src/test/resources/arquillian.xml 2010-10-09 09:58:41 UTC (rev 13815) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns="http://jboss.com/arquillian" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <engine> + <deploymentExportPath>/tmp/</deploymentExportPath> + </engine> + +</arquillian>