Author: rdonkin
Date: Sun Jul 10 20:20:07 2011
New Revision: 1144954
URL: http://svn.apache.org/viewvc?rev=1144954&view=rev
Log:
Merged /james/app/trunk:r1144181-1144945 which solves app boot issue
Modified:
james/app/branches/3_0_beta2/ (props changed)
james/app/branches/3_0_beta2/README.crypto (props changed)
james/app/branches/3_0_beta2/README.txt (props changed)
james/app/branches/3_0_beta2/src/main/config/james/META-INF/persistence.xml
james/app/branches/3_0_beta2/src/main/config/james/context/james-server-context.xml
Propchange: james/app/branches/3_0_beta2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:20:07 2011
@@ -1,2 +1,3 @@
+/james/app/trunk:1144181-1144945
/james/server/sandbox/active/mina_experiments/container-spring:824613-825114
/james/server/sandbox/active/pure_spring_deployment/container-spring:893986-896410
Propchange: james/app/branches/3_0_beta2/README.crypto
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:20:07 2011
@@ -1,2 +1,3 @@
+/james/app/trunk/README.crypto:1144181-1144945
/james/server/sandbox/active/mina_experiments/README.crypto:824613-825114
/james/server/sandbox/active/pure_spring_deployment/README.crypto:893986-896410
Propchange: james/app/branches/3_0_beta2/README.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jul 10 20:20:07 2011
@@ -1,2 +1,3 @@
+/james/app/trunk/README.txt:1144181-1144945
/james/server/sandbox/active/mina_experiments/README.txt:824613-825114
/james/server/sandbox/active/pure_spring_deployment/README.txt:893986-896410
Modified:
james/app/branches/3_0_beta2/src/main/config/james/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/james/app/branches/3_0_beta2/src/main/config/james/META-INF/persistence.xml?rev=1144954&r1=1144953&r2=1144954&view=diff
==============================================================================
--- james/app/branches/3_0_beta2/src/main/config/james/META-INF/persistence.xml
(original)
+++ james/app/branches/3_0_beta2/src/main/config/james/META-INF/persistence.xml
Sun Jul 10 20:20:07 2011
@@ -24,8 +24,6 @@
version="2.0">
<persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
-
- <class>org.apache.james.mailbox.jpa.mail.model.JPAHeader</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAMailbox</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAUserFlag</class>
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage</class>
Modified:
james/app/branches/3_0_beta2/src/main/config/james/context/james-server-context.xml
URL:
http://svn.apache.org/viewvc/james/app/branches/3_0_beta2/src/main/config/james/context/james-server-context.xml?rev=1144954&r1=1144953&r2=1144954&view=diff
==============================================================================
---
james/app/branches/3_0_beta2/src/main/config/james/context/james-server-context.xml
(original)
+++
james/app/branches/3_0_beta2/src/main/config/james/context/james-server-context.xml
Sun Jul 10 20:20:07 2011
@@ -325,6 +325,7 @@
<bean id="entityManagerFactory"
class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
<property name="dataSource" ref="datasource"/>
<property name="jpaVendorAdapter" ref="vendorAdapter"/>
+ <property name="persistenceXmlLocation"
value="file://conf/META-INF/persistence.xml"/>
</bean>
<bean id="vendorAdapter"
class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter">
<property name="database" value="${vendorAdapter.database}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
