Return-Path: X-Original-To: apmail-tapestry-commits-archive@minotaur.apache.org Delivered-To: apmail-tapestry-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DAEFB10014 for ; Sun, 7 Apr 2013 07:04:12 +0000 (UTC) Received: (qmail 98214 invoked by uid 500); 7 Apr 2013 07:04:12 -0000 Delivered-To: apmail-tapestry-commits-archive@tapestry.apache.org Received: (qmail 98008 invoked by uid 500); 7 Apr 2013 07:04:12 -0000 Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tapestry.apache.org Delivered-To: mailing list commits@tapestry.apache.org Received: (qmail 97765 invoked by uid 99); 7 Apr 2013 07:04:11 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Apr 2013 07:04:11 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A9DEA504AC; Sun, 7 Apr 2013 07:04:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kaosko@apache.org To: commits@tapestry.apache.org Date: Sun, 07 Apr 2013 07:04:10 -0000 Message-Id: <2fbfde80e359457299c3cb4817d41542@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] git commit: FIXED - TAP5-2102: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo - interestingly, the tests collide in a suite since app5 sets a custom PersistenceProviderResolver. Also seems that the tests are run in the wro Updated Branches: refs/heads/5.3 1ed180c72 -> 0f3207441 refs/heads/master 1578ea0d2 -> 0ec991e06 FIXED - TAP5-2102: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo - interestingly, the tests collide in a suite since app5 sets a custom PersistenceProviderResolver. Also seems that the tests are run in the wrong order (first functional, then unit tests). Too cumbersome to fix the DummyPersistenceProvider, just add Eclipse as an available PersistenceProvider, it's already in the classpath Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/0ec991e0 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/0ec991e0 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/0ec991e0 Branch: refs/heads/master Commit: 0ec991e06a100a79040200b4e1d6a1927b1f7156 Parents: 1578ea0 Author: Kalle Korhonen Authored: Sun Apr 7 00:01:19 2013 -0700 Committer: Kalle Korhonen Committed: Sun Apr 7 00:01:19 2013 -0700 ---------------------------------------------------------------------- tapestry-jpa/build.gradle | 10 +++++----- .../java/org/example/app5/services/AppModule.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0ec991e0/tapestry-jpa/build.gradle ---------------------------------------------------------------------- diff --git a/tapestry-jpa/build.gradle b/tapestry-jpa/build.gradle index c197c19..62d21bb 100644 --- a/tapestry-jpa/build.gradle +++ b/tapestry-jpa/build.gradle @@ -3,13 +3,13 @@ description = "Provides support for simple CRUD applications built on top of Tap dependencies { compile project(':tapestry-core') compile "org.apache.geronimo.specs:geronimo-jpa_2.0_spec:1.1" - + testCompile project(':tapestry-test') - + testRuntime "com.h2database:h2:1.2.145" - testRuntime "org.eclipse.persistence:org.eclipse.persistence.jpa:2.2.0" - testRuntime "org.apache.tomcat:dbcp:6.0.32" - + testCompile "org.eclipse.persistence:org.eclipse.persistence.jpa:2.2.0" + testRuntime "org.apache.tomcat:dbcp:6.0.32" + } repositories { http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/0ec991e0/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java ---------------------------------------------------------------------- diff --git a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java index 7d82421..ebf0eba 100644 --- a/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java +++ b/tapestry-jpa/src/test/java/org/example/app5/services/AppModule.java @@ -36,7 +36,7 @@ public class AppModule { PersistenceProviderResolverHolder.setPersistenceProviderResolver(new PersistenceProviderResolver() { public List getPersistenceProviders() { - return Arrays.asList(new DummyPersistenceProvider()); + return Arrays.asList(new DummyPersistenceProvider(), new org.eclipse.persistence.jpa.PersistenceProvider()); } public void clearCachedProviders() {