Author: eric
Date: Wed Feb 6 06:54:43 2013
New Revision: 1442851
URL: http://svn.apache.org/viewvc?rev=1442851&view=rev
Log:
@PersistenceContext annotations should refer to unit name 'James', patch
contributed by Marco Zapletal (JAMES-1474)
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
Modified:
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml?rev=1442851&r1=1442850&r2=1442851&view=diff
==============================================================================
---
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
(original)
+++
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
Wed Feb 6 06:54:43 2013
@@ -72,6 +72,7 @@
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="datasource"/>
<property name="jpaVendorAdapter" ref="vendorAdapter"/>
+ <property name="persistenceUnitName" value="James"/>
</bean>
<bean id="vendorAdapter"
class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
<property name="database" value="${vendorAdapter.database}"/>
Modified:
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java?rev=1442851&r1=1442850&r2=1442851&view=diff
==============================================================================
---
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
(original)
+++
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/domainlist/jpa/JPADomainList.java
Wed Feb 6 06:54:43 2013
@@ -50,7 +50,7 @@ public class JPADomainList extends Abstr
*
* @param entityManagerFactory
*/
- @PersistenceUnit
+ @PersistenceUnit(unitName="James")
public void setEntityManagerFactory(EntityManagerFactory
entityManagerFactory) {
this.entityManagerFactory = entityManagerFactory;
}
Modified:
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java?rev=1442851&r1=1442850&r2=1442851&view=diff
==============================================================================
---
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
(original)
+++
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/rrt/jpa/JPARecipientRewriteTable.java
Wed Feb 6 06:54:43 2013
@@ -50,7 +50,7 @@ public class JPARecipientRewriteTable ex
*
* @param entityManagerFactory
*/
- @PersistenceUnit
+ @PersistenceUnit(unitName="James")
public void setEntityManagerFactory(EntityManagerFactory
entityManagerFactory) {
this.entityManagerFactory = entityManagerFactory;
}
Modified:
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java?rev=1442851&r1=1442850&r2=1442851&view=diff
==============================================================================
---
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
(original)
+++
james/server/trunk/data/data-jpa/src/main/java/org/apache/james/user/jpa/JPAUsersRepository.java
Wed Feb 6 06:54:43 2013
@@ -52,7 +52,7 @@ public class JPAUsersRepository extends
* @param entityManagerFactory
* the entityManager to set
*/
- @PersistenceUnit
+ @PersistenceUnit(unitName="James")
public final void setEntityManagerFactory(EntityManagerFactory
entityManagerFactory) {
this.entityManagerFactory = entityManagerFactory;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
