Author: eric
Date: Sun Mar 10 09:16:01 2013
New Revision: 1454807
URL: http://svn.apache.org/r1454807
Log:
Reorganize mpt modules to ease imap-mailbox integration (MPT-6)
Added:
james/mpt/trunk/all/
- copied from r1454805, james/mpt/trunk/assemble/
james/mpt/trunk/core/
- copied from r1454805, james/mpt/trunk/main/
james/mpt/trunk/impl/
james/mpt/trunk/impl/imap-mailbox/
- copied from r1454805, james/mpt/trunk/imap-mailbox/
Removed:
james/mpt/trunk/assemble/
james/mpt/trunk/imap-mailbox/
james/mpt/trunk/main/
Modified:
james/mpt/trunk/all/pom.xml
james/mpt/trunk/all/src/assemble/bin.xml
james/mpt/trunk/antlib/pom.xml
james/mpt/trunk/app/pom.xml
james/mpt/trunk/core/pom.xml
james/mpt/trunk/impl/imap-mailbox/pom.xml
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
james/mpt/trunk/mavenplugin/pom.xml
james/mpt/trunk/pom.xml
Modified: james/mpt/trunk/all/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/all/pom.xml?rev=1454807&r1=1454805&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/all/pom.xml (original)
+++ james/mpt/trunk/all/pom.xml Sun Mar 10 09:16:01 2013
@@ -22,23 +22,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <artifactId>apache-james-mpt-project</artifactId>
+ <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>0.2-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
-
- <artifactId>apache-james-mpt</artifactId>
+ <artifactId>apache-james-mpt-all</artifactId>
<packaging>pom</packaging>
-
- <name>Apache JAMES MPT Assembly</name>
+ <name>Apache James MPT All</name>
<description>
This module assembles distributions
MPT is a functional test framework specialised for the ASCII line-base
protocols common in mail.
</description>
-
<dependencies>
<dependency>
<groupId>commons-logging</groupId>
@@ -67,7 +63,6 @@ MPT is a functional test framework speci
<artifactId>commons-cli</artifactId>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
@@ -88,7 +83,6 @@ MPT is a functional test framework speci
</plugin>
</plugins>
</build>
-
<profiles>
<profile>
<id>site-reports</id>
Modified: james/mpt/trunk/all/src/assemble/bin.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/all/src/assemble/bin.xml?rev=1454807&r1=1454805&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/all/src/assemble/bin.xml (original)
+++ james/mpt/trunk/all/src/assemble/bin.xml Sun Mar 10 09:16:01 2013
@@ -51,7 +51,7 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../main/target</directory>
+ <directory>${project.basedir}/../core/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>apache-james-mpt*.jar</include>
Modified: james/mpt/trunk/antlib/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/antlib/pom.xml?rev=1454807&r1=1454806&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/antlib/pom.xml (original)
+++ james/mpt/trunk/antlib/pom.xml Sun Mar 10 09:16:01 2013
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-project</artifactId>
+ <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -32,8 +32,8 @@
<artifactId>apache-james-mpt-antlib</artifactId>
- <name>Apache JAMES MPT AntLib</name>
- <description>Apache JAMES Mail Protocol Tester (MPT) is a library
providing a framework for the
+ <name>Apache James MPT AntLib</name>
+ <description>Apache James Mail Protocol Tester (MPT) is a library
providing a framework for the
scritable functional testing of ASCII based line protocols. This AntLib
provides an easy interface
to the library requiring no extra coding.</description>
<url>http://james.apache.org/mpt/antlib</url>
@@ -47,7 +47,7 @@ to the library requiring no extra coding
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<!-- TODO: Use dependency from project pom -->
<version>${project.version}</version>
</dependency>
@@ -75,7 +75,7 @@ to the library requiring no extra coding
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<!-- TODO: Use dependency from project pom -->
<version>${project.version}</version>
<type>test-jar</type>
Modified: james/mpt/trunk/app/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/app/pom.xml?rev=1454807&r1=1454806&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/app/pom.xml (original)
+++ james/mpt/trunk/app/pom.xml Sun Mar 10 09:16:01 2013
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-project</artifactId>
+ <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -32,8 +32,8 @@
<artifactId>apache-james-mpt-app</artifactId>
- <name>Apache JAMES MPT Application</name>
- <description>Apache JAMES Mail Protocol Tester (MPT) is a library
providing a framework for the
+ <name>Apache James MPT Application</name>
+ <description>Apache James Mail Protocol Tester (MPT) is a library
providing a framework for the
scriptable functional testing of ASCII based line protocols. This application
provides easy executable
interfaces to the MPT library.</description>
<url>http://james.apache.org/mpt/app</url>
@@ -47,7 +47,7 @@ interfaces to the MPT library.</descript
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<!-- TODO: Use dependency from project pom -->
<version>${project.version}</version>
</dependency>
@@ -70,7 +70,7 @@ interfaces to the MPT library.</descript
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<!-- TODO: Use dependency from project pom -->
<version>${project.version}</version>
<type>test-jar</type>
@@ -98,7 +98,7 @@ interfaces to the MPT library.</descript
<include>commons-logging:commons-logging</include>
<include>commons-cli:commons-cli</include>
<include>junit:junit</include>
-
<include>${project.groupId}:apache-james-mpt-main</include>
+
<include>${project.groupId}:apache-james-mpt-core</include>
</includes>
</artifactSet>
</configuration>
Modified: james/mpt/trunk/core/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/core/pom.xml?rev=1454807&r1=1454805&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/core/pom.xml (original)
+++ james/mpt/trunk/core/pom.xml Sun Mar 10 09:16:01 2013
@@ -22,23 +22,19 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
- <artifactId>apache-james-mpt-project</artifactId>
+ <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
- <artifactId>apache-james-mpt-main</artifactId>
-
- <name>Apache JAMES MPT Main</name>
+ <artifactId>apache-james-mpt-core</artifactId>
+ <name>Apache James MPT Core</name>
<description>
- Apache JAMES Mail Protocol Tester (MPT) is a library providing a
framework for the
+ Apache James Mail Protocol Tester (MPT) is a library providing a
framework for the
scriptable functional testing of ASCII based line protocols.
</description>
<url>http://james.apache.org/mpt/main</url>
-
<properties>
<hbase.version>0.92.0</hbase.version>
<hadoop.version>1.0.1</hadoop.version>
@@ -52,13 +48,11 @@
<version.james-mailbox>0.5-SNAPSHOT</version.james-mailbox>
<version.james-mpt>0.2-SNAPSHOT</version.james-mpt>
</properties>
-
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mpt/trunk/main</connection>
-
<developerConnection>scm:svn:https://rdon...@svn.apache.org/repos/asf/james/mpt/trunk/main</developerConnection>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mpt/trunk/core</connection>
+
<developerConnection>scm:svn:https://rdon...@svn.apache.org/repos/asf/james/mpt/trunk/core</developerConnection>
<url>http://svn.apache.org/viewcvs.cgi/james/mpt/trunk/main?root=Apache-SVN</url>
</scm>
-
<dependencies>
<dependency>
<groupId>org.apache.james.protocols</groupId>
@@ -119,7 +113,6 @@
<scope>test</scope>
</dependency>
</dependencies>
-
<build>
<plugins>
<plugin>
Modified: james/mpt/trunk/impl/imap-mailbox/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/pom.xml?rev=1454807&r1=1454805&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/pom.xml (original)
+++ james/mpt/trunk/impl/imap-mailbox/pom.xml Sun Mar 10 09:16:01 2013
@@ -22,17 +22,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
+ <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
- <artifactId>james-project</artifactId>
- <version>1.8.2</version>
+ <version>0.2-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
</parent>
-
- <artifactId>apache-james-mailbox-integration-tester</artifactId>
-
- <name>Apache James Mailbox Integration Tester</name>
-
+ <artifactId>apache-james-mpt-imapmailbox</artifactId>
+ <name>Apache James MPT Imap Mailbox</name>
<properties>
<hbase.version>0.92.0</hbase.version>
<hadoop.version>1.0.1</hadoop.version>
@@ -46,7 +43,6 @@
<javax.mail.version>1.8.3</javax.mail.version>
<james-protocols.version>1.6.3-SNAPSHOT</james-protocols.version>
- <james-mpt.version>0.2-SNAPSHOT</james-mpt.version>
<james-mailbox.mailbox>0.6-SNAPSHOT</james-mailbox.mailbox>
<lucene-core.version>3.6.0</lucene-core.version>
@@ -59,8 +55,8 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
- <version>${james-mpt.version}</version>
+ <artifactId>apache-james-mpt-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james.protocols</groupId>
Modified:
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java?rev=1454807&r1=1454805&r2=1454807&view=diff
==============================================================================
---
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
(original)
+++
james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
Sun Mar 10 09:16:01 2013
@@ -115,7 +115,6 @@ public class HBaseHostSystem extends Ima
mailboxManager.logout(session, false);
}
- @Override
public boolean addUser(String user, String password) {
userManager.addUser(user, password);
return true;
Modified: james/mpt/trunk/mavenplugin/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/mavenplugin/pom.xml?rev=1454807&r1=1454806&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/mavenplugin/pom.xml (original)
+++ james/mpt/trunk/mavenplugin/pom.xml Sun Mar 10 09:16:01 2013
@@ -24,7 +24,7 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>apache-james-mpt-project</artifactId>
+ <artifactId>apache-james-mpt</artifactId>
<groupId>org.apache.james</groupId>
<version>0.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
@@ -33,8 +33,8 @@
<artifactId>maven-mpt-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <name>Apache JAMES MPT Maven2 Plugin</name>
- <description>Apache JAMES Mail Protocol Tester (MPT) is a library
providing a framework for the
+ <name>Apache James MPT Maven2 Plugin</name>
+ <description>Apache James Mail Protocol Tester (MPT) is a library
providing a framework for the
scriptable functional testing of ASCII based line protocols. This Maven2
Plugin is an easy interface
to the library requiring no extra coding.</description>
<url>http://james.apache.org/mpt/mavenplugin</url>
@@ -48,7 +48,7 @@ to the library requiring no extra coding
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<!-- TODO: Use dependency from project pom -->
<version>${project.version}</version>
</dependency>
@@ -63,7 +63,7 @@ to the library requiring no extra coding
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<!-- TODO: Use dependency from project pom -->
<version>${project.version}</version>
<type>test-jar</type>
Modified: james/mpt/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mpt/trunk/pom.xml?rev=1454807&r1=1454806&r2=1454807&view=diff
==============================================================================
--- james/mpt/trunk/pom.xml (original)
+++ james/mpt/trunk/pom.xml Sun Mar 10 09:16:01 2013
@@ -22,31 +22,27 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
-
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
<version>1.8</version>
<relativePath></relativePath>
</parent>
-
- <artifactId>apache-james-mpt-project</artifactId>
+ <artifactId>apache-james-mpt</artifactId>
<version>0.2-SNAPSHOT</version>
<packaging>pom</packaging>
-
- <name>Apache JAMES MPT Project</name>
+ <name>Apache James MPT</name>
<description>Functional test framework specialised for the ASCII line-base
protocols common in mail.</description>
<url>http://james.apache.org/mpt/</url>
<inceptionYear>2008</inceptionYear>
-
<modules>
- <module>main</module>
<module>antlib</module>
<module>app</module>
- <module>assemble</module>
+ <module>all</module>
+ <module>core</module>
+ <module>impl/imap-mailbox</module>
<module>mavenplugin</module>
</modules>
-
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/james/mpt/trunk</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/mpt/trunk</developerConnection>
@@ -56,14 +52,12 @@
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/MPT</url>
</issueManagement>
-
<distributionManagement>
<site>
<id>${james.www.id}</id>
<url>${james.mpt.www}</url>
</site>
</distributionManagement>
-
<properties>
<!--
The website is committed to subversion. This property can be
overriden
@@ -90,7 +84,6 @@
<james.www.id>mpt-website</james.www.id>
<target.jdk>1.5</target.jdk>
</properties>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -105,7 +98,6 @@
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>apache-james-mpt-app</artifactId>
@@ -120,17 +112,16 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>apache-james-mpt-main</artifactId>
+ <artifactId>apache-james-mpt-core</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -184,7 +175,6 @@
</dependency>
</dependencies>
</dependencyManagement>
-
<build>
<plugins>
<plugin>
@@ -206,7 +196,6 @@
</execution>
</executions>
</plugin>
-
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -230,7 +219,7 @@
<asfExtOptions>
<included>true</included>
<pmc>http://james.apache.org</pmc>
- <name>Apache JAMES</name>
+ <name>Apache James</name>
</asfExtOptions>
</configuration>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
