Author: eric
Date: Mon Feb 20 13:14:40 2012
New Revision: 1291240
URL: http://svn.apache.org/viewvc?rev=1291240&view=rev
Log:
Integrate managesieve in the current jSieve modules (JSIEVE-83) + Parent jSieve
should be apache-sieve and not sieve-project (JSIEVE-84)
Added:
james/jsieve/trunk/manager/api/src/main/resources/
james/jsieve/trunk/manager/api/src/main/resources/META-INF/
james/jsieve/trunk/manager/api/src/main/resources/META-INF/MANIFEST.MF
james/jsieve/trunk/manager/core/src/main/resources/
james/jsieve/trunk/manager/core/src/main/resources/META-INF/
james/jsieve/trunk/manager/core/src/main/resources/META-INF/MANIFEST.MF
james/jsieve/trunk/manager/jsieve/src/main/resources/
james/jsieve/trunk/manager/jsieve/src/main/resources/META-INF/
james/jsieve/trunk/manager/jsieve/src/main/resources/META-INF/MANIFEST.MF
james/jsieve/trunk/manager/mailet/src/main/resources/META-INF/
james/jsieve/trunk/manager/mailet/src/main/resources/META-INF/MANIFEST.MF
james/jsieve/trunk/manager/mock/src/main/resources/
james/jsieve/trunk/manager/mock/src/main/resources/META-INF/
james/jsieve/trunk/manager/mock/src/main/resources/META-INF/MANIFEST.MF
james/jsieve/trunk/manager/server/src/main/resources/
james/jsieve/trunk/manager/server/src/main/resources/META-INF/
james/jsieve/trunk/manager/server/src/main/resources/META-INF/MANIFEST.MF
james/jsieve/trunk/manager/target/
james/jsieve/trunk/manager/target/maven-shared-archive-resources/
Modified:
james/jsieve/trunk/mailet/pom.xml
james/jsieve/trunk/main/pom.xml
james/jsieve/trunk/manager/api/pom.xml
james/jsieve/trunk/manager/core/pom.xml
james/jsieve/trunk/manager/jsieve/pom.xml
james/jsieve/trunk/manager/mailet/pom.xml
james/jsieve/trunk/manager/mock/pom.xml
james/jsieve/trunk/manager/pom.xml
james/jsieve/trunk/manager/server/pom.xml
james/jsieve/trunk/pom.xml
james/jsieve/trunk/util/pom.xml
Modified: james/jsieve/trunk/mailet/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/pom.xml (original)
+++ james/jsieve/trunk/mailet/pom.xml Mon Feb 20 13:14:40 2012
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>jsieve-project</artifactId>
+ <artifactId>apache-jsieve</artifactId>
<groupId>org.apache.james</groupId>
<version>0.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>apache-jsieve-mailet</artifactId>
@@ -51,7 +51,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve</artifactId>
+ <artifactId>apache-jsieve-core</artifactId>
</dependency>
<dependency>
Modified: james/jsieve/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/main/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/main/pom.xml (original)
+++ james/jsieve/trunk/main/pom.xml Mon Feb 20 13:14:40 2012
@@ -24,13 +24,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>jsieve-project</artifactId>
+ <artifactId>apache-jsieve</artifactId>
<groupId>org.apache.james</groupId>
<version>0.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
- <artifactId>apache-jsieve</artifactId>
+ <artifactId>apache-jsieve-core</artifactId>
<packaging>jar</packaging>
<name>Apache JAMES jSieve</name>
Modified: james/jsieve/trunk/manager/api/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/api/pom.xml (original)
+++ james/jsieve/trunk/manager/api/pom.xml Mon Feb 20 13:14:40 2012
@@ -19,13 +19,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager</artifactId>
+ <relativePath>..</relativePath>
+ <version>0.5-SNAPSHOT</version>
</parent>
- <artifactId>managesieve-api</artifactId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
<packaging>jar</packaging>
</project>
Added: james/jsieve/trunk/manager/api/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/resources/META-INF/MANIFEST.MF?rev=1291240&view=auto
==============================================================================
(empty)
Modified: james/jsieve/trunk/manager/core/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/core/pom.xml (original)
+++ james/jsieve/trunk/manager/core/pom.xml Mon Feb 20 13:14:40 2012
@@ -20,25 +20,26 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
- <artifactId>managesieve-core</artifactId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-api</artifactId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-mock</artifactId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>test</scope>
Added: james/jsieve/trunk/manager/core/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/src/main/resources/META-INF/MANIFEST.MF?rev=1291240&view=auto
==============================================================================
(empty)
Modified: james/jsieve/trunk/manager/jsieve/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/jsieve/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/jsieve/pom.xml (original)
+++ james/jsieve/trunk/manager/jsieve/pom.xml Mon Feb 20 13:14:40 2012
@@ -19,27 +19,28 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
+
<parent>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
- <artifactId>managesieve-jsieve</artifactId>
+ <artifactId>apache-jsieve-manager-jsieve</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-core</artifactId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve</artifactId>
- <version>${jsieve.version}</version>
+ <artifactId>apache-jsieve-core</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
Added: james/jsieve/trunk/manager/jsieve/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/jsieve/src/main/resources/META-INF/MANIFEST.MF?rev=1291240&view=auto
==============================================================================
(empty)
Modified: james/jsieve/trunk/manager/mailet/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mailet/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/mailet/pom.xml (original)
+++ james/jsieve/trunk/manager/mailet/pom.xml Mon Feb 20 13:14:40 2012
@@ -20,18 +20,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve-mailet</artifactId>
+ <artifactId>apache-jsieve-manager-mailet</artifactId>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-core</artifactId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-mock</artifactId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>test</scope>
Added: james/jsieve/trunk/manager/mailet/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mailet/src/main/resources/META-INF/MANIFEST.MF?rev=1291240&view=auto
==============================================================================
(empty)
Modified: james/jsieve/trunk/manager/mock/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mock/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/mock/pom.xml (original)
+++ james/jsieve/trunk/manager/mock/pom.xml Mon Feb 20 13:14:40 2012
@@ -21,17 +21,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>apache-jsieve-manager</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
- <artifactId>managesieve-mock</artifactId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
<packaging>jar</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-api</artifactId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
Added: james/jsieve/trunk/manager/mock/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mock/src/main/resources/META-INF/MANIFEST.MF?rev=1291240&view=auto
==============================================================================
(empty)
Modified: james/jsieve/trunk/manager/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/pom.xml (original)
+++ james/jsieve/trunk/manager/pom.xml Mon Feb 20 13:14:40 2012
@@ -19,11 +19,16 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <artifactId>apache-jsieve-manager</artifactId>
<packaging>pom</packaging>
+ <parent>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>..</relativePath>
+ </parent>
+
<modules>
<module>api</module>
<module>core</module>
@@ -62,7 +67,6 @@
<properties>
<target.jdk>1.6</target.jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <jsieve.version>0.5-SNAPSHOT</jsieve.version>
<commons-io.version>2.1</commons-io.version>
<james-server.version>3.0-beta4-SNAPSHOT</james-server.version>
<mailet.version>2.4</mailet.version>
Modified: james/jsieve/trunk/manager/server/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/server/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/manager/server/pom.xml (original)
+++ james/jsieve/trunk/manager/server/pom.xml Mon Feb 20 13:14:40 2012
@@ -20,12 +20,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.james</groupId>
- <artifactId>managesieve</artifactId>
- <version>0.0.1-SNAPSHOT</version>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>..</relativePath>
</parent>
- <artifactId>managesieve-server</artifactId>
+ <artifactId>apache-jsieve-manager-server</artifactId>
<packaging>jar</packaging>
<dependencies>
@@ -43,7 +44,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>managesieve-core</artifactId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
Added: james/jsieve/trunk/manager/server/src/main/resources/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/server/src/main/resources/META-INF/MANIFEST.MF?rev=1291240&view=auto
==============================================================================
(empty)
Modified: james/jsieve/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Mon Feb 20 13:14:40 2012
@@ -30,7 +30,7 @@
<relativePath></relativePath>
</parent>
- <artifactId>jsieve-project</artifactId>
+ <artifactId>apache-jsieve</artifactId>
<version>0.5-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -43,6 +43,7 @@
<module>main</module>
<module>mailet</module>
<module>util</module>
+ <module>manager</module>
<module>assemble</module>
</modules>
@@ -102,6 +103,11 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
<version>${project.version}</version>
</dependency>
Modified: james/jsieve/trunk/util/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/util/pom.xml?rev=1291240&r1=1291239&r2=1291240&view=diff
==============================================================================
--- james/jsieve/trunk/util/pom.xml (original)
+++ james/jsieve/trunk/util/pom.xml Mon Feb 20 13:14:40 2012
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>jsieve-project</artifactId>
+ <artifactId>apache-jsieve</artifactId>
<groupId>org.apache.james</groupId>
<version>0.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>..</relativePath>
</parent>
<artifactId>apache-jsieve-util</artifactId>
@@ -51,7 +51,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-jsieve</artifactId>
+ <artifactId>apache-jsieve-core</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
