Author: norman
Date: Sun Dec 5 15:02:22 2010
New Revision: 1042367
URL: http://svn.apache.org/viewvc?rev=1042367&view=rev
Log:
Remove NodeLocker usage. See MAILBOX-15
Removed:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRVmNodeLocker.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/NodeLocker.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java?rev=1042367&r1=1042366&r2=1042367&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/JCRMailboxSessionMapperFactory.java
Sun Dec 5 15:02:22 2010
@@ -42,32 +42,32 @@ public class JCRMailboxSessionMapperFact
private final MailboxSessionJCRRepository repository;
private final Log logger;
- private final NodeLocker locker;
private final static int DEFAULT_SCALING = 2;
private final int scaling;
private final UidProvider<String> provider;
+ private int messageScaling;
- public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository
repository, final NodeLocker locker, final UidProvider<String> uidProvider) {
- this(repository, locker, uidProvider, DEFAULT_SCALING);
+ public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository
repository, final UidProvider<String> uidProvider) {
+ this(repository, uidProvider, DEFAULT_SCALING,
JCRMessageMapper.MESSAGE_SCALE_DAY);
}
- public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository
repository, final NodeLocker locker, final UidProvider<String> provider, final
int scaling) {
+ public JCRMailboxSessionMapperFactory(final MailboxSessionJCRRepository
repository, final UidProvider<String> provider, final int scaling, final int
messageScaling) {
this.repository = repository;
this.logger = LogFactory.getLog(JCRMailboxSessionMapperFactory.class);
- this.locker = locker;
this.scaling = scaling;
+ this.messageScaling = messageScaling;
this.provider = provider;
}
@Override
public MailboxMapper<String> createMailboxMapper(MailboxSession session)
throws MailboxException {
- JCRMailboxMapper mapper = new JCRMailboxMapper(repository, session,
locker, scaling, logger);
+ JCRMailboxMapper mapper = new JCRMailboxMapper(repository, session,
scaling, logger);
return mapper;
}
@Override
public MessageMapper<String> createMessageMapper(MailboxSession session)
throws MailboxException {
- JCRMessageMapper messageMapper = new JCRMessageMapper(repository,
session, provider, logger);
+ JCRMessageMapper messageMapper = new JCRMessageMapper(repository,
session, provider, logger, messageScaling);
return messageMapper;
}
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java?rev=1042367&r1=1042366&r2=1042367&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
(original)
+++
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/JCRMailboxMapper.java
Sun Dec 5 15:02:22 2010
@@ -41,8 +41,6 @@ import org.apache.james.mailbox.MailboxP
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.jcr.AbstractJCRScalingMapper;
import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
-import org.apache.james.mailbox.jcr.NodeLocker;
-import org.apache.james.mailbox.jcr.NodeLocker.NodeLockedExecution;
import org.apache.james.mailbox.jcr.mail.model.JCRMailbox;
import org.apache.james.mailbox.store.mail.MailboxMapper;
import org.apache.james.mailbox.store.mail.model.Mailbox;
@@ -54,11 +52,9 @@ import org.apache.james.mailbox.store.ma
*/
public class JCRMailboxMapper extends AbstractJCRScalingMapper implements
MailboxMapper<String> {
- private NodeLocker locker;
- public JCRMailboxMapper(final MailboxSessionJCRRepository repos,
MailboxSession session, final NodeLocker locker, final int scaling, final Log
logger) {
+ public JCRMailboxMapper(final MailboxSessionJCRRepository repos,
MailboxSession session, final int scaling, final Log logger) {
super(repos, session, scaling, logger);
- this.locker = locker;
}
/*
@@ -168,29 +164,15 @@ public class JCRMailboxMapper extends Ab
} else {
mailboxNode = rootNode.getNode(MAILBOXES_PATH);
}
- locker.execute(new NodeLockedExecution<Void>() {
- public Void execute(Node node) throws RepositoryException {
-
- node = JcrUtils.getOrAddNode(node,
Text.escapeIllegalJcrChars(jcrMailbox.getNamespace()), "nt:unstructured");
- if (jcrMailbox.getUser() != null) {
- node = createUserPathStructure(node,
Text.escapeIllegalJcrChars(jcrMailbox.getUser()));
- }
- node = JcrUtils.getOrAddNode(node,
Text.escapeIllegalJcrChars(jcrMailbox.getName()), "nt:unstructured");
- node.addMixin("jamesMailbox:mailbox");
-
-
- jcrMailbox.merge(node);
-
- getSession().save();
- return null;
- }
-
- public boolean isDeepLocked() {
- return true;
- }
-
- }, mailboxNode, Void.class);
+ node = JcrUtils.getOrAddNode(mailboxNode,
Text.escapeIllegalJcrChars(jcrMailbox.getNamespace()), "nt:unstructured");
+ if (jcrMailbox.getUser() != null) {
+ node = createUserPathStructure(node,
Text.escapeIllegalJcrChars(jcrMailbox.getUser()));
+ }
+ node = JcrUtils.getOrAddNode(node,
Text.escapeIllegalJcrChars(jcrMailbox.getName()), "nt:unstructured");
+ node.addMixin("jamesMailbox:mailbox");
+
+ jcrMailbox.merge(node);
} else {
jcrMailbox.merge(node);
@@ -198,8 +180,6 @@ public class JCRMailboxMapper extends Ab
} catch (RepositoryException e) {
throw new MailboxException("Unable to save mailbox " + mailbox, e);
- } catch (InterruptedException e) {
- throw new MailboxException("Unable to save mailbox " + mailbox, e);
}
}
Modified:
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java?rev=1042367&r1=1042366&r2=1042367&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
(original)
+++
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRHostSystem.java
Sun Dec 5 15:02:22 2010
@@ -36,7 +36,6 @@ import org.apache.james.mailbox.jcr.JCRM
import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory;
import org.apache.james.mailbox.jcr.JCRSubscriptionManager;
import org.apache.james.mailbox.jcr.JCRUtils;
-import org.apache.james.mailbox.jcr.JCRVmNodeLocker;
import org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider;
import org.apache.james.test.functional.HostSystem;
import org.xml.sax.InputSource;
@@ -72,7 +71,7 @@ public class JCRHostSystem extends ImapH
userManager = new InMemoryUserManager();
JCRCachingUidProvider uidProvider = new
JCRCachingUidProvider(sessionRepos);
- JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos, new JCRVmNodeLocker(),
uidProvider);
+ JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos, uidProvider);
mailboxManager = new JCRMailboxManager(mf, userManager,
uidProvider);
final ImapProcessor defaultImapProcessorFactory =
DefaultImapProcessorFactory.createDefaultProcessor(mailboxManager, new
JCRSubscriptionManager(mf));
Modified:
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java?rev=1042367&r1=1042366&r2=1042367&view=diff
==============================================================================
---
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
(original)
+++
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
Sun Dec 5 15:02:22 2010
@@ -32,7 +32,6 @@ import org.apache.james.mailbox.jcr.Glob
import org.apache.james.mailbox.jcr.JCRMailboxManager;
import org.apache.james.mailbox.jcr.JCRMailboxSessionMapperFactory;
import org.apache.james.mailbox.jcr.JCRUtils;
-import org.apache.james.mailbox.jcr.JCRVmNodeLocker;
import org.apache.james.mailbox.jcr.MailboxSessionJCRRepository;
import org.apache.james.mailbox.jcr.mail.JCRCachingUidProvider;
import org.junit.After;
@@ -65,7 +64,7 @@ public class JCRStressTest extends Abstr
JCRCachingUidProvider uidProvider = new
JCRCachingUidProvider(sessionRepos);
- JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos, new JCRVmNodeLocker(),
uidProvider);
+ JCRMailboxSessionMapperFactory mf = new
JCRMailboxSessionMapperFactory(sessionRepos, uidProvider);
mailboxManager = new JCRMailboxManager(mf, null, uidProvider);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
