You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by er...@apache.org on 2012/02/14 15:59:05 UTC
svn commit: r1243975 - in /james/jsieve/trunk: assemble/pom.xml
mailet/pom.xml
mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java pom.xml
Author: eric
Date: Tue Feb 14 14:59:04 2012
New Revision: 1243975
URL: http://svn.apache.org/viewvc?rev=1243975&view=rev
Log:
Upgrade jsieve from mime4j-0.6 to mime4j-0.7.2 (JSIEVE-81)
Modified:
james/jsieve/trunk/assemble/pom.xml
james/jsieve/trunk/mailet/pom.xml
james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
james/jsieve/trunk/pom.xml
Modified: james/jsieve/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/assemble/pom.xml?rev=1243975&r1=1243974&r2=1243975&view=diff
==============================================================================
--- james/jsieve/trunk/assemble/pom.xml (original)
+++ james/jsieve/trunk/assemble/pom.xml Tue Feb 14 14:59:04 2012
@@ -70,7 +70,7 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
+ <artifactId>apache-mime4j-core</artifactId>
</dependency>
<dependency>
Modified: james/jsieve/trunk/mailet/pom.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/pom.xml?rev=1243975&r1=1243974&r2=1243975&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/pom.xml (original)
+++ james/jsieve/trunk/mailet/pom.xml Tue Feb 14 14:59:04 2012
@@ -66,7 +66,12 @@
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
+ <artifactId>apache-mime4j-core</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
</dependency>
<dependency>
Modified: james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java?rev=1243975&r1=1243974&r2=1243975&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java (original)
+++ james/jsieve/trunk/mailet/src/main/java/org/apache/jsieve/mailet/SieveMailAdapter.java Tue Feb 14 14:59:04 2012
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.jsieve.mailet;
import java.io.IOException;
import java.util.ArrayList;
@@ -36,10 +35,11 @@ import javax.mail.internet.MimeMessage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.james.mime4j.field.address.AddressList;
-import org.apache.james.mime4j.field.address.Mailbox;
-import org.apache.james.mime4j.field.address.MailboxList;
-import org.apache.james.mime4j.field.address.parser.ParseException;
+import org.apache.james.mime4j.dom.address.AddressList;
+import org.apache.james.mime4j.dom.address.Mailbox;
+import org.apache.james.mime4j.dom.address.MailboxList;
+import org.apache.james.mime4j.dom.field.ParseException;
+import org.apache.james.mime4j.field.address.AddressBuilder;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.exception.InternetAddressException;
import org.apache.jsieve.exception.SieveException;
@@ -393,7 +393,7 @@ public class SieveMailAdapter implements
public Address[] parseAddresses(String arg) throws SieveMailException, InternetAddressException {
try {
- final MailboxList list = AddressList.parse(arg).flatten();
+ final MailboxList list = new AddressList(AddressBuilder.DEFAULT.parseAddressList(arg), true).flatten();
final int size = list.size();
final Address[] results = new Address[size];
for (int i=0;i<size;i++) {
Modified: james/jsieve/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/pom.xml?rev=1243975&r1=1243974&r2=1243975&view=diff
==============================================================================
--- james/jsieve/trunk/pom.xml (original)
+++ james/jsieve/trunk/pom.xml Tue Feb 14 14:59:04 2012
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.8</version>
+ <version>1.9-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
@@ -66,7 +66,6 @@
<properties>
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>src</sourceReleaseAssemblyDescriptor>
-
<!--
The website is committed to subversion. This property can be overriden
to upload the site to a local staging location.
@@ -90,8 +89,8 @@
<james.jsieve.www>${james.www}/jsieve/</james.jsieve.www>
<!-- Overridding this value allows single set of loopback settings to be maintained -->
<james.www.id>jsieve-website</james.www.id>
-
<target.jdk>1.5</target.jdk>
+ <mime4j.version>0.7.2</mime4j.version>
</properties>
<dependencyManagement>
@@ -101,37 +100,36 @@
<artifactId>apache-jsieve</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-util</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.4</version>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<version>1.0</version>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- <version>0.6</version>
+ <artifactId>apache-mime4j-core</artifactId>
+ <version>${mime4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j-dom</artifactId>
+ <version>${mime4j.version}</version>
</dependency>
-
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
@@ -155,34 +153,29 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<version>1.1.0</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>1.4</version>
</dependency>
-
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org