[jira] [Commented] (TAP5-2102) Allow supplying EntityManager properties via TapestryPersistenceUnitInfo
[ https://issues.apache.org/jira/browse/TAP5-2102?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13624611#comment-13624611 ] Hudson commented on TAP5-2102: -- Integrated in tapestry-trunk-freestyle #1040 (See [https://builds.apache.org/job/tapestry-trunk-freestyle/1040/]) FIXED - TAP5-2102: Allow supplying EntityManager properties via (Revision 1578ea0d229b536622258b4bd17176fb9ced9c85) Result = FAILURE kaosko : Files : * tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java * tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java * tapestry-jpa/src/test/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImplTest.java * tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java > Allow supplying EntityManager properties via TapestryPersistenceUnitInfo > > > Key: TAP5-2102 > URL: https://issues.apache.org/jira/browse/TAP5-2102 > Project: Tapestry 5 > Issue Type: Improvement > Components: tapestry-jpa >Affects Versions: 5.3.6 >Reporter: Kalle Korhonen >Assignee: Kalle Korhonen > > Currently EntityManagerSourceImpl.createEntityManagerFactory create an > internal map on the fly. We should users to supply their own properties map > to the EntityManagerFactory as the default properties for EntityManager. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[1/2] git commit: FIXED - TAP5-2102: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo - add new EntityManagerProperties to TapestryPersistenceUnitInfo - if set, use the supplie
Updated Branches: refs/heads/5.3 52e8ad578 -> 1ed180c72 refs/heads/master cf0f4e3d6 -> 1578ea0d2 FIXED - TAP5-2102: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo - add new EntityManagerProperties to TapestryPersistenceUnitInfo - if set, use the supplied entityManagerProperties in EntityManagerSourceImpl.createEntityManagerFactory Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1ed180c7 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1ed180c7 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1ed180c7 Branch: refs/heads/5.3 Commit: 1ed180c72089d98b63cca30aae2dec13c5f9095f Parents: 52e8ad5 Author: Kalle Korhonen Authored: Sat Apr 6 19:49:12 2013 -0700 Committer: Kalle Korhonen Committed: Sat Apr 6 19:49:12 2013 -0700 -- .../internal/jpa/EntityManagerSourceImpl.java |5 +- .../internal/jpa/PersistenceUnitInfoImpl.java | 12 .../tapestry5/jpa/TapestryPersistenceUnitInfo.java | 19 ++- .../internal/jpa/EntityManagerSourceImplTest.java | 41 +++ 4 files changed, 74 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ed180c7/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java -- diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java index e1be6ab..5f56014 100644 --- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java +++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java @@ -190,14 +190,15 @@ public class EntityManagerSourceImpl implements EntityManagerSource return emf; } -private EntityManagerFactory createEntityManagerFactory(final String persistenceUnitName) +@SuppressWarnings("unchecked") +EntityManagerFactory createEntityManagerFactory(final String persistenceUnitName) { for (final TapestryPersistenceUnitInfo info : persistenceUnitInfos) { if (info.getPersistenceUnitName().equals(persistenceUnitName)) { -final Map properties = CollectionFactory.newCaseInsensitiveMap(); +final Map properties = info.getEntityManagerProperties() == null ? CollectionFactory.newCaseInsensitiveMap() : info.getEntityManagerProperties(); properties.put(JpaConstants.PERSISTENCE_UNIT_NAME, persistenceUnitName); String providerClassName = info.getPersistenceProviderClassName(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ed180c7/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java -- diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java index 82c0e4a..463a4dd 100644 --- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java +++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java @@ -29,6 +29,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -60,6 +61,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo private final Properties properties = new Properties(); + private Map entityManagerProperties; public PersistenceUnitInfoImpl(String persistenceUnitName) { @@ -364,4 +366,14 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo } +public TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties) { + entityManagerProperties = properties; + return this; +} + +public Map getEntityManagerProperties() { + return entityManagerProperties; +} + + } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1ed180c7/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java -- diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java index 128f78d..4ff5b41 100644 --- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java +++ b/tapestry
[2/2] git commit: FIXED - TAP5-2102: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo - add new EntityManagerProperties to TapestryPersistenceUnitInfo - if set, use the supplie
FIXED - TAP5-2102: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo - add new EntityManagerProperties to TapestryPersistenceUnitInfo - if set, use the supplied entityManagerProperties in EntityManagerSourceImpl.createEntityManagerFactory Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1578ea0d Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1578ea0d Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1578ea0d Branch: refs/heads/master Commit: 1578ea0d229b536622258b4bd17176fb9ced9c85 Parents: cf0f4e3 Author: Kalle Korhonen Authored: Sat Apr 6 19:49:12 2013 -0700 Committer: Kalle Korhonen Committed: Sat Apr 6 19:50:10 2013 -0700 -- .../internal/jpa/EntityManagerSourceImpl.java |5 +- .../internal/jpa/PersistenceUnitInfoImpl.java | 12 .../tapestry5/jpa/TapestryPersistenceUnitInfo.java | 19 ++- .../internal/jpa/EntityManagerSourceImplTest.java | 41 +++ 4 files changed, 74 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1578ea0d/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java -- diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java index 6f02b32..39da3c4 100644 --- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java +++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/EntityManagerSourceImpl.java @@ -190,14 +190,15 @@ public class EntityManagerSourceImpl implements EntityManagerSource return emf; } -private EntityManagerFactory createEntityManagerFactory(final String persistenceUnitName) +@SuppressWarnings("unchecked") +EntityManagerFactory createEntityManagerFactory(final String persistenceUnitName) { for (final TapestryPersistenceUnitInfo info : persistenceUnitInfos) { if (info.getPersistenceUnitName().equals(persistenceUnitName)) { -final Map properties = CollectionFactory.newCaseInsensitiveMap(); +final Map properties = info.getEntityManagerProperties() == null ? CollectionFactory.newCaseInsensitiveMap() : info.getEntityManagerProperties(); properties.put(JpaConstants.PERSISTENCE_UNIT_NAME, persistenceUnitName); String providerClassName = info.getPersistenceProviderClassName(); http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1578ea0d/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java -- diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java index 82c0e4a..463a4dd 100644 --- a/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java +++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/internal/jpa/PersistenceUnitInfoImpl.java @@ -29,6 +29,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Properties; import java.util.Set; @@ -60,6 +61,7 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo private final Properties properties = new Properties(); + private Map entityManagerProperties; public PersistenceUnitInfoImpl(String persistenceUnitName) { @@ -364,4 +366,14 @@ public class PersistenceUnitInfoImpl implements TapestryPersistenceUnitInfo } +public TapestryPersistenceUnitInfo setEntityManagerProperties(Map properties) { + entityManagerProperties = properties; + return this; +} + +public Map getEntityManagerProperties() { + return entityManagerProperties; +} + + } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1578ea0d/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java -- diff --git a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java index 128f78d..4ff5b41 100644 --- a/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java +++ b/tapestry-jpa/src/main/java/org/apache/tapestry5/jpa/TapestryPersistenceUnitInfo.java @@ -14,11 +14,13 @@ p
git commit: Advance version number to 5.4-alpha-4
Updated Branches: refs/heads/master 32931768f -> cf0f4e3d6 Advance version number to 5.4-alpha-4 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/cf0f4e3d Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/cf0f4e3d Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/cf0f4e3d Branch: refs/heads/master Commit: cf0f4e3d67ec73cb37a20cb5ea82bd3830ef5a50 Parents: 3293176 Author: Howard M. Lewis Ship Authored: Sat Apr 6 16:19:12 2013 -0700 Committer: Howard M. Lewis Ship Committed: Sat Apr 6 16:19:12 2013 -0700 -- build.gradle |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/cf0f4e3d/build.gradle -- diff --git a/build.gradle b/build.gradle index 5e5b826..4c41f39 100755 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.4" -def minor = "-alpha-3" +def minor = "-alpha-4" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
Git Push Summary
Updated Tags: refs/tags/5.4-alpha-3 [created] 32931768f
git commit: Set version number to 5.4-alpha-3
Updated Branches: refs/heads/master 04bf4d862 -> 32931768f Set version number to 5.4-alpha-3 Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/32931768 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/32931768 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/32931768 Branch: refs/heads/master Commit: 32931768fb7caeefa1ac8e8ce1a36e80c38b2b40 Parents: 04bf4d8 Author: Howard M. Lewis Ship Authored: Sat Apr 6 16:04:25 2013 -0700 Committer: Howard M. Lewis Ship Committed: Sat Apr 6 16:04:25 2013 -0700 -- build.gradle |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/32931768/build.gradle -- diff --git a/build.gradle b/build.gradle index 4c41f39..5e5b826 100755 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ project.version = tapestryVersion() def tapestryVersion() { def major = "5.4" -def minor = "-alpha-4" +def minor = "-alpha-3" // When building on the CI server, make sure -SNAPSHOT is appended, as it is a nightly build. // When building normally, or for a release, no suffix is desired.
[jira] [Created] (TAP5-2102) Allow supplying EntityManager properties via TapestryPersistenceUnitInfo
Kalle Korhonen created TAP5-2102: Summary: Allow supplying EntityManager properties via TapestryPersistenceUnitInfo Key: TAP5-2102 URL: https://issues.apache.org/jira/browse/TAP5-2102 Project: Tapestry 5 Issue Type: Improvement Components: tapestry-jpa Affects Versions: 5.3.6 Reporter: Kalle Korhonen Currently EntityManagerSourceImpl.createEntityManagerFactory create an internal map on the fly. We should users to supply their own properties map to the EntityManagerFactory as the default properties for EntityManager. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira
[jira] [Assigned] (TAP5-2102) Allow supplying EntityManager properties via TapestryPersistenceUnitInfo
[ https://issues.apache.org/jira/browse/TAP5-2102?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Kalle Korhonen reassigned TAP5-2102: Assignee: Kalle Korhonen > Allow supplying EntityManager properties via TapestryPersistenceUnitInfo > > > Key: TAP5-2102 > URL: https://issues.apache.org/jira/browse/TAP5-2102 > Project: Tapestry 5 > Issue Type: Improvement > Components: tapestry-jpa >Affects Versions: 5.3.6 >Reporter: Kalle Korhonen >Assignee: Kalle Korhonen > > Currently EntityManagerSourceImpl.createEntityManagerFactory create an > internal map on the fly. We should users to supply their own properties map > to the EntityManagerFactory as the default properties for EntityManager. -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators For more information on JIRA, see: http://www.atlassian.com/software/jira