Index: pom.xml
===================================================================
--- pom.xml	(revision 1074479)
+++ pom.xml	(working copy)
@@ -23,6 +23,7 @@
     <groupId>org.apache.james</groupId>
     <version>1.5</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
   <artifactId>apache-james-mailbox</artifactId>
@@ -32,8 +33,8 @@
   <url>http://james.apache.org/mailbox</url>
   <inceptionYear>2010</inceptionYear>
   <packaging>pom</packaging>
+
   <modules>
-    <module>parent</module>
     <module>api</module>
     <module>store</module>
     <module>memory</module>
@@ -42,6 +43,7 @@
     <module>maildir</module>
     <module>tool</module>
   </modules>
+
   <ciManagement>
     <system>hudson</system>
     <url>http://hudson.zones.apache.org/hudson/view/James/job/james-mailbox-trunk/</url>
@@ -51,11 +53,13 @@
       </notifier>
     </notifiers>
   </ciManagement>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/james/mailbox/trunk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailbox/trunk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/james/mailbox/trunk?root=Apache-SVN</url>
   </scm>
+
   <repositories>
     <!-- needed for javamail -->
     <repository>
@@ -73,40 +77,120 @@
       </snapshots>
     </repository>
   </repositories>
+
   <build>
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <optimize>true</optimize>
-          <source>1.5</source>
-          <target>1.5</target>
+          <source>${target.jdk}</source>
+          <target>${target.jdk}</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>jar</goal>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <useDefaultManifestFile>true</useDefaultManifestFile>
+          <archive>
+            <manifest>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>bin</descriptorRef>
+            <descriptorRef>src</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Export-Package>org.apache.james.mailbox.*</Export-Package>
+            <Embed-Dependency>*;scope=runtime</Embed-Dependency>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
   </build>
+
   <reporting>
     <plugins>
       <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
+        <artifactId>maven-jxr-plugin</artifactId>
         <configuration>
           <aggregate>true</aggregate>
         </configuration>
       </plugin>
       <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <aggregate>true</aggregate>
+          <forkMode>pertest</forkMode>
+          <argLine>-Xms256m -Xmx512m</argLine>
+          <testFailureIgnore>false</testFailureIgnore>
+          <skip>false</skip>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <configuration>
+          <excludes>
+            <exclude>NOTICE.*</exclude>
+            <exclude>LICENSE.*</exclude>
+            <!-- Generated by Maven -->
+            <exclude>release.properties</exclude>
+            <exclude>dist/**/*</exclude>
+            <!-- Eclipse -->
+            <exclude>**/.*</exclude>
+            <exclude>.*/**/*</exclude>
+            <!-- Ignore logs -->
+            <exclude>**/derby.log</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-pmd-plugin</artifactId>
         <configuration>
           <aggregate>true</aggregate>
-          <targetJdk>1.5</targetJdk>
+          <targetJdk>${target.jdk}</targetJdk>
           <rulesets>
             <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/imports.xml</ruleset>
             <ruleset>/rulesets/controversial.xml</ruleset>
+            <ruleset>/rulesets/unusedcode.xml</ruleset>
           </rulesets>
           <format>xml</format>
           <linkXref>true</linkXref>
@@ -115,33 +199,410 @@
         </configuration>
       </plugin>
       <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
         <artifactId>maven-site-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-changes-plugin</artifactId>
         <configuration>
-            <onlyCurrentVersion>true</onlyCurrentVersion>
-            <resolutionIds>Closed</resolutionIds>
-            <maxEntries>1000</maxEntries>
+          <onlyCurrentVersion>true</onlyCurrentVersion>
+          <resolutionIds>Closed</resolutionIds>
+          <maxEntries>1000</maxEntries>
         </configuration>
         <reportSets>
-            <reportSet>
-                <reports>
-                    <report>jira-report</report>
-                </reports>
-            </reportSet>
+          <reportSet>
+            <reports>
+              <report>jira-report</report>
+            </reports>
+          </reportSet>
         </reportSets>
       </plugin>
     </plugins>
   </reporting>
+
   <distributionManagement>
     <site>
-      <id>server-trunk-website</id>
-      <url>scp://people.apache.org/www/james.apache.org/mailbox/trunk/</url>
+      <id>mailbox-website</id>
+      <url>scp://people.apache.org/www/james.apache.org/mailbox</url>
     </site>
   </distributionManagement>
+
   <dependencyManagement>
