Author: bago
Date: Tue Jan 18 11:10:36 2011
New Revision: 1060306
URL: http://svn.apache.org/viewvc?rev=1060306&view=rev
Log:
modules consolidation (JAMES-1184)
Modified:
james/server/trunk/container-spring/pom.xml
james/server/trunk/data-library/ (props changed)
james/server/trunk/data-library/pom.xml
james/server/trunk/domainlist-jpa/pom.xml
james/server/trunk/domainlist-xml/pom.xml
james/server/trunk/mail-file/pom.xml
james/server/trunk/mail-jcr/pom.xml
james/server/trunk/mail-jdbc/pom.xml
james/server/trunk/mailets/pom.xml
james/server/trunk/pom.xml
james/server/trunk/pop3server/pom.xml
james/server/trunk/smtpserver/pom.xml
james/server/trunk/user-file/pom.xml
james/server/trunk/user-jcr/pom.xml
james/server/trunk/user-jdbc/pom.xml
james/server/trunk/user-jpa/pom.xml
Modified: james/server/trunk/container-spring/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/container-spring/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/container-spring/pom.xml (original)
+++ james/server/trunk/container-spring/pom.xml Tue Jan 18 11:10:36 2011
@@ -549,7 +549,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -584,11 +584,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-library</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domainlist-xml</artifactId>
<scope>runtime</scope>
</dependency>
@@ -677,11 +672,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mail-file</artifactId>
<scope>runtime</scope>
</dependency>
Propchange: james/server/trunk/data-library/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jan 18 11:10:36 2011
@@ -0,0 +1,5 @@
+.settings
+
+.classpath
+
+.project
Modified: james/server/trunk/data-library/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/data-library/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/data-library/pom.xml (original)
+++ james/server/trunk/data-library/pom.xml Tue Jan 18 11:10:36 2011
@@ -25,8 +25,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
- <name>Apache James Server User Library</name>
+ <artifactId>james-server-data-library</artifactId>
+ <name>Apache James Server Data Library</name>
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -46,6 +46,18 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-dnsservice-api</artifactId>
+ </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>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
</dependency>
@@ -72,6 +84,11 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
Modified: james/server/trunk/domainlist-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-jpa/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/domainlist-jpa/pom.xml (original)
+++ james/server/trunk/domainlist-jpa/pom.xml Tue Jan 18 11:10:36 2011
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
Modified: james/server/trunk/domainlist-xml/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/domainlist-xml/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/domainlist-xml/pom.xml (original)
+++ james/server/trunk/domainlist-xml/pom.xml Tue Jan 18 11:10:36 2011
@@ -70,7 +70,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mail-file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-file/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/mail-file/pom.xml (original)
+++ james/server/trunk/mail-file/pom.xml Tue Jan 18 11:10:36 2011
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -80,7 +80,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/mail-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jcr/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/mail-jcr/pom.xml (original)
+++ james/server/trunk/mail-jcr/pom.xml Tue Jan 18 11:10:36 2011
@@ -34,7 +34,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
Modified: james/server/trunk/mail-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mail-jdbc/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/mail-jdbc/pom.xml (original)
+++ james/server/trunk/mail-jdbc/pom.xml Tue Jan 18 11:10:36 2011
@@ -42,7 +42,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/mailets/pom.xml (original)
+++ james/server/trunk/mailets/pom.xml Tue Jan 18 11:10:36 2011
@@ -122,7 +122,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Modified: james/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Tue Jan 18 11:10:36 2011
@@ -42,9 +42,9 @@
<module>filesystem-api</module>
<module>imapserver</module>
<module>lmtpserver</module>
+ <module>data-library</module>
<module>domainlist-api</module>
<module>domainlist-jpa</module>
- <module>domainlist-library</module>
<module>domainlist-xml</module>
<module>lifecycle-api</module>
<module>mailbox-adapter</module>
@@ -56,7 +56,6 @@
<module>mail-file</module>
<module>mail-jcr</module>
<module>mail-jdbc</module>
- <module>mail-library</module>
<module>protocols-library</module>
<module>osgi</module>
<module>pop3server</module>
@@ -68,7 +67,6 @@
<module>queue-jms</module>
<module>queue-activemq</module>
<module>user-api</module>
- <module>user-library</module>
<module>user-file</module>
<module>user-jcr</module>
<module>user-jdbc</module>
@@ -557,11 +555,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-domainlist-library</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domainlist-xml</artifactId>
<version>${project.version}</version>
</dependency>
@@ -577,18 +570,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-mail-file</artifactId>
<version>${project.version}</version>
</dependency>
@@ -616,12 +597,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<type>test-jar</type>
Modified: james/server/trunk/pop3server/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/pop3server/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/pop3server/pom.xml (original)
+++ james/server/trunk/pop3server/pom.xml Tue Jan 18 11:10:36 2011
@@ -95,13 +95,13 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified: james/server/trunk/smtpserver/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/smtpserver/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/smtpserver/pom.xml (original)
+++ james/server/trunk/smtpserver/pom.xml Tue Jan 18 11:10:36 2011
@@ -130,12 +130,12 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
@@ -169,12 +169,6 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-mail-library</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.james</groupId>
<artifactId>james-server-domainlist-api</artifactId>
<scope>test</scope>
<type>test-jar</type>
Modified: james/server/trunk/user-file/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-file/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/user-file/pom.xml (original)
+++ james/server/trunk/user-file/pom.xml Tue Jan 18 11:10:36 2011
@@ -51,7 +51,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/user-jcr/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jcr/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/user-jcr/pom.xml (original)
+++ james/server/trunk/user-jcr/pom.xml Tue Jan 18 11:10:36 2011
@@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -66,7 +66,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/user-jdbc/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jdbc/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/user-jdbc/pom.xml (original)
+++ james/server/trunk/user-jdbc/pom.xml Tue Jan 18 11:10:36 2011
@@ -47,7 +47,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
@@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
Modified: james/server/trunk/user-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-jpa/pom.xml?rev=1060306&r1=1060305&r2=1060306&view=diff
==============================================================================
--- james/server/trunk/user-jpa/pom.xml (original)
+++ james/server/trunk/user-jpa/pom.xml Tue Jan 18 11:10:36 2011
@@ -74,7 +74,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
</dependency>
<dependency>
<groupId>commons-configuration</groupId>
@@ -105,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>james-server-user-library</artifactId>
+ <artifactId>james-server-data-library</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
