james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject svn commit: r1688123 - in /james/mailbox/trunk: elasticsearch/.gitignore elasticsearch/README.txt elasticsearch/pom.xml elasticsearch/src/reporting-site/ elasticsearch/src/reporting-site/site.xml pom.xml
Date Mon, 29 Jun 2015 08:31:02 GMT
Author: btellier
Date: Mon Jun 29 08:31:02 2015
New Revision: 1688123

URL: http://svn.apache.org/r1688123
Log:
MAILBOX-242 Complete mailbox-elasticsearch project - patch contributed by Antoine Duprat

Added:
    james/mailbox/trunk/elasticsearch/.gitignore
    james/mailbox/trunk/elasticsearch/README.txt
    james/mailbox/trunk/elasticsearch/src/reporting-site/
    james/mailbox/trunk/elasticsearch/src/reporting-site/site.xml
Modified:
    james/mailbox/trunk/elasticsearch/pom.xml
    james/mailbox/trunk/pom.xml

Added: james/mailbox/trunk/elasticsearch/.gitignore
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/elasticsearch/.gitignore?rev=1688123&view=auto
==============================================================================
--- james/mailbox/trunk/elasticsearch/.gitignore (added)
+++ james/mailbox/trunk/elasticsearch/.gitignore Mon Jun 29 08:31:02 2015
@@ -0,0 +1,6 @@
+data
+.classpath
+.project
+.settings/
+target/
+*.iml

Added: james/mailbox/trunk/elasticsearch/README.txt
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/elasticsearch/README.txt?rev=1688123&view=auto
==============================================================================
--- james/mailbox/trunk/elasticsearch/README.txt (added)
+++ james/mailbox/trunk/elasticsearch/README.txt Mon Jun 29 08:31:02 2015
@@ -0,0 +1 @@
+= ElasticSearch search implementation

Modified: james/mailbox/trunk/elasticsearch/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/elasticsearch/pom.xml?rev=1688123&r1=1688122&r2=1688123&view=diff
==============================================================================
--- james/mailbox/trunk/elasticsearch/pom.xml (original)
+++ james/mailbox/trunk/elasticsearch/pom.xml Mon Jun 29 08:31:02 2015
@@ -27,9 +27,9 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-
     <artifactId>apache-james-mailbox-elasticsearch</artifactId>
     <description>Apache James Mailbox IMAP search implementation using ElasticSearch</description>
+    <name>Apache James :: Mailbox :: ElasticSearch</name>
 
     <properties>
         <javax.mail.groupId>javax.mail</javax.mail.groupId>
@@ -42,7 +42,7 @@
             <artifactId>apache-james-mailbox-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-store</artifactId>
         </dependency>
         <dependency>
@@ -51,7 +51,6 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -72,6 +71,11 @@
             <version>16.0</version>
         </dependency>
         <dependency>
+            <groupId>com.jayway.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>1.6.3</version>
+        </dependency>
+        <dependency>
             <groupId>${javax.mail.groupId}</groupId>
             <artifactId>${javax.mail.artifactId}</artifactId>
         </dependency>
@@ -93,6 +97,12 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>4.10.4</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>3.0.0</version>
@@ -104,6 +114,13 @@
             <version>1.5.2</version>
         </dependency>
         <dependency>
+            <groupId>org.elasticsearch</groupId>
+            <artifactId>elasticsearch</artifactId>
+            <version>1.5.2</version>
+            <scope>test</scope>
+            <type>test-jar</type>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
@@ -257,4 +274,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>

Added: james/mailbox/trunk/elasticsearch/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/elasticsearch/src/reporting-site/site.xml?rev=1688123&view=auto
==============================================================================
--- james/mailbox/trunk/elasticsearch/src/reporting-site/site.xml (added)
+++ james/mailbox/trunk/elasticsearch/src/reporting-site/site.xml Mon Jun 29 08:31:02 2015
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.    
+-->
+<project name="${project.name}">
+
+    <body>
+
+        <menu ref="parent" />
+        <menu ref="reports" />
+
+    </body>
+
+</project>

Modified: james/mailbox/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/pom.xml?rev=1688123&r1=1688122&r2=1688123&view=diff
==============================================================================
--- james/mailbox/trunk/pom.xml (original)
+++ james/mailbox/trunk/pom.xml Mon Jun 29 08:31:02 2015
@@ -50,9 +50,9 @@
     <modules>
         <module>api</module>
         <module>caching</module>
-        <module>hbase</module>
         <module>cassandra</module>
         <module>elasticsearch</module>
+        <module>hbase</module>
         <module>jcr</module>
         <module>jpa</module>
         <module>lucene</module>
@@ -156,11 +156,6 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.james</groupId>
-                <artifactId>apache-james-mailbox-elasticsearch</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.james</groupId>
                 <artifactId>apache-james-mailbox-lucene</artifactId>
                 <version>${project.version}</version>
             </dependency>
@@ -206,6 +201,11 @@
                 <artifactId>apache-james-mailbox-cassandra</artifactId>
                 <version>${project.version}</version>
             </dependency>
+           <dependency>
+                <groupId>org.apache.james</groupId>
+                <artifactId>apache-james-mailbox-elasticsearch</artifactId>
+                <version>${project.version}</version>
+            </dependency>
 
            <dependency>
                 <groupId>org.apache.james</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