Reenabling JPA tests.
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
index 83f9162..66dd5b9 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app1/JpaIntegrationTest.java
@@ -16,9 +16,11 @@
import org.apache.tapestry5.internal.jpa.PersistedEntity;
import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.example.app1.entities.User;
import org.testng.annotations.Test;
+@TapestryTestConfiguration(webAppFolder = "src/test/app1")
public class JpaIntegrationTest extends SeleniumTestCase
{
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
index fe10373..e4af879 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app2/SinglePersistenceUnitIntegrationTest.java
@@ -15,8 +15,10 @@
package org.apache.tapestry5.jpa.integration.app2;
import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
+@TapestryTestConfiguration(webAppFolder = "src/test/app2")
public class SinglePersistenceUnitIntegrationTest extends SeleniumTestCase
{
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
index 1cec63a..a0f4b23 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app3/JndiDataSourceTest.java
@@ -15,8 +15,10 @@
package org.apache.tapestry5.jpa.integration.app3;
import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
+@TapestryTestConfiguration(webAppFolder = "src/test/app3")
public class JndiDataSourceTest extends SeleniumTestCase
{
@Test
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
index cecef95..6534a1a 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app4/IncludeUnlistedClassesTest.java
@@ -15,8 +15,10 @@
package org.apache.tapestry5.jpa.integration.app4;
import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
+@TapestryTestConfiguration(webAppFolder = "src/test/app4")
public class IncludeUnlistedClassesTest extends SeleniumTestCase
{
@Test
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
index 3deed3c..f820fa2 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app5/ExplicitPersistenceProviderClassTest.java
@@ -15,8 +15,10 @@
package org.apache.tapestry5.jpa.integration.app5;
import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.testng.annotations.Test;
+@TapestryTestConfiguration(webAppFolder = "src/test/app5")
public class ExplicitPersistenceProviderClassTest extends SeleniumTestCase
{
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
index ee3cd4d..f1efd76 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/integration/app6/JpaIntegrationTestWithAnnotationsInServiceImplementation.java
@@ -16,9 +16,11 @@
import org.apache.tapestry5.internal.jpa.PersistedEntity;
import org.apache.tapestry5.test.SeleniumTestCase;
+import org.apache.tapestry5.test.TapestryTestConfiguration;
import org.example.app6.entities.User;
import org.testng.annotations.Test;
+@TapestryTestConfiguration(webAppFolder = "src/test/app6")
public class JpaIntegrationTestWithAnnotationsInServiceImplementation extends SeleniumTestCase
{
diff --git a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
index d70e4b8..b1ea41f 100644
--- a/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
+++ b/tapestry-jpa/src/test/java/org/apache/tapestry5/jpa/test/JpaTestModule.java
@@ -59,7 +59,7 @@
@Contribute(EntityManagerSource.class)
public static void configurePersistenceUnit(
- MappedConfiguration<String, PersistenceUnitConfigurer> cfg, ObjectLocator objectLocator)
+ MappedConfiguration<String, PersistenceUnitConfigurer> cfg, final ObjectLocator objectLocator)
{
PersistenceUnitConfigurer configurer = new PersistenceUnitConfigurer()
{
