james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ieu...@apache.org
Subject svn commit: r1429793 - in /james/mailbox/trunk: ./ api/ api/src/test/java/org/apache/james/mailbox/ guice/ guice/src/reporting-site/ hbase/ jcr/ jcr/src/test/java/org/apache/james/mailbox/jcr/ jpa/ lucene/ maildir/ memory/ spring/ spring/src/main/resou...
Date Mon, 07 Jan 2013 13:21:21 GMT
Author: ieugen
Date: Mon Jan  7 13:21:20 2013
New Revision: 1429793

URL: http://svn.apache.org/viewvc?rev=1429793&view=rev
Log:
MAILBOX-189 We have bundles and other fixes

* configured maven-bundle-plugin to generate OSGi bundles
* updated dependencies to new versions, most of them now OSGi friendly
* enabled Mailbox Jcr
* disbled Mailbox Hbase and Mailbox Index modules
* added Guava in dependency management

Removed:
    james/mailbox/trunk/guice/pom.xml
    james/mailbox/trunk/guice/src/reporting-site/site.xml
Modified:
    james/mailbox/trunk/.gitignore
    james/mailbox/trunk/api/pom.xml
    james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java
    james/mailbox/trunk/hbase/pom.xml
    james/mailbox/trunk/jcr/pom.xml
    james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
    james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRStressTest.java
    james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRSubscriptionManagerTest.java
    james/mailbox/trunk/jpa/pom.xml
    james/mailbox/trunk/lucene/pom.xml
    james/mailbox/trunk/maildir/pom.xml
    james/mailbox/trunk/memory/pom.xml
    james/mailbox/trunk/pom.xml
    james/mailbox/trunk/spring/pom.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.xml
    james/mailbox/trunk/store/pom.xml
    james/mailbox/trunk/tool/pom.xml
    james/mailbox/trunk/zoo-seq-provider/pom.xml

Modified: james/mailbox/trunk/.gitignore
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/.gitignore?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/.gitignore (original)
+++ james/mailbox/trunk/.gitignore Mon Jan  7 13:21:20 2013
@@ -1,3 +1,6 @@
 .idea/
 target
 *.iml
+derby.log
+var
+log

Modified: james/mailbox/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/api/pom.xml (original)
+++ james/mailbox/trunk/api/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -28,8 +28,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-api</artifactId>
-
-    <name>Apache James Mailbox API</name>
+    <packaging>bundle</packaging>
+    <name>Apache James :: Mailbox :: API</name>
 
     <dependencies>
         <dependency>
@@ -47,7 +47,7 @@
         </dependency>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java (original)
+++ james/mailbox/trunk/api/src/test/java/org/apache/james/mailbox/AbstractStressTest.java Mon Jan  7 13:21:20 2013
@@ -18,6 +18,15 @@
  ****************************************************************/
 package org.apache.james.mailbox;
 
+import org.apache.james.mailbox.exception.MailboxException;
+import org.apache.james.mailbox.model.MailboxConstants;
+import org.apache.james.mailbox.model.MailboxPath;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+import org.junit.Test;
+import org.slf4j.LoggerFactory;
+
+import javax.mail.Flags;
 import java.io.ByteArrayInputStream;
 import java.util.ArrayList;
 import java.util.Date;
@@ -28,103 +37,88 @@ import java.util.concurrent.ExecutorServ
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import javax.mail.Flags;
-
-import junit.framework.Assert;
-
-import org.apache.james.mailbox.MailboxManager;
-import org.apache.james.mailbox.MailboxSession;
-import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.model.MailboxConstants;
-import org.apache.james.mailbox.model.MailboxPath;
-import org.junit.Test;
-import org.slf4j.LoggerFactory;
-
 public abstract class AbstractStressTest {
 
     private final static int APPEND_OPERATIONS = 200;
-    
-    
+
+
     protected abstract MailboxManager getMailboxManager();
-    
+
     @Test
     public void testStessTest() throws InterruptedException, MailboxException {
-       
+
         final CountDownLatch latch = new CountDownLatch(APPEND_OPERATIONS);
-        final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS/2);
+        final ExecutorService pool = Executors.newFixedThreadPool(APPEND_OPERATIONS / 2);
         final List<Long> uList = new ArrayList<Long>();
         MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         getMailboxManager().startProcessingRequest(session);
         final MailboxPath path = new MailboxPath(MailboxConstants.USER_NAMESPACE, "username", "INBOX");
         getMailboxManager().createMailbox(path, session);
         getMailboxManager().addListener(path, new MailboxListener() {
-			
-			
-			@Override
-			public void event(Event event) {
-				long u = ((Added) event).getUids().get(0);
-				uList.add(u);
-			}
-		}, session);
+
+
+            @Override
+            public void event(Event event) {
+                long u = ((Added) event).getUids().get(0);
+                uList.add(u);
+            }
+        }, session);
         getMailboxManager().endProcessingRequest(session);
         getMailboxManager().logout(session, false);
