Author: rdonkin
Date: Mon Sep 1 11:34:29 2008
New Revision: 691027
URL: http://svn.apache.org/viewvc?rev=691027&view=rev
Log:
Switch CommandManager from singleton to configured instance. JSIEVE-25
Modified:
james/jsieve/trunk/src/main/java/org/apache/jsieve/CommandManager.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/ConfigurationManager.java
james/jsieve/trunk/src/main/java/org/apache/jsieve/SieveFactory.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/SieveParserVisitorImplQuoteTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.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/ConditionTest.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/NotTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RejectTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.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/StopTest.java
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/TrueTest.java
Modified: james/jsieve/trunk/src/main/java/org/apache/jsieve/CommandManager.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/main/java/org/apache/jsieve/CommandManager.java?rev=691027&r1=691026&r2=691027&view=diff
==============================================================================
--- james/jsieve/trunk/src/main/java/org/apache/jsieve/CommandManager.java
(original)
+++ james/jsieve/trunk/src/main/java/org/apache/jsieve/CommandManager.java Mon
Sep 1 11:34:29 2008
@@ -28,73 +28,15 @@
* configured Command implementation classes.
*/
public class CommandManager {
- /**
- * The sole instance of the receiver.
- */
- static private CommandManager fieldInstance;
+ private final Map commandMap;
+
/**
* Constructor for CommandManager.
*/
- private CommandManager() {
+ public CommandManager(final Map commandMap) {
super();
- }
-
- /**
- * Returns the sole instance of the receiver, lazily initialised if
- * required.
- *
- * @return CommandManager
- */
- public static synchronized CommandManager getInstance() {
- CommandManager instance = null;
- if (null == (instance = getInstanceBasic())) {
- updateInstance();
- return getInstance();
- }
- return instance;
- }
-
- /**
- * Returns the sole instance of the receiver.
- *
- * @return CommandManager
- */
- private static CommandManager getInstanceBasic() {
- return fieldInstance;
- }
-
- /**
- * Computes a new instance of the receiver.
- *
- * @return CommandManager
- */
- protected static CommandManager computeInstance() {
- return new CommandManager();
- }
-
- /**
- * Sets the sole instance of the receiver.
- *
- * @param instance
- * The current instance to set
- */
- protected static void setInstance(CommandManager instance) {
- fieldInstance = instance;
- }
-
- /**
- * Resets the sole instance.
- */
- public static void resetInstance() {
- setInstance(null);
- }
-
- /**
- * Updates the sole instance.
- */
- protected static void updateInstance() {
- setInstance(computeInstance());
+ this.commandMap = commandMap;
}
/**
@@ -194,7 +136,6 @@
* @throws SieveConfigurationException
*/
protected Map getClassNameMap() throws SieveConfigurationException {
- return ConfigurationManager.getInstance().getCommandMap();
+ return commandMap;
}
-
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -281,4 +281,7 @@
return new ComparatorManager(fieldComparatorMap);
}
+ public CommandManager getCommandManager() {
+ return new CommandManager(fieldCommandMap);
+ }
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -85,7 +85,7 @@
public Node parse(InputStream inputStream) throws ParseException {
try {
final SimpleNode node = new SieveParser(inputStream,
"UTF-8").start();
- final CommandManager commandManager = CommandManager.getInstance();
+ final CommandManager commandManager =
ConfigurationManager.getInstance().getCommandManager();
final TestManager testManager = TestManager.getInstance();
SieveValidationVisitor visitor = new
SieveValidationVisitor(commandManager, testManager);
node.jjtAccept(visitor, null);
@@ -129,7 +129,7 @@
*/
public void evaluate(MailAdapter mail, Node startNode)
throws SieveException {
- final CommandManager commandManager = CommandManager.getInstance();
+ final CommandManager commandManager =
ConfigurationManager.getInstance().getCommandManager();
final ComparatorManager comparatorManager =
ConfigurationManager.getInstance().getComparatorManager();
final TestManager testManager = TestManager.getInstance();
final Log log = ConfigurationManager.log;
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -35,7 +35,7 @@
protected void setUp() throws Exception {
super.setUp();
- visitor = new SieveParserVisitorImpl(new
BaseSieveContext(CommandManager.getInstance(),
ConfigurationManager.getInstance().getComparatorManager(),
+ visitor = new SieveParserVisitorImpl(new
BaseSieveContext(ConfigurationManager.getInstance().getCommandManager(),
ConfigurationManager.getInstance().getComparatorManager(),
TestManager.getInstance(),
LogFactory.getLog(SieveParserVisitorImplQuoteTest.class)));
data = new ArrayList();
node = new ASTstring(100);
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java?rev=691027&r1=691026&r2=691027&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/AddressParseTest.java
Mon Sep 1 11:34:29 2008
@@ -23,7 +23,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jsieve.BaseSieveContext;
-import org.apache.jsieve.CommandManager;
import org.apache.jsieve.ConfigurationManager;
import org.apache.jsieve.TestManager;
import org.apache.jsieve.junit.utils.JUnitUtils;
@@ -42,7 +41,7 @@
protected void setUp() throws Exception {
super.setUp();
- context = new BaseSieveContext(CommandManager.getInstance(),
ConfigurationManager.getInstance().getComparatorManager(),
+ context = new
BaseSieveContext(ConfigurationManager.getInstance().getCommandManager(),
ConfigurationManager.getInstance().getComparatorManager(),
TestManager.getInstance(),
LogFactory.getLog(AddressParseTest.class));
mail = (SieveMailAdapter) JUnitUtils.createMail();
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -55,7 +55,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java?rev=691027&r1=691026&r2=691027&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/ConditionTest.java
Mon Sep 1 11:34:29 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -55,7 +55,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -53,7 +53,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -53,7 +53,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -50,7 +50,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
Modified:
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java?rev=691027&r1=691026&r2=691027&view=diff
==============================================================================
---
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
(original)
+++
james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/RequireMissingTest.java
Mon Sep 1 11:34:29 2008
@@ -37,7 +37,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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
Mon Sep 1 11:34:29 2008
@@ -51,7 +51,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -55,7 +55,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
Modified: james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java?rev=691027&r1=691026&r2=691027&view=diff
==============================================================================
--- james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java
(original)
+++ james/jsieve/trunk/src/test/java/org/apache/jsieve/junit/StopTest.java Mon
Sep 1 11:34:29 2008
@@ -54,7 +54,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
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=691027&r1=691026&r2=691027&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 Mon
Sep 1 11:34:29 2008
@@ -52,7 +52,6 @@
*/
protected void setUp() throws Exception {
super.setUp();
- CommandManager.resetInstance();
TestManager.resetInstance();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
