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/08/31 18:11:24 UTC
svn commit: r690717 - in /james/jsieve/trunk/src:
main/java/org/apache/jsieve/ main/java/org/apache/jsieve/commands/
main/java/org/apache/jsieve/comparators/ main/java/org/apache/jsieve/tests/
main/java/org/apache/jsieve/tests/optional/ test/java/org/a...
Author: rdonkin
Date: Sun Aug 31 09:11:23 2008
New Revision: 690717
URL: http://svn.apache.org/viewvc?rev=690717&view=rev
Log:
JSIEVE-28 ConditionManager is no longer a singleton. https://issues.apache.org/jira/browse/JSIEVE-28
Removed:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ConcurrencyTest.java
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java Sun Aug 31 09:11:23 2008
@@ -26,11 +26,14 @@
public class BaseSieveContext extends SieveContext {
private ScriptCoordinate coordinate;
+ private ConditionManager conditionManager;
+
private final CommandStateManager commandStateManager;
public BaseSieveContext()
{
this.commandStateManager = new CommandStateManager();
+ this.conditionManager = new ConditionManager();
}
/**
@@ -57,4 +60,12 @@
return commandStateManager;
}
+ public ConditionManager getConditionManager() {
+ return conditionManager;
+ }
+
+ public void setConditionManager(ConditionManager conditionManager) {
+ this.conditionManager = conditionManager;
+ }
+
}
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java Sun Aug 31 09:11:23 2008
@@ -73,10 +73,10 @@
}
/**
- * @see org.apache.jsieve.Executable#execute(MailAdapter)
+ * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
- public Object execute(MailAdapter mail) throws SieveException {
- return getChildren().execute(mail);
+ public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
+ return getChildren().execute(mail, context);
}
public String toString() {
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java Sun Aug 31 09:11:23 2008
@@ -155,9 +155,9 @@
}
/**
- * @see org.apache.jsieve.Executable#execute(MailAdapter)
+ * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
- public Object execute(MailAdapter mail) throws SieveException {
+ public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
Log log = Logger.getLog();
if (log.isDebugEnabled()) {
log.debug(toString());
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java Sun Aug 31 09:11:23 2008
@@ -23,7 +23,7 @@
import java.util.List;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.mail.*;
+import org.apache.jsieve.mail.MailAdapter;
/**
* <p>
@@ -76,12 +76,12 @@
}
/**
- * @see org.apache.jsieve.Executable#execute(MailAdapter)
+ * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
- public Object execute(MailAdapter mail) throws SieveException {
+ public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
Iterator commandsIter = getChildren().iterator();
while (commandsIter.hasNext())
- ((Executable) commandsIter.next()).execute(mail);
+ ((Executable) commandsIter.next()).execute(mail, context);
return null;
}
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java Sun Aug 31 09:11:23 2008
@@ -24,10 +24,6 @@
* Sieve evaluation.
*/
public class ConditionManager {
- /**
- * The Condition Manager instance for the current thread
- */
- static private final ThreadLocal fieldInstance = new ThreadLocal();
/**
* Is an Else Condition allowed
@@ -42,7 +38,7 @@
/**
* Constructor for ConditionManager.
*/
- private ConditionManager() {
+ public ConditionManager() {
super();
initialize();
}
@@ -149,69 +145,6 @@
}
/**
- * Answers a new instance of the manager.
- *
- * @return ConditionManager
- */
- static protected ConditionManager computeInstance() {
- return new ConditionManager();
- }
-
- /**
- * <p>
- * Returns the conditionManager, lazily intialised if required.
- * </p>
- *
- * <p>
- * Note that this must be synchronized to prevent another thread detecting
- * the null state while this thread is initialising.
- * </p>
- *
- * @return ConditionManager
- */
- static synchronized public ConditionManager getInstance() {
- ConditionManager instance = null;
- if (null == (instance = getInstanceBasic())) {
- updateInstance();
- return getInstance();
- }
- return instance;
- }
-
- /**
- * Returns the current conditionManager.
- *
- * @return ConditionManager
- */
- static private ConditionManager getInstanceBasic() {
- return (ConditionManager) fieldInstance.get();
- }
-
- /**
- * Sets the current conditionManager.
- *
- * @param conditionManager
- * The conditionManager to set
- */
- public static void setInstance(ConditionManager conditionManager) {
- fieldInstance.set(conditionManager);
- }
-
- /**
- * resets the current conditionManager.
- */
- static public void resetInstance() {
- setInstance(null);
- }
-
- /**
- * Updates the current conditionManager.
- */
- static protected void updateInstance() {
- setInstance(computeInstance());
- }
-
- /**
* Returns the testResult.
*
* @return boolean
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java Sun Aug 31 09:11:23 2008
@@ -19,9 +19,6 @@
package org.apache.jsieve;
-import org.apache.commons.logging.Log;
-import org.xml.sax.SAXException;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
@@ -29,6 +26,9 @@
import java.util.Map;
import java.util.Properties;
+import org.apache.commons.logging.Log;
+import org.xml.sax.SAXException;
+
/**
* <p>
* Singleton class <code>ConfigurationManager</code> parses the XML statements
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java Sun Aug 31 09:11:23 2008
@@ -20,12 +20,12 @@
package org.apache.jsieve;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.mail.*;
+import org.apache.jsieve.mail.MailAdapter;
/**
* Interface for an Executable operation.
*/
public interface Executable {
- public Object execute(MailAdapter mail) throws SieveException;
+ public Object execute(MailAdapter mail, SieveContext context) throws SieveException;
}
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java Sun Aug 31 09:11:23 2008
@@ -42,4 +42,9 @@
//TODO: simplify interface
public abstract CommandStateManager getCommandStateManager();
+
+ //TODO: simplify interface
+ public abstract ConditionManager getConditionManager();
+ //TODO: simplify interface
+ public abstract void setConditionManager(final ConditionManager manager);
}
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java Sun Aug 31 09:11:23 2008
@@ -22,10 +22,10 @@
import java.io.InputStream;
import org.apache.commons.logging.Log;
-
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.StopException;
-import org.apache.jsieve.mail.*;
+import org.apache.jsieve.mail.ActionKeep;
+import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.Node;
import org.apache.jsieve.parser.generated.ParseException;
import org.apache.jsieve.parser.generated.SieveParser;
@@ -129,48 +129,38 @@
throws SieveException {
SieveContext context = new BaseSieveContext();
SieveParserVisitor visitor = new SieveParserVisitorImpl(context);
- reset();
try {
- try {
- // Evaluate the Nodes
- startNode.jjtAccept(visitor, mail);
-
- } catch (StopException ex) {
- // Stop is OK
- } catch (SieveException ex) {
- Log log = Logger.getLog();
- if (log.isErrorEnabled())
- log.error("Evaluation failed. Reason: " + ex.getMessage());
- if (log.isDebugEnabled())
- log.debug("Evaluation failed.", ex);
- throw ex;
- }
-
- // If after evaluating all of the nodes or stopping, implicitKeep is
- // still
- // in effect, add a Keep to the list of Actions.
- if (context.getCommandStateManager().isImplicitKeep())
- mail.addAction(new ActionKeep());
-
- // Execute the List of Actions
- try {
- mail.executeActions();
- } catch (SieveException ex) {
- Log log = Logger.getLog();
- if (log.isErrorEnabled())
- log.error("Evaluation failed. Reason: " + ex.getMessage());
- if (log.isDebugEnabled())
- log.debug("Evaluation failed.", ex);
- throw ex;
- }
- } finally {
- // Tidy up managers stored in thread local variables
- reset();
+ // Evaluate the Nodes
+ startNode.jjtAccept(visitor, mail);
+
+ } catch (StopException ex) {
+ // Stop is OK
+ } catch (SieveException ex) {
+ Log log = Logger.getLog();
+ if (log.isErrorEnabled())
+ log.error("Evaluation failed. Reason: " + ex.getMessage());
+ if (log.isDebugEnabled())
+ log.debug("Evaluation failed.", ex);
+ throw ex;
}
- }
- private void reset() {
- ConditionManager.resetInstance();
+ // If after evaluating all of the nodes or stopping, implicitKeep is
+ // still
+ // in effect, add a Keep to the list of Actions.
+ if (context.getCommandStateManager().isImplicitKeep())
+ mail.addAction(new ActionKeep());
+
+ // Execute the List of Actions
+ try {
+ mail.executeActions();
+ } catch (SieveException ex) {
+ Log log = Logger.getLog();
+ if (log.isErrorEnabled())
+ log.error("Evaluation failed. Reason: " + ex.getMessage());
+ if (log.isDebugEnabled())
+ log.debug("Evaluation failed.", ex);
+ throw ex;
+ }
}
/**
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java Sun Aug 31 09:11:23 2008
@@ -24,8 +24,19 @@
import java.util.List;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.mail.*;
-import org.apache.jsieve.parser.generated.*;
+import org.apache.jsieve.mail.MailAdapter;
+import org.apache.jsieve.parser.generated.ASTargument;
+import org.apache.jsieve.parser.generated.ASTarguments;
+import org.apache.jsieve.parser.generated.ASTblock;
+import org.apache.jsieve.parser.generated.ASTcommand;
+import org.apache.jsieve.parser.generated.ASTcommands;
+import org.apache.jsieve.parser.generated.ASTstart;
+import org.apache.jsieve.parser.generated.ASTstring;
+import org.apache.jsieve.parser.generated.ASTstring_list;
+import org.apache.jsieve.parser.generated.ASTtest;
+import org.apache.jsieve.parser.generated.ASTtest_list;
+import org.apache.jsieve.parser.generated.SieveParserVisitor;
+import org.apache.jsieve.parser.generated.SimpleNode;
/**
* <p>
@@ -193,7 +204,7 @@
Block block = new Block(commands);
context.setCoordinate(node.getCoordinate());
// Answer the result of executing the Block
- return block.execute((MailAdapter) data);
+ return block.execute((MailAdapter) data, context);
}
/**
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java Sun Aug 31 09:11:23 2008
@@ -20,10 +20,9 @@
package org.apache.jsieve;
import org.apache.commons.logging.Log;
-
import org.apache.jsieve.exception.LookupException;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.mail.*;
+import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.tests.ExecutableTest;
/**
@@ -48,9 +47,9 @@
private Arguments fieldArguments;
/**
- * @see org.apache.jsieve.Executable#execute(MailAdapter)
+ * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
- public Object execute(MailAdapter mail) throws SieveException {
+ public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
Log log = Logger.getLog();
if (log.isDebugEnabled()) {
log.debug(toString());
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java Sun Aug 31 09:11:23 2008
@@ -24,7 +24,7 @@
import java.util.List;
import org.apache.jsieve.exception.SieveException;
-import org.apache.jsieve.mail.*;
+import org.apache.jsieve.mail.MailAdapter;
/**
* <p>
@@ -71,14 +71,14 @@
}
/**
- * @see org.apache.jsieve.Executable#execute(MailAdapter)
+ * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
- public Object execute(MailAdapter mail) throws SieveException {
+ public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
boolean result = true;
Iterator testsIter = getTests().iterator();
while (result && testsIter.hasNext()) {
- result = ((Boolean) ((Test) testsIter.next()).execute(mail))
+ result = ((Boolean) ((Test) testsIter.next()).execute(mail, context))
.booleanValue();
}
return new Boolean(result);
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java Sun Aug 31 09:11:23 2008
@@ -109,7 +109,7 @@
*
* <p>Also,</p>
*
- * @see org.apache.jsieve.Executable#execute(MailAdapter)
+ * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
*/
public Object execute(MailAdapter mail, Arguments arguments, Block block,
SieveContext context) throws SieveException {
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java Sun Aug 31 09:11:23 2008
@@ -45,22 +45,23 @@
*
* @param mail
* @param block
+ * @param context TODO
* @return Object
* @throws SieveException
*/
- protected Object execute(MailAdapter mail, Block block)
+ protected Object execute(MailAdapter mail, Block block, SieveContext context)
throws SieveException {
// Switch to a new ConditionManager
- ConditionManager oldManager = ConditionManager.getInstance();
- ConditionManager.resetInstance();
+ ConditionManager oldManager = context.getConditionManager();
+ context.setConditionManager(new ConditionManager());
try {
// Execute the Block
- Object result = block.execute(mail);
+ Object result = block.execute(mail, context);
return result;
} finally {
// Always restore the old ConditionManager
- ConditionManager.setInstance(oldManager);
+ context.setConditionManager(oldManager);
}
}
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java Sun Aug 31 09:11:23 2008
@@ -21,7 +21,6 @@
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
-import org.apache.jsieve.ConditionManager;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.MailAdapter;
@@ -52,20 +51,20 @@
protected Object executeBasic(MailAdapter mail, Arguments arguments,
Block block, SieveContext context) throws SieveException {
// Check Syntax
- if (!ConditionManager.getInstance().isElseAllowed())
+ if (!context.getConditionManager().isElseAllowed())
throw context.getCoordinate().commandException(
"Unexpected Command: \"else\".");
// Check Runnable
- if (!ConditionManager.getInstance().isElseRunnable())
+ if (!context.getConditionManager().isElseRunnable())
return Boolean.FALSE;
// Execute the Block
- execute(mail, block);
+ execute(mail, block, context);
// Update the ConditionManager
// 'Else' is always true
- ConditionManager.getInstance().setElseTestResult(true);
+ context.getConditionManager().setElseTestResult(true);
// Return the result
return Boolean.TRUE;
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java Sun Aug 31 09:11:23 2008
@@ -21,7 +21,6 @@
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
-import org.apache.jsieve.ConditionManager;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.TestList;
import org.apache.jsieve.exception.SieveException;
@@ -54,23 +53,23 @@
protected Object executeBasic(MailAdapter mail, Arguments arguments,
Block block, SieveContext context) throws SieveException {
// Check Syntax
- if (!ConditionManager.getInstance().isElsifAllowed())
+ if (!context.getConditionManager().isElsifAllowed())
throw context.getCoordinate().commandException(
"Unexpected Command: \"elsif\".");
// Check Runnable
- if (!ConditionManager.getInstance().isElsifRunnable())
+ if (!context.getConditionManager().isElsifRunnable())
return Boolean.FALSE;
// Run the tests
- Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail);
+ Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail, context);
// If the tests answered TRUE, execute the Block
if (isTestPassed.booleanValue())
- execute(mail, block);
+ execute(mail, block, context);
// Update the ConditionManager
- ConditionManager.getInstance().setElsifTestResult(
+ context.getConditionManager().setElsifTestResult(
isTestPassed.booleanValue());
// Return the result
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java Sun Aug 31 09:11:23 2008
@@ -21,7 +21,6 @@
import org.apache.jsieve.Arguments;
import org.apache.jsieve.Block;
-import org.apache.jsieve.ConditionManager;
import org.apache.jsieve.SieveContext;
import org.apache.jsieve.TestList;
import org.apache.jsieve.exception.SieveException;
@@ -53,23 +52,23 @@
protected Object executeBasic(MailAdapter mail, Arguments arguments,
Block block, SieveContext context) throws SieveException {
// Check Syntax
- if (!ConditionManager.getInstance().isIfAllowed())
+ if (!context.getConditionManager().isIfAllowed())
throw context.getCoordinate().commandException(
"Unexpected Command: \"if\".");
// Check Runnable
- if (!ConditionManager.getInstance().isIfRunnable())
+ if (!context.getConditionManager().isIfRunnable())
return Boolean.FALSE;
// Run the tests
- Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail);
+ Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail, context);
// If the tests answered TRUE, execute the Block
if (isTestPassed.booleanValue())
- execute(mail, block);
+ execute(mail, block, context);
// Update the ConditionManager
- ConditionManager.getInstance().setIfTestResult(
+ context.getConditionManager().setIfTestResult(
isTestPassed.booleanValue());
// Return the result
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java Sun Aug 31 09:11:23 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.comparators;
-import org.apache.jsieve.*;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+
+import org.apache.jsieve.ComparatorManager;
import org.apache.jsieve.exception.LookupException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SievePatternException;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
/**
* Class ComparatorUtils implements utility methods used by Comparators.
*/
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java Sun Aug 31 09:11:23 2008
@@ -48,7 +48,7 @@
boolean result = true;
Iterator testsIter = arguments.getTestList().getTests().iterator();
while (result && testsIter.hasNext()) {
- result = ((Boolean) ((Test) testsIter.next()).execute(mail))
+ result = ((Boolean) ((Test) testsIter.next()).execute(mail, context))
.booleanValue();
}
return result;
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java Sun Aug 31 09:11:23 2008
@@ -48,7 +48,7 @@
boolean result = false;
Iterator testsIter = arguments.getTestList().getTests().iterator();
while (!result && testsIter.hasNext()) {
- result = ((Boolean) ((Test) testsIter.next()).execute(mail))
+ result = ((Boolean) ((Test) testsIter.next()).execute(mail, context))
.booleanValue();
}
return result;
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java Sun Aug 31 09:11:23 2008
@@ -54,7 +54,7 @@
Iterator testsIter = tests.iterator();
while (testsIter.hasNext()) {
result = result
- && ((Boolean) ((Test) testsIter.next()).execute(mail))
+ && ((Boolean) ((Test) testsIter.next()).execute(mail, context))
.booleanValue();
}
return !result;
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java (original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java Sun Aug 31 09:11:23 2008
@@ -19,19 +19,18 @@
package org.apache.jsieve.tests.optional;
-import java.lang.String;
import java.util.List;
import java.util.ListIterator;
-import org.apache.jsieve.SieveContext;
import org.apache.jsieve.Arguments;
-import org.apache.jsieve.TagArgument;
+import org.apache.jsieve.SieveContext;
import org.apache.jsieve.StringListArgument;
-import org.apache.jsieve.tests.AbstractTest;
+import org.apache.jsieve.TagArgument;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.mail.SieveMailException;
+import org.apache.jsieve.tests.AbstractTest;
/**
* This implements a single subset of the 'body' Sieve test as define here:
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java Sun Aug 31 09:11:23 2008
@@ -22,10 +22,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.jsieve.parser.generated.ASTstring;
-
import junit.framework.TestCase;
+import org.apache.jsieve.parser.generated.ASTstring;
+
public class SieveParserVisitorImplQuoteTest extends TestCase {
SieveParserVisitorImpl visitor;
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java Sun Aug 31 09:11:23 2008
@@ -19,18 +19,35 @@
package org.apache.jsieve.javaxmail;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.InternetHeaders;
-import javax.mail.internet.InternetAddress;
-import javax.mail.*;
-import javax.mail.search.SearchTerm;
-import javax.activation.DataHandler;
-import java.util.*;
import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.activation.DataHandler;
+import javax.mail.Address;
+import javax.mail.Flags;
+import javax.mail.Folder;
+import javax.mail.Header;
+import javax.mail.Message;
+import javax.mail.MessagingException;
+import javax.mail.Multipart;
+import javax.mail.Session;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.InternetHeaders;
+import javax.mail.internet.MimeMessage;
+import javax.mail.search.SearchTerm;
/**
* Forked from JAMES server.
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java Sun Aug 31 09:11:23 2008
@@ -27,8 +27,8 @@
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.junit.utils.JUnitUtils;
+import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java Sun Aug 31 09:11:23 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class AllOfTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java Sun Aug 31 09:11:23 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class AnyOfTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java Sun Aug 31 09:11:23 2008
@@ -21,13 +21,15 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
+
import junit.framework.TestCase;
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
+import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java Sun Aug 31 09:11:23 2008
@@ -23,11 +23,11 @@
import java.util.Iterator;
import java.util.Map;
+import junit.framework.TestCase;
+
import org.apache.jsieve.ConfigurationManager;
import org.apache.jsieve.SieveConfigurationException;
-import junit.framework.TestCase;
-
/**
* Class ConfigurationManagerTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java Sun Aug 31 09:11:23 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class DiscardTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java Sun Aug 31 09:11:23 2008
@@ -25,8 +25,8 @@
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.SieveEnvelopeMailAdapter;
import org.apache.jsieve.junit.utils.JUnitUtils;
+import org.apache.jsieve.junit.utils.SieveEnvelopeMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java Sun Aug 31 09:11:23 2008
@@ -21,16 +21,17 @@
import javax.mail.MessagingException;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
+import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class ExistsTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java Sun Aug 31 09:11:23 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class FalseTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java Sun Aug 31 09:11:23 2008
@@ -19,17 +19,17 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionFileInto;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class FileIntoTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java Sun Aug 31 09:11:23 2008
@@ -20,13 +20,15 @@
package org.apache.jsieve.junit;
import javax.mail.MessagingException;
+
import junit.framework.TestCase;
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
+import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java Sun Aug 31 09:11:23 2008
@@ -19,17 +19,17 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionKeep;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class KeepTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java Sun Aug 31 09:11:23 2008
@@ -19,14 +19,14 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class LogTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java Sun Aug 31 09:11:23 2008
@@ -19,11 +19,11 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.MailAdapter;
-import junit.framework.TestCase;
-
public class MultipleRequireTest extends TestCase {
private static final String MINIMAL_SIEVE = "require [\"fileinto\", \"reject\"];\n";
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java Sun Aug 31 09:11:23 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class NotTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java Sun Aug 31 09:11:23 2008
@@ -26,7 +26,7 @@
import org.apache.jsieve.exception.CommandException;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.mail.ActionReject;
import org.apache.jsieve.mail.MailAdapter;
import org.apache.jsieve.parser.generated.ParseException;
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java Sun Aug 31 09:11:23 2008
@@ -25,7 +25,7 @@
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
/**
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java Sun Aug 31 09:11:23 2008
@@ -27,8 +27,8 @@
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.junit.utils.JUnitUtils;
+import org.apache.jsieve.junit.utils.SieveMailAdapter;
import org.apache.jsieve.mail.SieveMailException;
import org.apache.jsieve.parser.generated.ParseException;
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java Sun Aug 31 09:11:23 2008
@@ -19,16 +19,16 @@
package org.apache.jsieve.junit;
+import junit.framework.TestCase;
+
import org.apache.jsieve.CommandManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.exception.SyntaxException;
import org.apache.jsieve.junit.commands.ThrowTestException;
-import org.apache.jsieve.junit.utils.*;
+import org.apache.jsieve.junit.utils.JUnitUtils;
import org.apache.jsieve.parser.generated.ParseException;
-import junit.framework.TestCase;
-
/**
* Class TrueTest
*/
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java Sun Aug 31 09:11:23 2008
@@ -19,11 +19,11 @@
package org.apache.jsieve.junit.comparator;
+import junit.framework.TestCase;
+
import org.apache.jsieve.comparators.ComparatorUtils;
import org.apache.jsieve.exception.SievePatternException;
-import junit.framework.TestCase;
-
public class ComparatorUtilsTest extends TestCase {
public void testMatchesStringString() throws SievePatternException {
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java Sun Aug 31 09:11:23 2008
@@ -21,7 +21,6 @@
package org.apache.jsieve.junit.utils;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
@@ -36,7 +35,6 @@
import javax.mail.internet.MimeMessage;
import org.apache.commons.logging.Log;
-
import org.apache.jsieve.Logger;
import org.apache.jsieve.exception.SieveException;
import org.apache.jsieve.mail.Action;
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java Sun Aug 31 09:11:23 2008
@@ -18,11 +18,11 @@
****************************************************************/
package org.apache.jsieve.parser.address;
+import junit.framework.TestCase;
+
import org.apache.jsieve.mail.MailAdapter.Address;
import org.apache.jsieve.parser.generated.address.ParseException;
-import junit.framework.TestCase;
-
public class SieveAddressBuilderTest extends TestCase {
public static final String DOMAIN = "example.org";
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java Sun Aug 31 09:11:23 2008
@@ -20,7 +20,6 @@
package org.apache.jsieve.util.check;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java Sun Aug 31 09:11:23 2008
@@ -21,10 +21,10 @@
import java.util.List;
-import org.apache.jsieve.javaxmail.MockMimeMessage;
-
import junit.framework.TestCase;
+import org.apache.jsieve.javaxmail.MockMimeMessage;
+
public class ScriptCheckMailAdapterHeadersTest extends TestCase {
private static final String BCC = "Bcc";
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java?rev=690717&r1=690716&r2=690717&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java (original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java Sun Aug 31 09:11:23 2008
@@ -21,14 +21,14 @@
import java.util.Arrays;
+import junit.framework.TestCase;
+
import org.apache.jsieve.mail.Action;
import org.apache.jsieve.mail.ActionFileInto;
import org.apache.jsieve.mail.ActionKeep;
import org.apache.jsieve.mail.ActionRedirect;
import org.apache.jsieve.mail.ActionReject;
-import junit.framework.TestCase;
-
public class ScriptCheckerTestActionsTest extends TestCase {
private static final String REDIRECT_ADDRESS_TWO = "roadrunner@acme.example.org";
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r690717 - in /james/jsieve/trunk/src: main/java/org/apache/jsieve/
main/java/org/apache/jsieve/commands/ main/java/org/apache/jsieve/comparators/
main/java/org/apache/jsieve/tests/ main/java/org/apache/jsieve/tests/optional/
test/java/org/a...
Posted by Stefano Bagnara <ap...@bago.org>.
rdonkin@apache.org ha scritto:
> Author: rdonkin
> Date: Sun Aug 31 09:11:23 2008
> New Revision: 690717
>
> URL: http://svn.apache.org/viewvc?rev=690717&view=rev
> Log:
> JSIEVE-28 ConditionManager is no longer a singleton. https://issues.apache.org/jira/browse/JSIEVE-28
This broke
org.apache.jsieve.junit.commands.ConcurrencyTest.testConditionManagerReset
http://hudson.zones.apache.org/hudson/view/James/job/jsieve-trunk/57/
Stefano
> Removed:
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/commands/ConcurrencyTest.java
> Modified:
> james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java
> james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
> james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/BaseSieveContext.java Sun Aug 31 09:11:23 2008
> @@ -26,11 +26,14 @@
> public class BaseSieveContext extends SieveContext {
>
> private ScriptCoordinate coordinate;
> + private ConditionManager conditionManager;
> +
> private final CommandStateManager commandStateManager;
>
> public BaseSieveContext()
> {
> this.commandStateManager = new CommandStateManager();
> + this.conditionManager = new ConditionManager();
> }
>
> /**
> @@ -57,4 +60,12 @@
> return commandStateManager;
> }
>
> + public ConditionManager getConditionManager() {
> + return conditionManager;
> + }
> +
> + public void setConditionManager(ConditionManager conditionManager) {
> + this.conditionManager = conditionManager;
> + }
> +
> }
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Block.java Sun Aug 31 09:11:23 2008
> @@ -73,10 +73,10 @@
> }
>
> /**
> - * @see org.apache.jsieve.Executable#execute(MailAdapter)
> + * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
> */
> - public Object execute(MailAdapter mail) throws SieveException {
> - return getChildren().execute(mail);
> + public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
> + return getChildren().execute(mail, context);
> }
>
> public String toString() {
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Command.java Sun Aug 31 09:11:23 2008
> @@ -155,9 +155,9 @@
> }
>
> /**
> - * @see org.apache.jsieve.Executable#execute(MailAdapter)
> + * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
> */
> - public Object execute(MailAdapter mail) throws SieveException {
> + public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
> Log log = Logger.getLog();
> if (log.isDebugEnabled()) {
> log.debug(toString());
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Commands.java Sun Aug 31 09:11:23 2008
> @@ -23,7 +23,7 @@
> import java.util.List;
>
> import org.apache.jsieve.exception.SieveException;
> -import org.apache.jsieve.mail.*;
> +import org.apache.jsieve.mail.MailAdapter;
>
> /**
> * <p>
> @@ -76,12 +76,12 @@
> }
>
> /**
> - * @see org.apache.jsieve.Executable#execute(MailAdapter)
> + * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
> */
> - public Object execute(MailAdapter mail) throws SieveException {
> + public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
> Iterator commandsIter = getChildren().iterator();
> while (commandsIter.hasNext())
> - ((Executable) commandsIter.next()).execute(mail);
> + ((Executable) commandsIter.next()).execute(mail, context);
> return null;
> }
>
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/ConditionManager.java Sun Aug 31 09:11:23 2008
> @@ -24,10 +24,6 @@
> * Sieve evaluation.
> */
> public class ConditionManager {
> - /**
> - * The Condition Manager instance for the current thread
> - */
> - static private final ThreadLocal fieldInstance = new ThreadLocal();
>
> /**
> * Is an Else Condition allowed
> @@ -42,7 +38,7 @@
> /**
> * Constructor for ConditionManager.
> */
> - private ConditionManager() {
> + public ConditionManager() {
> super();
> initialize();
> }
> @@ -149,69 +145,6 @@
> }
>
> /**
> - * Answers a new instance of the manager.
> - *
> - * @return ConditionManager
> - */
> - static protected ConditionManager computeInstance() {
> - return new ConditionManager();
> - }
> -
> - /**
> - * <p>
> - * Returns the conditionManager, lazily intialised if required.
> - * </p>
> - *
> - * <p>
> - * Note that this must be synchronized to prevent another thread detecting
> - * the null state while this thread is initialising.
> - * </p>
> - *
> - * @return ConditionManager
> - */
> - static synchronized public ConditionManager getInstance() {
> - ConditionManager instance = null;
> - if (null == (instance = getInstanceBasic())) {
> - updateInstance();
> - return getInstance();
> - }
> - return instance;
> - }
> -
> - /**
> - * Returns the current conditionManager.
> - *
> - * @return ConditionManager
> - */
> - static private ConditionManager getInstanceBasic() {
> - return (ConditionManager) fieldInstance.get();
> - }
> -
> - /**
> - * Sets the current conditionManager.
> - *
> - * @param conditionManager
> - * The conditionManager to set
> - */
> - public static void setInstance(ConditionManager conditionManager) {
> - fieldInstance.set(conditionManager);
> - }
> -
> - /**
> - * resets the current conditionManager.
> - */
> - static public void resetInstance() {
> - setInstance(null);
> - }
> -
> - /**
> - * Updates the current conditionManager.
> - */
> - static protected void updateInstance() {
> - setInstance(computeInstance());
> - }
> -
> - /**
> * Returns the testResult.
> *
> * @return boolean
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java Sun Aug 31 09:11:23 2008
> @@ -19,9 +19,6 @@
>
> package org.apache.jsieve;
>
> -import org.apache.commons.logging.Log;
> -import org.xml.sax.SAXException;
> -
> import java.io.IOException;
> import java.io.InputStream;
> import java.util.Collections;
> @@ -29,6 +26,9 @@
> import java.util.Map;
> import java.util.Properties;
>
> +import org.apache.commons.logging.Log;
> +import org.xml.sax.SAXException;
> +
> /**
> * <p>
> * Singleton class <code>ConfigurationManager</code> parses the XML statements
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Executable.java Sun Aug 31 09:11:23 2008
> @@ -20,12 +20,12 @@
> package org.apache.jsieve;
>
> import org.apache.jsieve.exception.SieveException;
> -import org.apache.jsieve.mail.*;
> +import org.apache.jsieve.mail.MailAdapter;
>
> /**
> * Interface for an Executable operation.
> */
> public interface Executable {
> - public Object execute(MailAdapter mail) throws SieveException;
> + public Object execute(MailAdapter mail, SieveContext context) throws SieveException;
>
> }
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveContext.java Sun Aug 31 09:11:23 2008
> @@ -42,4 +42,9 @@
>
> //TODO: simplify interface
> public abstract CommandStateManager getCommandStateManager();
> +
> + //TODO: simplify interface
> + public abstract ConditionManager getConditionManager();
> + //TODO: simplify interface
> + public abstract void setConditionManager(final ConditionManager manager);
> }
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java Sun Aug 31 09:11:23 2008
> @@ -22,10 +22,10 @@
> import java.io.InputStream;
>
> import org.apache.commons.logging.Log;
> -
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.StopException;
> -import org.apache.jsieve.mail.*;
> +import org.apache.jsieve.mail.ActionKeep;
> +import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.parser.generated.Node;
> import org.apache.jsieve.parser.generated.ParseException;
> import org.apache.jsieve.parser.generated.SieveParser;
> @@ -129,48 +129,38 @@
> throws SieveException {
> SieveContext context = new BaseSieveContext();
> SieveParserVisitor visitor = new SieveParserVisitorImpl(context);
> - reset();
> try {
> - try {
> - // Evaluate the Nodes
> - startNode.jjtAccept(visitor, mail);
> -
> - } catch (StopException ex) {
> - // Stop is OK
> - } catch (SieveException ex) {
> - Log log = Logger.getLog();
> - if (log.isErrorEnabled())
> - log.error("Evaluation failed. Reason: " + ex.getMessage());
> - if (log.isDebugEnabled())
> - log.debug("Evaluation failed.", ex);
> - throw ex;
> - }
> -
> - // If after evaluating all of the nodes or stopping, implicitKeep is
> - // still
> - // in effect, add a Keep to the list of Actions.
> - if (context.getCommandStateManager().isImplicitKeep())
> - mail.addAction(new ActionKeep());
> -
> - // Execute the List of Actions
> - try {
> - mail.executeActions();
> - } catch (SieveException ex) {
> - Log log = Logger.getLog();
> - if (log.isErrorEnabled())
> - log.error("Evaluation failed. Reason: " + ex.getMessage());
> - if (log.isDebugEnabled())
> - log.debug("Evaluation failed.", ex);
> - throw ex;
> - }
> - } finally {
> - // Tidy up managers stored in thread local variables
> - reset();
> + // Evaluate the Nodes
> + startNode.jjtAccept(visitor, mail);
> +
> + } catch (StopException ex) {
> + // Stop is OK
> + } catch (SieveException ex) {
> + Log log = Logger.getLog();
> + if (log.isErrorEnabled())
> + log.error("Evaluation failed. Reason: " + ex.getMessage());
> + if (log.isDebugEnabled())
> + log.debug("Evaluation failed.", ex);
> + throw ex;
> }
> - }
>
> - private void reset() {
> - ConditionManager.resetInstance();
> + // If after evaluating all of the nodes or stopping, implicitKeep is
> + // still
> + // in effect, add a Keep to the list of Actions.
> + if (context.getCommandStateManager().isImplicitKeep())
> + mail.addAction(new ActionKeep());
> +
> + // Execute the List of Actions
> + try {
> + mail.executeActions();
> + } catch (SieveException ex) {
> + Log log = Logger.getLog();
> + if (log.isErrorEnabled())
> + log.error("Evaluation failed. Reason: " + ex.getMessage());
> + if (log.isDebugEnabled())
> + log.debug("Evaluation failed.", ex);
> + throw ex;
> + }
> }
>
> /**
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveParserVisitorImpl.java Sun Aug 31 09:11:23 2008
> @@ -24,8 +24,19 @@
> import java.util.List;
>
> import org.apache.jsieve.exception.SieveException;
> -import org.apache.jsieve.mail.*;
> -import org.apache.jsieve.parser.generated.*;
> +import org.apache.jsieve.mail.MailAdapter;
> +import org.apache.jsieve.parser.generated.ASTargument;
> +import org.apache.jsieve.parser.generated.ASTarguments;
> +import org.apache.jsieve.parser.generated.ASTblock;
> +import org.apache.jsieve.parser.generated.ASTcommand;
> +import org.apache.jsieve.parser.generated.ASTcommands;
> +import org.apache.jsieve.parser.generated.ASTstart;
> +import org.apache.jsieve.parser.generated.ASTstring;
> +import org.apache.jsieve.parser.generated.ASTstring_list;
> +import org.apache.jsieve.parser.generated.ASTtest;
> +import org.apache.jsieve.parser.generated.ASTtest_list;
> +import org.apache.jsieve.parser.generated.SieveParserVisitor;
> +import org.apache.jsieve.parser.generated.SimpleNode;
>
> /**
> * <p>
> @@ -193,7 +204,7 @@
> Block block = new Block(commands);
> context.setCoordinate(node.getCoordinate());
> // Answer the result of executing the Block
> - return block.execute((MailAdapter) data);
> + return block.execute((MailAdapter) data, context);
> }
>
> /**
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/Test.java Sun Aug 31 09:11:23 2008
> @@ -20,10 +20,9 @@
> package org.apache.jsieve;
>
> import org.apache.commons.logging.Log;
> -
> import org.apache.jsieve.exception.LookupException;
> import org.apache.jsieve.exception.SieveException;
> -import org.apache.jsieve.mail.*;
> +import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.tests.ExecutableTest;
>
> /**
> @@ -48,9 +47,9 @@
> private Arguments fieldArguments;
>
> /**
> - * @see org.apache.jsieve.Executable#execute(MailAdapter)
> + * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
> */
> - public Object execute(MailAdapter mail) throws SieveException {
> + public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
> Log log = Logger.getLog();
> if (log.isDebugEnabled()) {
> log.debug(toString());
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/TestList.java Sun Aug 31 09:11:23 2008
> @@ -24,7 +24,7 @@
> import java.util.List;
>
> import org.apache.jsieve.exception.SieveException;
> -import org.apache.jsieve.mail.*;
> +import org.apache.jsieve.mail.MailAdapter;
>
> /**
> * <p>
> @@ -71,14 +71,14 @@
> }
>
> /**
> - * @see org.apache.jsieve.Executable#execute(MailAdapter)
> + * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
> */
> - public Object execute(MailAdapter mail) throws SieveException {
> + public Object execute(MailAdapter mail, SieveContext context) throws SieveException {
> boolean result = true;
>
> Iterator testsIter = getTests().iterator();
> while (result && testsIter.hasNext()) {
> - result = ((Boolean) ((Test) testsIter.next()).execute(mail))
> + result = ((Boolean) ((Test) testsIter.next()).execute(mail, context))
> .booleanValue();
> }
> return new Boolean(result);
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractCommand.java Sun Aug 31 09:11:23 2008
> @@ -109,7 +109,7 @@
> *
> * <p>Also,</p>
> *
> - * @see org.apache.jsieve.Executable#execute(MailAdapter)
> + * @see org.apache.jsieve.Executable#execute(MailAdapter, SieveContext)
> */
> public Object execute(MailAdapter mail, Arguments arguments, Block block,
> SieveContext context) throws SieveException {
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/AbstractConditionalCommand.java Sun Aug 31 09:11:23 2008
> @@ -45,22 +45,23 @@
> *
> * @param mail
> * @param block
> + * @param context TODO
> * @return Object
> * @throws SieveException
> */
> - protected Object execute(MailAdapter mail, Block block)
> + protected Object execute(MailAdapter mail, Block block, SieveContext context)
> throws SieveException {
> // Switch to a new ConditionManager
> - ConditionManager oldManager = ConditionManager.getInstance();
> - ConditionManager.resetInstance();
> + ConditionManager oldManager = context.getConditionManager();
> + context.setConditionManager(new ConditionManager());
>
> try {
> // Execute the Block
> - Object result = block.execute(mail);
> + Object result = block.execute(mail, context);
> return result;
> } finally {
> // Always restore the old ConditionManager
> - ConditionManager.setInstance(oldManager);
> + context.setConditionManager(oldManager);
> }
> }
>
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Else.java Sun Aug 31 09:11:23 2008
> @@ -21,7 +21,6 @@
>
> import org.apache.jsieve.Arguments;
> import org.apache.jsieve.Block;
> -import org.apache.jsieve.ConditionManager;
> import org.apache.jsieve.SieveContext;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.mail.MailAdapter;
> @@ -52,20 +51,20 @@
> protected Object executeBasic(MailAdapter mail, Arguments arguments,
> Block block, SieveContext context) throws SieveException {
> // Check Syntax
> - if (!ConditionManager.getInstance().isElseAllowed())
> + if (!context.getConditionManager().isElseAllowed())
> throw context.getCoordinate().commandException(
> "Unexpected Command: \"else\".");
>
> // Check Runnable
> - if (!ConditionManager.getInstance().isElseRunnable())
> + if (!context.getConditionManager().isElseRunnable())
> return Boolean.FALSE;
>
> // Execute the Block
> - execute(mail, block);
> + execute(mail, block, context);
>
> // Update the ConditionManager
> // 'Else' is always true
> - ConditionManager.getInstance().setElseTestResult(true);
> + context.getConditionManager().setElseTestResult(true);
>
> // Return the result
> return Boolean.TRUE;
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/Elsif.java Sun Aug 31 09:11:23 2008
> @@ -21,7 +21,6 @@
>
> import org.apache.jsieve.Arguments;
> import org.apache.jsieve.Block;
> -import org.apache.jsieve.ConditionManager;
> import org.apache.jsieve.SieveContext;
> import org.apache.jsieve.TestList;
> import org.apache.jsieve.exception.SieveException;
> @@ -54,23 +53,23 @@
> protected Object executeBasic(MailAdapter mail, Arguments arguments,
> Block block, SieveContext context) throws SieveException {
> // Check Syntax
> - if (!ConditionManager.getInstance().isElsifAllowed())
> + if (!context.getConditionManager().isElsifAllowed())
> throw context.getCoordinate().commandException(
> "Unexpected Command: \"elsif\".");
>
> // Check Runnable
> - if (!ConditionManager.getInstance().isElsifRunnable())
> + if (!context.getConditionManager().isElsifRunnable())
> return Boolean.FALSE;
>
> // Run the tests
> - Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail);
> + Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail, context);
>
> // If the tests answered TRUE, execute the Block
> if (isTestPassed.booleanValue())
> - execute(mail, block);
> + execute(mail, block, context);
>
> // Update the ConditionManager
> - ConditionManager.getInstance().setElsifTestResult(
> + context.getConditionManager().setElsifTestResult(
> isTestPassed.booleanValue());
>
> // Return the result
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/commands/If.java Sun Aug 31 09:11:23 2008
> @@ -21,7 +21,6 @@
>
> import org.apache.jsieve.Arguments;
> import org.apache.jsieve.Block;
> -import org.apache.jsieve.ConditionManager;
> import org.apache.jsieve.SieveContext;
> import org.apache.jsieve.TestList;
> import org.apache.jsieve.exception.SieveException;
> @@ -53,23 +52,23 @@
> protected Object executeBasic(MailAdapter mail, Arguments arguments,
> Block block, SieveContext context) throws SieveException {
> // Check Syntax
> - if (!ConditionManager.getInstance().isIfAllowed())
> + if (!context.getConditionManager().isIfAllowed())
> throw context.getCoordinate().commandException(
> "Unexpected Command: \"if\".");
>
> // Check Runnable
> - if (!ConditionManager.getInstance().isIfRunnable())
> + if (!context.getConditionManager().isIfRunnable())
> return Boolean.FALSE;
>
> // Run the tests
> - Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail);
> + Boolean isTestPassed = (Boolean) arguments.getTestList().execute(mail, context);
>
> // If the tests answered TRUE, execute the Block
> if (isTestPassed.booleanValue())
> - execute(mail, block);
> + execute(mail, block, context);
>
> // Update the ConditionManager
> - ConditionManager.getInstance().setIfTestResult(
> + context.getConditionManager().setIfTestResult(
> isTestPassed.booleanValue());
>
> // Return the result
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/comparators/ComparatorUtils.java Sun Aug 31 09:11:23 2008
> @@ -19,14 +19,14 @@
>
> package org.apache.jsieve.comparators;
>
> -import org.apache.jsieve.*;
> +import java.util.regex.Pattern;
> +import java.util.regex.PatternSyntaxException;
> +
> +import org.apache.jsieve.ComparatorManager;
> import org.apache.jsieve.exception.LookupException;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SievePatternException;
>
> -import java.util.regex.Pattern;
> -import java.util.regex.PatternSyntaxException;
> -
> /**
> * Class ComparatorUtils implements utility methods used by Comparators.
> */
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AllOf.java Sun Aug 31 09:11:23 2008
> @@ -48,7 +48,7 @@
> boolean result = true;
> Iterator testsIter = arguments.getTestList().getTests().iterator();
> while (result && testsIter.hasNext()) {
> - result = ((Boolean) ((Test) testsIter.next()).execute(mail))
> + result = ((Boolean) ((Test) testsIter.next()).execute(mail, context))
> .booleanValue();
> }
> return result;
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/AnyOf.java Sun Aug 31 09:11:23 2008
> @@ -48,7 +48,7 @@
> boolean result = false;
> Iterator testsIter = arguments.getTestList().getTests().iterator();
> while (!result && testsIter.hasNext()) {
> - result = ((Boolean) ((Test) testsIter.next()).execute(mail))
> + result = ((Boolean) ((Test) testsIter.next()).execute(mail, context))
> .booleanValue();
> }
> return result;
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/Not.java Sun Aug 31 09:11:23 2008
> @@ -54,7 +54,7 @@
> Iterator testsIter = tests.iterator();
> while (testsIter.hasNext()) {
> result = result
> - && ((Boolean) ((Test) testsIter.next()).execute(mail))
> + && ((Boolean) ((Test) testsIter.next()).execute(mail, context))
> .booleanValue();
> }
> return !result;
>
> Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java (original)
> +++ james/jsieve/trunk/src/main/java/org/apache/jsieve/tests/optional/Body.java Sun Aug 31 09:11:23 2008
> @@ -19,19 +19,18 @@
>
> package org.apache.jsieve.tests.optional;
>
> -import java.lang.String;
> import java.util.List;
> import java.util.ListIterator;
>
> -import org.apache.jsieve.SieveContext;
> import org.apache.jsieve.Arguments;
> -import org.apache.jsieve.TagArgument;
> +import org.apache.jsieve.SieveContext;
> import org.apache.jsieve.StringListArgument;
> -import org.apache.jsieve.tests.AbstractTest;
> +import org.apache.jsieve.TagArgument;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.mail.SieveMailException;
> +import org.apache.jsieve.tests.AbstractTest;
>
> /**
> * This implements a single subset of the 'body' Sieve test as define here:
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java Sun Aug 31 09:11:23 2008
> @@ -22,10 +22,10 @@
> import java.util.ArrayList;
> import java.util.List;
>
> -import org.apache.jsieve.parser.generated.ASTstring;
> -
> import junit.framework.TestCase;
>
> +import org.apache.jsieve.parser.generated.ASTstring;
> +
> public class SieveParserVisitorImplQuoteTest extends TestCase {
>
> SieveParserVisitorImpl visitor;
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/javaxmail/MockMimeMessage.java Sun Aug 31 09:11:23 2008
> @@ -19,18 +19,35 @@
>
> package org.apache.jsieve.javaxmail;
>
> -import javax.mail.internet.MimeMessage;
> -import javax.mail.internet.InternetHeaders;
> -import javax.mail.internet.InternetAddress;
> -import javax.mail.*;
> -import javax.mail.search.SearchTerm;
> -import javax.activation.DataHandler;
> -import java.util.*;
> import java.io.ByteArrayInputStream;
> -import java.io.InputStream;
> import java.io.IOException;
> +import java.io.InputStream;
> import java.io.OutputStream;
> import java.io.UnsupportedEncodingException;
> +import java.util.ArrayList;
> +import java.util.Arrays;
> +import java.util.Collection;
> +import java.util.Collections;
> +import java.util.Date;
> +import java.util.Enumeration;
> +import java.util.HashMap;
> +import java.util.Iterator;
> +import java.util.List;
> +import java.util.Map;
> +
> +import javax.activation.DataHandler;
> +import javax.mail.Address;
> +import javax.mail.Flags;
> +import javax.mail.Folder;
> +import javax.mail.Header;
> +import javax.mail.Message;
> +import javax.mail.MessagingException;
> +import javax.mail.Multipart;
> +import javax.mail.Session;
> +import javax.mail.internet.InternetAddress;
> +import javax.mail.internet.InternetHeaders;
> +import javax.mail.internet.MimeMessage;
> +import javax.mail.search.SearchTerm;
>
> /**
> * Forked from JAMES server.
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressTest.java Sun Aug 31 09:11:23 2008
> @@ -27,8 +27,8 @@
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.junit.utils.JUnitUtils;
> +import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> /**
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AllOfTest.java Sun Aug 31 09:11:23 2008
> @@ -19,16 +19,16 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class AllOfTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AnyOfTest.java Sun Aug 31 09:11:23 2008
> @@ -19,16 +19,16 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class AnyOfTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/BodyTest.java Sun Aug 31 09:11:23 2008
> @@ -21,13 +21,15 @@
>
> import javax.mail.MessagingException;
> import javax.mail.internet.MimeMultipart;
> +
> import junit.framework.TestCase;
>
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> +import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> /**
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConfigurationManagerTest.java Sun Aug 31 09:11:23 2008
> @@ -23,11 +23,11 @@
> import java.util.Iterator;
> import java.util.Map;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.ConfigurationManager;
> import org.apache.jsieve.SieveConfigurationException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class ConfigurationManagerTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/DiscardTest.java Sun Aug 31 09:11:23 2008
> @@ -19,16 +19,16 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class DiscardTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/EnvelopeTest.java Sun Aug 31 09:11:23 2008
> @@ -25,8 +25,8 @@
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.SieveEnvelopeMailAdapter;
> import org.apache.jsieve.junit.utils.JUnitUtils;
> +import org.apache.jsieve.junit.utils.SieveEnvelopeMailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> /**
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ExistsTest.java Sun Aug 31 09:11:23 2008
> @@ -21,16 +21,17 @@
>
> import javax.mail.MessagingException;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> +import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class ExistsTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FalseTest.java Sun Aug 31 09:11:23 2008
> @@ -19,16 +19,16 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class FalseTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/FileIntoTest.java Sun Aug 31 09:11:23 2008
> @@ -19,17 +19,17 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.mail.ActionFileInto;
> import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class FileIntoTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/HeaderTest.java Sun Aug 31 09:11:23 2008
> @@ -20,13 +20,15 @@
> package org.apache.jsieve.junit;
>
> import javax.mail.MessagingException;
> +
> import junit.framework.TestCase;
>
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> +import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> /**
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/KeepTest.java Sun Aug 31 09:11:23 2008
> @@ -19,17 +19,17 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.mail.ActionKeep;
> import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class KeepTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/LogTest.java Sun Aug 31 09:11:23 2008
> @@ -19,14 +19,14 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class LogTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/MultipleRequireTest.java Sun Aug 31 09:11:23 2008
> @@ -19,11 +19,11 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.mail.MailAdapter;
>
> -import junit.framework.TestCase;
> -
> public class MultipleRequireTest extends TestCase {
>
> private static final String MINIMAL_SIEVE = "require [\"fileinto\", \"reject\"];\n";
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/NotTest.java Sun Aug 31 09:11:23 2008
> @@ -19,16 +19,16 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class NotTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java Sun Aug 31 09:11:23 2008
> @@ -26,7 +26,7 @@
> import org.apache.jsieve.exception.CommandException;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.mail.ActionReject;
> import org.apache.jsieve.mail.MailAdapter;
> import org.apache.jsieve.parser.generated.ParseException;
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireTest.java Sun Aug 31 09:11:23 2008
> @@ -25,7 +25,7 @@
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> /**
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/SizeTest.java Sun Aug 31 09:11:23 2008
> @@ -27,8 +27,8 @@
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.junit.utils.JUnitUtils;
> +import org.apache.jsieve.junit.utils.SieveMailAdapter;
> import org.apache.jsieve.mail.SieveMailException;
> import org.apache.jsieve.parser.generated.ParseException;
>
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java Sun Aug 31 09:11:23 2008
> @@ -19,16 +19,16 @@
>
> package org.apache.jsieve.junit;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.CommandManager;
> import org.apache.jsieve.TestManager;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.exception.SyntaxException;
> import org.apache.jsieve.junit.commands.ThrowTestException;
> -import org.apache.jsieve.junit.utils.*;
> +import org.apache.jsieve.junit.utils.JUnitUtils;
> import org.apache.jsieve.parser.generated.ParseException;
>
> -import junit.framework.TestCase;
> -
> /**
> * Class TrueTest
> */
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/comparator/ComparatorUtilsTest.java Sun Aug 31 09:11:23 2008
> @@ -19,11 +19,11 @@
>
> package org.apache.jsieve.junit.comparator;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.comparators.ComparatorUtils;
> import org.apache.jsieve.exception.SievePatternException;
>
> -import junit.framework.TestCase;
> -
> public class ComparatorUtilsTest extends TestCase {
>
> public void testMatchesStringString() throws SievePatternException {
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/utils/SieveMailAdapter.java Sun Aug 31 09:11:23 2008
> @@ -21,7 +21,6 @@
> package org.apache.jsieve.junit.utils;
>
> import java.io.IOException;
> -
> import java.util.ArrayList;
> import java.util.Arrays;
> import java.util.Enumeration;
> @@ -36,7 +35,6 @@
> import javax.mail.internet.MimeMessage;
>
> import org.apache.commons.logging.Log;
> -
> import org.apache.jsieve.Logger;
> import org.apache.jsieve.exception.SieveException;
> import org.apache.jsieve.mail.Action;
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/parser/address/SieveAddressBuilderTest.java Sun Aug 31 09:11:23 2008
> @@ -18,11 +18,11 @@
> ****************************************************************/
> package org.apache.jsieve.parser.address;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.mail.MailAdapter.Address;
> import org.apache.jsieve.parser.generated.address.ParseException;
>
> -import junit.framework.TestCase;
> -
> public class SieveAddressBuilderTest extends TestCase {
>
> public static final String DOMAIN = "example.org";
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapter.java Sun Aug 31 09:11:23 2008
> @@ -20,7 +20,6 @@
> package org.apache.jsieve.util.check;
>
> import java.io.IOException;
> -
> import java.util.ArrayList;
> import java.util.Arrays;
> import java.util.Collections;
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckMailAdapterHeadersTest.java Sun Aug 31 09:11:23 2008
> @@ -21,10 +21,10 @@
>
> import java.util.List;
>
> -import org.apache.jsieve.javaxmail.MockMimeMessage;
> -
> import junit.framework.TestCase;
>
> +import org.apache.jsieve.javaxmail.MockMimeMessage;
> +
> public class ScriptCheckMailAdapterHeadersTest extends TestCase {
> private static final String BCC = "Bcc";
>
>
> Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java
> URL: http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java?rev=690717&r1=690716&r2=690717&view=diff
> ==============================================================================
> --- james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java (original)
> +++ james/jsieve/trunk/src/test/java/org/apache/jsieve/util/check/ScriptCheckerTestActionsTest.java Sun Aug 31 09:11:23 2008
> @@ -21,14 +21,14 @@
>
> import java.util.Arrays;
>
> +import junit.framework.TestCase;
> +
> import org.apache.jsieve.mail.Action;
> import org.apache.jsieve.mail.ActionFileInto;
> import org.apache.jsieve.mail.ActionKeep;
> import org.apache.jsieve.mail.ActionRedirect;
> import org.apache.jsieve.mail.ActionReject;
>
> -import junit.framework.TestCase;
> -
> public class ScriptCheckerTestActionsTest extends TestCase {
>
> private static final String REDIRECT_ADDRESS_TWO = "roadrunner@acme.example.org";
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org