Author: bago
Date: Wed Jun 4 12:46:02 2008
New Revision: 663356
URL: http://svn.apache.org/viewvc?rev=663356&view=rev
Log:
Created pom for mailbox-library, updated dependencies for most modules:
- removed junit dependency from modules with no tests (newest maven works now,
old mavens had error in this case).
- removed unused dependencies from modules.
- added explicit dependencies to modules where needed (sometimes we relied to
transitive dependencies for direct dependencies and this "hide" real
dependencies).
Added:
james/server/trunk/mailbox-library/pom.xml (with props)
Modified:
james/server/trunk/avalon-user-function/pom.xml
james/server/trunk/basic-user-function/pom.xml
james/server/trunk/core-library/pom.xml
james/server/trunk/domain-api/pom.xml
james/server/trunk/experimental-activemq-function/pom.xml
james/server/trunk/experimental-seda-imap-function/pom.xml
james/server/trunk/fetchmail-function/pom.xml
james/server/trunk/imap-mailbox-processor-function/pom.xml
james/server/trunk/imapmailbox-library/pom.xml
james/server/trunk/imapserver-function/pom.xml
james/server/trunk/jcr-backend-function/pom.xml
james/server/trunk/mailets-function/pom.xml
james/server/trunk/nntpserver-function/pom.xml
james/server/trunk/phoenix-deployment/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server-function/pom.xml
james/server/trunk/remotemanager-function/pom.xml
james/server/trunk/smtpserver-function/pom.xml
james/server/trunk/spoolmanager-function/pom.xml
james/server/trunk/torque-mailboxmanager-function/pom.xml
james/server/trunk/user-api/pom.xml
james/server/trunk/user-library/pom.xml
Modified: james/server/trunk/avalon-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/avalon-user-function/pom.xml (original)
+++ james/server/trunk/avalon-user-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -69,11 +69,6 @@
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/basic-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/pom.xml (original)
+++ james/server/trunk/basic-user-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -29,10 +29,6 @@
<name>Apache JAMES Server Basic User function</name>
<dependencies>
<dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
@@ -46,7 +42,7 @@
<artifactId>commons-io</artifactId>
</dependency>
- <!-- Neeled by the UsersLDAPRepository -->
+ <!-- Needed by the UsersLDAPRepository -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
Modified: james/server/trunk/core-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/core-library/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/core-library/pom.xml (original)
+++ james/server/trunk/core-library/pom.xml Wed Jun 4 12:46:02 2008
@@ -33,26 +33,17 @@
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domain-api</artifactId>
+ <artifactId>apache-james-mailet-base</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-domain-api</artifactId>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk14</artifactId>
- </dependency>
- <dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcmail-jdk14-workaround</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
@@ -69,25 +60,10 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
</dependency>
<dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>village</groupId>
- <artifactId>village</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
@@ -96,11 +72,6 @@
<artifactId>commons-dbcp</artifactId>
</dependency>
<dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -117,10 +88,6 @@
<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>
@@ -129,20 +96,10 @@
<artifactId>excalibur-datasource</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.avalon.cornerstone.datasources</groupId>
- <artifactId>cornerstone-datasources-impl</artifactId>
- <scope>runtime</scope>
- </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>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
@@ -163,50 +120,10 @@
<artifactId>cornerstone-threads-api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.avalon.cornerstone.threads</groupId>
- <artifactId>cornerstone-threads-impl</artifactId>
- <scope>runtime</scope>
- </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>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avalon.logkit</groupId>
- <artifactId>avalon-logkit</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <!-- <scope>runtime</scope> -->
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
Modified: james/server/trunk/domain-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/domain-api/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/domain-api/pom.xml (original)
+++ james/server/trunk/domain-api/pom.xml Wed Jun 4 12:46:02 2008
@@ -28,55 +28,9 @@
<artifactId>james-server-domain-api</artifactId>
<name>Apache JAMES Server Domain API</name>
<dependencies>
- <!--
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-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-imap-codec-library</artifactId>
- </dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</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.excalibur.components</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </dependency>
- -->
-
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/experimental-activemq-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-activemq-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/experimental-activemq-function/pom.xml (original)
+++ james/server/trunk/experimental-activemq-function/pom.xml Wed Jun 4
12:46:02 2008
@@ -32,12 +32,6 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
@@ -65,12 +59,7 @@
<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>
Modified: james/server/trunk/experimental-seda-imap-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/experimental-seda-imap-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/experimental-seda-imap-function/pom.xml (original)
+++ james/server/trunk/experimental-seda-imap-function/pom.xml Wed Jun 4
12:46:02 2008
@@ -8,15 +8,7 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-experimental-seda-imap-function</artifactId>
<name>Apache JAMES Server *Experimental* IMAP function</name>
- <dependencies>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
- </dependency>
+ <dependencies>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-imap-api</artifactId>
@@ -37,10 +29,14 @@
<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-lang</groupId>
+ <artifactId>commons-lang</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>
Modified: james/server/trunk/fetchmail-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/fetchmail-function/pom.xml (original)
+++ james/server/trunk/fetchmail-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -42,6 +42,10 @@
</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>
@@ -56,11 +60,5 @@
<groupId>org.apache.avalon.cornerstone.scheduler</groupId>
<artifactId>cornerstone-scheduler-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/imap-mailbox-processor-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/imap-mailbox-processor-function/pom.xml (original)
+++ james/server/trunk/imap-mailbox-processor-function/pom.xml Wed Jun 4
12:46:02 2008
@@ -34,12 +34,10 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
- <!--
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
- -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
@@ -58,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
+ <artifactId>james-server-mailbox-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/imapmailbox-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapmailbox-library/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/imapmailbox-library/pom.xml (original)
+++ james/server/trunk/imapmailbox-library/pom.xml Wed Jun 4 12:46:02 2008
@@ -40,21 +40,9 @@
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-core-library</artifactId>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- <version>0.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <artifactId>apache-james-mailet-base</artifactId>
</dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/imapserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/pom.xml (original)
+++ james/server/trunk/imapserver-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
+ <artifactId>apache-james-mailet-base</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -38,23 +38,25 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-imapmailbox-library</artifactId>
+ <artifactId>james-server-mailbox-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-api</artifactId>
+ <artifactId>james-server-imapmailbox-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-imap-api</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-codec-library</artifactId>
+ <artifactId>james-server-user-api</artifactId>
</dependency>
- -->
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j</artifactId>
+ </dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -76,11 +78,5 @@
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-pool-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/jcr-backend-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr-backend-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/jcr-backend-function/pom.xml (original)
+++ james/server/trunk/jcr-backend-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -28,7 +28,7 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-jcr-backend-function</artifactId>
- <name>JCR support for Apache James</name>
+ <name>Apache JAMES Server JCR Backend function</name>
<version>3.0-SNAPSHOT</version>
<dependencies>
@@ -56,11 +56,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>1.3</version>
</dependency>
Added: james/server/trunk/mailbox-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-library/pom.xml?rev=663356&view=auto
==============================================================================
--- james/server/trunk/mailbox-library/pom.xml (added)
+++ james/server/trunk/mailbox-library/pom.xml Wed Jun 4 12:46:02 2008
@@ -0,0 +1,66 @@
+<?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-server-mailbox-library</artifactId>
+ <name>Apache JAMES Server Mailbox Manager Library</name>
+ <dependencies>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</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>
\ No newline at end of file
Propchange: james/server/trunk/mailbox-library/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/mailbox-library/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: james/server/trunk/mailets-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/mailets-function/pom.xml (original)
+++ james/server/trunk/mailets-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -85,10 +85,6 @@
<artifactId>oro</artifactId>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.avalon.cornerstone.store</groupId>
<artifactId>cornerstone-store-api</artifactId>
</dependency>
@@ -100,16 +96,5 @@
<groupId>org.apache.avalon.cornerstone.datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>jsieve</artifactId>
- </dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/nntpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/nntpserver-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/nntpserver-function/pom.xml (original)
+++ james/server/trunk/nntpserver-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -38,7 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
+ <artifactId>apache-james-mailet-base</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -63,11 +63,5 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/phoenix-deployment/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/pom.xml (original)
+++ james/server/trunk/phoenix-deployment/pom.xml Wed Jun 4 12:46:02 2008
@@ -69,8 +69,28 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-imap-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-imap-codec-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>
@@ -133,19 +153,16 @@
<groupId>org.apache.james</groupId>
<artifactId>james-server-jcr-backend-function</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
</dependency>
<dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
@@ -166,6 +183,18 @@
<artifactId>commons-lang</artifactId>
</dependency>
<dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.excalibur.components</groupId>
<artifactId>excalibur-thread-api</artifactId>
</dependency>
@@ -237,9 +266,8 @@
<version>1.3</version>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>1.3</version>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Jun 4 12:46:02 2008
@@ -41,6 +41,7 @@
<module>imap-codec-library</module>
<module>user-library</module>
<module>core-library</module>
+ <module>mailbox-library</module>
<module>smtpserver-function</module>
<module>pop3server-function</module>
<module>nntpserver-function</module>
@@ -57,6 +58,7 @@
<module>experimental-activemq-function</module>
<module>jcr-backend-function</module>
<module>phoenix-deployment</module>
+ <module>spring-deployment</module>
</modules>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/james/server/trunk</connection>
@@ -253,6 +255,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailbox-library</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-imapmailbox-library</artifactId>
<version>3.0-SNAPSHOT</version>
</dependency>
@@ -785,12 +792,14 @@
<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>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
Modified: james/server/trunk/pop3server-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/pop3server-function/pom.xml (original)
+++ james/server/trunk/pop3server-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -57,11 +57,5 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/remotemanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/remotemanager-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/remotemanager-function/pom.xml (original)
+++ james/server/trunk/remotemanager-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -56,12 +56,5 @@
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/smtpserver-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/smtpserver-function/pom.xml (original)
+++ james/server/trunk/smtpserver-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -38,6 +38,10 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-james-mailet-base</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-user-api</artifactId>
</dependency>
<dependency>
@@ -73,11 +77,5 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jspf</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/spoolmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spoolmanager-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/spoolmanager-function/pom.xml (original)
+++ james/server/trunk/spoolmanager-function/pom.xml Wed Jun 4 12:46:02 2008
@@ -33,10 +33,6 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>mailet</artifactId>
</dependency>
@@ -55,23 +51,17 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</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>
+ <artifactId>james-server-mailbox-library</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jspf</artifactId>
+ <artifactId>apache-james-mailet-base</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
@@ -81,10 +71,6 @@
<artifactId>avalon-framework-impl</artifactId>
</dependency>
<dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </dependency>
- <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
@@ -93,23 +79,8 @@
<artifactId>cornerstone-store-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-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>jsieve</artifactId>
</dependency>
-
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/torque-mailboxmanager-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/torque-mailboxmanager-function/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/torque-mailboxmanager-function/pom.xml (original)
+++ james/server/trunk/torque-mailboxmanager-function/pom.xml Wed Jun 4
12:46:02 2008
@@ -32,16 +32,20 @@
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
+ <artifactId>apache-james-mailet-base</artifactId>
</dependency>
- -->
+ <!--
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>james-server-core-library</artifactId>
</dependency>
+ -->
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-mailbox-library</artifactId>
+ </dependency>
<!--
<dependency>
@@ -60,12 +64,10 @@
<artifactId>runtime</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
- -->
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -86,10 +88,12 @@
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
</dependency>
+ <!--
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
+ -->
<dependency>
<groupId>junit</groupId>
Modified: james/server/trunk/user-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-api/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/user-api/pom.xml (original)
+++ james/server/trunk/user-api/pom.xml Wed Jun 4 12:46:02 2008
@@ -28,54 +28,6 @@
<artifactId>james-server-user-api</artifactId>
<name>Apache JAMES Server User API</name>
<dependencies>
- <!--
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>mailet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-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-imap-codec-library</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-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.excalibur.components</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </dependency>
- -->
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
+ <!-- no dependencies -->
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/user-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/pom.xml?rev=663356&r1=663355&r2=663356&view=diff
==============================================================================
--- james/server/trunk/user-library/pom.xml (original)
+++ james/server/trunk/user-library/pom.xml Wed Jun 4 12:46:02 2008
@@ -50,46 +50,9 @@
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-imap-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-imap-codec-library</artifactId>
- </dependency>
-
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</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.excalibur.components</groupId>
- <artifactId>excalibur-pool-api</artifactId>
- </dependency>
- -->
<dependency>
<groupId>org.apache.avalon.framework</groupId>
<artifactId>avalon-framework-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
