Index: spring-deployment/pom.xml
===================================================================
--- spring-deployment/pom.xml	(revision 667185)
+++ spring-deployment/pom.xml	(working copy)
@@ -72,7 +72,6 @@
     <dependency>
       <groupId>avalon-phoenix</groupId>
       <artifactId>avalon-phoenix-client</artifactId>
-      <version>4.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>log4j</groupId>
Index: pom.xml
===================================================================
--- pom.xml	(revision 667185)
+++ pom.xml	(working copy)
@@ -34,6 +34,7 @@
   <inceptionYear>2002</inceptionYear>
   <packaging>pom</packaging>
   <modules>
+    <module>stage</module>
     <module>user-api</module>
     <module>domain-api</module>
     <module>imap-api</module>
@@ -109,6 +110,7 @@
     </plugins>
   </build>
   <repositories>
+<!--
     <repository>
       <id>local-james-stage-m1</id>
       <name>Local James stage repository</name>
@@ -123,7 +125,7 @@
         <checksumPolicy>ignore</checksumPolicy>
       </snapshots>
     </repository>
-    <!-- this is an hack for submodules to find stage folder -->
+    <! - - this is an hack for submodules to find stage folder - ->
     <repository>
       <id>parent-james-stage-m1</id>
       <name>Parent James stage repository</name>
@@ -138,7 +140,7 @@
         <checksumPolicy>ignore</checksumPolicy>
       </snapshots>
     </repository>
-    
+-->    
     <!-- Override parent POM to remove repositories -->
     <!-- 
     <repository>
@@ -363,6 +365,12 @@
       <scope>test</scope>
     </dependency>
 
+        <dependency>
+          <groupId>org.apache.james</groupId>
+          <artifactId>james-server-phoenix-deployment</artifactId>
+          <version>3.0-SNAPSHOT</version>
+        </dependency>
+
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcmail-jdk14</artifactId>
@@ -839,18 +847,35 @@
       <groupId>org.apache.james</groupId>
       <artifactId>apache-mime4j</artifactId>
       <version>0.4-SNAPSHOT</version>
-    </dependency>
-    <!-- Used by Mime4J -->
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>1.2</version>
     </dependency>
+    <!-- Used by Mime4J -->
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
       <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-core</artifactId>
       <version>4.1.1</version>
     </dependency>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+      <version>1.0</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon-phoenix</groupId>
+      <artifactId>avalon-phoenix-client</artifactId>
+      <version>4.2-SNAPSHOT</version>
+    </dependency>
+        <!-- phoenix runtime -->
+        <dependency>
+          <groupId>spice</groupId>
+          <artifactId>spice-configkit</artifactId>
+          <version>1.1.2</version>
+        </dependency>
     </dependencies>
+
   </dependencyManagement>
 </project>
Index: stage/pom.xml
===================================================================
--- stage/pom.xml	(revision 0)
+++ stage/pom.xml	(revision 0)
@@ -0,0 +1,401 @@
+<?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>
+  <parent>
+    <artifactId>james-server</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-repository</artifactId>
+  <name>Local maven repository for Apache James Server</name>
+  <description>Local maven repository for Apache James Server</description>
+  <packaging>pom</packaging>
+    <repositories>
+        <repository>
+            <id>module-local</id>
+            <name>Local Repository</name>
+            <url>file://${pom.basedir}/</url>
+            <layout>legacy</layout>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+    </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>mailet</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-mailet-base</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-standard-mailets</artifactId>
+    </dependency>
+<!--
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-user-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-domain-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-core-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-user-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-mailbox-library</artifactId>
+    </dependency>
+-->
+<!--
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imapmailbox-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imap-codec-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-avalon-user-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-basic-user-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-smtpserver-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-pop3server-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imapserver-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-nntpserver-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-fetchmail-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-spoolmanager-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-mailets-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-remotemanager-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-torque-mailboxmanager-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imap-mailbox-processor-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-experimental-activemq-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-jcr-backend-function</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-server-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14-workaround</artifactId>
+    </dependency>
+-->
+    <!-- TODO test the updated version
+    <dependency>
+      <groupId>bouncycastle</groupId>
+      <artifactId>bcmail-jdk14</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-jspf</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>jsieve</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-mime4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <!-- used by torque -->
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>village</groupId>
+      <artifactId>village</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.framework</groupId>
+      <artifactId>avalon-framework-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.connection</groupId>
+      <artifactId>cornerstone-connection-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
+      <artifactId>cornerstone-sockets-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-datasource</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
+      <artifactId>cornerstone-scheduler-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.store</groupId>
+      <artifactId>cornerstone-store-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>dnsjava</groupId>
+      <artifactId>dnsjava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-pool-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.threads</groupId>
+      <artifactId>cornerstone-threads-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.excalibur.components</groupId>
+      <artifactId>excalibur-thread-impl</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mstor</groupId>
+      <artifactId>mstor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>com.thoughtworks.xstream</groupId>
+      <artifactId>xstream</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>mx4j</groupId>
+      <artifactId>mx4j-jmx</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.db.torque</groupId>
+      <artifactId>runtime</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
+      <artifactId>cornerstone-datasources-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-mime4j</artifactId>
+    </dependency>
+    <!-- Used by Mime4J -->
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.jcr</groupId>
+      <artifactId>jcr</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>avalon-phoenix</groupId>
+      <artifactId>avalon-phoenix-client</artifactId>
+    </dependency>
+
+      <!-- phoenix-runtime -->
+      <dependency>
+        <groupId>spice</groupId>
+        <artifactId>spice-configkit</artifactId>
+      </dependency>
+
+  </dependencies>
+</project>

Property changes on: stage/pom.xml
___________________________________________________________________
Name: svn:mime-type
   + text/xml
Name: svn:keywords
   + Date Revision
Name: svn:eol-style
   + native