Author: norman
Date: Fri Apr 29 05:46:17 2011
New Revision: 1097692
URL: http://svn.apache.org/viewvc?rev=1097692&view=rev
Log:
Allow the database to correctly handle foreign keys, which in our case is to
remove the mapped entry. This fix the errors which were introduced by merging
Message / MailboxMembership. See MAILBOX-61
Modified:
james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml
james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml
Modified:
james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml?rev=1097692&r1=1097691&r2=1097692&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/examples/META-INF/persistence.xml
Fri Apr 29 05:46:17 2011
@@ -32,16 +32,12 @@
<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.openjpa.AbstractJPAMessage</class>
-
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMembership</class>
<!-- This needs to get used when you want to use streaming. Remember
to comment the following classes
- org.apache.james.mailbox.jpa.mail.model.JPAMailboxMembership
org.apache.james.mailbox.jpa.mail.model.JPAMessage
If you don't do this the EntityManager will get confused!
-
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMailboxMembership</class>
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage</class>
-->
<!-- Comment if you want to use streaming -->
-
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMembership</class>
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
@@ -59,8 +55,6 @@
<properties>
<!-- Create tables on startup -->
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
- <!-- Create foreign keys on startup -->
- <property name="openjpa.jdbc.MappingDefaults"
value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/>
<!-- Reorder SQL statements to satisfy database foreign key
constraints -->
<property name="openjpa.jdbc.SchemaFactory"
value="native(ForeignKeys=true)"/>
<!-- Disable query cache for now. It seems to be buggy. -->
Modified:
james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml?rev=1097692&r1=1097691&r2=1097692&view=diff
==============================================================================
---
james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml
(original)
+++
james/server/trunk/container-spring/src/main/config/james/META-INF/persistence.xml
Fri Apr 29 05:46:17 2011
@@ -28,8 +28,6 @@
<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.openjpa.AbstractJPAMessage</class>
-
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMailboxMembership</class>
-
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMailboxMembership</class>
<class>org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage</class>
<class>org.apache.james.mailbox.jpa.mail.model.JPAProperty</class>
<class>org.apache.james.mailbox.jpa.user.model.JPASubscription</class>
@@ -38,7 +36,6 @@
<class>org.apache.james.rrt.jpa.model.JPARecipientRewrite</class>
<properties>
<property name="openjpa.jdbc.SynchronizeMappings"
value="buildSchema(ForeignKeys=true)"/>
- <property name="openjpa.jdbc.MappingDefaults"
value="ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict"/>
<property name="openjpa.jdbc.SchemaFactory"
value="native(ForeignKeys=true)"/>
<property name="openjpa.jdbc.QuerySQLCache" value="false"/>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
