svn commit: r1237050 [3/3] - in /james/mailbox/trunk: ./ api/src/main/java/org/apache/james/mailbox/ api/src/test/java/org/apache/james/mailbox/ hbase/src/main/java/org/apache/james/mailbox/hbase/ hba
Modified:
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java?rev=1237050r1=1237049r2=1237050view=diff
==
---
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
(original)
+++
james/mailbox/trunk/jpa/src/main/java/org/apache/james/mailbox/jpa/openjpa/OpenJPAMessageManager.java
Sat Jan 28 11:56:55 2012
@@ -24,6 +24,8 @@ import java.util.Date;
import javax.mail.Flags;
import javax.mail.internet.SharedInputStream;
+import org.apache.james.mailbox.MailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxPathLocker;
import org.apache.james.mailbox.jpa.JPAMessageManager;
@@ -51,13 +53,13 @@ public class OpenJPAMessageManager exten
}
public OpenJPAMessageManager(MailboxSessionMapperFactoryLong
mapperFactory, MessageSearchIndexLong index,
-MailboxEventDispatcherLong dispatcher, MailboxPathLocker locker,
MailboxLong mailbox) throws MailboxException {
-this(mapperFactory, index, dispatcher, locker, mailbox,
AdvancedFeature.None);
+MailboxEventDispatcherLong dispatcher, MailboxPathLocker locker,
MailboxLong mailbox, MailboxACLResolver aclResolver, GroupMembershipResolver
groupMembershipResolver) throws MailboxException {
+this(mapperFactory, index, dispatcher, locker, mailbox,
AdvancedFeature.None, aclResolver, groupMembershipResolver);
}
public OpenJPAMessageManager(MailboxSessionMapperFactoryLong
mapperFactory, MessageSearchIndexLong index,
-MailboxEventDispatcherLong dispatcher, MailboxPathLocker locker,
MailboxLong mailbox, final AdvancedFeature f) throws MailboxException {
-super(mapperFactory, index, dispatcher, locker, mailbox);
+MailboxEventDispatcherLong dispatcher, MailboxPathLocker locker,
MailboxLong mailbox, final AdvancedFeature f, MailboxACLResolver aclResolver,
GroupMembershipResolver groupMembershipResolver) throws MailboxException {
+super(mapperFactory, index, dispatcher, locker, mailbox, aclResolver,
groupMembershipResolver);
this.feature = f;
}
Modified:
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java?rev=1237050r1=1237049r2=1237050view=diff
==
---
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
(original)
+++
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
Sat Jan 28 11:56:55 2012
@@ -23,9 +23,13 @@ import java.util.HashMap;
import javax.persistence.EntityManagerFactory;
import org.apache.james.mailbox.BadCredentialsException;
+import org.apache.james.mailbox.MailboxACLResolver;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.AbstractMailboxManagerTest;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
import org.apache.james.mailbox.jpa.mail.JPAModSeqProvider;
import org.apache.james.mailbox.jpa.mail.JPAUidProvider;
import org.apache.james.mailbox.jpa.mail.model.JPAMailbox;
@@ -99,7 +103,10 @@ public class JPAMailboxManagerTest exten
JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
JPAMailboxSessionMapperFactory mf = new
JPAMailboxSessionMapperFactory(entityManagerFactory, new JPAUidProvider(locker,
entityManagerFactory), new JPAModSeqProvider(locker, entityManagerFactory));
-JPAMailboxManager mailboxManager = new OpenJPAMailboxManager(mf, null);
+MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
+
+JPAMailboxManager mailboxManager = new OpenJPAMailboxManager(mf, null,
aclResolver, groupMembershipResolver);
mailboxManager.init();
setMailboxManager(mailboxManager);
Modified:
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAStressTest.java?rev=1237050r1=1237049r2=1237050view=diff
==
---
[jira] [Resolved] (MAILBOX-154) Add ACL support
[ https://issues.apache.org/jira/browse/MAILBOX-154?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Norman Maurer resolved MAILBOX-154. --- Resolution: Fixed Fix Version/s: 0.4 Add ACL support --- Key: MAILBOX-154 URL: https://issues.apache.org/jira/browse/MAILBOX-154 Project: James Mailbox Issue Type: New Feature Affects Versions: 0.3 Reporter: Norman Maurer Assignee: Norman Maurer Fix For: 0.4 -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1237058 - in /james/imap/trunk: api/src/main/java/org/apache/james/imap/api/ message/src/main/java/org/apache/james/imap/decode/parser/ message/src/main/java/org/apache/james/imap/encode/
Author: norman
Date: Sat Jan 28 13:33:34 2012
New Revision: 1237058
URL: http://svn.apache.org/viewvc?rev=1237058view=rev
Log:
Add support for ACL extension. Thanks to Jochen Gazda for the patch.See IMAP-351
Added:
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
(with props)
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/ACLResponseEncoder.java
(with props)
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/request/GetACLRequest.java
(with props)
james/imap/trunk/message/src/main/java/org/apache/james/imap/message/response/ACLResponse.java
(with props)
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/GetACLProcessor.java
(with props)
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/GetACLProcessorTest.java
(with props)
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/StatusResponseTypeMatcher.java
(with props)
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/ImapParserFactory.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/encode/main/DefaultImapEncoderFactory.java
james/imap/trunk/processor/src/main/java/org/apache/james/imap/processor/DefaultProcessorChain.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java?rev=1237058r1=1237057r2=1237058view=diff
==
---
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
(original)
+++
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapConstants.java
Sat Jan 28 13:33:34 2012
@@ -103,6 +103,8 @@ public interface ImapConstants {
public static final String SUPPORTS_QRESYNC = QRESYNC;
+public static final String SUPPORTS_ACL = ACL;
+
public static final String INBOX_NAME = INBOX;
public static final String MIME_TYPE_TEXT = TEXT;
@@ -212,6 +214,16 @@ public interface ImapConstants {
public static final String APPEND_COMMAND_NAME = APPEND;
public static final String ENABLE_COMMAND_NAME = ENABLE;
+
+public static final String GETACL_COMMAND_NAME = GETACL;
+
+public static final String SETACL_COMMAND_NAME = SETACL;
+
+public static final String DELETEACL_COMMAND_NAME = DELETEACL;
+
+public static final String LISTRIGHTS_COMMAND_NAME = LISTRIGHTS;
+
+public static final String MYRIGHTS_COMMAND_NAME = MYRIGHTS;
public static final String LIST_RESPONSE_NAME = LIST;
@@ -221,6 +233,8 @@ public interface ImapConstants {
public static final String SEARCH_RESPONSE_NAME = SEARCH;
+public static final String ACL_RESPONSE_NAME = ACL;
+
public static final String NAME_ATTRIBUTE_NOINFERIORS = \\Noinferiors;
public static final String NAME_ATTRIBUTE_NOSELECT = \\Noselect;
Added:
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java?rev=1237058view=auto
==
---
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
(added)
+++
james/imap/trunk/message/src/main/java/org/apache/james/imap/decode/parser/GetACLCommandParser.java
Sat Jan 28 13:33:34 2012
@@ -0,0 +1,48 @@
+/
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information*
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the*
+ * License); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the*
+ * specific language governing permissions and limitations *
+ *
svn commit: r1237059 - /james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Author: norman
Date: Sat Jan 28 13:37:41 2012
New Revision: 1237059
URL: http://svn.apache.org/viewvc?rev=1237059view=rev
Log:
Adjust for latest mailbox code changes. See MAILBOX-151
Modified:
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Modified:
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java?rev=1237059r1=1237058r2=1237059view=diff
==
---
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
(original)
+++
james/server/trunk/protocols-pop3/src/test/java/org/apache/james/pop3server/POP3ServerTest.java
Sat Jan 28 13:37:41 2012
@@ -34,11 +34,15 @@ import org.apache.commons.net.pop3.POP3C
import org.apache.commons.net.pop3.POP3MessageInfo;
import org.apache.commons.net.pop3.POP3Reply;
import org.apache.james.filesystem.api.mock.MockFileSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
import org.apache.james.mailbox.MailboxConstants;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxPath;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.Authenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
@@ -110,7 +114,8 @@ public class POP3ServerTest extends Test
chain.put(usersrepository, m_usersRepository);
InMemoryMailboxSessionMapperFactory factory = new
InMemoryMailboxSessionMapperFactory();
-
+MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
manager = new StoreMailboxManagerLong(factory, new Authenticator() {
public boolean isAuthentic(String userid, CharSequence passwd) {
@@ -122,7 +127,7 @@ public class POP3ServerTest extends Test
return false;
}
}
-});
+}, aclResolver, groupMembershipResolver);
manager.init();
chain.put(mailboxmanager, manager);
-
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
svn commit: r1237060 - in /james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox: hbase/host/ inmemory/host/ jcr/host/ jpa/host/ maildir/host/
Author: norman
Date: Sat Jan 28 13:44:38 2012
New Revision: 1237060
URL: http://svn.apache.org/viewvc?rev=1237060view=rev
Log:
Adjust for latest mailbox code changes. See MAILBOX-151
Modified:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/host/JCRHostSystem.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/host/JPAHostSystem.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/maildir/host/MaildirHostSystem.java
Modified:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java?rev=1237060r1=1237059r2=1237060view=diff
==
---
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
(original)
+++
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/hbase/host/HBaseHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -30,8 +30,12 @@ import org.apache.james.imap.api.process
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.imap.tester.ImapHostSystem;
import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
import org.apache.james.mailbox.SubscriptionManager;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
import org.apache.james.mailbox.hbase.HBaseMailboxManager;
import org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory;
import org.apache.james.mailbox.hbase.mail.HBaseModSeqProvider;
@@ -83,7 +87,10 @@ public class HBaseHostSystem extends Ima
final HBaseMailboxSessionMapperFactory mapperFactory = new
HBaseMailboxSessionMapperFactory(
conf, uidProvider, modSeqProvider);
-mailboxManager = new HBaseMailboxManager(mapperFactory, userManager);
+MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
+
+mailboxManager = new HBaseMailboxManager(mapperFactory, userManager,
aclResolver, groupMembershipResolver);
mailboxManager.init();
SubscriptionManager subscriptionManager = new
StoreSubscriptionManager(mapperFactory);
Modified:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java?rev=1237060r1=1237059r2=1237060view=diff
==
---
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
(original)
+++
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/host/InMemoryHostSystem.java
Sat Jan 28 13:44:38 2012
@@ -25,7 +25,11 @@ import org.apache.james.imap.main.Defaul
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.imap.tester.ImapHostSystem;
import org.apache.james.imap.tester.base.HostSystem;
+import org.apache.james.mailbox.MailboxACLResolver;
import org.apache.james.mailbox.MailboxException;
+import org.apache.james.mailbox.SimpleGroupMembershipResolver;
+import org.apache.james.mailbox.UnionMailboxACLResolver;
+import org.apache.james.mailbox.MailboxACLResolver.GroupMembershipResolver;
import org.apache.james.mailbox.inmemory.InMemoryMailboxSessionMapperFactory;
import org.apache.james.mailbox.store.MockAuthenticator;
import org.apache.james.mailbox.store.StoreMailboxManager;
@@ -59,7 +63,10 @@ public class InMemoryHostSystem extends
private void initFields() throws MailboxException {
userManager = new MockAuthenticator();
factory = new InMemoryMailboxSessionMapperFactory();
-mailboxManager = new StoreMailboxManagerLong(factory, userManager);
+MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
+GroupMembershipResolver groupMembershipResolver = new
SimpleGroupMembershipResolver();
+
+mailboxManager = new StoreMailboxManagerLong(factory, userManager,
aclResolver, groupMembershipResolver);
mailboxManager.init();
[jira] [Commented] (IMAP-351) ACL Support
[ https://issues.apache.org/jira/browse/IMAP-351?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13195536#comment-13195536 ] Norman Maurer commented on IMAP-351: I merged the patch into trunk. Thanks again for this work its really a massive patch :) ACL Support --- Key: IMAP-351 URL: https://issues.apache.org/jira/browse/IMAP-351 Project: JAMES Imap Issue Type: New Feature Components: JCR Mailbox, JPA Mailbox, Mailbox, Maildir Mailbox, Parser, Processor, Protocol Affects Versions: 0.3 Reporter: Jochen Gazda Labels: ACL, IMAP Fix For: 0.3 Attachments: IMAP-GETACL.txt, ImapGetACLTest.java Original Estimate: 672h Remaining Estimate: 672h Support for RFC 4314 IMAP4 Access Control List (ACL) Extension -- This message is automatically generated by JIRA. If you think it was sent incorrectly, please contact your JIRA administrators: https://issues.apache.org/jira/secure/ContactAdministrators!default.jspa For more information on JIRA, see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
Jenkins build became unstable: mailbox-integration-tests #687
See https://builds.apache.org/job/mailbox-integration-tests/687/ - To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
