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/07 19:15:07 UTC

svn commit: r692902 - in /james/protocols/imap/trunk: ./ api/pom.xml codec/pom.xml deployment/pom.xml mailbox/pom.xml pom.xml processor/pom.xml seda/pom.xml stage/pom.xml torque/pom.xml

Author: bago
Date: Sun Sep  7 10:15:07 2008
New Revision: 692902

URL: http://svn.apache.org/viewvc?rev=692902&view=rev
Log:
update m2 build to reflect new imap module names and their new pruned dependencies.

Added:
    james/protocols/imap/trunk/deployment/pom.xml
Modified:
    james/protocols/imap/trunk/   (props changed)
    james/protocols/imap/trunk/api/pom.xml
    james/protocols/imap/trunk/codec/pom.xml
    james/protocols/imap/trunk/mailbox/pom.xml
    james/protocols/imap/trunk/pom.xml
    james/protocols/imap/trunk/processor/pom.xml
    james/protocols/imap/trunk/seda/pom.xml
    james/protocols/imap/trunk/stage/pom.xml
    james/protocols/imap/trunk/torque/pom.xml

Propchange: james/protocols/imap/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Sep  7 10:15:07 2008
@@ -1,2 +1,4 @@
 dist
 .*
+
+target

Modified: james/protocols/imap/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/api/pom.xml (original)
+++ james/protocols/imap/trunk/api/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,14 +19,14 @@
 -->
 <project>
   <parent>
-    <artifactId>james-imap-protocol</artifactId>
+    <artifactId>james-imap</artifactId>
     <groupId>org.apache.james</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-imap-api</artifactId>
-  <name>Apache JAMES Server IMAP Api</name>
+  <artifactId>james-imap-api</artifactId>
+  <name>Apache JAMES IMAP Api</name>
   <dependencies>
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>
@@ -34,6 +34,10 @@
     </dependency>
     
     <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: james/protocols/imap/trunk/codec/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/codec/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/codec/pom.xml (original)
+++ james/protocols/imap/trunk/codec/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,14 +19,14 @@
 -->
 <project>
   <parent>
-    <artifactId>james-imap-protocol</artifactId>
+    <artifactId>james-imap</artifactId>
     <groupId>org.apache.james</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-imap-codec-library</artifactId>
-  <name>Apache JAMES Server IMAP Codec Library</name>
+  <artifactId>james-imap-codec</artifactId>
+  <name>Apache JAMES IMAP Codec Library</name>
   
   <profiles>
     <profile>
@@ -48,11 +48,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
+      <artifactId>james-imap-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
@@ -61,7 +61,7 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
+      <artifactId>james-imap-api</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Added: james/protocols/imap/trunk/deployment/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/pom.xml?rev=692902&view=auto
==============================================================================
--- james/protocols/imap/trunk/deployment/pom.xml (added)
+++ james/protocols/imap/trunk/deployment/pom.xml Sun Sep  7 10:15:07 2008
@@ -0,0 +1,110 @@
+<?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>james-imap</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>3.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>james-imap-deployment</artifactId>
+  <name>Apache JAMES IMAP Deployment</name>
+  <dependencies>
+    <dependency>
+      <groupId>${javax.mail.groupId}</groupId>
+      <artifactId>${javax.mail.artifactId}</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-codec</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-mailbox</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-processor</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-torque</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-seda</artifactId>
+    </dependency>
+
+
+    <dependency>
+      <groupId>concurrent</groupId>
+      <artifactId>concurrent</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>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.db.torque</groupId>
+      <artifactId>runtime</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>james-imap-seda</artifactId>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file

Modified: james/protocols/imap/trunk/mailbox/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/mailbox/pom.xml (original)
+++ james/protocols/imap/trunk/mailbox/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,14 +19,14 @@
 -->
 <project>
   <parent>
-    <artifactId>james-imap-protocol</artifactId>
+    <artifactId>james-imap</artifactId>
     <groupId>org.apache.james</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-mailbox-library</artifactId>
-  <name>Apache JAMES Server Mailbox Manager Library</name>
+  <artifactId>james-imap-mailbox</artifactId>
+  <name>Apache JAMES Mailbox Manager Library</name>
   <dependencies>
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>
@@ -35,12 +35,7 @@
 
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <artifactId>james-imap-api</artifactId>
     </dependency>
 
     <dependency>

Modified: james/protocols/imap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/pom.xml (original)
+++ james/protocols/imap/trunk/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,28 +19,29 @@
 -->
 <project>
   <parent>
-    <artifactId>james-server-root</artifactId>
+    <artifactId>james-project</artifactId>
     <groupId>org.apache.james</groupId>