+    <dependencies>
+      <!--
+        START Modules
+      -->
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-api</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-api</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-store</artifactId>
+        <version>${project.version}</version>
+        <type>test-jar</type>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-store</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-jpa</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-jcr</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-memory</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-james-mailbox-maildir</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <!--
+        END Modules
+      -->
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <version>3.0.3</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-analyzers</artifactId>
+        <version>3.0.3</version>
+      </dependency>
+
+
+      <!--
+        START Mail
+      -->
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-mime4j</artifactId>
+        <version>${version.apache-mime4j}</version>
+      </dependency>
+      <!-- Declare javamail as provided to be able to easily switch -->
+      <!-- to different implementations (Geronimo) -->
+      <dependency>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>${version.javax.mail}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>${version.activation}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-activation_1.1_spec</artifactId>
+        <version>1.0.2</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.javamail</groupId>
+        <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        <version>1.6</version>
+      </dependency>
+      <!--
+        END Mail
+      -->
+
+      <!--
+        Start James Mailet
+      -->
+      <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-mailet</artifactId>
+        <version>2.4</version>
+        <exclusions>
+          <exclusion>
+            <groupId>javax.mail</groupId>
+            <artifactId>mail</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <!--
+        Start Commons
+      -->
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${version.commons-collections}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${version.commons-logging}</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>logkit</artifactId>
+            <groupId>logkit</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>avalon-framework</artifactId>
+            <groupId>avalon-framework</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>log4j</artifactId>
+            <groupId>log4j</groupId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>${version.commons-lang}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>1.2</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <version>1.3</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>xercesImpl</artifactId>
+            <groupId>xerces</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <scope>test</scope>
+        <version>1.6</version>
+        <exclusions>
+          <exclusion>
+            <artifactId>dom4j</artifactId>
+            <groupId>dom4j</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>servletapi</artifactId>
+            <groupId>servletapi</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>xerces</artifactId>
+            <groupId>xerces</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>commons-digester</artifactId>
+            <groupId>commons-digester</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>commons-beanutils-core</artifactId>
+            <groupId>commons-beanutils</groupId>
+          </exclusion>
+          <exclusion>
+            <artifactId>commons-beanutils-bean-collections</artifactId>
+            <groupId>commons-beanutils</groupId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils-core</artifactId>
+        <version>1.7.0</version>
+      </dependency>
+      <!-- 
+        END Commons
+      -->
+      
+      <!--
+        START Testing
+      -->
+      <!--
+        Use to build protocol tester.
+        Convert this to testing once MPT has been released. 
+      -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit-dep</artifactId>
+        <version>4.4</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>${version.jmock}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.jmock</groupId>
+        <artifactId>jmock-junit4</artifactId>
+        <version>${version.jmock}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>1.2.134</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>10.6.2.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>1.4</version>
+      </dependency>
+
+      <!--
+        END Testing
+      -->
+
+
+      <!-- 
+        START OpenJPA
+      -->
+      <dependency>
+        <groupId>org.apache.openjpa</groupId>
+        <artifactId>openjpa</artifactId>
+        <version>${version.openjpa}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-jpa_2.0_spec</artifactId>
+        <version>1.1</version>
+      </dependency>
+      
+      <!-- 
+        END OpenJPA
+      -->
+        
+      <!-- 
+        START JCR
+      -->
+      <dependency>
+        <groupId>javax.jcr</groupId>
+        <artifactId>jcr</artifactId>
+        <version>2.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-jcr-commons</artifactId>
+        <version>${version.jackrabbit}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.jackrabbit</groupId>
+        <artifactId>jackrabbit-core</artifactId>
+        <version>${version.jackrabbit}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-log4j12</artifactId>
+        <version>1.5.7</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>2.9.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>1.3.04</version>
+        <scope>test</scope>
+      </dependency>
+      
+      <!-- 
+        END JCR
+      -->
+      
+      <!--
+        START GERONIMO ANNOTATION
+      -->
+
+      <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-annotation_1.0_spec</artifactId>
+        <version>1.1.1</version>
+      </dependency> 
+
+    <!-- 
+      END GERONIMO ANNOTATION
+     -->
+
+    </dependencies>
   </dependencyManagement>
