Author: norman
Date: Sat May 15 16:44:13 2010
New Revision: 944680
URL: http://svn.apache.org/viewvc?rev=944680&view=rev
Log:
change namespace from imap: to jamesMailbox: because mailbox implementation can
be reused for pop3 etc
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/JCRMessageMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRHeader.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMailbox.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRProperty.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/model/JCRSubscription.java
james/imap/trunk/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
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=944680&r1=944679&r2=944680&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
Sat May 15 16:44:13 2010
@@ -67,7 +67,7 @@ public class JCRMailboxMapper extends Ab
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//"+ MAILBOXES_PATH +
"//element(*,imap:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name + "']
order by @"+ JCRMailbox.NAME_PROPERTY;
+ String queryString = "//"+ MAILBOXES_PATH +
"//element(*,jamesMailbox:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name
+ "'] order by @"+ JCRMailbox.NAME_PROPERTY;
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
long resultSize = it.getSize();
@@ -135,7 +135,7 @@ public class JCRMailboxMapper extends Ab
public boolean existsMailboxStartingWith(String mailboxName) throws
StorageException {
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//"+ MAILBOXES_PATH +
"//element(*,imap:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY + ",'"
+mailboxName+"%')]";
+ String queryString = "//"+ MAILBOXES_PATH +
"//element(*,jamesMailbox:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY +
",'" +mailboxName+"%')]";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
return it.hasNext();
@@ -169,7 +169,7 @@ public class JCRMailboxMapper extends Ab
public Mailbox<String> findMailboxByName(String name) throws
StorageException, MailboxNotFoundException {
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name + "']";
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:mailbox)[@" + JCRMailbox.NAME_PROPERTY + "='" + name
+ "']";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
if (it.hasNext()) {
@@ -194,7 +194,7 @@ public class JCRMailboxMapper extends Ab
List<Mailbox<String>> mailboxList = new ArrayList<Mailbox<String>>();
try {
QueryManager manager =
getSession().getWorkspace().getQueryManager();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY + ",'%" +
name + "%')]";
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:mailbox)[jcr:like(@" + JCRMailbox.NAME_PROPERTY +
",'%" + name + "%')]";
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator it = result.getNodes();
while (it.hasNext()) {
@@ -250,10 +250,10 @@ public class JCRMailboxMapper extends Ab
for (int i = 0; i < nameParts.length; i++) {
String part = nameParts[i];
if (i == 1) {
- node = JcrUtils.getOrAddNode(node,
String.valueOf(part.charAt(0)), "imap:mailbox");
+ node = JcrUtils.getOrAddNode(node,
String.valueOf(part.charAt(0)), "jamesMailbox:mailbox");
}
- node = JcrUtils.getOrAddNode(node, part,
"imap:mailbox");
+ node = JcrUtils.getOrAddNode(node, part,
"jamesMailbox:mailbox");
}
jcrMailbox.merge(node);
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/JCRMessageMapper.java
Sat May 15 16:44:13 2010
@@ -70,7 +70,7 @@ public class JCRMessageMapper extends Ab
public long countMessagesInMailbox() throws StorageException {
try {
// we use order by because without it count will always be 0 in
jackrabbit
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] order by @" + JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] order by @" + JCRMessage.UID_PROPERTY;
QueryManager manager =
getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator nodes = result.getNodes();
@@ -101,7 +101,7 @@ public class JCRMessageMapper extends Ab
try {
// we use order by because without it count will always be 0 in
jackrabbit
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] AND [@" + JCRMessage.SEEN_PROPERTY +"='false'] order by @" +
JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] AND [@" + JCRMessage.SEEN_PROPERTY +"='false'] order by @" +
JCRMessage.UID_PROPERTY;
QueryManager manager =
getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
NodeIterator nodes = result.getNodes();
@@ -179,7 +179,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findMessagesInMailboxAfterUID(String uuid, long uid) throws RepositoryException
{
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='" + uuid
+ "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + uid + "] order by @" +
JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='"
+ uuid + "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + uid + "] order by @" +
JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -193,7 +193,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findMessagesInMailboxWithUID(String uuid, long uid) throws RepositoryException
{
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='" + uuid
+ "'] AND [@" + JCRMessage.UID_PROPERTY + "=" + uid + "] order by @" +
JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='"
+ uuid + "'] AND [@" + JCRMessage.UID_PROPERTY + "=" + uid + "] order by @" +
JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -207,7 +207,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findMessagesInMailboxBetweenUIDs(String uuid, long from, long to) throws
RepositoryException {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='" + uuid
+ "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + from + "] AND [@" +
JCRMessage.UID_PROPERTY + "<=" + to + "] order by @" + JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='"
+ uuid + "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + from + "] AND [@" +
JCRMessage.UID_PROPERTY + "<=" + to + "] order by @" + JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -222,7 +222,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>> findMessagesInMailbox(String uuid)
throws RepositoryException {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] order by @" + JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] order by @" + JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -237,7 +237,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findDeletedMessagesInMailboxAfterUID(String uuid, long uid) throws
RepositoryException {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='" + uuid
+ "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + uid + "] AND [@" +
JCRMessage.DELETED_PROPERTY+ "='true'] order by @" + JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='"
+ uuid + "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + uid + "] AND [@" +
JCRMessage.DELETED_PROPERTY+ "='true'] order by @" + JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -251,7 +251,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findDeletedMessagesInMailboxWithUID(String uuid, long uid) throws
RepositoryException {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='" + uuid
+ "'] AND [@" + JCRMessage.UID_PROPERTY + "=" + uid + "] AND [@" +
JCRMessage.DELETED_PROPERTY+ "='true'] order by @" + JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='"
+ uuid + "'] AND [@" + JCRMessage.UID_PROPERTY + "=" + uid + "] AND [@" +
JCRMessage.DELETED_PROPERTY+ "='true'] order by @" + JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -265,7 +265,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findDeletedMessagesInMailboxBetweenUIDs(String uuid, long from, long to) throws
RepositoryException {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='" + uuid
+ "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + from + "] AND [@" +
JCRMessage.UID_PROPERTY + "<=" + to + "] AND [@" + JCRMessage.DELETED_PROPERTY+
"='true'] order by @" + JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY + "='"
+ uuid + "'] AND [@" + JCRMessage.UID_PROPERTY + ">=" + from + "] AND [@" +
JCRMessage.UID_PROPERTY + "<=" + to + "] AND [@" + JCRMessage.DELETED_PROPERTY+
"='true'] order by @" + JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -280,7 +280,7 @@ public class JCRMessageMapper extends Ab
private List<MailboxMembership<String>>
findDeletedMessagesInMailbox(String uuid) throws RepositoryException {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] AND [@" + JCRMessage.DELETED_PROPERTY+ "='true'] order by @" +
JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] AND [@" + JCRMessage.DELETED_PROPERTY+ "='true'] order by @" +
JCRMessage.UID_PROPERTY;
QueryManager manager = getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -339,7 +339,7 @@ public class JCRMessageMapper extends Ab
try {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] AND [@" + JCRMessage.RECENT_PROPERTY +"='true'] order by @" +
JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] AND [@" + JCRMessage.RECENT_PROPERTY +"='true'] order by @" +
JCRMessage.UID_PROPERTY;
QueryManager manager =
getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -363,7 +363,7 @@ public class JCRMessageMapper extends Ab
public List<MailboxMembership<String>> findUnseenMessagesInMailbox()
throws StorageException {
try {
List<MailboxMembership<String>> list = new
ArrayList<MailboxMembership<String>>();
- String queryString = "//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] AND [@" + JCRMessage.SEEN_PROPERTY +"='false'] order by @" +
JCRMessage.UID_PROPERTY;
+ String queryString = "//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] AND [@" + JCRMessage.SEEN_PROPERTY +"='false'] order by @" +
JCRMessage.UID_PROPERTY;
QueryManager manager =
getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -448,7 +448,7 @@ public class JCRMessageMapper extends Ab
@Override
protected Object run(Node dayNode) throws
RepositoryException {
- Node messageNode =
dayNode.addNode(String.valueOf(membership.getUid()),"imap:message");
+ Node messageNode =
dayNode.addNode(String.valueOf(membership.getUid()),"jamesMailbox:message");
try {
membership.merge(messageNode);
} catch (IOException e) {
@@ -511,7 +511,7 @@ public class JCRMessageMapper extends Ab
*/
private String formulateXPath(String uuid, SearchQuery query) {
final StringBuilder queryBuilder = new StringBuilder(50);
- queryBuilder.append("//" + MAILBOXES_PATH +
"//element(*,imap:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='" + uuid
+"'] ");
+ queryBuilder.append("//" + MAILBOXES_PATH +
"//element(*,jamesMailbox:message)[@" + JCRMessage.MAILBOX_UUID_PROPERTY +"='"
+ uuid +"'] ");
final List<Criterion> criteria = query.getCriterias();
if (criteria.size() == 1) {
final Criterion firstCriterion = criteria.get(0);
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRHeader.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRHeader.java?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRHeader.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRHeader.java
Sat May 15 16:44:13 2010
@@ -35,9 +35,9 @@ import org.apache.james.imap.store.mail.
public class JCRHeader extends AbstractComparableHeader implements
JCRImapConstants, Persistent{
private static final String TOSTRING_SEP = " ";
- public final static String FIELDNAME_PROPERTY = "imap:headerFieldName";
- public final static String VALUE_PROPERTY = "imap:headerValue";
- public final static String LINENUMBER_PROPERTY = "imap:headerLineNumber";
+ public final static String FIELDNAME_PROPERTY =
"jamesMailbox:headerFieldName";
+ public final static String VALUE_PROPERTY = "jamesMailbox:headerValue";
+ public final static String LINENUMBER_PROPERTY =
"jamesMailbox:headerLineNumber";
private String fieldName;
private String value;
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=944680&r1=944679&r2=944680&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
Sat May 15 16:44:13 2010
@@ -36,9 +36,9 @@ public class JCRMailbox implements Mailb
private static final String TAB = " ";
- public final static String NAME_PROPERTY = "imap:mailboxName";
- public final static String UIDVALIDITY_PROPERTY =
"imap:mailboxUidValidity";
- public final static String LASTUID_PROPERTY = "imap:mailboxLastUid";
+ public final static String NAME_PROPERTY = "jamesMailbox:mailboxName";
+ public final static String UIDVALIDITY_PROPERTY =
"jamesMailbox:mailboxUidValidity";
+ public final static String LASTUID_PROPERTY =
"jamesMailbox:mailboxLastUid";
private String name;
private long uidValidity;
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRMessage.java
Sat May 15 16:44:13 2010
@@ -75,23 +75,23 @@ public class JCRMessage extends Abstract
private static final String TOSTRING_SEPARATOR = " ";
- public final static String MAILBOX_UUID_PROPERTY = "imap:mailboxUUID";
- public final static String UID_PROPERTY = "imap:uid";
- public final static String SIZE_PROPERTY = "imap:size";
- public final static String ANSWERED_PROPERTY = "imap:answered";
- public final static String DELETED_PROPERTY = "imap:deleted";
- public final static String DRAFT_PROPERTY = "imap:draft";
- public final static String FLAGGED_PROPERTY = "imap:flagged";
- public final static String RECENT_PROPERTY = "imap:recent";
- public final static String SEEN_PROPERTY = "imap:seen";
- public final static String INTERNAL_DATE_PROPERTY = "imap:internalDate";
+ public final static String MAILBOX_UUID_PROPERTY =
"jamesMailbox:mailboxUUID";
+ public final static String UID_PROPERTY = "jamesMailbox:uid";
+ public final static String SIZE_PROPERTY = "jamesMailbox:size";
+ public final static String ANSWERED_PROPERTY = "jamesMailbox:answered";
+ public final static String DELETED_PROPERTY = "jamesMailbox:deleted";
+ public final static String DRAFT_PROPERTY = "jamesMailbox:draft";
+ public final static String FLAGGED_PROPERTY = "jamesMailbox:flagged";
+ public final static String RECENT_PROPERTY = "jamesMailbox:recent";
+ public final static String SEEN_PROPERTY = "jamesMailbox:seen";
+ public final static String INTERNAL_DATE_PROPERTY =
"jamesMailbox:internalDate";
- public final static String BODY_START_OCTET_PROPERTY =
"imap:messageBodyStartOctet";
- public final static String HEADER_NODE_TYPE = "imap:messageHeader";
+ public final static String BODY_START_OCTET_PROPERTY =
"jamesMailbox:messageBodyStartOctet";
+ public final static String HEADER_NODE_TYPE =
"jamesMailbox:messageHeader";
- public final static String PROPERTY_NODE_TYPE = "imap:messageProperty";
- public final static String TEXTUAL_LINE_COUNT_PROPERTY =
"imap:messageTextualLineCount";
- public final static String SUBTYPE_PROPERTY = "imap:messageSubType";
+ public final static String PROPERTY_NODE_TYPE =
"jamesMailbox:messageProperty";
+ public final static String TEXTUAL_LINE_COUNT_PROPERTY =
"jamesMailbox:messageTextualLineCount";
+ public final static String SUBTYPE_PROPERTY =
"jamesMailbox:messageSubType";
public JCRMessage(Node node, Log logger) {
this.logger= logger;
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRProperty.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRProperty.java?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRProperty.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/mail/model/JCRProperty.java
Sat May 15 16:44:13 2010
@@ -41,10 +41,10 @@ public class JCRProperty extends Abstrac
private String value;
private int order;
- public final static String NAMESPACE_PROPERTY = "imap:propertyNamespace";
- public final static String LOCALNAME_PROPERTY = "imap:propertyLocalName";
- public final static String VALUE_PROPERTY = "imap:propertyValue";
- public final static String ORDER_PROPERTY = "imap:propertyOrder";
+ public final static String NAMESPACE_PROPERTY =
"jamesMailbox:propertyNamespace";
+ public final static String LOCALNAME_PROPERTY =
"jamesMailbox:propertyLocalName";
+ public final static String VALUE_PROPERTY = "jamesMailbox:propertyValue";
+ public final static String ORDER_PROPERTY = "jamesMailbox:propertyOrder";
public JCRProperty(final Node node, final Log logger) {
this.node = node;
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/JCRSubscriptionMapper.java
Sat May 15 16:44:13 2010
@@ -81,7 +81,7 @@ public class JCRSubscriptionMapper exten
*/
public Subscription findFindMailboxSubscriptionForUser(String user, String
mailbox) throws SubscriptionException {
try {
- String queryString = "//" + SUBSCRIPTIONS_PATH +
"//element(*,imap:subscription)[@" + JCRSubscription.USERNAME_PROPERTY + "='" +
user + "'] AND [@" + JCRSubscription.MAILBOX_PROPERTY +"='" + mailbox + "']";
+ String queryString = "//" + SUBSCRIPTIONS_PATH +
"//element(*,jamesMailbox:subscription)[@" + JCRSubscription.USERNAME_PROPERTY
+ "='" + user + "'] AND [@" + JCRSubscription.MAILBOX_PROPERTY +"='" + mailbox
+ "']";
QueryManager manager =
getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -111,7 +111,7 @@ public class JCRSubscriptionMapper exten
public List<Subscription> findSubscriptionsForUser(String user) throws
SubscriptionException {
List<Subscription> subList = new ArrayList<Subscription>();
try {
- String queryString = "//" + SUBSCRIPTIONS_PATH +
"//element(*,imap:subscription)[@" + JCRSubscription.USERNAME_PROPERTY + "='" +
user + "']";
+ String queryString = "//" + SUBSCRIPTIONS_PATH +
"//element(*,jamesMailbox:subscription)[@" + JCRSubscription.USERNAME_PROPERTY
+ "='" + user + "']";
QueryManager manager =
getSession().getWorkspace().getQueryManager();
QueryResult result = manager.createQuery(queryString,
Query.XPATH).execute();
@@ -157,7 +157,7 @@ public class JCRSubscriptionMapper exten
// This is needed to minimize the child nodes a bit
Node userNode = JcrUtils.getOrAddNode(subscriptionsNode,
String.valueOf(username.charAt(0)));
userNode = JcrUtils.getOrAddNode(userNode,
String.valueOf(username));
- node = JcrUtils.getOrAddNode(userNode, mailbox,
"imap:subscription");
+ node = JcrUtils.getOrAddNode(userNode, mailbox,
"jamesMailbox:subscription");
} else {
node = sub.getNode();
}
Modified:
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/model/JCRSubscription.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/model/JCRSubscription.java?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
---
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/model/JCRSubscription.java
(original)
+++
james/imap/trunk/jcr/src/main/java/org/apache/james/imap/jcr/user/model/JCRSubscription.java
Sat May 15 16:44:13 2010
@@ -34,8 +34,8 @@ import org.apache.james.imap.store.user.
public class JCRSubscription implements Subscription, Persistent,
JCRImapConstants {
private static final String TOSTRING_SEPARATOR = " ";
- public final static String USERNAME_PROPERTY = "imap:subscriptionUsername";
- public final static String MAILBOX_PROPERTY = "imap:subscriptionMailbox";
+ public final static String USERNAME_PROPERTY =
"jamesMailbox:subscriptionUsername";
+ public final static String MAILBOX_PROPERTY =
"jamesMailbox:subscriptionMailbox";
private Node node;
private final Log log;
Modified:
james/imap/trunk/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
URL:
http://svn.apache.org/viewvc/james/imap/trunk/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd?rev=944680&r1=944679&r2=944680&view=diff
==============================================================================
--- james/imap/trunk/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
(original)
+++ james/imap/trunk/jcr/src/main/resources/org/apache/james/imap/jcr/imap.cnd
Sat May 15 16:44:13 2010
@@ -15,42 +15,42 @@
* limitations under the License.
*/
-<imap = 'http://james.apache.org/imap/jcr/'>
+<jamesMailbox = 'http://james.apache.org/imap/jcr/'>
-[imap:subscription] > nt:base
- - imap:subscriptionUsername (STRING) mandatory
- - imap:subscriptionMailbox (STRING) mandatory
+[jamesMailbox:subscription] > nt:base
+ - jamesMailbox:subscriptionUsername (STRING) mandatory
+ - jamesMailbox:subscriptionMailbox (STRING) mandatory
-[imap:messageHeader] > nt:base
- - imap:headerFieldName (STRING) mandatory
- - imap:headerValue(STRING) mandatory
- - imap:headerLineNumber (LONG) mandatory
+[jamesMailbox:messageHeader] > nt:base
+ - jamesMailbox:headerFieldName (STRING) mandatory
+ - jamesMailbox:headerValue(STRING) mandatory
+ - jamesMailbox:headerLineNumber (LONG) mandatory
-[imap:messageProperty] > nt:base
- - imap:propertyNamespace (STRING) mandatory
- - imap:propertyLocalName (STRING) mandatory
- - imap:propertyValue(STRING) mandatory
- - imap:propertyOrder (Long) mandatory
+[jamesMailbox:messageProperty] > nt:base
+ - jamesMailbox:propertyNamespace (STRING) mandatory
+ - jamesMailbox:propertyLocalName (STRING) mandatory
+ - jamesMailbox:propertyValue(STRING) mandatory
+ - jamesMailbox:propertyOrder (Long) mandatory
-[imap:message] > mix:referenceable, nt:file
- - imap:mailboxUUID (String) mandatory
- - imap:uid (LONG) mandatory
- - imap:size (LONG) mandatory
- - imap:answered (BOOLEAN)
- - imap:deleted (BOOLEAN)
- - imap:draft (BOOLEAN)
- - imap:flagged (BOOLEAN)
- - imap:recent (BOOLEAN)
- - imap:seen (BOOLEAN)
- - imap:internalDate (DATE)
- - imap:messageBodyStartOctet (LONG) mandatory
- - imap:messageTextualLineCount (LONG)
- - imap:messageSubType (String) mandatory
- + messageHeader (imap:messageHeader) multiple
- + messageProperty (imap:messageProperty) multiple
+[jamesMailbox:message] > mix:referenceable, nt:file
+ - jamesMailbox:mailboxUUID (String) mandatory
+ - jamesMailbox:uid (LONG) mandatory
+ - jamesMailbox:size (LONG) mandatory
+ - jamesMailbox:answered (BOOLEAN)
+ - jamesMailbox:deleted (BOOLEAN)
+ - jamesMailbox:draft (BOOLEAN)
+ - jamesMailbox:flagged (BOOLEAN)
+ - jamesMailbox:recent (BOOLEAN)
+ - jamesMailbox:seen (BOOLEAN)
+ - jamesMailbox:internalDate (DATE)
+ - jamesMailbox:messageBodyStartOctet (LONG) mandatory
+ - jamesMailbox:messageTextualLineCount (LONG)
+ - jamesMailbox:messageSubType (String) mandatory
+ + messageHeader (jamesMailbox:messageHeader) multiple
+ + messageProperty (jamesMailbox:messageProperty) multiple
-[imap:mailbox] > mix:referenceable, mix:lockable, nt:folder
- - imap:mailboxUidValidity (LONG)
- - imap:mailboxName (STRING)
- - imap:mailboxLastUid (LONG)
+[jamesMailbox:mailbox] > mix:referenceable, mix:lockable, nt:folder
+ - jamesMailbox:mailboxUidValidity (LONG)
+ - jamesMailbox:mailboxName (STRING)
+ - jamesMailbox:mailboxLastUid (LONG)
+ * (nt:folder) multiple
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
