james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ieu...@apache.org
Subject svn commit: r1452487 - in /james/mailbox/trunk: ./ hbase/src/main/resources/META-INF/ hbase/src/main/resources/META-INF/spring/ jcr/src/main/resources/META-INF/ jcr/src/main/resources/META-INF/spring/ jpa/src/main/resources/ jpa/src/main/resources/META...
Date Mon, 04 Mar 2013 20:31:09 GMT
Author: ieugen
Date: Mon Mar  4 20:31:08 2013
New Revision: 1452487

URL: http://svn.apache.org/r1452487
Log:
MAILBOX-195 Moved spring application contexts

* eache module has it's own META-INF/spring/mailbox-<module-name>.xml

Added:
    james/mailbox/trunk/README.md
    james/mailbox/trunk/hbase/src/main/resources/META-INF/
    james/mailbox/trunk/hbase/src/main/resources/META-INF/spring/
    james/mailbox/trunk/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml
    james/mailbox/trunk/jcr/src/main/resources/META-INF/
    james/mailbox/trunk/jcr/src/main/resources/META-INF/spring/
    james/mailbox/trunk/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
    james/mailbox/trunk/jpa/src/main/resources/
    james/mailbox/trunk/jpa/src/main/resources/META-INF/
    james/mailbox/trunk/jpa/src/main/resources/META-INF/persistence.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/persistence.xml
    james/mailbox/trunk/jpa/src/main/resources/META-INF/spring/
    james/mailbox/trunk/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
    james/mailbox/trunk/jpa/src/main/resources/james-database.properties
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/james-database.properties
    james/mailbox/trunk/lucene/src/main/resources/
    james/mailbox/trunk/lucene/src/main/resources/META-INF/
    james/mailbox/trunk/lucene/src/main/resources/META-INF/spring/
    james/mailbox/trunk/lucene/src/main/resources/META-INF/spring/mailbox-index-lucene.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
    james/mailbox/trunk/maildir/src/main/resources/
    james/mailbox/trunk/maildir/src/main/resources/META-INF/
    james/mailbox/trunk/maildir/src/main/resources/META-INF/spring/
    james/mailbox/trunk/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
    james/mailbox/trunk/maildir/src/main/resources/mailbox-maildir.properties
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/mailbox-maildir.properties
    james/mailbox/trunk/memory/src/main/resources/
    james/mailbox/trunk/memory/src/main/resources/META-INF/
    james/mailbox/trunk/memory/src/main/resources/META-INF/spring/
    james/mailbox/trunk/memory/src/main/resources/META-INF/spring/mailbox-memory.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-memory.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-locker.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml
      - copied, changed from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
Removed:
    james/mailbox/trunk/BUILDING.txt
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-memory.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
    james/mailbox/trunk/spring/src/main/resources/META-INF/persistence.xml
    james/mailbox/trunk/spring/src/main/resources/james-database.properties
    james/mailbox/trunk/spring/src/main/resources/mailbox-maildir.properties
Modified:
    james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
    james/mailbox/trunk/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
    james/mailbox/trunk/zoo-seq-provider/pom.xml
    james/mailbox/trunk/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java