-    <version>1.0</version>
-    <relativePath>../james-project/project/server/pom.xml</relativePath>
+    <version>1.2</version>
+    <relativePath>../james-project/project/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-imap-protocol</artifactId>
-  <name>Apache JAMES Server</name>
+  <artifactId>james-imap</artifactId>
+  <name>Apache JAMES Imap</name>
   <version>3.0-SNAPSHOT</version>
-  <description>The Apache Java Enterprise Mail Server (a.k.a. JAMES Server)</description>
-  <url>http://james.apache.org/server/head/</url>
+  <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>imap-api</module>
-    <module>imap-codec-library</module>
-    <module>mailbox-library</module>
-    <module>imap-mailbox-processor-function</module>
-    <module>torque-mailboxmanager-function</module>
-    <module>experimental-seda-imap-function</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>
@@ -262,86 +263,49 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailbox-library</artifactId>
+      <artifactId>james-imap-mailbox</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-codec-library</artifactId>
+      <artifactId>james-imap-codec</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-torque-mailboxmanager-function</artifactId>
+      <artifactId>james-imap-torque</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-mailbox-processor-function</artifactId>
+      <artifactId>james-imap-processor</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+      <artifactId>james-imap-seda</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-experimental-seda-imap-function</artifactId>
+      <artifactId>james-imap-seda</artifactId>
       <version>3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
+      <artifactId>james-imap-api</artifactId>
       <version>3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
+      <artifactId>james-imap-api</artifactId>
       <version>3.0-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
-
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcmail-jdk14</artifactId>
-      <version>129</version>
-    </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcmail-jdk14-workaround</artifactId>
-      <version>129</version>
-    </dependency>
-    <!-- TODO test the updated version
-    <dependency>
-      <groupId>bouncycastle</groupId>
-      <artifactId>bcmail-jdk14</artifactId>
-      <version>136</version>
-    </dependency>
-     -->
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-jspf</artifactId>
-      <version>0.9.5</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>log4j</artifactId>
-          <groupId>log4j</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-cli</artifactId>
-          <groupId>commons-cli</groupId>
-        </exclusion>
-        <!--  only used for the asynchronous executors -->
-        <exclusion>
-          <artifactId>dnsjnio</artifactId>
-          <groupId>uk.nominet</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
+    
     <dependency>
       <groupId>org.apache.james</groupId>
       <artifactId>apache-jsieve</artifactId>
@@ -516,175 +480,6 @@
       <version>3.1</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.cornerstone.connection</groupId>
-      <artifactId>cornerstone-connection-api</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.connection</groupId>
-      <artifactId>cornerstone-connection-impl</artifactId>
-      <version>2.2.2</version>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
-      <artifactId>cornerstone-sockets-api</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.sockets</groupId>
-      <artifactId>cornerstone-sockets-impl</artifactId>
-      <version>2.2.2</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>xml-apis</artifactId>
-          <groupId>xml-apis</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
-      <artifactId>cornerstone-datasources-api</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-datasource</artifactId>
-      <version>2.2.2</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>excalibur-pool-instrumented</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-component</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-testcase</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress-container-api</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-logger</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>hsqldb</artifactId>
-          <groupId>hsqldb</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>excalibur-fortress-meta</artifactId>
-          <groupId>org.apache.excalibur.components</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.datasources</groupId>
-      <artifactId>cornerstone-datasources-impl</artifactId>
-      <version>2.2.2</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>d-haven-managed-pool</artifactId>
-          <groupId>d-haven-managed-pool</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
-      <artifactId>cornerstone-scheduler-api</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.scheduler</groupId>
-      <artifactId>cornerstone-scheduler-impl</artifactId>
-      <version>2.2.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.store</groupId>
-      <artifactId>cornerstone-store-api</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>dnsjava</groupId>
-      <artifactId>dnsjava</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-impl</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.threads</groupId>
-      <artifactId>cornerstone-threads-api</artifactId>
-      <version>2.2.2</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.threads</groupId>
-      <artifactId>cornerstone-threads-impl</artifactId>
-      <version>2.2.2</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-thread-api</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-thread-impl</artifactId>
-      <version>2.2.1</version>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>junitperf</artifactId>
-          <groupId>junitperf</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.logkit</groupId>
-      <artifactId>avalon-logkit</artifactId>
-      <version>2.2.1</version>
-      <!-- maybe this is only needed in phoenix -->
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>geronimo-spec-javamail</artifactId>
-          <groupId>geronimo-spec</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>geronimo-spec-jms</artifactId>
-          <groupId>geronimo-spec</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>servletapi</artifactId>
-          <groupId>servletapi</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>

