Index: src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java
===================================================================
--- src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java	(revision 1037399)
+++ src/main/java/org/apache/james/mailbox/jpa/mail/model/JPAMailbox.java	(working copy)
@@ -29,25 +29,7 @@
 import org.apache.james.mailbox.MailboxPath;
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 
-@Entity(name="Mailbox")
-@NamedQueries({
-    @NamedQuery(name="findMailboxById",
-        query="SELECT mailbox FROM Mailbox mailbox WHERE mailbox.mailboxId = :idParam"),
-    @NamedQuery(name="findMailboxByName",
-        query="SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam"),
-    @NamedQuery(name="findMailboxByNameWithUser",
-        query="SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
-    @NamedQuery(name="deleteAll",
-                query="DELETE FROM Mailbox mailbox"),
-    @NamedQuery(name="findMailboxWithNameLikeWithUser",
-                query="SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
-    @NamedQuery(name="findMailboxWithNameLike",
-                query="SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam"),
-    @NamedQuery(name="countMailboxesWithNameLikeWithUser",
-                query="SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam"),
-    @NamedQuery(name="countMailboxesWithNameLike",
-                query="SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam")     
-})
+@Entity
 public class JPAMailbox implements Mailbox<Long> {
     
     private static final String TAB = " ";
Index: src/main/resources/META-INF/persistence.xml
===================================================================
--- src/main/resources/META-INF/persistence.xml	(revision 0)
+++ src/main/resources/META-INF/persistence.xml	(revision 0)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.    
+-->
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
+    version="2.0">
+
+    <persistence-unit name="James" transaction-type="RESOURCE_LOCAL">
+
+		<mapping-file>org/apache/james/mailbox/jpa/mail/model/mailbox.xml</mapping-file>
+		
+        <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>
+        <class>org.apache.james.domainlist.jpa.model.JPADomain</class>
+        <class>org.apache.james.user.jpa.model.JPAUser</class>
+        <class>org.apache.james.vut.jpa.model.JPAVirtualUser</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>
+
+    </persistence-unit>
+
+</persistence>
Index: src/main/resources/org/apache/james/mailbox/jpa/mail/model/mailbox.xml
===================================================================
--- src/main/resources/org/apache/james/mailbox/jpa/mail/model/mailbox.xml	(revision 0)
+++ src/main/resources/org/apache/james/mailbox/jpa/mail/model/mailbox.xml	(revision 0)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+    version="1.0">
+    
+<!--	
+    <entity class="org.apache.james.mailbox.jpa.mail.model.JPAMailbox">
+        <table name="JPA_BOOKS"/>
+        
+        <named-query name="SoldOut"><![CDATA[SELECT p FROM Product p WHERE p.status == "Sold Out"]]></named-query>
+        
+        <attributes>
+			<id name="id">
+                <generated-value strategy="TABLE"/>
+            </id>
+            <basic name="isbn">
+                <column name="ISBN" length="20"></column>
+            </basic>
+            <basic name="author">
+                <column name="AUTHOR" length="40"/>
+            </basic>
+            <basic name="publisher">
+                <column name="PUBLISHER" length="40"/>
+            </basic>
+        </attributes>
+    </entity>
+-->
+
+    <entity class="org.apache.james.mailbox.jpa.mail.model.JPAMailbox" name="Mailbox">
+        <table name="Mailbox"/>
+        
+        <named-query name="findMailboxById">
+			<![CDATA[SELECT mailbox FROM Mailbox mailbox WHERE mailbox.mailboxId = :idParam]]>
+		</named-query>
+        <named-query name="findMailboxByName">
+			<![CDATA[SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam]]>
+		</named-query>
+        <named-query name="findMailboxByNameWithUser">
+			<![CDATA[SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name = :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam]]>
+		</named-query>        
+        <named-query name="deleteAll">
+			<![CDATA[DELETE FROM Mailbox mailbox]]>
+		</named-query>        
+        <named-query name="findMailboxWithNameLikeWithUser">
+			<![CDATA[SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam]]>
+		</named-query>
+        <named-query name="findMailboxWithNameLike">
+			<![CDATA[SELECT mailbox FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam]]>
+		</named-query>        
+        <named-query name="countMailboxesWithNameLikeWithUser">
+			<![CDATA[SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user= :userParam and mailbox.namespace= :namespaceParam]]>
+		</named-query>        
+        <named-query name="countMailboxesWithNameLike">
+			<![CDATA[SELECT COUNT(mailbox) FROM Mailbox mailbox WHERE mailbox.name LIKE :nameParam and mailbox.user is NULL and mailbox.namespace= :namespaceParam]]>
+		</named-query>
+        
+    </entity>
+    
+</entity-mappings>
\ No newline at end of file