Author: bago
Date: Wed Jan 19 20:27:47 2011
New Revision: 1060970
URL: http://svn.apache.org/viewvc?rev=1060970&view=rev
Log:
second step of modules consolidation (JAMES-1184)
Modified:
james/server/trunk/cli/pom.xml
james/server/trunk/container-spring/pom.xml
james/server/trunk/data-api/pom.xml
james/server/trunk/data-library/pom.xml
james/server/trunk/fetchmail/pom.xml
james/server/trunk/file/pom.xml
james/server/trunk/jcr/pom.xml
james/server/trunk/jdbc/pom.xml
james/server/trunk/jpa/pom.xml
james/server/trunk/ldap/pom.xml
james/server/trunk/lmtpserver/pom.xml
james/server/trunk/mailbox-adapter/pom.xml
james/server/trunk/mailetcontainer-camel/pom.xml
james/server/trunk/mailetcontainer-library/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pom.xml
james/server/trunk/smtpserver/pom.xml
Modified: james/server/trunk/cli/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/cli/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/cli/pom.xml (original)
+++ james/server/trunk/cli/pom.xml Wed Jan 19 20:27:47 2011
@@ -64,11 +64,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Modified: james/server/trunk/container-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Wed Jan 19 20:27:47 2011
@@ -439,10 +439,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
@@ -545,21 +541,17 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-data-library</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-ldap</artifactId>
+ <artifactId>james-server-ldap</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
@@ -634,10 +626,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-mailbox-tool</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/data-api/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-api/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/data-api/pom.xml (original)
+++ james/server/trunk/data-api/pom.xml Wed Jan 19 20:27:47 2011
@@ -25,8 +25,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- <name>Apache James Server User API</name>
+ <artifactId>james-server-data-api</artifactId>
+ <name>Apache James Server Data API</name>
<properties>
<!-- OSGI stuff -->
<james.osgi.export>
@@ -68,5 +68,9 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
+ <dependency>
+ <groupId>${javax.mail.groupId}</groupId>
+ <artifactId>${javax.mail.artifactId}</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified: james/server/trunk/data-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Wed Jan 19 20:27:47 2011
@@ -38,15 +38,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-repository-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -54,10 +46,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-filesystem-api</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/fetchmail/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/fetchmail/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/fetchmail/pom.xml (original)
+++ james/server/trunk/fetchmail/pom.xml Wed Jan 19 20:27:47 2011
@@ -42,11 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/file/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/file/pom.xml (original)
+++ james/server/trunk/file/pom.xml Wed Jan 19 20:27:47 2011
@@ -39,11 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-repository-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/jcr/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jcr/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/jcr/pom.xml (original)
+++ james/server/trunk/jcr/pom.xml Wed Jan 19 20:27:47 2011
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jdbc/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/jdbc/pom.xml (original)
+++ james/server/trunk/jdbc/pom.xml Wed Jan 19 20:27:47 2011
@@ -43,11 +43,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-repository-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -55,10 +51,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
Modified: james/server/trunk/jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/jpa/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/jpa/pom.xml (original)
+++ james/server/trunk/jpa/pom.xml Wed Jan 19 20:27:47 2011
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/ldap/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/ldap/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/ldap/pom.xml (original)
+++ james/server/trunk/ldap/pom.xml Wed Jan 19 20:27:47 2011
@@ -25,8 +25,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-ldap</artifactId>
- <name>Apache James Server User LDAP</name>
+ <artifactId>james-server-ldap</artifactId>
+ <name>Apache James Server LDAP Data Implementation</name>
<dependencies>
<dependency>
@@ -35,7 +35,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
Modified: james/server/trunk/lmtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/lmtpserver/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/lmtpserver/pom.xml (original)
+++ james/server/trunk/lmtpserver/pom.xml Wed Jan 19 20:27:47 2011
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: james/server/trunk/mailbox-adapter/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailbox-adapter/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/mailbox-adapter/pom.xml (original)
+++ james/server/trunk/mailbox-adapter/pom.xml Wed Jan 19 20:27:47 2011
@@ -30,7 +30,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mailetcontainer-camel/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-camel/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-camel/pom.xml (original)
+++ james/server/trunk/mailetcontainer-camel/pom.xml Wed Jan 19 20:27:47 2011
@@ -30,10 +30,6 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mailetcontainer-library</artifactId>
</dependency>
<dependency>
@@ -50,11 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -103,11 +95,5 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/mailetcontainer-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/mailetcontainer-library/pom.xml (original)
+++ james/server/trunk/mailetcontainer-library/pom.xml Wed Jan 19 20:27:47 2011
@@ -38,10 +38,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
<dependency>
@@ -86,11 +82,5 @@
<artifactId>apache-standard-mailets</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
</project>
Modified: james/server/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Wed Jan 19 20:27:47 2011
@@ -110,15 +110,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-api</artifactId>
+ <artifactId>james-server-data-api</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=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Wed Jan 19 20:27:47 2011
@@ -42,29 +42,25 @@
<module>filesystem-api</module>
<module>imapserver</module>
<module>lmtpserver</module>
+ <module>data-api</module>
<module>data-library</module>
<module>jpa</module>
<module>jcr</module>
<module>jdbc</module>
<module>file</module>
- <module>domainlist-api</module>
<module>lifecycle-api</module>
<module>mailbox-adapter</module>
- <module>mailetcontainer-api</module>
<module>mailetcontainer-library</module>
<module>mailetcontainer-camel</module>
<module>mailets</module>
- <module>mail-api</module>
<module>protocols-library</module>
<module>osgi</module>
<module>pop3server</module>
- <module>repository-api</module>
<module>smtpserver</module>
<module>queue-api</module>
<module>queue-jms</module>
<module>queue-activemq</module>
- <module>user-api</module>
- <module>user-ldap</module>
+ <module>ldap</module>
<module>util</module>
<module>cli</module>
</modules>
@@ -286,11 +282,6 @@
<artifactId>james-server-container-spring</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-repository-api</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -462,18 +453,6 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mailetcontainer-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mailetcontainer-library</artifactId>
<version>${project.version}</version>
</dependency>
@@ -509,29 +488,17 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-lifecycle-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
@@ -543,11 +510,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-file</artifactId>
<version>${project.version}</version>
</dependency>
@@ -616,7 +578,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-ldap</artifactId>
+ <artifactId>james-server-ldap</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: james/server/trunk/smtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1060970&r1=1060969&r2=1060970&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Wed Jan 19 20:27:47 2011
@@ -46,11 +46,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -167,7 +163,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-api</artifactId>
+ <artifactId>james-server-data-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