-        
+
         final AtomicBoolean fail = new AtomicBoolean(false);
         final ConcurrentHashMap<Long, Object> uids = new ConcurrentHashMap<Long, Object>();
-        
+
         // fire of 1000 append operations
-        for (int i = 0 ; i < APPEND_OPERATIONS; i++) {
+        for (int i = 0; i < APPEND_OPERATIONS; i++) {
             pool.execute(new Runnable() {
-                
+
                 public void run() {
-                    if (fail.get()){
+                    if (fail.get()) {
                         latch.countDown();
                         return;
                     }
-                    
+
 
                     try {
                         MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
 
                         getMailboxManager().startProcessingRequest(session);
                         MessageManager m = getMailboxManager().getMailbox(path, session);
-                        Long uid =  m.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), session, false, new Flags());
-                        
+                        Long uid = m.appendMessage(new ByteArrayInputStream("Subject: test\r\n\r\ntestmail".getBytes()), new Date(), session, false, new Flags());
+
                         System.out.println("Append message with uid=" + uid);
                         if (uids.put(uid, new Object()) != null) {
                             fail.set(true);
                         }
                         getMailboxManager().endProcessingRequest(session);
-                        getMailboxManager().logout(session,false);
+                        getMailboxManager().logout(session, false);
                     } catch (MailboxException e) {
                         e.printStackTrace();
                         fail.set(true);
                     } finally {
                         latch.countDown();
                     }
-                    
-                    
+
+
                 }
             });
         }
-        
+
         latch.await();
-        
+
         // check if the uids were higher on each append. See MAILBOX-131
         long last = 0;
         for (int i = 0; i < uList.size(); i++) {
             long l = uList.get(i);
             if (l <= last) {
-                Assert.fail(l + "->" + last);
+                fail(l + "->" + last);
             } else {
                 last = l;
             }
 
         }
-        org.junit.Assert.assertFalse("Unable to append all messages",fail.get());
+        assertFalse("Unable to append all messages", fail.get());
         pool.shutdown();
-
-        
     }
 }

Modified: james/mailbox/trunk/hbase/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/hbase/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/hbase/pom.xml (original)
+++ james/mailbox/trunk/hbase/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -28,9 +29,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-hbase</artifactId>
-
-    <name>Apache James HBase Mailbox</name>
     <description>Apache James Mailbox implementation over HBase</description>
+    <name>Apache James :: Mailbox :: HBase</name>
 
     <dependencies>
         <dependency>
@@ -39,7 +39,7 @@
         </dependency>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -115,12 +115,14 @@
             </exclusions>
         </dependency>
     </dependencies>
-    
+
     <profiles>
         <profile>
             <id>noTest</id>
             <activation>
-                <os><family>windows</family></os>
+                <os>
+                    <family>windows</family>
+                </os>
             </activation>
             <build>
                 <plugins>

Modified: james/mailbox/trunk/jcr/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/pom.xml (original)
+++ james/mailbox/trunk/jcr/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -28,13 +29,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-jcr</artifactId>
-
-    <name>Apache James JCR Mailbox</name>
-
-    <!-- we need to set it to 2.4.1 for jackrabbit -->
-    <properties>
-        <version.lucene>2.4.1</version.lucene>
-    </properties>
+    <name>Apache James :: Mailbox :: JCR</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -77,7 +73,7 @@
         </dependency>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <!-- xercesImpl needed for some java versions -->

Modified: james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java (original)
+++ james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java Mon Jan  7 13:21:20 2013
@@ -18,12 +18,6 @@
  ****************************************************************/
 package org.apache.james.mailbox.jcr;
 
-import java.io.File;
-
-import javax.jcr.RepositoryException;
-
-import junit.framework.Assert;
-
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.ConfigurationException;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
@@ -33,52 +27,43 @@ import org.apache.james.mailbox.acl.Grou
 import org.apache.james.mailbox.acl.MailboxACLResolver;
 import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver;
 import org.apache.james.mailbox.acl.UnionMailboxACLResolver;