Added: james/mailbox/trunk/README.md
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/README.md?rev=1452487&view=auto
==============================================================================
--- james/mailbox/trunk/README.md (added)
+++ james/mailbox/trunk/README.md Mon Mar  4 20:31:08 2013
@@ -0,0 +1,86 @@
+Apache James Mailbox project
+============================
+
+The James Mailbox project aims to provide an email (message) store. The main user of the
Mailbox project is James Server
+project. The implementations can be used standalone and do not depend on James Server.
+
+The project defines the Mailbox API and has several implementations that you can use. More
details bellow.
+
+Overview
+========
+
+Apache James Mailbox has the following project (Maven) structure:
+
+~~~
+|-- api             -- Mailbox API
+|-- hbase           -- Mailbox implementation over HBase
+|-- jcr             -- Mailbox implementation over Java Content Repository (JCR)
+|-- jpa             -- Database Mailbox implementation using Java Persistence API
+|-- lucene          -- Email indexing module with Apache Lucene
+|-- maildir         -- Email storage using Maildir format http://en.wikipedia.org/wiki/Maildir
+|-- memory          -- In memory Mailbox implementation - good for testing
+|-- spring          -- Spring module - starts a specific mailbox implementation
+|-- store           -- Common base/utility classes used in all mailbox implementations
+|-- tool            -- Database migration/mailbox export tool
+|-- zoo-seq-provider -- Distributed unique ID generator using Zookeeper and Curator (Clustering
James Mailbox)
+~~~
+
+Mailbox JPA
+===========
+
+Persist email messages inside any database that is supported by your Java Persistence Api
provider. Currently James uses
+OpenJPA (http://openjpa.apache.org/), but it's easy to implement your own.
+
+Mailbox 'In memory' message store
+=================================
+
+In module **memory**, does not persist emails. It just keeps them in memory. Fast, and good
for testing.
+**Note:** Not to be used in production.
+
+Mailbox JCR
+===========
+
+Uses Java Content Repository as a persistence layer. Uses Jackrabbit as a provider (http://jackrabbit.apache.org/),
+but you could swap in any provider. Comes with all the nice features that Jackrabbit has.
+
+
+Mailbox Maildir
+===============
+
+Implements the Maildir standard for email storage (http://en.wikipedia.org/wiki/Maildir).
Works only on GNU/Linux and other
+*Nix systems.
+
+
+Mailbox HBase
+=============
+
+Uses Apache HBase (http://hbase.apache.org/) for storing email messages. Provides a scalable
email storage. To have a fully
+distributed email server you will also need, among others:
+
+* distributed UID generation, look at Zookeeper Sequence Provider (**zoo-seq-provider**)
for distributed locking and Mailbox manipulation
+* distributed SMTP/IMAP access
+* other
+
+Zookeeper Sequence Provider
+==========================
+
+Uses Zookeeper and Curator Framework for generating distributed unique ID's, needed for mailbox
management from multiple
+instances of James (IMAP) servers.
+
+
+Building
+========
+
+The primary build tool for Apache James Mailbox is maven 3.
+
+On a new checkout start by running
+~~~
+    $ mvn clean package
+~~~
+
+This will compiled all modules
+
+For just building without running junit tests:
+~~~
+    $ mvn clean package -DskiTests=true
+~~~

Copied: james/mailbox/trunk/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml (from
r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml?p2=james/mailbox/trunk/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml
(original)
+++ james/mailbox/trunk/hbase/src/main/resources/META-INF/spring/mailbox-hbase.xml Mon Mar
 4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox HBase

Copied: james/mailbox/trunk/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml (from r1443857,
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml?p2=james/mailbox/trunk/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jcr.xml
(original)
+++ james/mailbox/trunk/jcr/src/main/resources/META-INF/spring/mailbox-jcr.xml Mon Mar  4
20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox JCR

Copied: james/mailbox/trunk/jpa/src/main/resources/META-INF/persistence.xml (from r1443857,
james/mailbox/trunk/spring/src/main/resources/META-INF/persistence.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/resources/META-INF/persistence.xml?p2=james/mailbox/trunk/jpa/src/main/resources/META-INF/persistence.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/persistence.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
    (empty)

Copied: james/mailbox/trunk/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml (from r1443857,
james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml?p2=james/mailbox/trunk/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-jpa.xml
(original)
+++ james/mailbox/trunk/jpa/src/main/resources/META-INF/spring/mailbox-jpa.xml Mon Mar  4
20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox JPA

Copied: james/mailbox/trunk/jpa/src/main/resources/james-database.properties (from r1443857,
james/mailbox/trunk/spring/src/main/resources/james-database.properties)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/src/main/resources/james-database.properties?p2=james/mailbox/trunk/jpa/src/main/resources/james-database.properties&p1=james/mailbox/trunk/spring/src/main/resources/james-database.properties&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
    (empty)

Copied: james/mailbox/trunk/lucene/src/main/resources/META-INF/spring/mailbox-index-lucene.xml
(from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/lucene/src/main/resources/META-INF/spring/mailbox-index-lucene.xml?p2=james/mailbox/trunk/lucene/src/main/resources/META-INF/spring/mailbox-index-lucene.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
(original)
+++ james/mailbox/trunk/lucene/src/main/resources/META-INF/spring/mailbox-index-lucene.xml
Mon Mar  4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Lucene

Copied: james/mailbox/trunk/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml
(from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml?p2=james/mailbox/trunk/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-maildir.xml
(original)
+++ james/mailbox/trunk/maildir/src/main/resources/META-INF/spring/mailbox-maildir.xml Mon
Mar  4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Maildir

Copied: james/mailbox/trunk/maildir/src/main/resources/mailbox-maildir.properties (from r1443857,
james/mailbox/trunk/spring/src/main/resources/mailbox-maildir.properties)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/resources/mailbox-maildir.properties?p2=james/mailbox/trunk/maildir/src/main/resources/mailbox-maildir.properties&p1=james/mailbox/trunk/spring/src/main/resources/mailbox-maildir.properties&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
    (empty)

Copied: james/mailbox/trunk/memory/src/main/resources/META-INF/spring/mailbox-memory.xml (from
r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-memory.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/main/resources/META-INF/spring/mailbox-memory.xml?p2=james/mailbox/trunk/memory/src/main/resources/META-INF/spring/mailbox-memory.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-memory.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-memory.xml
(original)
+++ james/mailbox/trunk/memory/src/main/resources/META-INF/spring/mailbox-memory.xml Mon Mar
 4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Memory

Modified: james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java?rev=1452487&r1=1452486&r2=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
(original)
+++ james/mailbox/trunk/spring/src/main/java/org/apache/james/mailbox/spring/SpringMailbox.java
Mon Mar  4 20:31:08 2013
@@ -26,7 +26,7 @@ public class SpringMailbox {
     private ApplicationContext applicationContext;
     
     public SpringMailbox() {
-        applicationContext = new ClassPathXmlApplicationContext("META-INF/org/apache/james/spring-mailbox.xml");
+        applicationContext = new ClassPathXmlApplicationContext("META-INF/spring/spring-mailbox.xml");
     }
     
     public Object getBean(String beanName) {

Copied: james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml
(from r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml?p2=james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-authenticator.xml
(original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-authenticator.xml
Mon Mar  4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Authenticator

Copied: james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-locker.xml (from
r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-locker.xml?p2=james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-locker.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-locker.xml
(original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/spring/mailbox-locker.xml Mon Mar
 4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Locker

Copied: james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml (from
r1443857, james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml)
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml?p2=james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml&p1=james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml&r1=1443857&r2=1452487&rev=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox.xml
(original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/spring/spring-mailbox.xml Mon Mar
 4 20:31:08 2013
@@ -20,30 +20,25 @@
 
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:camel="http://camel.apache.org/schema/spring"
-       xmlns:amq="http://activemq.apache.org/schema/core"
-       xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd
-          http://camel.apache.org/schema/spring classpath:camel-spring.xsd
-          http://activemq.apache.org/schema/core classpath:activemq.xsd">
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Managers
      -->
 
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-locker.xml" />
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-authenticator.xml"
/>
+    <import resource="classpath:META-INF/spring/mailbox-locker.xml"/>
+    <import resource="classpath:META-INF/spring/mailbox-authenticator.xml"/>
     <!-- TODO: fix dependency issues with lucene and JCR and re-enable -->
-    <!--<import resource="classpath:META-INF/org/apache/james/spring-mailbox-lucene.xml"
/>-->
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-jpa.xml" />
+    <!--<import resource="classpath:META-INF/spring/mailbox-index-lucene.xml" />-->
+    <import resource="classpath:META-INF/spring/mailbox-jpa.xml"/>
 
     <!-- TODO: update spring context creation to match new Jackrabbit version -->
-    <!--<import resource="classpath:META-INF/org/apache/james/spring-mailbox-jcr.xml"
/>-->
+    <!--<import resource="classpath:META-INF/spring/mailbox-jcr.xml" />-->
 
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-maildir.xml"
/>
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-memory.xml" />
+    <import resource="classpath:META-INF/spring/mailbox-maildir.xml"/>
+    <import resource="classpath:META-INF/spring/mailbox-memory.xml"/>
     <!-- TODO: Fix hbase build and re-enable -->
-    <!--<import resource="classpath:META-INF/org/apache/james/spring-mailbox-hbase.xml"
/>-->
+    <!--<import resource="classpath:META-INF/spring/mailbox-hbase.xml" />-->
 
     <!-- 
       Mailbox Copier

Modified: james/mailbox/trunk/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml?rev=1452487&r1=1452486&r2=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
(original)
+++ james/mailbox/trunk/spring/src/test/resources/META-INF/org/apache/james/spring-mailbox-lucene.xml
Mon Mar  4 20:31:08 2013
@@ -21,7 +21,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans" 
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="
-          http://www.springframework.org/schema/beans classpath:org/springframework/beans/factory/xml/spring-beans-3.0.xsd">
+          http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
     <!-- 
       Mailbox Lucene

Modified: james/mailbox/trunk/zoo-seq-provider/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/zoo-seq-provider/pom.xml?rev=1452487&r1=1452486&r2=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/zoo-seq-provider/pom.xml (original)
+++ james/mailbox/trunk/zoo-seq-provider/pom.xml Mon Mar  4 20:31:08 2013
@@ -34,7 +34,7 @@
     <description>High performance distribuited sequence provider based on ZooKeepr</description>
 
     <properties>
-        <curator.version>1.1.2</curator.version>
+        <curator.version>1.3.2</curator.version>
     </properties>
 
     <dependencies>

Modified: james/mailbox/trunk/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java?rev=1452487&r1=1452486&r2=1452487&view=diff
==============================================================================
--- james/mailbox/trunk/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
(original)
+++ james/mailbox/trunk/zoo-seq-provider/src/main/java/org/apache/james/mailbox/store/mail/ZooUidProvider.java
Mon Mar  4 20:31:08 2013
@@ -29,7 +29,7 @@ import org.apache.james.mailbox.exceptio
 import org.apache.james.mailbox.store.mail.model.Mailbox;
 
 /**
- * ZooKeepr based implementation of a distribuited sequential UID generator.
+ * ZooKeeper based implementation of a distributed sequential UID generator.
  */
 public class ZooUidProvider<E> implements UidProvider<E> {
     // TODO: use ZK paths to store uid and modSeq, etc.
@@ -43,8 +43,8 @@ public class ZooUidProvider<E> implement
     }
 
     public ZooUidProvider(CuratorFramework client, RetryPolicy retryPolicy) {
-        Preconditions.checkNotNull(client);
-        Preconditions.checkNotNull(retryPolicy);
+        Preconditions.checkNotNull(client, "Curator client is null");
+        Preconditions.checkNotNull(retryPolicy, "Retry policy is null");
         this.client = client;
         this.retryPolicy = retryPolicy;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message