+
+  <profiles>
+    <profile>
+      <id>geronimo</id>
+      <properties>
+        <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
+        <javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
+        <javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId>
+        <javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
+        <version.javax.mail>1.6</version.javax.mail>
+        <version.activation>1.0.2</version.activation>
+      </properties>
+    </profile>
+  </profiles>
+
+  <properties>
+    <javax.activation.groupId>javax.activation</javax.activation.groupId>
+    <javax.activation.artifactId>activation</javax.activation.artifactId>
+    <javax.mail.groupId>javax.mail</javax.mail.groupId>
+    <javax.mail.artifactId>mail</javax.mail.artifactId>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <version.openjpa>2.0.1</version.openjpa>
+    <version.javax.persistence>1.0.2</version.javax.persistence>
+    <version.commons-lang>2.4</version.commons-lang>
+    <version.commons-collections>3.2.1</version.commons-collections>
+    <version.commons-logging>1.1.1</version.commons-logging>
+    <version.apache-mime4j>0.6.1</version.apache-mime4j>
+    <version.javax.mail>1.4.3</version.javax.mail>
+    <version.activation>1.1.1</version.activation>
+    <version.jmock>2.5.1</version.jmock>
+    <version.jackrabbit>2.2.0</version.jackrabbit>
+    <target.jdk>1.5</target.jdk>
+  </properties>
 </project>
 
