Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

testsuite structure update

  • Loading branch information...
commit a9e0126122f46a1552aeb00829ffe5ae50b8737b 1 parent b830e85
@maschmid maschmid authored
Showing with 587 additions and 1,077 deletions.
  1. +1 −105 pom.xml
  2. +14 −5 readme.txt
  3. +0 −109 tests/base/pom.xml
  4. +0 −335 tests/jbossas-hibernate/pom.xml
  5. +0 −3  tests/jbossas-hibernate/src/test/resources-jbossas/jndi.properties
  6. +0 −16 tests/jbossas-hibernate/src/test/resources-jbossas/seam-transactions-test-ds.xml
  7. +0 −222 tests/jetty-hibernate/pom.xml
  8. +0 −9 tests/jetty-hibernate/src/test/resources/arquillian.xml
  9. +0 −195 tests/jetty-openjpa/pom.xml
  10. +0 −9 tests/jetty-openjpa/src/test/resources/arquillian.xml
  11. +499 −0 testsuite/pom.xml
  12. 0  ...main → testsuite/src/test}/java/org/jboss/seam/persistence/hibernate/test/HibernateSearchTestBase.java
  13. 0  ...; testsuite/src/test}/java/org/jboss/seam/persistence/hibernate/test/ManagedHibernateSessionELTestBase.java
  14. 0  ...uite/src/test}/java/org/jboss/seam/persistence/hibernate/test/ManagedHibernateSessionFlushModeTestBase.java
  15. 0  ...rr; testsuite/src/test}/java/org/jboss/seam/persistence/hibernate/test/ManagedHibernateSessionTestBase.java
  16. +5 −4 ...testsuite/src/test/java/org/jboss/seam/persistence/hibernate/test/jetty}/ManagedHibernateSessionELTest.java
  17. +5 −4 ...te/src/test/java/org/jboss/seam/persistence/hibernate/test/jetty}/ManagedHibernateSessionFlushModeTest.java
  18. +5 −4 ...suite/src/test/java/org/jboss/seam/persistence/hibernate/test/jetty}/ManagedHibernateSessionSearchTest.java
  19. +5 −4 ...; testsuite/src/test/java/org/jboss/seam/persistence/hibernate/test/jetty}/ManagedHibernateSessionTest.java
  20. 0  .../base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/EntityInjectionTestBase.java
  21. 0  .../base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/HibernateSearchTestBase.java
  22. 0  ...testsuite/src/test}/java/org/jboss/seam/persistence/test/ManagedPersistenceContextCreatedEventTestBase.java
  23. 0  ...in → testsuite/src/test}/java/org/jboss/seam/persistence/test/ManagedPersistenceContextELTestBase.java
  24. 0  ...r; testsuite/src/test}/java/org/jboss/seam/persistence/test/ManagedPersistenceContextFlushModeTestBase.java
  25. 0  ...main → testsuite/src/test}/java/org/jboss/seam/persistence/test/ManagedPersistenceContextTestBase.java
  26. 0  ...as-hibernate → testsuite}/src/test/java/org/jboss/seam/persistence/test/jboss/EntityInjectionTest.java
  27. +1 −1  ...rnate → testsuite}/src/test/java/org/jboss/seam/persistence/test/jboss/JBossASHibernateSearchTest.java
  28. 0  ...rarr; testsuite}/src/test/java/org/jboss/seam/persistence/test/jboss/JNDIManagedPersistenceContextTest.java
  29. 0  ...stsuite}/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextCreatedEventTest.java
  30. 0  ... → testsuite}/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextELTest.java
  31. 0  ...te → testsuite}/src/test/java/org/jboss/seam/persistence/test/jboss/ManagedPersistenceContextTest.java
  32. +3 −3 ...ty-hibernate → testsuite}/src/test/java/org/jboss/seam/persistence/test/jetty/HibernateSearchTest.java
  33. +3 −3 ...stsuite}/src/test/java/org/jboss/seam/persistence/test/jetty/ManagedPersistenceContextCreatedEventTest.java
  34. +3 −3 ... → testsuite}/src/test/java/org/jboss/seam/persistence/test/jetty/ManagedPersistenceContextELTest.java
  35. +3 −3 ... testsuite}/src/test/java/org/jboss/seam/persistence/test/jetty/ManagedPersistenceContextFlushModeTest.java
  36. +3 −3 ...te → testsuite}/src/test/java/org/jboss/seam/persistence/test/jetty/ManagedPersistenceContextTest.java
  37. +8 −8 ...ty-hibernate → testsuite}/src/test/java/org/jboss/seam/persistence/test/jetty/util/JettyTestUtils.java
  38. +3 −3 ...suite}/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextCreatedEventTest.java
  39. +3 −3 ...rarr; testsuite}/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextELTest.java
  40. +3 −3 ... → testsuite}/src/test/java/org/jboss/seam/persistence/test/openjpa/ManagedPersistenceContextTest.java
  41. +4 −4 ...ty-openjpa → testsuite}/src/test/java/org/jboss/seam/persistence/test/openjpa/util/JettyTestUtils.java
  42. 0  ...enjpa → testsuite}/src/test/java/org/jboss/seam/persistence/test/openjpa/util/SeamMetaDataFactory.java
  43. +2 −7 {tests/base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/ArtifactNames.java
  44. 0  ...se/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/DontRollBackException.java
  45. 0  ...se/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/EntityManagerProvider.java
  46. 0  {tests/base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/HelloService.java
  47. 0  {tests/base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/Hotel.java
  48. 0  ...s/base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/HotelNameProducer.java
  49. 0  {tests/base/src/main → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/IndexedHotel.java
  50. +1 −1  ...bossas-hibernate → testsuite}/src/test/java/org/jboss/seam/persistence/test/util/JBossASTestUtils.java
  51. 0  ...r; testsuite}/src/test/java/org/jboss/seam/persistence/test/util/JNDIManagedPersistenceContextProvider.java
  52. 0  ...n → testsuite/src/test}/java/org/jboss/seam/persistence/test/util/ManagedHibernateSessionProvider.java
  53. 0  ...→ testsuite/src/test}/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextObserver.java
  54. 0  ...→ testsuite/src/test}/java/org/jboss/seam/persistence/test/util/ManagedPersistenceContextProvider.java
  55. 0  {tests/jetty-openjpa/src/test/resources → testsuite/src/test/resources-jbossas-7}/META-INF/orm.xml
  56. 0  ...as-hibernate/src/test/resources → testsuite/src/test/resources-jbossas-7}/META-INF/persistence-orm.xml
  57. 0  ...hibernate/src/test/resources → testsuite/src/test/resources-jbossas-7}/META-INF/persistence-search.xml
  58. 0  ...bossas-hibernate/src/test/resources → testsuite/src/test/resources-jbossas-7}/META-INF/persistence.xml
  59. 0  ...e/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/hibernate-seam-beans.xml
  60. 0  ...e/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/hibernate-search.cfg.xml
  61. 0  ...nate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/hibernate-std.cfg.xml
  62. 0  ...bernate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/jpa-seam-beans.xml
  63. 0  ...ts/jetty-hibernate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/orm.xml
  64. 0  ...ernate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/persistence-orm.xml
  65. 0  ...ate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/persistence-search.xml
  66. 0  ...ernate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/META-INF/persistence-std.xml
  67. 0  ...st/resources → testsuite/src/test/resources-jetty-hibernate}/WEB-INF/beans-transaction-interceptor.xml
  68. 0  {tests/jetty-openjpa/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/WEB-INF/beans.xml
  69. 0  ...bernate/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/WEB-INF/hibernate-beans.xml
  70. 0  ...jetty-openjpa/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/WEB-INF/jetty-env.xml
  71. 0  {tests/jetty-openjpa/src/test/resources → testsuite/src/test/resources-jetty-hibernate}/WEB-INF/web.xml
  72. 0  ...ts/jbossas-hibernate/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/META-INF/orm.xml
  73. 0  ...-openjpa/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/META-INF/persistence-orm.xml
  74. 0  ...-openjpa/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/META-INF/persistence-std.xml
  75. 0  ...jetty-openjpa/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/META-INF/seam-beans.xml
  76. 0  ...test/resources → testsuite/src/test/resources-jetty-openjpa}/WEB-INF/beans-transaction-interceptor.xml
  77. 0  {tests/jetty-hibernate/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/WEB-INF/beans.xml
  78. 0  ...jetty-hibernate/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/WEB-INF/jetty-env.xml
  79. 0  {tests/jetty-hibernate/src/test/resources → testsuite/src/test/resources-jetty-openjpa}/WEB-INF/web.xml
  80. +13 −8 {tests/jbossas-hibernate → testsuite}/src/test/resources/arquillian.xml
View
106 pom.xml
@@ -23,7 +23,7 @@
<modules>
<module>api</module>
<module>impl</module>
- <module>tests/base</module>
+ <module>testsuite</module>
</modules>
<properties>
@@ -57,14 +57,6 @@
<artifactId>seam-persistence</artifactId>
<version>${project.version}</version>
</dependency>
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-tests-base</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
</dependencies>
</dependencyManagement>
@@ -82,102 +74,6 @@
<module>docs</module>
</modules>
</profile>
-
- <profile>
- <!-- all tests using managed containers -->
- <id>all</id>
- <modules>
- <module>tests/jbossas-hibernate</module>
- </modules>
- </profile>
-
- <profile>
- <!-- jboss remote profile-->
- <id>jbossas-remote-6</id>
- <modules>
- <module>tests/jbossas-hibernate</module>
- </modules>
- </profile>
-
- <profile>
- <!-- jboss managed profile-->
- <id>jbossas-managed-6</id>
- <modules>
- <module>tests/jbossas-hibernate</module>
- </modules>
- </profile>
-
- <profile>
- <id>code-coverage</id>
- <dependencies>
- <dependency>
- <groupId>emma</groupId>
- <artifactId>emma</artifactId>
- <version>${emma.version}</version>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>report</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <sourceSets>
- <sourceSet>
- <directory>${project.parent.build.directory}/../impl/src/main/java
- </directory>
- </sourceSet>
- </sourceSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>retrieve-coverage-files</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${project.parent.build.directory}/../impl/target/coverage.em" todir="${basedir}" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>${basedir}/</directory>
- <includes>
- <include>**/*.ec</include>
- <include>**/*.em</include>
- <include>**/transaction.log</include>
- </includes>
- <followSymlinks>false</followSymlinks>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
</profiles>
<developers>
View
19 readme.txt
@@ -1,9 +1,18 @@
-To run the tests you can use either a remote or managed jboss instance.
+To run the tests you can use either a remote or managed JBoss AS 7 or embedded Jetty instance
-To use a managed instance set the JBOSS_HOME environment variable and run
+To use a managed JBoss AS instance set the JBOSS_HOME environment variable and run
-mvn install -Pjbossas-managed-6
+ mvn clean verify -Darquillian=jbossas-managed-7
-To use a remote jboss instance start jboss and then run
+To use a remote JBoss AS instance start it and then run
+
+ mvn clean verify -Darquillian=jbossas-remote-7
+
+To run the embedded Jetty tests with Hibernate run
+
+ mvn clean verify -Darquillian=jetty-embedded-7-hibernate
+
+To run the embedded Jetty tests with OpenJPA run
+
+ mvn clean verify -Darquillian=jetty-embedded-7-openjpa
-mvn install -Pjbossas-remote-6
View
109 tests/base/pom.xml
@@ -1,109 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>seam-persistence-tests-base</artifactId>
- <packaging>jar</packaging>
-
- <name>Seam Persistence Tests: Base</name>
- <!-- url required for JAR Manifest -->
- <url>${project.parent.url}</url>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <dependencies>
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.solder</groupId>
- <artifactId>solder-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>4.0.0.Beta2</version>
- <optional>true</optional>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <!-- No test phase in base module -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
View
335 tests/jbossas-hibernate/pom.xml
@@ -1,335 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>seam-persistence-parent</artifactId>
- <groupId>org.jboss.seam.persistence</groupId>
- <version>3.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>seam-persistence-tests-jbossas</artifactId>
- <packaging>jar</packaging>
-
- <name>Seam Persistence Tests: JBoss AS</name>
- <!-- url required for JAR Manifest -->
- <url>${project.parent.url}</url>
-
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- </properties>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <dependencies>
-
- <!-- including whole API breaks tests -->
- <!--
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.transaction</groupId>
- <artifactId>seam-transaction</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.weld</groupId>
- <artifactId>weld-core</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.solder</groupId>
- <artifactId>solder-impl</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <version>4.0.0.Beta2</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-tests-base</artifactId>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <!--
- skip unit test run, tests to be executed during
- integration-test
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>jbossas-managed-7</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.seam.test</groupId>
- <artifactId>jbossas-managed-7</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/test/resources-jbossas</directory>
- </testResource>
- </testResources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>enforce-property</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireProperty>
- <property>jboss.home</property>
- </requireProperty>
- </rules>
- <fail>true</fail>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <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>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>jbossas-remote-7</id>
- <dependencies>
-
- <dependency>
- <groupId>org.jboss.seam.test</groupId>
- <artifactId>jbossas-remote-7</artifactId>
- <type>pom</type>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- </testResource>
- <testResource>
- <directory>src/test/resources-jbossas</directory>
- </testResource>
- </testResources>
- <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>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-emma-jar</id>
- <phase>process-test-sources</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>emma</groupId>
- <artifactId>emma</artifactId>
- <version>${emma.version}</version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>${env.JBOSS_HOME}/server/default/lib</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>merge</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>merge</goal>
- </goals>
- <configuration>
- <searchPath>${project.parent.build.directory}/../</searchPath>
- </configuration>
- </execution>
- <execution>
- <id>report</id>
- <phase>verify</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <sourceSets>
- <sourceSet>
- <directory>${project.parent.build.directory}/../impl/src/main/java
- </directory>
- </sourceSet>
- </sourceSets>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>retrieve-coverage-files</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy file="${env.JBOSS_HOME}/bin/coverage.ec" todir="${basedir}"/>
- <copy file="${project.parent.build.directory}/../impl/target/coverage.em"
- todir="${basedir}"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
View
3  tests/jbossas-hibernate/src/test/resources-jbossas/jndi.properties
@@ -1,3 +0,0 @@
-#java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-#java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-#java.naming.provider.url=jnp://localhost:1099
View
16 tests/jbossas-hibernate/src/test/resources-jbossas/seam-transactions-test-ds.xml
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE datasources
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-<datasources>
- <local-tx-datasource>
- <jndi-name>jdbc/__default</jndi-name>
- <use-java-context>false</use-java-context>
- <connection-url>jdbc:hsqldb:.</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
- <min-pool-size>5</min-pool-size>
- <max-pool-size>20</max-pool-size>
- </local-tx-datasource>
-</datasources>
View
222 tests/jetty-hibernate/pom.xml
@@ -1,222 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>seam-persistence-tests-jetty</artifactId>
- <packaging>jar</packaging>
-
- <name>Seam Persistence Tests: Jetty with Hibernate</name>
- <!-- url required for JAR Manifest -->
- <url>${project.parent.url}</url>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <dependencies>
-
- <!-- including whole API breaks tests -->
- <!--
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.transaction</groupId>
- <artifactId>jboss-transaction-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
- <artifactId>jboss-jsp-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-search</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</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</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.transaction</groupId>
- <artifactId>seam-transaction</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.config</groupId>
- <artifactId>seam-config-xml</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.solder</groupId>
- <artifactId>seam-solder</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <!--dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- </dependency-->
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-tests-base</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-7</artifactId>
- </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>
-
- </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>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
View
9 tests/jetty-hibernate/src/test/resources/arquillian.xml
@@ -1,9 +0,0 @@
-<?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>
View
195 tests/jetty-openjpa/pom.xml
@@ -1,195 +0,0 @@
-<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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-parent</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <artifactId>seam-persistence-tests-jetty-openjpa</artifactId>
- <packaging>jar</packaging>
-
- <name>Seam Persistence Tests: Jetty with OpenJPA</name>
- <!-- url required for JAR Manifest -->
- <url>${project.parent.url}</url>
-
- <prerequisites>
- <maven>3.0</maven>
- </prerequisites>
-
- <dependencies>
-
- <!-- including whole API breaks tests -->
- <!--
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.jboss.spec.javax.interceptor</groupId>
- <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.el</groupId>
- <artifactId>jboss-el-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.enterprise</groupId>
- <artifactId>cdi-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
- <artifactId>jboss-jsp-api_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa-all</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <scope>test</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</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.transaction</groupId>
- <artifactId>seam-transaction</artifactId>
- <version>3.1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.config</groupId>
- <artifactId>seam-config-xml</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam.solder</groupId>
- <artifactId>seam-solder</artifactId>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
- <!--dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-junit</artifactId>
- </dependency-->
-
- <dependency>
- <groupId>org.jboss.seam.persistence</groupId>
- <artifactId>seam-persistence-tests-base</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jetty-embedded-7</artifactId>
- </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>
-
- </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>
-
- <profiles>
- <profile>
- <id>code-coverage</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.sonatype.maven.plugin</groupId>
- <artifactId>emma4it-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
View
9 tests/jetty-openjpa/src/test/resources/arquillian.xml
@@ -1,9 +0,0 @@
-<?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>
View
499 testsuite/pom.xml
@@ -0,0 +1,499 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>seam-persistence-parent</artifactId>
+ <groupId>org.jboss.seam.persistence</groupId>
+ <version>3.1.0-SNAPSHOT</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>seam-persistence-testsuite</artifactId>
+ <packaging>jar</packaging>
+
+ <name>Seam Persistence Test Suite</name>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
+ <properties>
+ <eclipse.jetty.version>8.0.0.M3</eclipse.jetty.version>
+ <hibernate.core.version>3.6.0.Final</hibernate.core.version>
+ <slf4j.version>1.5.10</slf4j.version>
+ </properties>
+
+ <dependencies>
+
+ <!-- including whole API breaks tests -->
+ <!--
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.ejb</groupId>
+ <artifactId>jboss-ejb-api_3.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.interceptor</groupId>
+ <artifactId>jboss-interceptors-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.el</groupId>
+ <artifactId>jboss-el-api_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.transaction</groupId>
+ <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.enterprise</groupId>
+ <artifactId>cdi-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec.javax.servlet.jsp</groupId>
+ <artifactId>jboss-jsp-api_2.2_spec</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <scope>test</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</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam.transaction</groupId>
+ <artifactId>seam-transaction</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.weld.servlet</groupId>
+ <artifactId>weld-servlet</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.solder</groupId>
+ <artifactId>solder-impl</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-search</artifactId>
+ <version>4.0.0.CR1</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.arquillian.junit</groupId>
+ <artifactId>arquillian-junit-container</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!--
+ skip unit test run, tests to be executed during
+ integration-test
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ </property>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ <systemProperties>
+ <arquillian.launch>${arquillian}</arquillian.launch>
+ <arquillian>${arquillian}</arquillian>
+ </systemProperties>
+ </configuration>
+
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <trimStackTrace>false</trimStackTrace>
+ <printSummary>true</printSummary>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jbossas-managed-7</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-managed-7</value>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.test</groupId>
+ <artifactId>jbossas-managed-7</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-jbossas-7</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/test/jetty/**</exclude>
+ <exclude>**/test/openjpa/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jbossas-remote-7</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jbossas-remote-7</value>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.test</groupId>
+ <artifactId>jbossas-remote-7</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-jbossas-7</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/test/jetty/**</exclude>
+ <exclude>**/test/openjpa/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jetty-embedded-7-hibernate</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jetty-embedded-7-hibernate</value>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jetty-embedded-7</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${eclipse.jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- plus and naming requires for using JNDI -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${eclipse.jetty.version}</version>
+ <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>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.core.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.core.version}</version>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-jetty-hibernate</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/test/jboss/**</exclude>
+ <exclude>**/test/openjpa/**</exclude>
+ </excludes>
+ <classpathDependencyExcludes>
+ <classpathDependencyExcludes>org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec</classpathDependencyExcludes>
+ </classpathDependencyExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>jetty-embedded-7-openjpa</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ <value>jetty-embedded-7-openjpa</value>
+ </property>
+ </activation>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.arquillian.container</groupId>
+ <artifactId>arquillian-jetty-embedded-7</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${eclipse.jetty.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- plus and naming requires for using JNDI -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-plus</artifactId>
+ <version>${eclipse.jetty.version}</version>
+ <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>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa-all</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ </testResource>
+ <testResource>
+ <directory>src/test/resources-jetty-openjpa</directory>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/test/jboss/**</exclude>
+ <exclude>**/test/jetty/**</exclude>
+ </excludes>
+ <classpathDependencyExcludes>
+ <classpathDependencyExcludes>org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec</classpathDependencyExcludes>
+ </classpathDependencyExcludes>
+ </configuration>
+ <executions>
+ <execution>
+ <id>surefire-it</id>
+ <phase>integration-test</phase>
+ <configuration>
+ <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>
+ </profile>
+ </profiles>
+</project>
View
0  ...bernate/test/HibernateSearchTestBase.java → ...bernate/test/HibernateSearchTestBase.java
File renamed without changes
View
0  ...st/ManagedHibernateSessionELTestBase.java → ...st/ManagedHibernateSessionELTestBase.java
File renamed without changes
View
0  ...gedHibernateSessionFlushModeTestBase.java → ...gedHibernateSessionFlushModeTestBase.java
File renamed without changes
View
0  ...test/ManagedHibernateSessionTestBase.java → ...test/ManagedHibernateSessionTestBase.java
File renamed without changes
View
9 ...e/test/ManagedHibernateSessionELTest.java → .../jetty/ManagedHibernateSessionELTest.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.persistence.hibernate.test;
+package org.jboss.seam.persistence.hibernate.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.persistence.hibernate.test.ManagedHibernateSessionELTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -28,8 +29,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createHibernateTestArchive();
- war.addWebResource("WEB-INF/hibernate-beans.xml", "beans.xml");
- war.addWebResource("META-INF/hibernate-std.cfg.xml", "classes/hibernate.cfg.xml");
+ war.addAsWebInfResource("WEB-INF/hibernate-beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/hibernate-std.cfg.xml", "classes/hibernate.cfg.xml");
war.addClasses(getTestClasses());
return war;
}
View
9 ...ManagedHibernateSessionFlushModeTest.java → ...ManagedHibernateSessionFlushModeTest.java
@@ -14,14 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.persistence.hibernate.test;
+package org.jboss.seam.persistence.hibernate.test.jetty;
import java.util.HashMap;
import javax.inject.Inject;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.persistence.hibernate.test.ManagedHibernateSessionFlushModeTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -39,8 +40,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createHibernateTestArchive();
- war.addWebResource("WEB-INF/hibernate-beans.xml", "beans.xml");
- war.addWebResource("META-INF/hibernate-std.cfg.xml", "classes/hibernate.cfg.xml");
+ war.addAsWebInfResource("WEB-INF/hibernate-beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/hibernate-std.cfg.xml", "classes/hibernate.cfg.xml");
war.addClasses(getTestClasses());
return war;
}
View
9 ...st/ManagedHibernateSessionSearchTest.java → ...ty/ManagedHibernateSessionSearchTest.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.persistence.hibernate.test;
+package org.jboss.seam.persistence.hibernate.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.persistence.hibernate.test.HibernateSearchTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -28,8 +29,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createHibernateTestArchive();
- war.addWebResource("WEB-INF/hibernate-beans.xml", "beans.xml");
- war.addWebResource("META-INF/hibernate-search.cfg.xml", "classes/hibernate.cfg.xml");
+ war.addAsWebInfResource("WEB-INF/hibernate-beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/hibernate-search.cfg.xml", "classes/hibernate.cfg.xml");
war.addClasses(getTestClasses());
return war;
}
View
9 ...ate/test/ManagedHibernateSessionTest.java → ...st/jetty/ManagedHibernateSessionTest.java
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.seam.persistence.hibernate.test;
+package org.jboss.seam.persistence.hibernate.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.seam.persistence.hibernate.test.ManagedHibernateSessionTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -28,8 +29,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createHibernateTestArchive();
- war.addWebResource("WEB-INF/hibernate-beans.xml", "beans.xml");
- war.addWebResource("META-INF/hibernate-std.cfg.xml", "classes/hibernate.cfg.xml");
+ war.addAsWebInfResource("WEB-INF/hibernate-beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/hibernate-std.cfg.xml", "classes/hibernate.cfg.xml");
war.addClasses(getTestClasses());
return war;
}
View
0  ...istence/test/EntityInjectionTestBase.java → ...istence/test/EntityInjectionTestBase.java
File renamed without changes
View
0  ...istence/test/HibernateSearchTestBase.java → ...istence/test/HibernateSearchTestBase.java
File renamed without changes
View
0  ...rsistenceContextCreatedEventTestBase.java → ...rsistenceContextCreatedEventTestBase.java
File renamed without changes
View
0  .../ManagedPersistenceContextELTestBase.java → .../ManagedPersistenceContextELTestBase.java
File renamed without changes
View
0  ...dPersistenceContextFlushModeTestBase.java → ...dPersistenceContextFlushModeTestBase.java
File renamed without changes
View
0  ...st/ManagedPersistenceContextTestBase.java → ...st/ManagedPersistenceContextTestBase.java
File renamed without changes
View
0  ...tence/test/jboss/EntityInjectionTest.java → ...tence/test/jboss/EntityInjectionTest.java
File renamed without changes
View
2  ...est/jboss/JBossASHibernateSearchTest.java → ...est/jboss/JBossASHibernateSearchTest.java
@@ -37,7 +37,7 @@
war.addAsLibraries(
DependencyResolvers.use(MavenDependencyResolver.class)
- .configureFrom("../../settings.xml")
+ .configureFrom("../settings.xml")
.loadReposFromPom("pom.xml")
.artifact(ArtifactNames.HIBERNATE_SEARCH)
.resolveAs(JavaArchive.class)
View
0  ...ss/JNDIManagedPersistenceContextTest.java → ...ss/JNDIManagedPersistenceContextTest.java
File renamed without changes
View
0  ...edPersistenceContextCreatedEventTest.java → ...edPersistenceContextCreatedEventTest.java
File renamed without changes
View
0  ...boss/ManagedPersistenceContextELTest.java → ...boss/ManagedPersistenceContextELTest.java
File renamed without changes
View
0  .../jboss/ManagedPersistenceContextTest.java → .../jboss/ManagedPersistenceContextTest.java
File renamed without changes
View
6 ...tence/test/jetty/HibernateSearchTest.java → ...tence/test/jetty/HibernateSearchTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.HibernateSearchTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
@@ -29,9 +29,9 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createJPATestArchive();
- war.addWebResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
war.addClasses(getTestClasses());
- war.addWebResource("META-INF/persistence-search.xml", "classes/META-INF/persistence.xml");
+ war.addAsWebInfResource("META-INF/persistence-search.xml", "classes/META-INF/persistence.xml");
return war;
}
View
6 ...edPersistenceContextCreatedEventTest.java → ...edPersistenceContextCreatedEventTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextCreatedEventTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
@@ -29,8 +29,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createJPATestArchive();
- war.addWebResource("WEB-INF/beans.xml", "beans.xml");
- war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
+ war.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
6 ...etty/ManagedPersistenceContextELTest.java → ...etty/ManagedPersistenceContextELTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextELTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
@@ -29,8 +29,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createJPATestArchive();
- war.addWebResource("WEB-INF/beans.xml", "beans.xml");
- war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
+ war.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
6 ...nagedPersistenceContextFlushModeTest.java → ...nagedPersistenceContextFlushModeTest.java
@@ -20,7 +20,7 @@
import javax.inject.Inject;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextFlushModeTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
@@ -41,8 +41,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createJPATestArchive();
- war.addWebResource("WEB-INF/beans.xml", "beans.xml");
- war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
+ war.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
6 .../jetty/ManagedPersistenceContextTest.java → .../jetty/ManagedPersistenceContextTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.jetty;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextTestBase;
import org.jboss.seam.persistence.test.jetty.util.JettyTestUtils;
@@ -29,8 +29,8 @@
@Deployment
public static Archive<?> createTestArchive() {
WebArchive war = JettyTestUtils.createJPATestArchive();
- war.addWebResource("WEB-INF/beans.xml", "beans.xml");
- war.addWebResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
+ war.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
16 ...tence/test/jetty/util/JettyTestUtils.java → ...tence/test/jetty/util/JettyTestUtils.java
@@ -28,19 +28,19 @@
public class JettyTestUtils {
public static WebArchive createJPATestArchive() {
WebArchive war = ShrinkWrap.createDomain().getArchiveFactory().create(WebArchive.class, "test.war");
- war.addWebResource("META-INF/jpa-seam-beans.xml", "classes/META-INF/seam-beans.xml");
- war.addWebResource("WEB-INF/jetty-env.xml", "jetty-env.xml");
- war.addWebResource("WEB-INF/web.xml", "web.xml");
- war.addServiceProvider(ExpressionFactory.class, ExpressionFactoryImpl.class);
+ war.addAsWebInfResource("META-INF/jpa-seam-beans.xml", "classes/META-INF/seam-beans.xml");
+ war.addAsWebInfResource("WEB-INF/jetty-env.xml", "jetty-env.xml");
+ war.addAsWebInfResource("WEB-INF/web.xml", "web.xml");
+ war.addAsServiceProvider(ExpressionFactory.class, ExpressionFactoryImpl.class);
return war;
}
public static WebArchive createHibernateTestArchive() {
WebArchive war = ShrinkWrap.createDomain().getArchiveFactory().create(WebArchive.class, "test.war");
- war.addWebResource("META-INF/hibernate-seam-beans.xml", "classes/META-INF/seam-beans.xml");
- war.addWebResource("WEB-INF/jetty-env.xml", "jetty-env.xml");
- war.addWebResource("WEB-INF/web.xml", "web.xml");
- war.addServiceProvider(ExpressionFactory.class, ExpressionFactoryImpl.class);
+ war.addAsWebInfResource("META-INF/hibernate-seam-beans.xml", "classes/META-INF/seam-beans.xml");
+ war.addAsWebInfResource("WEB-INF/jetty-env.xml", "jetty-env.xml");
+ war.addAsWebInfResource("WEB-INF/web.xml", "web.xml");
+ war.addAsServiceProvider(ExpressionFactory.class, ExpressionFactoryImpl.class);
return war;
}
}
View
6 ...edPersistenceContextCreatedEventTest.java → ...edPersistenceContextCreatedEventTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.openjpa;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextCreatedEventTestBase;
import org.jboss.seam.persistence.test.openjpa.util.JettyTestUtils;
@@ -29,8 +29,8 @@
@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.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
6 ...njpa/ManagedPersistenceContextELTest.java → ...njpa/ManagedPersistenceContextELTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.openjpa;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextELTestBase;
import org.jboss.seam.persistence.test.openjpa.util.JettyTestUtils;
@@ -29,8 +29,8 @@
@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.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
6 ...penjpa/ManagedPersistenceContextTest.java → ...penjpa/ManagedPersistenceContextTest.java
@@ -16,7 +16,7 @@
*/
package org.jboss.seam.persistence.test.openjpa;
-import org.jboss.arquillian.api.Deployment;
+import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.seam.persistence.test.ManagedPersistenceContextTestBase;
import org.jboss.seam.persistence.test.openjpa.util.JettyTestUtils;
@@ -29,8 +29,8 @@
@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.addAsWebInfResource("WEB-INF/beans.xml", "beans.xml");
+ war.addAsWebInfResource("META-INF/persistence-std.xml", "classes/META-INF/persistence.xml");
war.addClasses(getTestClasses());
return war;
}
View
8 ...nce/test/openjpa/util/JettyTestUtils.java → ...nce/test/openjpa/util/JettyTestUtils.java
@@ -28,10 +28,10 @@
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");
- war.addServiceProvider(ExpressionFactory.class, ExpressionFactoryImpl.class);
+ war.addAsWebInfResource("META-INF/seam-beans.xml", "classes/META-INF/seam-beans.xml");
+ war.addAsWebInfResource("WEB-INF/jetty-env.xml", "jetty-env.xml");
+ war.addAsWebInfResource("WEB-INF/web.xml", "web.xml");
+ war.addAsServiceProvider(ExpressionFactory.class, ExpressionFactoryImpl.class);
return war;
}
}
View
0  ...est/openjpa/util/SeamMetaDataFactory.java → ...est/openjpa/util/SeamMetaDataFactory.java
File renamed without changes
View
9 .../persistence/test/util/ArtifactNames.java → .../persistence/test/util/ArtifactNames.java
@@ -18,17 +18,12 @@
public class ArtifactNames {
- public static final String SEAM_PERSISTENCE_API_JAR = "../../api/target/seam-persistence-api.jar";
- public static final String SEAM_PERSISTENCE_IMPL_JAR = "../../impl/target/seam-persistence.jar";
+ public static final String SEAM_PERSISTENCE_API_JAR = "../api/target/seam-persistence-api.jar";
+ public static final String SEAM_PERSISTENCE_IMPL_JAR = "../impl/target/seam-persistence.jar";
public static final String SOLDER = "org.jboss.solder:solder-impl";
- public static final String SOLDER_API = "org.jboss.solder:solder-api";
- public static final String SOLDER_LOGGING = "org.jboss.solder:solder-logging";
public static final String SEAM_TRANSACTION = "org.jboss.seam.transaction:seam-transaction";
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";
-
}
View
0  ...ence/test/util/DontRollBackException.java → ...ence/test/util/DontRollBackException.java
File renamed without changes
View
0  ...ence/test/util/EntityManagerProvider.java → ...ence/test/util/EntityManagerProvider.java
File renamed without changes
View
0  ...m/persistence/test/util/HelloService.java → ...m/persistence/test/util/HelloService.java
File renamed without changes
View
0  ...oss/seam/persistence/test/util/Hotel.java → ...oss/seam/persistence/test/util/Hotel.java
File renamed without changes
View
0  ...sistence/test/util/HotelNameProducer.java → ...sistence/test/util/HotelNameProducer.java
File renamed without changes
View
0  ...m/persistence/test/util/IndexedHotel.java → ...m/persistence/test/util/IndexedHotel.java
File renamed without changes
View
2  ...rsistence/test/util/JBossASTestUtils.java → ...rsistence/test/util/JBossASTestUtils.java
@@ -46,7 +46,7 @@ public static WebArchive createTestArchive(boolean includeEmptyBeansXml) {
war.addAsLibraries(
DependencyResolvers.use(MavenDependencyResolver.class)
- .configureFrom("../../settings.xml")
+ .configureFrom("../settings.xml")
.loadReposFromPom("pom.xml")
.artifact(ArtifactNames.SOLDER)
.artifact(ArtifactNames.SEAM_TRANSACTION)
View
0  ...NDIManagedPersistenceContextProvider.java → ...NDIManagedPersistenceContextProvider.java
File renamed without changes
View
0  ...util/ManagedHibernateSessionProvider.java → ...util/ManagedHibernateSessionProvider.java
File renamed without changes
View
0  ...il/ManagedPersistenceContextObserver.java → ...il/ManagedPersistenceContextObserver.java
File renamed without changes
View
0  ...il/ManagedPersistenceContextProvider.java → ...il/ManagedPersistenceContextProvider.java
File renamed without changes
View
0  ...enjpa/src/test/resources/META-INF/orm.xml → ...test/resources-jbossas-7/META-INF/orm.xml
File renamed without changes
View
0  ...st/resources/META-INF/persistence-orm.xml → ...es-jbossas-7/META-INF/persistence-orm.xml
File renamed without changes
View
0  ...resources/META-INF/persistence-search.xml → ...jbossas-7/META-INF/persistence-search.xml
File renamed without changes
View
0  ...c/test/resources/META-INF/persistence.xml → ...ources-jbossas-7/META-INF/persistence.xml
File renamed without changes
View
0  ...sources/META-INF/hibernate-seam-beans.xml → ...bernate/META-INF/hibernate-seam-beans.xml
File renamed without changes
View
0  ...sources/META-INF/hibernate-search.cfg.xml → ...bernate/META-INF/hibernate-search.cfg.xml
File renamed without changes
View
0  .../resources/META-INF/hibernate-std.cfg.xml → ...-hibernate/META-INF/hibernate-std.cfg.xml
File renamed without changes
View
0  ...est/resources/META-INF/jpa-seam-beans.xml → ...tty-hibernate/META-INF/jpa-seam-beans.xml
File renamed without changes
View
0  ...rnate/src/test/resources/META-INF/orm.xml → ...esources-jetty-hibernate/META-INF/orm.xml
File renamed without changes
View
0  ...st/resources/META-INF/persistence-orm.xml → ...ty-hibernate/META-INF/persistence-orm.xml
File renamed without changes
View
0  ...resources/META-INF/persistence-search.xml → ...hibernate/META-INF/persistence-search.xml
File renamed without changes
View
0  ...st/resources/META-INF/persistence-std.xml → ...ty-hibernate/META-INF/persistence-std.xml
File renamed without changes
View
0  ...WEB-INF/beans-transaction-interceptor.xml → ...WEB-INF/beans-transaction-interceptor.xml
File renamed without changes
View
0  ...njpa/src/test/resources/WEB-INF/beans.xml → ...sources-jetty-hibernate/WEB-INF/beans.xml
File renamed without changes
View
0  ...est/resources/WEB-INF/hibernate-beans.xml → ...tty-hibernate/WEB-INF/hibernate-beans.xml
File renamed without changes
View
0  .../src/test/resources/WEB-INF/jetty-env.xml → ...ces-jetty-hibernate/WEB-INF/jetty-env.xml
File renamed without changes
View
0  ...penjpa/src/test/resources/WEB-INF/web.xml → ...resources-jetty-hibernate/WEB-INF/web.xml
File renamed without changes
View
0  ...rnate/src/test/resources/META-INF/orm.xml → .../resources-jetty-openjpa/META-INF/orm.xml
File renamed without changes
View
0  ...st/resources/META-INF/persistence-orm.xml → ...etty-openjpa/META-INF/persistence-orm.xml
File renamed without changes
View
0  ...st/resources/META-INF/persistence-std.xml → ...etty-openjpa/META-INF/persistence-std.xml
File renamed without changes
View
0 