Modified: james/protocols/imap/trunk/processor/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/processor/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/processor/pom.xml (original)
+++ james/protocols/imap/trunk/processor/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,16 +19,14 @@
 -->
 <project>
   <parent>
-    <artifactId>james-imap-protocol</artifactId>
+    <artifactId>james-imap</artifactId>
     <groupId>org.apache.james</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>
-    james-server-imap-mailbox-processor-function
-  </artifactId>
-  <name>Apache JAMES Server IMAP Mailbox Processor function</name>
+  <artifactId>james-imap-processor</artifactId>
+  <name>Apache JAMES IMAP Mailbox Processor function</name>
   
   <profiles>
     <profile>
@@ -53,24 +51,16 @@
       <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailbox-library</artifactId>
+      <artifactId>james-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-codec-library</artifactId>
+      <artifactId>james-imap-mailbox</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailet-base</artifactId>
+      <artifactId>james-imap-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/protocols/imap/trunk/seda/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/pom.xml (original)
+++ james/protocols/imap/trunk/seda/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,48 +19,36 @@
 -->
 <project>
   <parent>
-    <artifactId>james-imap-protocol</artifactId>
+    <artifactId>james-imap</artifactId>
     <groupId>org.apache.james</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-experimental-seda-imap-function</artifactId>
-  <name>Apache JAMES Server *Experimental* IMAP function</name>
+  <artifactId>james-imap-seda</artifactId>
+  <name>Apache JAMES *Experimental* IMAP function</name>
   <dependencies>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-api</artifactId>
+      <artifactId>james-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-imap-codec-library</artifactId>
+      <artifactId>james-imap-codec</artifactId>
     </dependency>
     <dependency>
       <groupId>concurrent</groupId>
       <artifactId>concurrent</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-    </dependency>
     <dependency>
       <groupId>commons-lang</groupId>
       <artifactId>commons-lang</artifactId>
     </dependency>
     <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.avalon.cornerstone.connection</groupId>
-      <artifactId>cornerstone-connection-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.excalibur.components</groupId>
-      <artifactId>excalibur-pool-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <scope>test</scope>

Modified: james/protocols/imap/trunk/stage/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/stage/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/stage/pom.xml (original)
+++ james/protocols/imap/trunk/stage/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,20 +19,20 @@
 -->
 <project>
   <parent>
-    <artifactId>james-imap-protocol</artifactId>
+    <artifactId>james-imap</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>
+  <artifactId>james-imap-repository</artifactId>
+  <name>Local maven repository for Apache James Imap</name>
+  <description>Local maven repository for Apache James Imap</description>
   <packaging>pom</packaging>
     <repositories>
         <repository>
-            <id>module-local</id>
-            <name>Local Repository</name>
+            <id>module-imap-local</id>
+            <name>Local Imap Repository</name>
             <url>file://${pom.basedir}/</url>
             <layout>legacy</layout>
             <snapshots>
@@ -57,121 +57,6 @@
       <groupId>org.apache.james</groupId>
       <artifactId>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-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>apache-jsieve</artifactId>
@@ -189,10 +74,6 @@
       <artifactId>${javax.activation.artifactId}</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>
@@ -218,94 +99,14 @@
       <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>
@@ -326,77 +127,15 @@
       <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>
-
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.apache.james</groupId>

Modified: james/protocols/imap/trunk/torque/pom.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/pom.xml?rev=692902&r1=692901&r2=692902&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/pom.xml (original)
+++ james/protocols/imap/trunk/torque/pom.xml Sun Sep  7 10:15:07 2008
@@ -19,14 +19,14 @@
 -->
 <project>
   <parent>
-    <artifactId>james-server</artifactId>
+    <artifactId>james-imap</artifactId>
     <groupId>org.apache.james</groupId>
     <version>3.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>james-server-torque-mailboxmanager-function</artifactId>
-  <name>Apache JAMES Server Torque Mailbox Manager</name>
+  <artifactId>james-imap-torque</artifactId>
+  <name>Apache JAMES Imap Torque Mailbox Manager</name>
   <dependencies>
     <dependency>
       <groupId>${javax.mail.groupId}</groupId>
@@ -34,20 +34,11 @@
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailet-base</artifactId>
-      <scope>test</scope>
+      <artifactId>james-imap-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.james</groupId>
-      <artifactId>james-server-common-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-mailbox-library</artifactId>
+      <artifactId>james-imap-mailbox</artifactId>
     </dependency>
 
     <dependency>
@@ -61,10 +52,6 @@
     </dependency>
 
     <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-    </dependency>
-    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>



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