Author: btellier
Date: Sat Oct 24 10:41:58 2015
New Revision: 1710325
URL: http://svn.apache.org/viewvc?rev=1710325&view=rev
Log:
JAMES-1614 Move SieveRepository to data api - contributed by Erwan Guyomarc'h
and Benoit Tellier
Removed:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/DuplicateException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/DuplicateUserException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/IsActiveException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/QuotaExceededException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/QuotaNotFoundException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/ScriptNotFoundException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/ScriptSummary.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/SieveRepository.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/StorageException.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/UserNotFoundException.java
Modified:
james/jsieve/trunk/manager/api/pom.xml
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/DeleteScript.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetActive.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetScript.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/HaveSpace.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/ListScripts.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/PutScript.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/RenameScript.java
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java
james/jsieve/trunk/manager/core/pom.xml
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCore.java
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCoreToLine.java
james/jsieve/trunk/manager/core/src/test/java/org/apache/james/managesieve/core/CoreProcessorTestCase.java
james/jsieve/trunk/manager/mailet/src/main/java/org/apache/james/managesieve/mailet/ManageSieveMailet.java
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
james/jsieve/trunk/manager/mock/pom.xml
james/jsieve/trunk/manager/mock/src/main/java/org/apache/james/managesieve/mock/MockSieveRepository.java
james/jsieve/trunk/manager/pom.xml
Modified: james/jsieve/trunk/manager/api/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/pom.xml?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
--- james/jsieve/trunk/manager/api/pom.xml (original)
+++ james/jsieve/trunk/manager/api/pom.xml Sat Oct 24 10:41:58 2015
@@ -31,4 +31,11 @@
<packaging>bundle</packaging>
<name>Apache James :: jSieve :: Manager API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/DeleteScript.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/DeleteScript.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/DeleteScript.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/DeleteScript.java
Sat Oct 24 10:41:58 2015
@@ -21,8 +21,8 @@
package org.apache.james.managesieve.api.commands;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.IsActiveException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.IsActiveException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
/**
* <code>DeleteScript</code>
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetActive.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetActive.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetActive.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetActive.java
Sat Oct 24 10:41:58 2015
@@ -21,7 +21,8 @@
package org.apache.james.managesieve.api.commands;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.StorageException;
/**
* <code>GetScript</code> is an extension to the commands defined by RFC 5804.
It provides a means
@@ -31,6 +32,6 @@ import org.apache.james.managesieve.api.
*/
public interface GetActive {
- abstract public String getActive() throws AuthenticationRequiredException,
ScriptNotFoundException;
+ abstract public String getActive() throws AuthenticationRequiredException,
ScriptNotFoundException, StorageException;
}
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetScript.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetScript.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetScript.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/GetScript.java
Sat Oct 24 10:41:58 2015
@@ -21,7 +21,8 @@
package org.apache.james.managesieve.api.commands;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.StorageException;
/**
* <code>GetScript</code>
@@ -30,6 +31,6 @@ import org.apache.james.managesieve.api.
*/
public interface GetScript {
- abstract public String getScript(String name) throws
AuthenticationRequiredException, ScriptNotFoundException;
+ abstract public String getScript(String name) throws
AuthenticationRequiredException, ScriptNotFoundException, StorageException;
}
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/HaveSpace.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/HaveSpace.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/HaveSpace.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/HaveSpace.java
Sat Oct 24 10:41:58 2015
@@ -21,7 +21,7 @@
package org.apache.james.managesieve.api.commands;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
/**
* <code>HaveSpace</code>
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/ListScripts.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/ListScripts.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/ListScripts.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/ListScripts.java
Sat Oct 24 10:41:58 2015
@@ -23,7 +23,7 @@ package org.apache.james.managesieve.api
import java.util.List;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.ScriptSummary;
+import org.apache.james.sieverepository.api.ScriptSummary;
/**
* <code>ListScripts</code>
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/PutScript.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/PutScript.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/PutScript.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/PutScript.java
Sat Oct 24 10:41:58 2015
@@ -23,8 +23,8 @@ package org.apache.james.managesieve.api
import java.util.List;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.QuotaExceededException;
import org.apache.james.managesieve.api.SyntaxException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
/**
* <code>PutScript</code>
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/RenameScript.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/RenameScript.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/RenameScript.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/RenameScript.java
Sat Oct 24 10:41:58 2015
@@ -21,8 +21,8 @@
package org.apache.james.managesieve.api.commands;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.DuplicateException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
/**
* <code>RenameScript</code>
Modified:
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java
(original)
+++
james/jsieve/trunk/manager/api/src/main/java/org/apache/james/managesieve/api/commands/SetActive.java
Sat Oct 24 10:41:58 2015
@@ -21,7 +21,7 @@
package org.apache.james.managesieve.api.commands;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
/**
* <code>SetActive</code>
Modified: james/jsieve/trunk/manager/core/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/pom.xml?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
--- james/jsieve/trunk/manager/core/pom.xml (original)
+++ james/jsieve/trunk/manager/core/pom.xml Sat Oct 24 10:41:58 2015
@@ -40,5 +40,9 @@
<artifactId>apache-jsieve-manager-mock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
(original)
+++
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/core/CoreProcessor.java
Sat Oct 24 10:41:58 2015
@@ -25,21 +25,22 @@ import java.util.List;
import java.util.Map;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.DuplicateUserException;
-import org.apache.james.managesieve.api.IsActiveException;
import org.apache.james.managesieve.api.ManageSieveRuntimeException;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.ScriptSummary;
import org.apache.james.managesieve.api.Session;
import org.apache.james.managesieve.api.SieveParser;
-import org.apache.james.managesieve.api.SieveRepository;
-import org.apache.james.managesieve.api.StorageException;
import org.apache.james.managesieve.api.SyntaxException;
-import org.apache.james.managesieve.api.UserNotFoundException;
import org.apache.james.managesieve.api.Session.UserListener;
import org.apache.james.managesieve.api.commands.CoreCommands;
+import org.apache.james.sieverepository.api.exception.DuplicateException;
+import org.apache.james.sieverepository.api.exception.DuplicateUserException;
+import org.apache.james.sieverepository.api.exception.IsActiveException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.ScriptSummary;
+import org.apache.james.sieverepository.api.SieveRepository;
+import org.apache.james.sieverepository.api.exception.SieveRepositoryException;
+import org.apache.james.sieverepository.api.exception.StorageException;
+import org.apache.james.sieverepository.api.exception.UserNotFoundException;
/**
* <code>CoreProcessor</code>
@@ -134,7 +135,7 @@ public class CoreProcessor implements Co
* @see
org.apache.james.managesieve.api.commands.GetScript#getScript(java.lang.String)
*/
public String getScript(String name) throws
AuthenticationRequiredException,
- ScriptNotFoundException {
+ ScriptNotFoundException, StorageException {
authenticationCheck();
String script = null;
try {
@@ -154,7 +155,7 @@ public class CoreProcessor implements Co
authenticationCheck();
try {
_repository.haveSpace(getUser(), name, size);
- } catch (UserNotFoundException ex) {
+ } catch (SieveRepositoryException ex) {
// Should not happen as the UserListener should ensure the session
user is defined in the repository
throw new ManageSieveRuntimeException(ex);
}
@@ -168,7 +169,7 @@ public class CoreProcessor implements Co
List<ScriptSummary> summaries = null;
try {
summaries = _repository.listScripts(getUser());
- } catch (UserNotFoundException ex) {
+ } catch (SieveRepositoryException ex) {
// Should not happen as the UserListener should ensure the session
user is defined in the repository
throw new ManageSieveRuntimeException(ex);
}
@@ -231,18 +232,13 @@ public class CoreProcessor implements Co
return _session.getUser();
}
- protected void ensureUser(String user)
- {
- if (!_repository.hasUser(user))
- {
- try {
+ protected void ensureUser(String user) {
+ try {
+ if (!_repository.hasUser(user)) {
_repository.addUser(user);
- } catch (DuplicateUserException ex) {
- // Should never happen as we checked first!
- throw new ManageSieveRuntimeException(ex);
- } catch (StorageException ex) {
- throw new ManageSieveRuntimeException(ex);
}
+ } catch (SieveRepositoryException ex) {
+ throw new ManageSieveRuntimeException(ex);
}
}
@@ -262,7 +258,7 @@ public class CoreProcessor implements Co
/**
* @see org.apache.james.managesieve.api.commands.GetActive#getActive()
*/
- public String getActive() throws AuthenticationRequiredException,
ScriptNotFoundException {
+ public String getActive() throws AuthenticationRequiredException,
ScriptNotFoundException, StorageException {
authenticationCheck();
String script = null;
Modified:
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCore.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCore.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCore.java
(original)
+++
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCore.java
Sat Oct 24 10:41:58 2015
@@ -28,15 +28,16 @@ import java.util.Scanner;
import org.apache.james.managesieve.api.ArgumentException;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.IsActiveException;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.ScriptSummary;
import org.apache.james.managesieve.api.SyntaxException;
import org.apache.james.managesieve.api.commands.CoreCommands;
import org.apache.james.managesieve.api.commands.Capability.Capabilities;
import org.apache.james.managesieve.util.ParserUtils;
+import org.apache.james.sieverepository.api.exception.DuplicateException;
+import org.apache.james.sieverepository.api.exception.IsActiveException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.ScriptSummary;
+import org.apache.james.sieverepository.api.exception.StorageException;
/**
* <code>LineToCore</code>
@@ -88,8 +89,7 @@ public class LineToCore{
_core.deleteScript(ParserUtils.unquote(scriptName));
}
- public String getScript(String args) throws
AuthenticationRequiredException, ScriptNotFoundException, ArgumentException
- {
+ public String getScript(String args) throws
AuthenticationRequiredException, ScriptNotFoundException, ArgumentException,
StorageException {
String scriptName = ParserUtils.getScriptName(args);
if (null == scriptName || scriptName.isEmpty())
{
@@ -200,8 +200,7 @@ public class LineToCore{
_core.setActive(ParserUtils.unquote(scriptName));
}
- public String getActive(String args) throws
AuthenticationRequiredException, ScriptNotFoundException, ArgumentException
- {
+ public String getActive(String args) throws
AuthenticationRequiredException, ScriptNotFoundException, ArgumentException,
StorageException {
Scanner scanner = new Scanner(args.trim()).useDelimiter("\\A");
if (scanner.hasNext())
{
Modified:
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCoreToLine.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCoreToLine.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCoreToLine.java
(original)
+++
james/jsieve/trunk/manager/core/src/main/java/org/apache/james/managesieve/transcode/LineToCoreToLine.java
Sat Oct 24 10:41:58 2015
@@ -26,13 +26,14 @@ import java.util.Map.Entry;
import org.apache.james.managesieve.api.ArgumentException;
import org.apache.james.managesieve.api.AuthenticationRequiredException;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.IsActiveException;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.ScriptSummary;
import org.apache.james.managesieve.api.SyntaxException;
import org.apache.james.managesieve.api.commands.Capability.Capabilities;
+import org.apache.james.sieverepository.api.exception.DuplicateException;
+import org.apache.james.sieverepository.api.exception.IsActiveException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.ScriptSummary;
+import org.apache.james.sieverepository.api.exception.StorageException;
/**
* <code>LineToCoreToLine</code>
@@ -127,6 +128,8 @@ public class LineToCoreToLine {
return "NO (NONEXISTENT) \"There is no script by that name\"";
} catch (ArgumentException ex) {
return "NO \"" + ex.getMessage() + "\"";
+ } catch (StorageException ex) {
+ return "NO \"" + ex.getMessage() + "\"";
}
StringBuilder builder = new StringBuilder(content);
builder
@@ -243,6 +246,8 @@ public class LineToCoreToLine {
return "NO (NONEXISTENT) \"" + ex.getMessage() + "\"";
} catch (ArgumentException ex) {
return "NO \"" + ex.getMessage() + "\"";
+ } catch (StorageException ex) {
+ return "NO \"" + ex.getMessage() + "\"";
}
StringBuilder builder = new StringBuilder(content);
builder
Modified:
james/jsieve/trunk/manager/core/src/test/java/org/apache/james/managesieve/core/CoreProcessorTestCase.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/core/src/test/java/org/apache/james/managesieve/core/CoreProcessorTestCase.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/core/src/test/java/org/apache/james/managesieve/core/CoreProcessorTestCase.java
(original)
+++
james/jsieve/trunk/manager/core/src/test/java/org/apache/james/managesieve/core/CoreProcessorTestCase.java
Sat Oct 24 10:41:58 2015
@@ -20,11 +20,18 @@
package org.apache.james.managesieve.core;
-import org.apache.james.managesieve.api.*;
+import org.apache.james.managesieve.api.AuthenticationRequiredException;
+import org.apache.james.managesieve.api.SyntaxException;
import org.apache.james.managesieve.api.commands.Capability.Capabilities;
import org.apache.james.managesieve.mock.MockSession;
import org.apache.james.managesieve.mock.MockSieveParser;
import org.apache.james.managesieve.mock.MockSieveRepository;
+import org.apache.james.sieverepository.api.exception.IsActiveException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.ScriptSummary;
+import org.apache.james.sieverepository.api.exception.StorageException;
+import org.apache.james.sieverepository.api.exception.UserNotFoundException;
import org.junit.Before;
import org.junit.Test;
@@ -175,9 +182,17 @@ public class CoreProcessorTestCase {
session.setAuthentication(true);
session.setUser("test");
try {
+ System.out.println("hello");
core.getScript("script");
+ System.out.println("yop yop");
} catch (ScriptNotFoundException ex) {
+ System.out.println("toto");
success = true;
+ ex.printStackTrace();
+ } catch (Exception e) {
+ System.out.println("Euh ... ");
+ e.printStackTrace();
+ System.out.println("Yolo");
}
assertTrue("Expected ScriptNotFoundException", success);
Modified:
james/jsieve/trunk/manager/mailet/src/main/java/org/apache/james/managesieve/mailet/ManageSieveMailet.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mailet/src/main/java/org/apache/james/managesieve/mailet/ManageSieveMailet.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/mailet/src/main/java/org/apache/james/managesieve/mailet/ManageSieveMailet.java
(original)
+++
james/jsieve/trunk/manager/mailet/src/main/java/org/apache/james/managesieve/mailet/ManageSieveMailet.java
Sat Oct 24 10:41:58 2015
@@ -30,13 +30,13 @@ import javax.inject.Inject;
import javax.mail.MessagingException;
import org.apache.james.managesieve.api.SieveParser;
-import org.apache.james.managesieve.api.SieveRepository;
import org.apache.james.managesieve.core.CoreProcessor;
import org.apache.james.managesieve.mailet.transcode.MessageToCoreToMessage;
import
org.apache.james.managesieve.mailet.transcode.MessageToCoreToMessage.HelpProvider;
import org.apache.james.managesieve.transcode.LineToCore;
import org.apache.james.managesieve.transcode.LineToCoreToLine;
import org.apache.james.managesieve.util.SettableSession;
+import org.apache.james.sieverepository.api.SieveRepository;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.base.GenericMailet;
Modified:
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
(original)
+++
james/jsieve/trunk/manager/mailet/src/test/java/org/apache/james/managesieve/mailet/ManageSieveMailetTestCase.java
Sat Oct 24 10:41:58 2015
@@ -20,14 +20,14 @@
package org.apache.james.managesieve.mailet;
-import org.apache.james.managesieve.api.DuplicateUserException;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.SieveRepository;
-import org.apache.james.managesieve.api.StorageException;
-import org.apache.james.managesieve.api.UserNotFoundException;
import org.apache.james.managesieve.mock.MockSieveParser;
import org.apache.james.managesieve.mock.MockSieveRepository;
+import org.apache.james.sieverepository.api.exception.DuplicateUserException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.SieveRepository;
+import org.apache.james.sieverepository.api.exception.StorageException;
+import org.apache.james.sieverepository.api.exception.UserNotFoundException;
import org.apache.mailet.Mail;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -155,7 +155,7 @@ public class ManageSieveMailetTestCase {
}
@Test
- public final void testPutScript() throws MessagingException, IOException,
UserNotFoundException, ScriptNotFoundException {
+ public final void testPutScript() throws MessagingException, IOException,
UserNotFoundException, ScriptNotFoundException, StorageException {
MimeMessage message = new MimeMessage(Session.getDefaultInstance(new
Properties()));
String scriptName = "scriptName";
String scriptContent = "scriptContent";
Modified: james/jsieve/trunk/manager/mock/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mock/pom.xml?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
--- james/jsieve/trunk/manager/mock/pom.xml (original)
+++ james/jsieve/trunk/manager/mock/pom.xml Sat Oct 24 10:41:58 2015
@@ -36,5 +36,9 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ </dependency>
</dependencies>
</project>
Modified:
james/jsieve/trunk/manager/mock/src/main/java/org/apache/james/managesieve/mock/MockSieveRepository.java
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/mock/src/main/java/org/apache/james/managesieve/mock/MockSieveRepository.java?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
---
james/jsieve/trunk/manager/mock/src/main/java/org/apache/james/managesieve/mock/MockSieveRepository.java
(original)
+++
james/jsieve/trunk/manager/mock/src/main/java/org/apache/james/managesieve/mock/MockSieveRepository.java
Sat Oct 24 10:41:58 2015
@@ -20,6 +20,17 @@
package org.apache.james.managesieve.mock;
+import org.apache.james.sieverepository.api.exception.DuplicateException;
+import org.apache.james.sieverepository.api.exception.DuplicateUserException;
+import org.apache.james.sieverepository.api.exception.IsActiveException;
+import org.apache.james.sieverepository.api.exception.QuotaExceededException;
+import org.apache.james.sieverepository.api.exception.QuotaNotFoundException;
+import org.apache.james.sieverepository.api.exception.ScriptNotFoundException;
+import org.apache.james.sieverepository.api.ScriptSummary;
+import org.apache.james.sieverepository.api.SieveRepository;
+import org.apache.james.sieverepository.api.exception.StorageException;
+import org.apache.james.sieverepository.api.exception.UserNotFoundException;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -27,16 +38,6 @@ import java.util.Map;
import java.util.Set;
import java.util.Map.Entry;
-import org.apache.james.managesieve.api.DuplicateException;
-import org.apache.james.managesieve.api.DuplicateUserException;
-import org.apache.james.managesieve.api.IsActiveException;
-import org.apache.james.managesieve.api.QuotaExceededException;
-import org.apache.james.managesieve.api.QuotaNotFoundException;
-import org.apache.james.managesieve.api.ScriptNotFoundException;
-import org.apache.james.managesieve.api.ScriptSummary;
-import org.apache.james.managesieve.api.SieveRepository;
-import org.apache.james.managesieve.api.StorageException;
-import org.apache.james.managesieve.api.UserNotFoundException;
/**
* <code>MockSieveRepository</code>
@@ -121,7 +122,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#addUser(java.lang.String)
+ * @see SieveRepository#addUser(java.lang.String)
*/
public void addUser(String user) throws DuplicateUserException,
StorageException {
if (_repository.containsKey(user))
@@ -132,7 +133,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#deleteScript(java.lang.String,
java.lang.String)
+ * @see SieveRepository#deleteScript(java.lang.String, java.lang.String)
*/
public void deleteScript(String user, String name) throws
UserNotFoundException,
ScriptNotFoundException, IsActiveException, StorageException {
@@ -153,7 +154,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#getActive(java.lang.String)
+ * @see SieveRepository#getActive(java.lang.String)
*/
public String getActive(String user) throws UserNotFoundException,
ScriptNotFoundException {
if (!_repository.containsKey(user))
@@ -178,7 +179,7 @@ public class MockSieveRepository impleme
}
/**
- * @see org.apache.james.managesieve.api.SieveRepository#getQuota()
+ * @see SieveRepository#getQuota()
*/
public long getQuota() throws QuotaNotFoundException {
// TODO Auto-generated method stub
@@ -186,7 +187,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#getQuota(java.lang.String)
+ * @see SieveRepository#getQuota(java.lang.String)
*/
public long getQuota(String user) throws UserNotFoundException,
QuotaNotFoundException {
// TODO Auto-generated method stub
@@ -194,7 +195,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#getScript(java.lang.String,
java.lang.String)
+ * @see SieveRepository#getScript(java.lang.String, java.lang.String)
*/
public String getScript(String user, String name) throws
UserNotFoundException,
ScriptNotFoundException {
@@ -211,7 +212,7 @@ public class MockSieveRepository impleme
}
/**
- * @see org.apache.james.managesieve.api.SieveRepository#hasQuota()
+ * @see SieveRepository#hasQuota()
*/
public boolean hasQuota() {
// TODO Auto-generated method stub
@@ -219,7 +220,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#hasQuota(java.lang.String)
+ * @see SieveRepository#hasQuota(java.lang.String)
*/
public boolean hasQuota(String user) throws UserNotFoundException {
// TODO Auto-generated method stub
@@ -227,14 +228,14 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#hasUser(java.lang.String)
+ * @see SieveRepository#hasUser(java.lang.String)
*/
public boolean hasUser(String user) {
return _repository.containsKey(user);
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#haveSpace(java.lang.String,
java.lang.String, long)
+ * @see SieveRepository#haveSpace(java.lang.String, java.lang.String, long)
*/
public void haveSpace(String user, String name, long size) throws
UserNotFoundException,
QuotaExceededException {
@@ -245,7 +246,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#listScripts(java.lang.String)
+ * @see SieveRepository#listScripts(java.lang.String)
*/
public List<ScriptSummary> listScripts(String user) throws
UserNotFoundException {
if (!_repository.containsKey(user))
@@ -261,7 +262,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#putScript(java.lang.String,
java.lang.String, java.lang.String)
+ * @see SieveRepository#putScript(java.lang.String, java.lang.String,
java.lang.String)
*/
public void putScript(String user, String name, String content) throws
UserNotFoundException,
StorageException, QuotaExceededException {
@@ -274,7 +275,7 @@ public class MockSieveRepository impleme
}
/**
- * @see org.apache.james.managesieve.api.SieveRepository#removeQuota()
+ * @see SieveRepository#removeQuota()
*/
public void removeQuota() throws QuotaNotFoundException, StorageException {
// TODO Auto-generated method stub
@@ -282,7 +283,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#removeQuota(java.lang.String)
+ * @see SieveRepository#removeQuota(java.lang.String)
*/
public void removeQuota(String user) throws UserNotFoundException,
QuotaNotFoundException,
StorageException {
@@ -291,7 +292,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#removeUser(java.lang.String)
+ * @see SieveRepository#removeUser(java.lang.String)
*/
public void removeUser(String user) throws UserNotFoundException,
StorageException {
// TODO Auto-generated method stub
@@ -299,7 +300,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#renameScript(java.lang.String,
java.lang.String, java.lang.String)
+ * @see SieveRepository#renameScript(java.lang.String, java.lang.String,
java.lang.String)
*/
public void renameScript(String user, String oldName, String newName)
throws UserNotFoundException, ScriptNotFoundException,
@@ -309,7 +310,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#setActive(java.lang.String,
java.lang.String)
+ * @see SieveRepository#setActive(java.lang.String, java.lang.String)
*/
public void setActive(String user, String name) throws
UserNotFoundException,
ScriptNotFoundException, StorageException {
@@ -350,7 +351,7 @@ public class MockSieveRepository impleme
}
/**
- * @see org.apache.james.managesieve.api.SieveRepository#setQuota(long)
+ * @see SieveRepository#setQuota(long)
*/
public void setQuota(long quota) throws StorageException {
// TODO Auto-generated method stub
@@ -358,7 +359,7 @@ public class MockSieveRepository impleme
}
/**
- * @see
org.apache.james.managesieve.api.SieveRepository#setQuota(java.lang.String,
long)
+ * @see SieveRepository#setQuota(java.lang.String, long)
*/
public void setQuota(String user, long quota) throws
UserNotFoundException, StorageException {
// TODO Auto-generated method stub
Modified: james/jsieve/trunk/manager/pom.xml
URL:
http://svn.apache.org/viewvc/james/jsieve/trunk/manager/pom.xml?rev=1710325&r1=1710324&r2=1710325&view=diff
==============================================================================
--- james/jsieve/trunk/manager/pom.xml (original)
+++ james/jsieve/trunk/manager/pom.xml Sat Oct 24 10:41:58 2015
@@ -41,4 +41,14 @@
<module>mock</module>
</modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-data-api</artifactId>
+ <version>3.0.0-beta5-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
