Author: norman
Date: Sun Mar 21 07:42:28 2010
New Revision: 925737
URL: http://svn.apache.org/viewvc?rev=925737&view=rev
Log:
use CND for Mailbox (IMAP-120)
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java?rev=925737&r1=925736&r2=925737&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMailboxMapper.java
Sun Mar 21 07:42:28 2010
@@ -68,7 +68,7 @@ public class JCRMailboxMapper extends Ab
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//" + PATH + "//element(*)[@" +
JCRMailbox.NAME_PROPERTY + "='" + name + "']";
+ String queryString = "//" + PATH +
"//element(*,imap:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name + "']";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
long resultSize = it.getSize();
@@ -134,7 +134,7 @@ public class JCRMailboxMapper extends Ab
public boolean existsMailboxStartingWith(String mailboxName) throws
StorageException {
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//" + PATH + "//element(*)[jcr:like(@" +
JCRMailbox.NAME_PROPERTY + ",'" +mailboxName+"%')]";
+ String queryString = "//" + PATH +
"//element(*,imap:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY + ",'"
+mailboxName+"%')]";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
return it.hasNext();
@@ -172,7 +172,7 @@ public class JCRMailboxMapper extends Ab
public Mailbox findMailboxByName(String name) throws StorageException,
MailboxNotFoundException {
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//" + PATH + "//element(*)[@" +
JCRMailbox.NAME_PROPERTY + "='" + name + "']";
+ String queryString = "//" + PATH +
"//element(*,imap:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name + "']";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
if (it.hasNext()) {
@@ -198,7 +198,7 @@ public class JCRMailboxMapper extends Ab
List<Mailbox> mailboxList = new ArrayList<Mailbox>();
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//" + PATH + "//element(*)[jcr:like(@" +
JCRMailbox.NAME_PROPERTY + ",'%" + name + "%')]";
+ String queryString = "//" + PATH +
"//element(*,imap:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY + ",'%" +
name + "%')]";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
while (it.hasNext()) {
@@ -231,7 +231,7 @@ public class JCRMailboxMapper extends Ab
if (node == null) {
String nodePath =
JCRUtils.escapePath(PATH,JCRUtils.createScaledPath(mailbox.getName(),
getScaling()));
- node =
JCRUtils.createNodeRecursive(getSession().getRootNode(), nodePath);
+ node =
JCRUtils.createNodeRecursive(getSession().getRootNode(), nodePath,
"imap:mailbox");
node.addMixin(JcrConstants.MIX_REFERENCEABLE);
}
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java?rev=925737&r1=925736&r2=925737&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
Sun Mar 21 07:42:28 2010
@@ -36,9 +36,9 @@ public class JCRMailbox implements Mailb
private static final String TAB = " ";
- public final static String NAME_PROPERTY = PROPERTY_PREFIX + "mailboxName";
- public final static String UIDVALIDITY_PROPERTY = PROPERTY_PREFIX +
"mailboxUidValidity";
- public final static String LASTUID_PROPERTY = PROPERTY_PREFIX +
"mailboxLastUid";
+ public final static String NAME_PROPERTY = "imap:mailboxName";
+ public final static String UIDVALIDITY_PROPERTY =
"imap:mailboxUidValidity";
+ public final static String LASTUID_PROPERTY = "imap:mailboxLastUid";
private String name;
private long uidValidity;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