-import org.apache.james.mailbox.exception.BadCredentialsException;
 import org.apache.james.mailbox.exception.MailboxException;
 import org.apache.james.mailbox.jcr.mail.JCRModSeqProvider;
 import org.apache.james.mailbox.jcr.mail.JCRUidProvider;
 import org.apache.james.mailbox.store.JVMMailboxPathLocker;
 import org.junit.After;
+import static org.junit.Assert.fail;
 import org.junit.Before;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
+import javax.jcr.RepositoryException;
+import java.io.File;
+
 /**
  * JCRMailboxManagerTest that extends the StoreMailboxManagerTest.
  */
 public class JCRMailboxManagerTest extends AbstractMailboxManagerTest {
-    
+
     private static final String JACKRABBIT_HOME = "target/jackrabbit";
-    
+
     public static final String META_DATA_DIRECTORY = "target/user-meta-data";
 
     private static RepositoryImpl repository;
-   
-    /**
-     * Setup the mailboxManager.
-     * 
-     * @throws Exception
-     */
+
     @Before
     public void setup() throws Exception {
         createMailboxManager();
     }
 
-    
-    /**
-     * Close system session and shutdown system repository.
-     */
     @After
-    public void tearDown() throws BadCredentialsException, MailboxException {
+    public void tearDown() throws MailboxException {
         MailboxSession session = getMailboxManager().createSystemSession("test", LoggerFactory.getLogger("Test"));
         session.close();
         repository.shutdown();
         new File(JACKRABBIT_HOME).delete();
     }
-    
-    /* (non-Javadoc)
-     * @see org.apache.james.mailbox.MailboxManagerTest#createMailboxManager()
-     */
+
     protected void createMailboxManager() throws MailboxException {
 
         new File(JACKRABBIT_HOME).delete();
@@ -92,10 +77,10 @@ public class JCRMailboxManagerTest exten
             repository = RepositoryImpl.create(config);
         } catch (ConfigurationException e) {
             e.printStackTrace();
-            Assert.fail();
+            fail();
         } catch (RepositoryException e) {
             e.printStackTrace();
-            Assert.fail();
+            fail();
         }
 
         // Register imap cnd file
@@ -103,9 +88,9 @@ public class JCRMailboxManagerTest exten
         MailboxSessionJCRRepository sessionRepos = new GlobalMailboxSessionJCRRepository(repository, workspace, user, pass);
         JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
         JCRUidProvider uidProvider = new JCRUidProvider(locker, sessionRepos);
-        JCRModSeqProvider modSeqProvider= new JCRModSeqProvider(locker, sessionRepos);
+        JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker, sessionRepos);
         JCRMailboxSessionMapperFactory mf = new JCRMailboxSessionMapperFactory(sessionRepos, uidProvider, modSeqProvider);
-        
+
         MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
         GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
 

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=1429793&r1=1429792&r2=1429793&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 Mon Jan  7 13:21:20 2013
@@ -18,10 +18,6 @@
  ****************************************************************/
 package org.apache.james.mailbox.jcr;
 
-import java.io.File;
-
-import javax.jcr.RepositoryException;
-
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.james.mailbox.AbstractStressTest;
@@ -40,12 +36,15 @@ import org.junit.Before;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
+import javax.jcr.RepositoryException;
+import java.io.File;
+
 public class JCRStressTest extends AbstractStressTest {
-    
+
     private JCRMailboxManager mailboxManager;
     private RepositoryImpl repository;
     private static final String JACKRABBIT_HOME = "target/jackrabbit";
-   
+
     @Before
     public void setUp() throws RepositoryException, MailboxException {
 
@@ -62,19 +61,18 @@ public class JCRStressTest extends Abstr
         MailboxSessionJCRRepository sessionRepos = new GlobalMailboxSessionJCRRepository(repository, workspace, user, pass);
         JVMMailboxPathLocker locker = new JVMMailboxPathLocker();
         JCRUidProvider uidProvider = new JCRUidProvider(locker, sessionRepos);
-        JCRModSeqProvider modSeqProvider= new JCRModSeqProvider(locker, sessionRepos);
+        JCRModSeqProvider modSeqProvider = new JCRModSeqProvider(locker, sessionRepos);
         JCRMailboxSessionMapperFactory mf = new JCRMailboxSessionMapperFactory(sessionRepos, uidProvider, modSeqProvider);
         MailboxACLResolver aclResolver = new UnionMailboxACLResolver();
         GroupMembershipResolver groupMembershipResolver = new SimpleGroupMembershipResolver();
 
         mailboxManager = new JCRMailboxManager(mf, null, locker, aclResolver, groupMembershipResolver);
         mailboxManager.init();
-
     }
-    
+
     @After
     public void tearDown() {
-        MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger("Test"));
+        MailboxSession session = mailboxManager.createSystemSession("test", LoggerFactory.getLogger(JCRStressTest.class));
         session.close();
         repository.shutdown();
         new File(JACKRABBIT_HOME).delete();
@@ -84,5 +82,5 @@ public class JCRStressTest extends Abstr
     protected MailboxManager getMailboxManager() {
         return mailboxManager;
     }
- 
+
 }

Modified: james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRSubscriptionManagerTest.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRSubscriptionManagerTest.java?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRSubscriptionManagerTest.java (original)
+++ james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRSubscriptionManagerTest.java Mon Jan  7 13:21:20 2013
@@ -18,10 +18,6 @@
  ****************************************************************/
 package org.apache.james.mailbox.jcr;
 
-import java.io.File;
-
-import javax.jcr.RepositoryException;
-
 import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.config.RepositoryConfig;
 import org.apache.james.mailbox.AbstractSubscriptionManagerTest;
@@ -30,26 +26,28 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.xml.sax.InputSource;
 
-public class JCRSubscriptionManagerTest extends AbstractSubscriptionManagerTest{
+import javax.jcr.RepositoryException;
+import java.io.File;
+
+public class JCRSubscriptionManagerTest extends AbstractSubscriptionManagerTest {
     private static final String JACKRABBIT_HOME = "target/jackrabbit";
-    
+
     public static final String META_DATA_DIRECTORY = "target/user-meta-data";
 
     private static RepositoryImpl repository;
     private static String user = "user";
     private static String pass = "pass";
     private static String workspace = null;
+
     @BeforeClass
     public static void before() throws RepositoryException {
-       
-        RepositoryConfig  config = RepositoryConfig.create(new InputSource(JCRMailboxManagerTest.class.getClassLoader().getResourceAsStream("test-repository.xml")), JACKRABBIT_HOME);
+        RepositoryConfig config = RepositoryConfig.create(new InputSource(JCRMailboxManagerTest.class.getClassLoader().getResourceAsStream("test-repository.xml")), JACKRABBIT_HOME);
         repository = RepositoryImpl.create(config);
-       
 
         // Register imap cnd file
         JCRUtils.registerCnd(repository, workspace, user, pass);
     }
-    
+
     @AfterClass
     public static void after() {
         if (repository != null) {
@@ -57,7 +55,7 @@ public class JCRSubscriptionManagerTest 
         }
         new File(JACKRABBIT_HOME).delete();
     }
-    
+
     @Override
     public SubscriptionManager createSubscriptionManager() {
 

Modified: james/mailbox/trunk/jpa/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jpa/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/jpa/pom.xml (original)
+++ james/mailbox/trunk/jpa/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -17,7 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -28,8 +29,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-jpa</artifactId>
-
-    <name>Apache James JPA Mailbox</name>
+    <name>Apache James :: Mailbox :: JPA</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -58,7 +59,7 @@
         </dependency>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -108,7 +109,9 @@
                         </property>
                         <property>
                             <name>metaDataFactory</name>
-                            <value>jpa(Types=org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;org.apache.james.mailbox.jpa.mail.model.JPAMailbox;org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage;org.apache.james.mailbox.jpa.mail.model.JPAProperty;org.apache.james.mailbox.jpa.user.model.JPASubscription)</value>
+                            <value>
+                                jpa(Types=org.apache.james.mailbox.jpa.mail.model.JPAUserFlag;org.apache.james.mailbox.jpa.mail.model.JPAMailbox;org.apache.james.mailbox.jpa.mail.model.openjpa.AbstractJPAMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAEncryptedMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAMessage;org.apache.james.mailbox.jpa.mail.model.openjpa.JPAStreamingMessage;org.apache.james.mailbox.jpa.mail.model.JPAProperty;org.apache.james.mailbox.jpa.user.model.JPASubscription)
+                            </value>
                         </property>
                     </toolProperties>
                 </configuration>

Modified: james/mailbox/trunk/lucene/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/lucene/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/lucene/pom.xml (original)
+++ james/mailbox/trunk/lucene/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -28,8 +28,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-lucene</artifactId>
-
-    <name>Apache James Mailbox Lucene Index</name>
+    <name>Apache James :: Mailbox :: Lucene Index</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>

Modified: james/mailbox/trunk/maildir/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/pom.xml (original)
+++ james/mailbox/trunk/maildir/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -28,8 +28,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-maildir</artifactId>
-
-    <name>Apache James Maildir Mailbox</name>
+    <name>Apache James :: Mailbox :: Maildir</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -83,7 +83,7 @@
         </dependency>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

Modified: james/mailbox/trunk/memory/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/memory/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/memory/pom.xml (original)
+++ james/mailbox/trunk/memory/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -28,8 +28,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-memory</artifactId>
-
-    <name>Apache James In Memory Mailbox</name>
+    <name>Apache James :: Mailbox :: In Memory</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>

Modified: james/mailbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Mon Jan  7 13:21:20 2013
@@ -17,21 +17,22 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>james-project</artifactId>
         <groupId>org.apache.james</groupId>
         <version>1.8.1</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <artifactId>apache-james-mailbox</artifactId>
     <version>0.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>Apache James Mailbox</name>
+    <name>Apache James :: Mailbox</name>
     <description>Apache James Mailbox</description>
     <url>http://james.apache.org/mailbox</url>
     <inceptionYear>2010</inceptionYear>
@@ -39,12 +40,14 @@
     <modules>
         <module>api</module>
         <module>store</module>
-        <module>lucene</module>
+        <!-- Disabled - Dependency issues -> jackrabbit requires lucene 3.0.3, we need to downgrade -->
+        <!--<module>lucene</module>-->
         <module>memory</module>
         <module>jpa</module>
         <module>jcr</module>
         <module>maildir</module>
-        <module>hbase</module>
+        <!-- Disabled for now tests need to be configured -->
+        <!--<module>hbase</module>-->
         <module>spring</module>
         <module>tool</module>
         <module>zoo-seq-provider</module>
@@ -68,28 +71,52 @@
     </distributionManagement>
 
     <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <javax.activation.groupId>javax.activation</javax.activation.groupId>
         <javax.activation.artifactId>activation</javax.activation.artifactId>
         <javax.mail.groupId>javax.mail</javax.mail.groupId>
         <javax.mail.artifactId>mail</javax.mail.artifactId>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <version.openjpa>2.2.0</version.openjpa>
-        <version.javax.persistence>1.0.2</version.javax.persistence>
-        <version.javax.inject>1</version.javax.inject>
-        <version.commons-lang>2.4</version.commons-lang>
-        <version.apache-mime4j>0.7.2</version.apache-mime4j>
-        <version.javax.mail>1.4.1</version.javax.mail>
-        <version.activation>1.1.1</version.activation>
-        <version.jmock>2.5.1</version.jmock>
-        <version.lucene>3.1.0</version.lucene>
-        <version.jackrabbit>2.2.0</version.jackrabbit>
-        <version.hbase>0.92.0</version.hbase>
-        <version.hadoop>1.0.1</version.hadoop>
-        <version.spring>3.1.0.RELEASE</version.spring>
+        <openjpa.version>2.2.1</openjpa.version>
+        <javax.persistence.version>1.0.2</javax.persistence.version>
+        <javax.inject.version>1</javax.inject.version>
+        <apache-mime4j.version>0.7.2</apache-mime4j.version>
+        <javax.mail.version>1.4.1</javax.mail.version>
+        <activation.version>1.1.1</activation.version>
+        <jmock.version>2.5.1</jmock.version>
+        <hbase.version>0.92.0</hbase.version>
+        <hadoop.version>1.0.1</hadoop.version>
+        <spring.version>3.1.2.RELEASE</spring.version>
+        <commons-io.version>2.4</commons-io.version>
+        <commons-lang.version>2.6</commons-lang.version>
+        <commons-pool.version>1.6</commons-pool.version>
+        <commons-dbcp.version>1.4</commons-dbcp.version>
+        <commons-configuration.version>1.9</commons-configuration.version>
+        <commons-beanutils-core.version>1.8.3</commons-beanutils-core.version>
+        <h2.version>1.3.170</h2.version>
+        <derby.version>10.9.1.0</derby.version>
+        <geronimo-jpa-spec.version>1.1</geronimo-jpa-spec.version>
+        <jcr.version>2.0</jcr.version>
+        <jackrabbit.version>2.4.3</jackrabbit.version>
+        <lucene.version>3.0.3</lucene.version>
+        <xercesImpl.version>2.9.1</xercesImpl.version>
+        <xml-apis.version>1.3.04</xml-apis.version>
+        <geronimo-annotation-spec.version>1.1.1</geronimo-annotation-spec.version>
+        <geronimo-activation-spec.version>1.1</geronimo-activation-spec.version>
+        <geronimo-javamail-mail.version>1.8.3</geronimo-javamail-mail.version>
+        <apache-mailet.version>2.5.0</apache-mailet.version>
+        <slf4j.version>1.7.2</slf4j.version>
+        <junit.version>4.11</junit.version>
+        <jasypt.version>1.9.0</jasypt.version>
+        <guava.version>13.0</guava.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
             <!--
                 START Modules
             -->
@@ -165,17 +192,17 @@
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-core</artifactId>
-                <version>${version.lucene}</version>
+                <version>${lucene.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-analyzers</artifactId>
-                <version>${version.lucene}</version>
+                <version>${lucene.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-smartcn</artifactId>
-                <version>${version.lucene}</version>
+                <version>${lucene.version}</version>
             </dependency>
 
             <!--
@@ -184,39 +211,39 @@
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>apache-mime4j-core</artifactId>
-                <version>${version.apache-mime4j}</version>
+                <version>${apache-mime4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
                 <artifactId>apache-mime4j-dom</artifactId>
-                <version>${version.apache-mime4j}</version>
+                <version>${apache-mime4j.version}</version>
             </dependency>
             <!-- Declare javamail as provided to be able to easily switch -->
             <!-- to different implementations (Geronimo) -->
             <dependency>
                 <groupId>javax.mail</groupId>
                 <artifactId>mail</artifactId>
-                <version>${version.javax.mail}</version>
+                <version>${javax.mail.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.activation</groupId>
                 <artifactId>activation</artifactId>
-                <version>${version.activation}</version>
+                <version>${activation.version}</version>
             </dependency>
             <dependency>
                 <groupId>javax.inject</groupId>
                 <artifactId>javax.inject</artifactId>
-                <version>${version.javax.inject}</version>
+                <version>${javax.inject.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-activation_1.1_spec</artifactId>
-                <version>1.0.2</version>
+                <version>${geronimo-activation-spec.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.javamail</groupId>
                 <artifactId>geronimo-javamail_1.4_mail</artifactId>
-                <version>1.6</version>
+                <version>${geronimo-javamail-mail.version}</version>
             </dependency>
             <!--
                 END Mail
@@ -227,8 +254,8 @@
             -->
             <dependency>
                 <groupId>org.apache.james</groupId>
-                <artifactId>apache-mailet</artifactId>
-                <version>2.4</version>
+                <artifactId>apache-mailet-api</artifactId>
+                <version>${apache-mailet.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -243,12 +270,12 @@
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.6.1</version>
+                <version>${slf4j.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-simple</artifactId>
-                <version>1.6.1</version>
+                <version>${slf4j.version}</version>
                 <scope>test</scope>
             </dependency>
             <!--
@@ -261,17 +288,17 @@
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>${version.commons-lang}</version>
+                <version>${commons-lang.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
                 <artifactId>commons-pool</artifactId>
-                <version>1.2</version>
+                <version>${commons-pool.version}</version>
             </dependency>
             <dependency>
                 <groupId>commons-dbcp</groupId>
                 <artifactId>commons-dbcp</artifactId>
-                <version>1.4</version>
+                <version>${commons-dbcp.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>xercesImpl</artifactId>
@@ -283,7 +310,7 @@
                 <groupId>commons-configuration</groupId>
                 <artifactId>commons-configuration</artifactId>
                 <scope>test</scope>
-                <version>1.6</version>
+                <version>${commons-configuration.version}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>dom4j</artifactId>
@@ -314,7 +341,7 @@
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils-core</artifactId>
-                <version>1.7.0</version>
+                <version>${commons-beanutils-core.version}</version>
             </dependency>
             <!--
                 END Commons
@@ -330,43 +357,37 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.1</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit-dep</artifactId>
-                <version>4.4</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.jmock</groupId>
                 <artifactId>jmock</artifactId>
-                <version>${version.jmock}</version>
+                <version>${jmock.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.jmock</groupId>
                 <artifactId>jmock-junit4</artifactId>
-                <version>${version.jmock}</version>
+                <version>${jmock.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>1.2.134</version>
+                <version>${h2.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.derby</groupId>
                 <artifactId>derby</artifactId>
-                <version>10.7.1.1</version>
+                <version>${derby.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.0.1</version>
+                <version>${commons-io.version}</version>
             </dependency>
 
             <!--
@@ -380,17 +401,17 @@
             <dependency>
                 <groupId>org.apache.openjpa</groupId>
                 <artifactId>openjpa</artifactId>
-                <version>${version.openjpa}</version>
+                <version>${openjpa.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-jpa_2.0_spec</artifactId>
-                <version>1.1</version>
+                <version>${geronimo-jpa-spec.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jasypt</groupId>
                 <artifactId>jasypt</artifactId>
-                <version>1.7.1</version>
+                <version>${jasypt.version}</version>
             </dependency>
 
             <!--
@@ -403,30 +424,30 @@
             <dependency>
                 <groupId>javax.jcr</groupId>
                 <artifactId>jcr</artifactId>
-                <version>2.0</version>
+                <version>${jcr.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>jackrabbit-jcr-commons</artifactId>
-                <version>${version.jackrabbit}</version>
+                <version>${jackrabbit.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.jackrabbit</groupId>
                 <artifactId>jackrabbit-core</artifactId>
-                <version>${version.jackrabbit}</version>
+                <version>${jackrabbit.version}</version>
                 <scope>test</scope>
             </dependency>
 
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>2.9.1</version>
+                <version>${xercesImpl.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>xml-apis</groupId>
                 <artifactId>xml-apis</artifactId>
-                <version>1.3.04</version>
+                <version>${xml-apis.version}</version>
                 <scope>test</scope>
             </dependency>
 
@@ -441,7 +462,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.1.1</version>
+                <version>${geronimo-annotation-spec.version}</version>
             </dependency>
 
             <!--
@@ -454,22 +475,22 @@
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-core</artifactId>
-                <version>${version.spring}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-beans</artifactId>
-                <version>${version.spring}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-context</artifactId>
-                <version>${version.spring}</version>
+                <version>${spring.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-orm</artifactId>
-                <version>${version.spring}</version>
+                <version>${spring.version}</version>
             </dependency>
 
             <!--
@@ -482,24 +503,24 @@
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase</artifactId>
-                <version>${version.hbase}</version>
+                <version>${hbase.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase</artifactId>
-                <version>${version.hbase}</version>
+                <version>${hbase.version}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-core</artifactId>
-                <version>${version.hadoop}</version>
+                <version>${hadoop.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-test</artifactId>
-                <version>${version.hadoop}</version>
+                <version>${hadoop.version}</version>
                 <scope>test</scope>
             </dependency>
             <!--
@@ -521,15 +542,26 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <useDefaultManifestFile>true</useDefaultManifestFile>
-                    <archive>
-                        <manifest>
-                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-                            <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-                        </manifest>
-                    </archive>
-                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-clean-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>auto-clean</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <goal>clean</goal>
+                        </goals>
+                        <configuration>
+                            <filesets>
+                                <fileset>
+                                    <directory>var</directory>
+                                    <directory>log</directory>
+                                </fileset>
+                            </filesets>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -544,22 +576,8 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <version>2.3.7</version>
                 <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>org.apache.james.mailbox.*</Export-Package>
-                        <Embed-Dependency>*;scope=runtime</Embed-Dependency>
-                    </instructions>
-                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: james/mailbox/trunk/spring/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/spring/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/spring/pom.xml (original)
+++ james/mailbox/trunk/spring/pom.xml Mon Jan  7 13:21:20 2013
@@ -17,7 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -28,8 +29,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-spring</artifactId>
-
-    <name>Apache James Mailbox Spring</name>
+    <name>Apache James :: Mailbox :: Spring</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>
@@ -56,17 +57,15 @@
             <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-maildir</artifactId>
         </dependency>
+        <!-- TODO: enable after fix maibox-hbase -->
+        <!--<dependency>-->
+        <!--<groupId>org.apache.james</groupId>-->
+        <!--<artifactId>apache-james-mailbox-hbase</artifactId>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.james</groupId>
-            <artifactId>apache-james-mailbox-hbase</artifactId>
-        </dependency>
-        <!--
-            JCR temporary desactivated because jackrabbit still uses lucene 2
-            <dependency>
-            <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-jcr</artifactId>
-            </dependency>
-        -->
+        </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-tool</artifactId>
@@ -105,23 +104,23 @@
             <groupId>javax.jcr</groupId>
             <artifactId>jcr</artifactId>
         </dependency>
-        <!--
-            JCR temporary desactivated because jackrabbit still uses lucene 2
-            <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-core</artifactId>
-            <version>2.4.1</version>
-            <scope>test</scope>
-            </dependency>
-            <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-core</artifactId>
-            </dependency>
-            <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-jcr-commons</artifactId>
-            </dependency>
-        -->
+            <!--
+                JCR temporary desactivated because jackrabbit still uses lucene 2
+                <dependency>
+                <groupId>org.apache.lucene</groupId>
+                <artifactId>lucene-core</artifactId>
+                <version>2.4.1</version>
+                <scope>test</scope>
+                </dependency>
+                <dependency>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-core</artifactId>
+                </dependency>
+                <dependency>
+                <groupId>org.apache.jackrabbit</groupId>
+                <artifactId>jackrabbit-jcr-commons</artifactId>
+                </dependency>
+            -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

Modified: 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/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml (original)
+++ james/mailbox/trunk/spring/src/main/resources/META-INF/org/apache/james/spring-mailbox-hbase.xml Mon Jan  7 13:21:20 2013
@@ -44,7 +44,7 @@
         <constructor-arg index="3" ref="aclResolver"/>
         <constructor-arg index="4" ref="groupMembershipResolver"/>
     </bean>
-    
+
     <bean id="hbase-sessionMapperFactory" class="org.apache.james.mailbox.hbase.HBaseMailboxSessionMapperFactory">
         <constructor-arg index="0" ref="hbase-conf"/>
         <constructor-arg index="1" ref="hbase-uidProvider"/>
@@ -56,7 +56,7 @@
     <bean id="hbase-modSeqProvider" class="org.apache.james.mailbox.hbase.mail.HBaseModSeqProvider">
         <constructor-arg index="0" ref="hbase-conf"/>
     </bean>
-    
+
     <alias name="jvm-locker" alias="hbase-locker"/>
 
 </beans>

Modified: 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/org/apache/james/spring-mailbox.xml?rev=1429793&r1=1429792&r2=1429793&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/org/apache/james/spring-mailbox.xml Mon Jan  7 13:21:20 2013
@@ -33,16 +33,17 @@
 
     <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/org/apache/james/spring-mailbox-lucene.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" />
-<!--
-    JCR temporary desactivated because jackrabbit still uses lucene 2
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-jcr.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/org/apache/james/spring-mailbox-maildir.xml" />
     <import resource="classpath:META-INF/org/apache/james/spring-mailbox-memory.xml" />
-
-    <import resource="classpath:META-INF/org/apache/james/spring-mailbox-hbase.xml" />
+    <!-- TODO: Fix hbase build and re-enable -->
+    <!--<import resource="classpath:META-INF/org/apache/james/spring-mailbox-hbase.xml" />-->
 
     <!-- 
       Mailbox Copier

Modified: james/mailbox/trunk/store/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/store/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/store/pom.xml (original)
+++ james/mailbox/trunk/store/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -28,8 +28,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-store</artifactId>
-
-    <name>Apache James Mailbox Store Framework</name>
+    <name>Apache James :: Mailbox :: Store Framework</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>

Modified: james/mailbox/trunk/tool/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/tool/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/tool/pom.xml (original)
+++ james/mailbox/trunk/tool/pom.xml Mon Jan  7 13:21:20 2013
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
     Licensed to the Apache Software Foundation (ASF) under one
     or more contributor license agreements. See the NOTICE file
@@ -28,8 +28,8 @@
     </parent>
 
     <artifactId>apache-james-mailbox-tool</artifactId>
-
-    <name>Apache James Mailbox Tools</name>
+    <name>Apache James :: Mailbox :: Tools</name>
+    <packaging>bundle</packaging>
 
     <dependencies>
         <dependency>

Modified: james/mailbox/trunk/zoo-seq-provider/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/zoo-seq-provider/pom.xml?rev=1429793&r1=1429792&r2=1429793&view=diff
==============================================================================
--- james/mailbox/trunk/zoo-seq-provider/pom.xml (original)
+++ james/mailbox/trunk/zoo-seq-provider/pom.xml Mon Jan  7 13:21:20 2013
@@ -17,7 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -28,9 +29,9 @@
     </parent>
 
     <artifactId>zookeeper-sequence-provider</artifactId>
-
-    <name>Apache James Zookeeper Sequence Provider</name>
-    <description>High performance distribuited sequence provider based on ZooKeepr </description>
+    <name>Apache James :: Mailbox :: Zookeeper Sequence Provider</name>
+    <packaging>bundle</packaging>
+    <description>High performance distribuited sequence provider based on ZooKeepr</description>
 
     <properties>
         <curator.version>1.1.2</curator.version>
@@ -39,7 +40,7 @@
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
-            <artifactId>junit-dep</artifactId>
+            <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -48,8 +49,7 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>1.6.4</version>
+            <artifactId>slf4j-simple</artifactId>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>



---------------------------------------------------------------------
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