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 rd...@apache.org on 2008/11/16 20:29:03 UTC
svn commit: r718084 - in /james/server/trunk: ./ build-tools/
imapserver-function/src/main/java/org/apache/james/imapserver/sieve/
stage/org.apache.james/jars/
Author: rdonkin
Date: Sun Nov 16 11:29:03 2008
New Revision: 718084
URL: http://svn.apache.org/viewvc?rev=718084&view=rev
Log:
Updated to latest repackage jsieve
Added:
james/server/trunk/stage/org.apache.james/jars/apache-jsieve-0.3-SNAPSHOT.jar (with props)
james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar (with props)
Removed:
james/server/trunk/stage/org.apache.james/jars/apache-jsieve-0.2.jar
Modified:
james/server/trunk/build-tools/common-build.xml
james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java
james/server/trunk/include.properties
Modified: james/server/trunk/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/common-build.xml?rev=718084&r1=718083&r2=718084&view=diff
==============================================================================
--- james/server/trunk/build-tools/common-build.xml (original)
+++ james/server/trunk/build-tools/common-build.xml Sun Nov 16 11:29:03 2008
@@ -221,6 +221,7 @@
<include name="${commons-lang.jar}"/>
<include name="${commons-configuration.jar}"/>
<include name="${jsieve.jar}"/>
+ <include name="${jsieve-mailet.jar}"/>
<include name="${mailet.jar}"/>
<include name="${base-mailet.jar}"/>
<include name="${std-mailet.jar}"/>
Modified: james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java
URL: http://svn.apache.org/viewvc/james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java?rev=718084&r1=718083&r2=718084&view=diff
==============================================================================
--- james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java (original)
+++ james/server/trunk/imapserver-function/src/main/java/org/apache/james/imapserver/sieve/PosterMailboxAdapter.java Sun Nov 16 11:29:03 2008
@@ -22,12 +22,13 @@
import java.util.Date;
import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
import org.apache.james.mailboxmanager.MailboxSession;
import org.apache.james.mailboxmanager.mailbox.Mailbox;
import org.apache.james.mailboxmanager.manager.MailboxManager;
import org.apache.james.mailboxmanager.manager.MailboxManagerProvider;
-import org.apache.mailet.Mail;
+import org.apache.jsieve.mailet.Poster;
/**
* This is just an experimental example.
@@ -36,7 +37,7 @@
*
* Temporarily removed "Poster" to avoid function-to-function dependency.
*/
-public class PosterMailboxAdapter { // implements Poster {
+public class PosterMailboxAdapter implements Poster {
private final MailboxManagerProvider mailboxManagerProvider;
@@ -48,7 +49,7 @@
this.mailboxManagerProvider = mailboxManagerProvider;
}
- public void post(String url, Mail mail)throws MessagingException {
+ public void post(String url, MimeMessage mail)throws MessagingException {
final int endOfScheme = url.indexOf(':');
if (endOfScheme < 0) {
throw new MessagingException("Malformed URI");
@@ -91,7 +92,7 @@
}
- public void postToMailbox(String username, Mail mail, String destination) throws MessagingException {
+ public void postToMailbox(String username, MimeMessage mail, String destination) throws MessagingException {
final String name = mailboxManagerProvider.getMailboxManager().resolve(username, "INBOX");
final MailboxManager mailboxManager = mailboxManagerProvider.getMailboxManager();
final MailboxSession session = mailboxManager.createSession();
@@ -104,7 +105,7 @@
+ " was not found on this server.";
throw new MessagingException(error);
}
- mailbox.appendMessage(mail.getMessage(), new Date(), null, session);
+ mailbox.appendMessage(mail, new Date(), null, session);
}
finally
{
Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=718084&r1=718083&r2=718084&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Sun Nov 16 11:29:03 2008
@@ -256,8 +256,10 @@
javax.management=${path.lib.mx4j}/${jarname.javax.management}
# ----- sieve-----
-jarname.jsieve.jar=apache-jsieve-0.2.jar
+jarname.jsieve.jar=apache-jsieve-0.3-SNAPSHOT.jar
jsieve.jar=${path.lib.james}/${jarname.jsieve.jar}
+jarname.jsieve-mailet.jar=apache-jsieve-mailet-0.3-SNAPSHOT.jar
+jsieve-mailet.jar=${path.lib.james}/${jarname.jsieve-mailet.jar}
jarname.commons-digester.jar=commons-digester-1.8.jar
commons-digester.jar=${path.lib.commonsdigester}/${jarname.commons-digester.jar}
Added: james/server/trunk/stage/org.apache.james/jars/apache-jsieve-0.3-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-jsieve-0.3-SNAPSHOT.jar?rev=718084&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/apache-jsieve-0.3-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar?rev=718084&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.apache.james/jars/apache-jsieve-mailet-0.3-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org