You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/09/09 10:22:12 UTC

svn commit: r693400 - in /james/server/trunk: ./ phoenix-deployment-refactor/ phoenix-deployment/ stage/ stage/org.apache.james/jars/ stage/org.apache.james/poms/

Author: bago
Date: Tue Sep  9 01:22:11 2008
New Revision: 693400

URL: http://svn.apache.org/viewvc?rev=693400&view=rev
Log:
Updated poms to use apache-james-imap-*-0.1-SNAPSHOT as dependency.
Removed javadoc/tests jars for apache-james-imap.
Added poms to stage for apache-james-imap.

Added:
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom   (with props)
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-api-0.1-SNAPSHOT.pom   (with props)
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom   (with props)
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-mailbox-0.1-SNAPSHOT.pom   (with props)
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom   (with props)
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom   (with props)
    james/server/trunk/stage/org.apache.james/poms/apache-james-imap-torque-0.1-SNAPSHOT.pom   (with props)
Removed:
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-api-javadoc-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-api-test-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-codec-javadoc-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-codec-test-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-deployment-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-deployment-test-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-mailbox-javadoc-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-mailbox-test-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-processor-javadoc-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-processor-test-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-seda-javadoc-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-seda-test-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-torque-javadoc-0.1-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/apache-james-imap-torque-test-0.1-SNAPSHOT.jar
Modified:
    james/server/trunk/phoenix-deployment-refactor/pom.xml
    james/server/trunk/phoenix-deployment/pom.xml
    james/server/trunk/pom.xml
    james/server/trunk/stage/pom.xml