Index: api/pom.xml
===================================================================
--- api/pom.xml	(revision 1074479)
+++ api/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
Index: jcr/pom.xml
===================================================================
--- jcr/pom.xml	(revision 1074479)
+++ jcr/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
Index: jpa/pom.xml
===================================================================
--- jpa/pom.xml	(revision 1074479)
+++ jpa/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
Index: maildir/pom.xml
===================================================================
--- maildir/pom.xml	(revision 1074479)
+++ maildir/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
Index: memory/pom.xml
===================================================================
--- memory/pom.xml	(revision 1074479)
+++ memory/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
Index: parent/pom.xml
===================================================================
--- parent/pom.xml	(revision 1074479)
+++ parent/pom.xml	(working copy)
@@ -1,554 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
-  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.    
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>james-project</artifactId>
-    <groupId>org.apache.james</groupId>
-    <version>1.5</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.james</groupId>
-  <artifactId>apache-james-mailbox-parent</artifactId>
-  <name>Apache James Mailbox Parent pom</name>
-  <version>0.2-M2-SNAPSHOT</version>
-  <description>The Apache James Mailbox Project</description>
-  <url>http://james.apache.org/mailbox/</url>
-  <inceptionYear>2010</inceptionYear>
-  <packaging>pom</packaging>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/james/mailbox/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mailbox/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/james/mailbox/trunk?root=Apache-SVN</url>
-  </scm>
-
-  <repositories>
-    <!-- needed for javamail -->
-    <repository>
-      <id>maven2-repository.dev.java.net</id>
-      <name>Java.net Repository for Maven</name>
-      <url>http://download.java.net/maven/2/</url>
-      <layout>default</layout>
-    </repository>
-  </repositories>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <optimize>true</optimize>
-          <source>${target.jdk}</source>
-          <target>${target.jdk}</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>jar</goal>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <useDefaultManifestFile>true</useDefaultManifestFile>
-          <archive>
-            <manifest>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-            </manifest>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptorRefs>
-            <descriptorRef>bin</descriptorRef>
-            <descriptorRef>src</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>bundle-manifest</id>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>manifest</goal>
-            </goals>
-          </execution>
-        </executions>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Export-Package>org.apache.james.mailbox.*</Export-Package>
-            <Embed-Dependency>*;scope=runtime</Embed-Dependency>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-     <plugin>
-       <groupId>org.apache.maven.plugins</groupId>
-       <artifactId>maven-surefire-plugin</artifactId>
-       <configuration>
-         <forkMode>pertest</forkMode>
-         <argLine>-Xms256m -Xmx512m</argLine> 
-         <testFailureIgnore>false</testFailureIgnore>
-         <skip>false</skip>
-         <includes>
-           <include>**/*Test.java</include>
-         </includes>
-       </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
-        <configuration>
-          <excludes>
-            <exclude>NOTICE.*</exclude>
-            <exclude>LICENSE.*</exclude>
-            <!-- Generated by Maven -->
-            <exclude>release.properties</exclude>
-            <exclude>dist/**/*</exclude>
-            <!-- Eclipse -->
-            <exclude>**/.*</exclude>
-            <exclude>.*/**/*</exclude>
-            <!-- Ignore logs -->
-            <exclude>**/derby.log</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-pmd-plugin</artifactId>
-        <configuration>
-          <aggregate>true</aggregate>
-          <targetJdk>${target.jdk}</targetJdk>
-          <rulesets>
-            <ruleset>/rulesets/basic.xml</ruleset>
-            <ruleset>/rulesets/unusedcode.xml</ruleset>
-            <ruleset>/rulesets/imports.xml</ruleset>
-          </rulesets>
-          <format>xml</format>
-          <linkXref>true</linkXref>
-          <sourceEncoding>utf-8</sourceEncoding>
-          <minimumTokens>100</minimumTokens>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-site-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-  
-  <distributionManagement>
-    <site>
-      <id>mailbox-website</id>
-      <url>scp://people.apache.org/www/james.apache.org/mailbox</url>
-    </site>
-  </distributionManagement>
-  
-  <dependencyManagement>
-    <dependencies>
-      <!--
-        START Modules
-      -->
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-api</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-api</artifactId>
-        <version>${project.version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-store</artifactId>
-        <version>${project.version}</version>
-        <type>test-jar</type>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-store</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-jpa</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-jcr</artifactId>
-        <version>${project.version}</version>
-      </dependency>   
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-memory</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-james-mailbox-maildir</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <!--
-        END Modules
-      -->
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-core</artifactId>
-        <version>3.0.3</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-analyzers</artifactId>
-        <version>3.0.3</version>
-      </dependency>
-
-
-      <!--
-        START Mail
-      -->
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-mime4j</artifactId>
-        <version>${version.apache-mime4j}</version>
-      </dependency>
-      <!-- Declare javamail as provided to be able to easily switch -->
-      <!-- to different implementations (Geronimo) -->
-      <dependency>
-        <groupId>javax.mail</groupId>
-        <artifactId>mail</artifactId>
-        <version>${version.javax.mail}</version>
-      </dependency>
-      <dependency>
-        <groupId>javax.activation</groupId>
-        <artifactId>activation</artifactId>
-        <version>${version.activation}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-activation_1.1_spec</artifactId>
-        <version>1.0.2</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.javamail</groupId>
-        <artifactId>geronimo-javamail_1.4_mail</artifactId>
-        <version>1.6</version>
-      </dependency>
-      <!--
-        END Mail
-      -->
-
-      <!--
-        Start James Mailet
-      -->
-      <dependency>
-        <groupId>org.apache.james</groupId>
-        <artifactId>apache-mailet</artifactId>
-        <version>2.4</version>
-        <exclusions>
-          <exclusion>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-
-      <!--
-        Start Commons
-      -->
-      <dependency>
-        <groupId>commons-collections</groupId>
-        <artifactId>commons-collections</artifactId>
-        <version>${version.commons-collections}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-logging</groupId>
-        <artifactId>commons-logging</artifactId>
-        <version>${version.commons-logging}</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>logkit</artifactId>
-            <groupId>logkit</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>avalon-framework</artifactId>
-            <groupId>avalon-framework</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>log4j</artifactId>
-            <groupId>log4j</groupId>
-          </exclusion>
-          <exclusion>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-lang</groupId>
-        <artifactId>commons-lang</artifactId>
-        <version>${version.commons-lang}</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-pool</groupId>
-        <artifactId>commons-pool</artifactId>
-        <version>1.2</version>
-      </dependency>
-      <dependency>
-        <groupId>commons-dbcp</groupId>
-        <artifactId>commons-dbcp</artifactId>
-        <version>1.3</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>xercesImpl</artifactId>
-            <groupId>xerces</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-configuration</groupId>
-        <artifactId>commons-configuration</artifactId>
-        <scope>test</scope>
-        <version>1.6</version>
-        <exclusions>
-          <exclusion>
-            <artifactId>dom4j</artifactId>
-            <groupId>dom4j</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>servletapi</artifactId>
-            <groupId>servletapi</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>xerces</artifactId>
-            <groupId>xerces</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>commons-digester</artifactId>
-            <groupId>commons-digester</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>commons-beanutils-core</artifactId>
-            <groupId>commons-beanutils</groupId>
-          </exclusion>
-          <exclusion>
-            <artifactId>commons-beanutils-bean-collections</artifactId>
-            <groupId>commons-beanutils</groupId>
-          </exclusion>
-        </exclusions>
-      </dependency>
-      <dependency>
-        <groupId>commons-beanutils</groupId>
-        <artifactId>commons-beanutils-core</artifactId>
-        <version>1.7.0</version>     
-      </dependency>
-      <!-- 
-        END Commons
-      -->
-      
-      <!--
-        START Testing
-      -->
-      <!--
-        Use to build protocol tester.
-        Convert this to testing once MPT has been released. 
-      -->
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit</artifactId>
-        <version>4.8.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>junit</groupId>
-        <artifactId>junit-dep</artifactId>
-        <version>4.4</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.jmock</groupId>
-        <artifactId>jmock</artifactId>
-        <version>${version.jmock}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.jmock</groupId>
-        <artifactId>jmock-junit4</artifactId>
-        <version>${version.jmock}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.h2database</groupId>
-        <artifactId>h2</artifactId>
-        <version>1.2.134</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.derby</groupId>
-        <artifactId>derby</artifactId>
-        <version>10.6.2.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <version>1.4</version>
-      </dependency>
-
-      <!--
-        END Testing
-      -->
-
-
-      <!-- 
-        START OpenJPA
-      -->
-      <dependency>
-        <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa</artifactId>
-        <version>${version.openjpa}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_2.0_spec</artifactId>
-        <version>1.1</version>
-      </dependency>
-      
-      <!-- 
-        END OpenJPA
-      -->
-        
-      <!-- 
-        START JCR
-      -->
-      <dependency>
-        <groupId>javax.jcr</groupId>
-        <artifactId>jcr</artifactId>
-        <version>2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-jcr-commons</artifactId>
-        <version>${version.jackrabbit}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.jackrabbit</groupId>
-        <artifactId>jackrabbit-core</artifactId>
-        <version>${version.jackrabbit}</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>slf4j-log4j12</artifactId>
-        <version>1.5.7</version>
-        <scope>test</scope>
-      </dependency>
-      
-      <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xercesImpl</artifactId>
-        <version>2.9.1</version>
-        <scope>test</scope>
-      </dependency>
-      <dependency>
-        <groupId>xml-apis</groupId>
-        <artifactId>xml-apis</artifactId>
-        <version>1.3.04</version>
-        <scope>test</scope>
-      </dependency>
-      
-      <!-- 
-        END JCR
-      -->
-      
-      <!--
-        START GERONIMO ANNOTATION
-      -->
-
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId>
-      <artifactId>geronimo-annotation_1.0_spec</artifactId>
-      <version>1.1.1</version>
-    </dependency> 
-
-    <!-- 
-      END GERONIMO ANNOTATION
-     -->
-
-    </dependencies>
-    
-  </dependencyManagement>
-
-  <profiles>
-    <profile>
-      <id>geronimo</id>
-      <properties>
-        <javax.mail.groupId>org.apache.geronimo.javamail</javax.mail.groupId>
-        <javax.mail.artifactId>geronimo-javamail_1.4_mail</javax.mail.artifactId>
-        <javax.activation.groupId>org.apache.geronimo.specs</javax.activation.groupId>
-        <javax.activation.artifactId>geronimo-activation_1.1_spec</javax.activation.artifactId>
-        <version.javax.mail>1.6</version.javax.mail>
-        <version.activation>1.0.2</version.activation>
-      </properties>
-    </profile>
-  </profiles>
-  <properties>
-    <javax.activation.groupId>javax.activation</javax.activation.groupId>
-    <javax.activation.artifactId>activation</javax.activation.artifactId>
-    <javax.mail.groupId>javax.mail</javax.mail.groupId>
-    <javax.mail.artifactId>mail</javax.mail.artifactId>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <version.openjpa>2.0.1</version.openjpa>
-    <version.javax.persistence>1.0.2</version.javax.persistence>
-    <version.commons-lang>2.4</version.commons-lang>
-    <version.commons-collections>3.2.1</version.commons-collections>
-    <version.commons-logging>1.1.1</version.commons-logging>
-    <version.apache-mime4j>0.6.1</version.apache-mime4j>
-    <version.javax.mail>1.4.3</version.javax.mail>
-    <version.activation>1.1.1</version.activation>
-    <version.jmock>2.5.1</version.jmock>
-    <version.jackrabbit>2.2.0</version.jackrabbit>
-    <target.jdk>1.5</target.jdk>
-  </properties>
-</project>
Index: store/pom.xml
===================================================================
--- store/pom.xml	(revision 1074479)
+++ store/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
Index: tool/pom.xml
===================================================================
--- tool/pom.xml	(revision 1074479)
+++ tool/pom.xml	(working copy)
@@ -19,10 +19,9 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <parent>
-    <artifactId>apache-james-mailbox-parent</artifactId>
+    <artifactId>apache-james-mailbox</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>0.2-M2-SNAPSHOT</version>
-    <relativePath>../parent/pom.xml</relativePath>
+    <version>1.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>