Modified: james/server/trunk/phoenix-deployment-refactor/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment-refactor/pom.xml?rev=693400&r1=693399&r2=693400&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment-refactor/pom.xml (original)
+++ james/server/trunk/phoenix-deployment-refactor/pom.xml Tue Sep  9 01:22:11 2008
@@ -84,7 +84,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
+      <artifactId>apache-james-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -96,11 +96,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-codec-library</artifactId>
+      <artifactId>apache-james-imap-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailbox-library</artifactId>
+      <artifactId>apache-james-imap-mailbox</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -134,15 +134,15 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-torque-mailboxmanager-function</artifactId>
+      <artifactId>apache-james-imap-torque</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-mailbox-processor-function</artifactId>
+      <artifactId>apache-james-imap-processor</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+      <artifactId>apache-james-imap-seda</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -260,7 +260,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+      <artifactId>apache-james-imap-seda</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: james/server/trunk/phoenix-deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=693400&r1=693399&r2=693400&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Tue Sep  9 01:22:11 2008
@@ -90,7 +90,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-api</artifactId>
+      <artifactId>apache-james-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -102,11 +102,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-codec</artifactId>
+      <artifactId>apache-james-imap-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-mailbox</artifactId>
+      <artifactId>apache-james-imap-mailbox</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -132,15 +132,15 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-torque</artifactId>
+      <artifactId>apache-james-imap-torque</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-processor</artifactId>
+      <artifactId>apache-james-imap-processor</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-seda</artifactId>
+      <artifactId>apache-james-imap-seda</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=693400&r1=693399&r2=693400&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Sep  9 01:22:11 2008
@@ -330,13 +330,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-mailbox</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <artifactId>apache-james-imap-mailbox</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-codec</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <artifactId>apache-james-imap-codec</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -390,18 +390,13 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-torque</artifactId>
-      <version>3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-deployment</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <artifactId>apache-james-imap-torque</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-processor</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <artifactId>apache-james-imap-processor</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -410,8 +405,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-seda</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <artifactId>apache-james-imap-seda</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
@@ -427,8 +422,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-api</artifactId>
-      <version>3.0-SNAPSHOT</version>
+      <artifactId>apache-james-imap-api</artifactId>
+      <version>0.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,478 @@
+<?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-project</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>1.2</version>
+    <relativePath>../james-project/project/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap</artifactId>
+  <name>Apache JAMES Imap</name>
+  <version>0.1-SNAPSHOT</version>
+  <description>The Apache JAMES Imap Protocol</description>
+  <url>http://james.apache.org/imap/</url>
+  <inceptionYear>2002</inceptionYear>
+  <packaging>pom</packaging>
+  <modules>
+    <module>stage</module>
+    <module>api</module>
+    <module>codec</module>
+    <module>mailbox</module>
+    <module>processor</module>
+    <module>torque</module>
+    <module>seda</module>
+    <module>deployment</module>
+  </modules>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/server/trunk</connection>
+    <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/james/server/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/james/server/trunk?root=Apache-SVN</url>
+  </scm>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <optimize>true</optimize>
+          <source>1.4</source>
+          <target>1.4</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+            </manifest>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptorRefs>
+            <descriptorRef>bin</descriptorRef>
+            <descriptorRef>src</descriptorRef>
+          </descriptorRefs>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <repositories>
+<!--
+    <repository>
+      <id>local-james-stage-m1</id>
+      <name>Local James stage repository</name>
+      <url>file://${basedir}/stage</url>
+      <layout>legacy</layout>
+      <releases>
+        <enabled>true</enabled>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+    </repository>
+    <! - - this is an hack for submodules to find stage folder - ->
+    <repository>
+      <id>parent-james-stage-m1</id>
+      <name>Parent James stage repository</name>
+      <url>file://${basedir}/../stage</url>
+      <layout>legacy</layout>
+      <releases>
+        <enabled>true</enabled>
+        <checksumPolicy>ignore</checksumPolicy>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+        <checksumPolicy>ignore</checksumPolicy>
+      </snapshots>
+    </repository>
+-->    
+    <!-- Override parent POM to remove repositories -->
+    <!-- 
+    <repository>
+      <id>central</id>
+      <name>Apache Main M2 Repository</name>
+      <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+    <repository>
+      <id>apache.snapshots</id>
+      <name>Apache Snapshot Repository</name>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
+     -->
+  </repositories>
+  <reporting>
+    <plugins>
+    <!--
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      -->
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <!--
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jxr-maven-plugin</artifactId>
+      </plugin>
+      -->
+      <plugin>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <configuration>
+          <aggregate>true</aggregate>
+          <targetjdk>1.4</targetjdk>
+          <rulesets>
+            <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/controversial.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>server-trunk-website</id>
+      <url>scp://people.apache.org/www/james.apache.org/server/trunk/</url>
+    </site>
+  </distributionManagement>
+  <dependencyManagement>
+    <dependencies>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-mailbox</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-codec</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-torque</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-processor</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-seda</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-seda</artifactId>
+      <version>0.1-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+      <version>0.1-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+      <version>0.1-SNAPSHOT</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-mime4j</artifactId>
+      <version>0.4</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>1.4.1</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1.1</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.5</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1</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>2.1</version>
+    </dependency>
+    <!-- used by torque -->
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+      <version>1.2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xerces</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.1</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>village</groupId>
+      <artifactId>village</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-dbcp</groupId>
+      <artifactId>commons-dbcp</artifactId>
+      <version>1.2.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>xercesImpl</artifactId>
+          <groupId>xerces</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.7.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <version>1.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>10.2.2.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <version>2.0.2</version>
+      <scope>provided</scope>
+    </dependency>
+    <!-- 
+    <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.6.2</version>
+      <scope>provided</scope>
+    </dependency>
+     -->
+    <dependency>
+      <groupId>org.apache.db.torque</groupId>
+      <artifactId>runtime</artifactId>
+      <version>3.3-RC2</version>
+      <exclusions>
+        <exclusion>
+          <groupId>avalon-framework</groupId>
+          <artifactId>avalon-framework-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>avalon-logkit</groupId>
+          <artifactId>avalon-logkit</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xerces</groupId>
+          <artifactId>xercesImpl</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    </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>
+      </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>
+  </properties>
+
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-api-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-api-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-api-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-api-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,51 @@
+<?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>apache-james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap-api</artifactId>
+  <name>Apache JAMES IMAP Api</name>
+  <dependencies>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-api-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,79 @@
+<?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>apache-james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap-codec</artifactId>
+  <name>Apache JAMES IMAP Codec Library</name>
+  
+  <profiles>
+    <profile>
+      <!-- Geronimo Mail module do not declare runtime dependency on Activation -->
+      <id>geronimo</id>
+      <dependencies>
+        <dependency>
+          <groupId>${javax.activation.groupId}</groupId>
+          <artifactId>${javax.activation.artifactId}</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+  
+  <dependencies>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-codec-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-mailbox-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-mailbox-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-mailbox-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-mailbox-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,58 @@
+<?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>apache-james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap-mailbox</artifactId>
+  <name>Apache JAMES Mailbox Manager Library</name>
+  <dependencies>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <!--  <scope>runtime</scope> -->
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-mailbox-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,80 @@
+<?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>apache-james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap-processor</artifactId>
+  <name>Apache JAMES IMAP Mailbox Processor function</name>
+  
+  <profiles>
+    <profile>
+      <!-- Geronimo Mail module do not declare runtime dependency on Activation -->
+      <id>geronimo</id>
+      <dependencies>
+        <dependency>
+          <groupId>${javax.activation.groupId}</groupId>
+          <artifactId>${javax.activation.artifactId}</artifactId>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+  
+  <dependencies>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-mailbox</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-mime4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>jmock</groupId>
+      <artifactId>jmock</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-processor-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,57 @@
+<?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.    
+-->
+<project>
+  <parent>
+    <artifactId>apache-james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap-seda</artifactId>
+  <name>Apache JAMES *Experimental* IMAP function</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-seda-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Added: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-torque-0.1-SNAPSHOT.pom
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/poms/apache-james-imap-torque-0.1-SNAPSHOT.pom?rev=693400&view=auto
==============================================================================
--- james/server/trunk/stage/org.apache.james/poms/apache-james-imap-torque-0.1-SNAPSHOT.pom (added)
+++ james/server/trunk/stage/org.apache.james/poms/apache-james-imap-torque-0.1-SNAPSHOT.pom Tue Sep  9 01:22:11 2008
@@ -0,0 +1,81 @@
+<?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>apache-james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>0.1-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-james-imap-torque</artifactId>
+  <name>Apache JAMES Imap Torque Mailbox Manager</name>
+  <dependencies>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-james-imap-mailbox</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>apache-mime4j</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.db.torque</groupId>
+      <artifactId>runtime</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>village</groupId>
+      <artifactId>village</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

Propchange: james/server/trunk/stage/org.apache.james/poms/apache-james-imap-torque-0.1-SNAPSHOT.pom
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: james/server/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/pom.xml?rev=693400&r1=693399&r2=693400&view=diff
==============================================================================
--- james/server/trunk/stage/pom.xml (original)
+++ james/server/trunk/stage/pom.xml Tue Sep  9 01:22:11 2008
@@ -81,31 +81,27 @@
 -->
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-api</artifactId>
+      <artifactId>apache-james-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-codec</artifactId>
+      <artifactId>apache-james-imap-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-mailbox</artifactId>
+      <artifactId>apache-james-imap-mailbox</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-processor</artifactId>
+      <artifactId>apache-james-imap-processor</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-seda</artifactId>
+      <artifactId>apache-james-imap-seda</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-torque</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-imap-deployment</artifactId>
+      <artifactId>apache-james-imap-torque</artifactId>
     </dependency>
 <!--
     <dependency>



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org