You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/09 09:22:38 UTC
[1/4] james-project git commit: JAMES-2109 Consolidate install
documentation for Guice
Repository: james-project
Updated Branches:
refs/heads/master eaf503e66 -> 6ed40404e
JAMES-2109 Consolidate install documentation for Guice
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3b63f45f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3b63f45f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3b63f45f
Branch: refs/heads/master
Commit: 3b63f45f3a3d5264089e4e788f05995a39301ca6
Parents: 8cb90d8
Author: benwa <bt...@linagora.com>
Authored: Fri Aug 4 11:11:19 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 9 16:19:16 2017 +0700
----------------------------------------------------------------------
.../container/guice/cassandra-guice/README.adoc | 56 ----------------
.../container/guice/cassandra-guice/README.md | 4 ++
.../guice/cassandra-ldap-guice/README.md | 4 ++
server/container/guice/jpa-guice/README.adoc | 44 -------------
server/container/guice/jpa-guice/README.md | 4 ++
server/container/guice/jpa-smtp/README.adoc | 40 ------------
server/container/guice/jpa-smtp/README.md | 4 ++
.../markdown/server/install/guice-cassandra.md | 68 ++++++++++++++++++++
.../markdown/server/install/guice-jpa-smtp.md | 37 +++++++++++
src/site/markdown/server/install/guice-jpa.md | 44 +++++++++++++
src/site/site.xml | 7 +-
src/site/xdoc/server/install.xml | 4 ++
src/site/xdoc/server/packaging.xml | 8 +++
13 files changed, 183 insertions(+), 141 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/cassandra-guice/README.adoc
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/README.adoc b/server/container/guice/cassandra-guice/README.adoc
deleted file mode 100644
index f930b89..0000000
--- a/server/container/guice/cassandra-guice/README.adoc
+++ /dev/null
@@ -1,56 +0,0 @@
-= Guice-Cassandra Module How-to
-
-== Building
-
-=== Requirements
-
- * Java 8 SDK
- * Docker ∕ ElasticSearch 2.2.1 and Cassandra 2.2.3
- * Maven 3
-
-=== Building the artifacts
-
-An usual compilation using maven will produce two artifacts into target directory:
-
- * james-server-cassandra-guice.jar
- * james-server-cassandra-guice.lib
-
-You can for example run in the base of this git repository:
-
-```
-mvn clean install
-```
-
-== Running
-
-=== Requirements
-
- * Cassandra
- * ElasticSearch 1.5.2
-
-=== James Launch
-
-To run james, you have to create a directory containing required configuration files.
-
-James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample
-directory for configuration from dockerfiles/run/guice/cassandra/destination/conf. You might need to adapt it to your needs.
-
-You also need to generate a keystore in your conf folder with the following command:
-[source]
-----
-$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
-----
-
-You need to have a Cassandra and an ElasticSearch instance running. You can either install the servers or launch them via docker:
-
-```bash
-$ docker run -d --port 9042:9042 --name=cassandra cassandra:2.2.3
-$ docker run -d --port 9200:9200 --port 9300:9300 --name=elasticsearch elasticsearch:2.2.1
-```
-
-Once everything is set up, you just have to run the jar with:
-
-[source]
-----
-$ java -Dworking.directory=. -jar target/james-server-cassandra-guice.jar
-----
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/cassandra-guice/README.md
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/README.md b/server/container/guice/cassandra-guice/README.md
new file mode 100644
index 0000000..ca9b20c
--- /dev/null
+++ b/server/container/guice/cassandra-guice/README.md
@@ -0,0 +1,4 @@
+# Install James Cassandra-Guice
+
+Follow this [guide](https://james.apache.org/server/install/guice-cassandra.html) to install James Cassandra-guice
+from command line.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/cassandra-ldap-guice/README.md
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/README.md b/server/container/guice/cassandra-ldap-guice/README.md
new file mode 100644
index 0000000..ca9b20c
--- /dev/null
+++ b/server/container/guice/cassandra-ldap-guice/README.md
@@ -0,0 +1,4 @@
+# Install James Cassandra-Guice
+
+Follow this [guide](https://james.apache.org/server/install/guice-cassandra.html) to install James Cassandra-guice
+from command line.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/jpa-guice/README.adoc
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/README.adoc b/server/container/guice/jpa-guice/README.adoc
deleted file mode 100644
index 4db218f..0000000
--- a/server/container/guice/jpa-guice/README.adoc
+++ /dev/null
@@ -1,44 +0,0 @@
-= Guice-JPA Module How-to
-
-== Building
-
-=== Requirements
-
- * Java 8 SDK
- * Docker
- * Maven 3
-
-=== Building the artifacts
-
-An usual compilation using maven will produce two artifacts into target directory:
-
- * james-server-jpa-guice.jar
- * james-server-jpa-guice.lib
-
-You can for example run in the base of this git repository:
-
-```
-mvn clean install
-```
-
-== Running
-
-=== James Launch
-
-To run james, you have to create a directory containing required configuration files.
-
-James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample
-directory for configuration from dockerfiles/run/guice/jpa/destination/conf. You might need to adapt it to your needs.
-
-You also need to generate a keystore in your conf folder with the following command:
-[source]
-----
-$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
-----
-
-Once everything is set up, you just have to run the jar with:
-
-[source]
-----
-$ java -Dworking.directory=. -jar target/james-server-jpa-guice.jar
-----
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/jpa-guice/README.md
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/README.md b/server/container/guice/jpa-guice/README.md
new file mode 100644
index 0000000..708882c
--- /dev/null
+++ b/server/container/guice/jpa-guice/README.md
@@ -0,0 +1,4 @@
+# Install James JPA-Guice
+
+Follow this [guide](https://james.apache.org/server/install/guice-jpa.html) to install James JPA-guice
+from command line.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/jpa-smtp/README.adoc
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/README.adoc b/server/container/guice/jpa-smtp/README.adoc
deleted file mode 100644
index bedf715..0000000
--- a/server/container/guice/jpa-smtp/README.adoc
+++ /dev/null
@@ -1,40 +0,0 @@
-= Guice-JPA Module How-to
-
-== Building
-
-=== Requirements
-
- * Java 8 SDK
- * Docker
- * Maven
-
-=== Building the artifacts
-
-An usual compilation using maven will produce two artifacts into target directory :
-
- * james-server-jpa-smtp-${version}.jar
- * james-server-jpa-smtp-${version}.lib
-
-== Running
-
-=== Requirements
-
-=== James Launch
-
-To run james, you have to create a directory containing required configuration files.
-
-A sample directory (appropriately named sample-directory) is provided with some
-default value you may need to replace.
-
-You also need to generate a keystore with the following command :
-[source]
-----
-$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
-----
-
-Once everything is set up, you just have to run the jar with :
-
-[source]
-----
-$ java -Dworking.directory=sample-configuration -jar target/james-server-jpa-smtp-${version}.jar
-----
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/server/container/guice/jpa-smtp/README.md
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/README.md b/server/container/guice/jpa-smtp/README.md
new file mode 100644
index 0000000..3d241d0
--- /dev/null
+++ b/server/container/guice/jpa-smtp/README.md
@@ -0,0 +1,4 @@
+# Install James JPA-Guice
+
+Follow this [guide](https://james.apache.org/server/install/guice-jpa-smtp.html) to install James JPA-SMTP-guice
+from command line.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/src/site/markdown/server/install/guice-cassandra.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/server/install/guice-cassandra.md b/src/site/markdown/server/install/guice-cassandra.md
new file mode 100644
index 0000000..3729d1f
--- /dev/null
+++ b/src/site/markdown/server/install/guice-cassandra.md
@@ -0,0 +1,68 @@
+# Guice-Cassandra installation guide
+
+## Building
+
+### Requirements
+
+ - Java 8 SDK
+ - Docker ∕ ElasticSearch 2.2.1 and Cassandra 2.2.3
+ - Maven 3
+
+### Building the artifacts
+
+An usual compilation using maven will produce two artifacts into server/container/guice/cassandra-guice/target directory:
+
+ * james-server-cassandra-guice.jar
+ * james-server-cassandra-guice.lib
+
+You can for example run in the base of [this git repository](https://github.com/apache/james-project):
+
+```
+mvn clean install
+```
+
+## Running
+
+### Requirements
+
+ * Cassandra
+ * ElasticSearch 1.5.2
+
+### James Launch
+
+To run james, you have to create a directory containing required configuration files.
+
+James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample
+directory for configuration from
+[dockerfiles/run/guice/cassandra/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra/destination/conf). You might need to adapt it to your needs.
+
+You also need to generate a keystore in your conf folder with the following command:
+
+```bash
+$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
+```
+
+You need to have a Cassandra and an ElasticSearch instance running. You can either install the servers or launch them via docker:
+
+```bash
+$ docker run -d --port 9042:9042 --name=cassandra cassandra:2.2.3
+$ docker run -d --port 9200:9200 --port 9300:9300 --name=elasticsearch elasticsearch:2.2.1
+```
+
+Once everything is set up, you just have to run the jar with:
+
+```bash
+$ java -Dworking.directory=. -jar target/james-server-cassandra-guice.jar
+```
+
+## Guice-cassandra-ldap
+
+You can follow the same guide to build and run guice-cassandra-ldap artifact, except that:
+ - The **jar** and **libs** needs to be retrieve from server/container/guice/cassandra-ldap-guice/target after compilation
+ - The sample configuration can be found in [dockerfiles/run/guice/cassandra-ldap/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra-ldap/destination/conf)
+ - You need a running LDAP server to connect to.
+ - You can then launch James via this command:
+
+```bash
+$ java -Dworking.directory=. -jar target/james-server-cassandra-ldap-guice.jar
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/src/site/markdown/server/install/guice-jpa-smtp.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/server/install/guice-jpa-smtp.md b/src/site/markdown/server/install/guice-jpa-smtp.md
new file mode 100644
index 0000000..e2b28ad
--- /dev/null
+++ b/src/site/markdown/server/install/guice-jpa-smtp.md
@@ -0,0 +1,37 @@
+# Guice-JPA-SMTP installation guide
+
+## Building
+
+### Requirements
+
+ - Java 8 SDK
+ - Docker
+ - Maven
+
+### Building the artifacts
+
+An usual compilation using maven of this [Git repository content](https://github.com/apache/james-project) will produce
+two artifacts into server/container/guice/jpa-smtp/target directory :
+
+ - james-server-jpa-smtp-${version}.jar
+ - james-server-jpa-smtp-${version}.lib
+
+## Running
+
+### James Launch
+
+To run james, you have to create a directory containing required configuration files.
+
+A [sample directory](https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp/sample-configuration) is provided with some default value you may need to replace.
+
+You also need to generate a keystore with the following command :
+
+```bash
+$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
+```
+
+Once everything is set up, you just have to run the jar with :
+
+```bash
+$ java -Dworking.directory=sample-configuration -jar target/james-server-jpa-smtp-${version}.jar
+```
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/src/site/markdown/server/install/guice-jpa.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/server/install/guice-jpa.md b/src/site/markdown/server/install/guice-jpa.md
new file mode 100644
index 0000000..b8e7587
--- /dev/null
+++ b/src/site/markdown/server/install/guice-jpa.md
@@ -0,0 +1,44 @@
+# Guice-JPA installation guide
+
+## Building
+
+### Requirements
+
+ - Java 8 SDK
+ - Docker
+ - Maven 3
+
+### Building the artifacts
+
+An usual compilation using maven of this [Git repository content](https://github.com/apache/james-project) will produce
+two artifacts into server/container/guice/jpa-guice/target directory:
+
+ - james-server-jpa-guice.jar
+ - james-server-jpa-guice.lib
+
+You can for example run in the base of this git repository:
+
+```
+mvn clean install
+```
+
+## Running
+
+### James Launch
+
+To run james, you have to create a directory containing required configuration files.
+
+James requires the configuration to be in a subfolder of working directory that is called **conf**. You can get a sample
+directory for configuration from [dockerfiles/run/guice/jpa/destination/conf](https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa/destination/conf). You might need to adapt it to your needs.
+
+You also need to generate a keystore in your conf folder with the following command:
+
+```bash
+$ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
+```
+
+Once everything is set up, you just have to run the jar with:
+
+```bash
+$ java -Dworking.directory=. -jar target/james-server-jpa-guice.jar
+```
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 32c5ae0..1d62152 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -114,7 +114,12 @@
<item name="Security" href="/server/feature-security.html" />
</item>
<item name="2. Packaging" href="/server/packaging.html" />
- <item name="3. Install James" href="/server/install.html" />
+ <item name="3. Install James" href="/server/install.html" >
+ <item name="Cassandra-guice" href="/server/install/guice-cassandra.html" />
+ <item name="JPA-guice" href="/server/install/guice-jpa.html" />
+ <item name="JPA-SMTP-guice" href="/server/install/guice-jpa-smtp.html" />
+
+ </item>
<item name="4. Configure James" href="/server/config.html" collapse="true" >
<item name="System" href="/server/config-system.html" />
<item name="Domain List" href="/server/config-domainlist.html" />
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/src/site/xdoc/server/install.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/install.xml b/src/site/xdoc/server/install.xml
index c0de159..0edb131 100644
--- a/src/site/xdoc/server/install.xml
+++ b/src/site/xdoc/server/install.xml
@@ -90,6 +90,10 @@
<p>Alternatively, if you don't want your build to be handled via Docker, you can follow <a href="quick-start-cassandra.html">
Guice Cassandra quick-start</a> </p>
+ <p>Note that install instructions from command line are available for <a href="install/cassandra-guice.html">Cassandra-Guice</a>,
+ <a href="install/jpa-guice.html">JPA-Guice</a> and <a href="install/jpa-smtp-guice.html">JPA-SMTP-Guice</a>.
+ </p>
+
<p>A <a href="https://github.com/apache/james-project/blob/9502cfebfd9a4eaebbba7dda802d1fe0ad3589b7/dockerfiles/run/docker-compose.yml">
docker-compose</a> is available for Guice + Cassandra + ElasticSearch</p>
</section>
http://git-wip-us.apache.org/repos/asf/james-project/blob/3b63f45f/src/site/xdoc/server/packaging.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml
index fffa283..ac25549 100644
--- a/src/site/xdoc/server/packaging.xml
+++ b/src/site/xdoc/server/packaging.xml
@@ -193,6 +193,14 @@
<td>Experimental</td>
<td>No</td>
</tr>
+ <tr>
+ <td>Installation instructions</td>
+ <td><a href="install.html">Here</a></td>
+ <td><a href="install/guice-cassandra.html">Here</a></td>
+ <td><a href="install/guice-cassandra.html">Here</a></td>
+ <td><a href="install/guice-jpa.html">Here</a></td>
+ <td><a href="install/guice-jpa-smtp.html">Here</a></td>
+ </tr>
</table>
</p>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/4] james-project git commit: JAMES-2112 Add missing SINGLETON
guice bindings
Posted by bt...@apache.org.
JAMES-2112 Add missing SINGLETON guice bindings
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6ed40404
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6ed40404
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6ed40404
Branch: refs/heads/master
Commit: 6ed40404e13f27d5b4af9ec45175c93c0bbf177b
Parents: fdaa804
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 8 17:06:35 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 9 16:19:55 2017 +0700
----------------------------------------------------------------------
.../org/apache/james/modules/mailbox/CassandraMailboxModule.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/6ed40404/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
index eefecf2..3ab79b7 100644
--- a/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
+++ b/server/container/guice/cassandra-guice/src/main/java/org/apache/james/modules/mailbox/CassandraMailboxModule.java
@@ -33,8 +33,10 @@ import org.apache.james.mailbox.cassandra.CassandraMailboxSessionMapperFactory;
import org.apache.james.mailbox.cassandra.CassandraSubscriptionManager;
import org.apache.james.mailbox.cassandra.ids.CassandraId;
import org.apache.james.mailbox.cassandra.ids.CassandraMessageId;
+import org.apache.james.mailbox.cassandra.mail.CassandraBlobsDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraMailboxMapper;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAO;
+import org.apache.james.mailbox.cassandra.mail.CassandraMessageDAOV2;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraMessageIdToImapUidDAO;
import org.apache.james.mailbox.cassandra.mail.CassandraModSeqProvider;
@@ -92,6 +94,8 @@ public class CassandraMailboxModule extends AbstractModule {
bind(StoreMessageIdManager.class).in(Scopes.SINGLETON);
bind(StoreAttachmentManager.class).in(Scopes.SINGLETON);
bind(CassandraMailboxMapper.class).in(Scopes.SINGLETON);
+ bind(CassandraMessageDAOV2.class).in(Scopes.SINGLETON);
+ bind(CassandraBlobsDAO.class).in(Scopes.SINGLETON);
bind(MessageMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class);
bind(MailboxMapperFactory.class).to(CassandraMailboxSessionMapperFactory.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/4] james-project git commit: JAMES-2109 Consolidate install
documentation for Guice
Posted by bt...@apache.org.
JAMES-2109 Consolidate install documentation for Guice
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/fdaa8049
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/fdaa8049
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/fdaa8049
Branch: refs/heads/master
Commit: fdaa804933fa7737ccf39e3996abb03a38d937be
Parents: 3b63f45
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 8 18:22:39 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 9 16:19:24 2017 +0700
----------------------------------------------------------------------
src/site/markdown/server/install/guice-jpa-smtp.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/fdaa8049/src/site/markdown/server/install/guice-jpa-smtp.md
----------------------------------------------------------------------
diff --git a/src/site/markdown/server/install/guice-jpa-smtp.md b/src/site/markdown/server/install/guice-jpa-smtp.md
index e2b28ad..fe42240 100644
--- a/src/site/markdown/server/install/guice-jpa-smtp.md
+++ b/src/site/markdown/server/install/guice-jpa-smtp.md
@@ -20,7 +20,7 @@ two artifacts into server/container/guice/jpa-smtp/target directory :
### James Launch
-To run james, you have to create a directory containing required configuration files.
+To run james, you have to create a directory containing required configuration files names **conf**.
A [sample directory](https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp/sample-configuration) is provided with some default value you may need to replace.
@@ -33,5 +33,5 @@ $ keytool -genkey -alias james -keyalg RSA -keystore conf/keystore
Once everything is set up, you just have to run the jar with :
```bash
-$ java -Dworking.directory=sample-configuration -jar target/james-server-jpa-smtp-${version}.jar
+$ java -Dworking.directory=. -jar target/james-server-jpa-smtp-${version}.jar
```
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/4] james-project git commit: JAMES-2109 Resurect packaging page
Posted by bt...@apache.org.
JAMES-2109 Resurect packaging page
The disparition of this page might be a Git mistake.
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8cb90d88
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8cb90d88
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8cb90d88
Branch: refs/heads/master
Commit: 8cb90d8861ed25c21dbc89267abcf67d5064943d
Parents: eaf503e
Author: benwa <bt...@linagora.com>
Authored: Fri Aug 4 10:30:44 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Wed Aug 9 16:19:16 2017 +0700
----------------------------------------------------------------------
src/site/xdoc/server/packaging.xml | 202 ++++++++++++++++++++++++++++++++
src/site/xdoc/server/wiring.xml | 202 --------------------------------
2 files changed, 202 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8cb90d88/src/site/xdoc/server/packaging.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/packaging.xml b/src/site/xdoc/server/packaging.xml
new file mode 100644
index 0000000..fffa283
--- /dev/null
+++ b/src/site/xdoc/server/packaging.xml
@@ -0,0 +1,202 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<document>
+
+ <properties>
+ <title>Apache James Server 3 - Packaging</title>
+ </properties>
+
+ <body>
+
+ <section name="Available packaging options">
+ <p>James components are assembled in various way, called packaging.</p>
+
+ <ul>The packaging you choose will influence:
+ <li>Your java requirement</li>
+ <li>The protocol the mail server supports</li>
+ <li>The components you can use</li>
+ </ul>
+
+ <p>Thus, one must carefully choose his packaging.</p>
+
+ <ul>To help you doing this, here is a list of available packages:
+ <li><a href="https://github.com/apache/james-project/tree/master/server/app">Spring</a>: Allows you to
+ choose across various available implementations for each component. Requires more configuration effort.</li>
+ <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-guice">
+ Cassandra-guice</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch.</li>
+ <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-ldap-guice">
+ Cassandra-guice-ldap</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch. User are authenticated against a LDAP server.</li>
+ <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/jpa-guice">
+ Jpa-Guice</a>: Ships a James server storing emails in a SQL database (derby by default) accessed with JPA and Lucene to index emails.</li>
+ <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp">
+ Jpa-Smtp</a>: A tiny SMTP server shiped without mailbox, using SQL database to store data, accessed by JPA.</li>
+ </ul>
+
+ <p>Note: Especially using Guice, one can easily define new modules for existing James components, as well as
+ for third party code. Note that building your own combination of components will lead to an untested and unsupported server.
+ </p>
+ </section>
+
+ <section name="Support matrix">
+ <p>
+ <table>
+ <tr>
+ <th>Packaging</th>
+ <th>Spring</th>
+ <th>Cassandra-guice</th>
+ <th>Cassandra-ldap-guice</th>
+ <th>Jpa-guice</th>
+ <th>Jpa-smtp</th>
+ </tr>
+ <tr>
+ <td>IoC framework</td>
+ <td>Spring</td>
+ <td>Guice</td>
+ <td>Guice</td>
+ <td>Guice</td>
+ <td>Guice</td>
+ </tr>
+ <tr>
+ <td>Java version</td>
+ <td>Java 6</td>
+ <td>Java 8</td>
+ <td>Java 8</td>
+ <td>Java 8</td>
+ <td>Java 8</td>
+ </tr>
+ <tr>
+ <td>Docker image</td>
+ <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/spring">Available</a></td>
+ <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra">Available</a></td>
+ <td><a href="https://github.com/apache/james-project/tree/master/dockerfilehttps://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpas/run/guice/cassandra-ldap">Available</a></td>
+ <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa">Available</a></td>
+ <td>None</td>
+ </tr>
+ <tr>
+ <td>Supports SMTP</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>Supports IMAP</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Supports JMAP</td>
+ <td>No</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>No</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Supports POP3</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Supports FetchMail</td>
+ <td>Yes</td>
+ <td>No</td>
+ <td>No</td>
+ <td>No</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Supports CLI</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Supports WebAdmin</td>
+ <td>No</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ </tr>
+ <tr>
+ <td>Supports Grafana metrics</td>
+ <td>No</td>
+ <td>Yes</td>
+ <td>Yes</td>
+ <td>No</td>
+ <td>No</td>
+ </tr>
+ <tr>
+ <td>Mailbox implementation</td>
+ <td>JPA/MailDir/JCR/Memory</td>
+ <td>Cassandra</td>
+ <td>Cassandra</td>
+ <td>JPA</td>
+ <td>JPA</td>
+ </tr>
+ <tr>
+ <td>Indexer implementation</td>
+ <td>Lucene/None</td>
+ <td>ElasticSearch</td>
+ <td>ElasticSearch</td>
+ <td>Lucene</td>
+ <td>None</td>
+ </tr>
+ <tr>
+ <td>Server data implementation</td>
+ <td>JPA/File/HBase/JCR</td>
+ <td>Cassandra</td>
+ <td>Cassandra</td>
+ <td>JPA</td>
+ <td>JPA</td>
+ </tr>
+ <tr>
+ <td>Mail queue implementation</td>
+ <td>ActiveMQ</td>
+ <td>ActiveMQ</td>
+ <td>ActiveMQ</td>
+ <td>ActiveMQ</td>
+ <td>ActiveMQ</td>
+ </tr>
+ <tr>
+ <td>Sieve</td>
+ <td>Experimental</td>
+ <td>Experimental</td>
+ <td>Experimental</td>
+ <td>Experimental</td>
+ <td>No</td>
+ </tr>
+ </table>
+ </p>
+ </section>
+
+ </body>
+
+</document>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8cb90d88/src/site/xdoc/server/wiring.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/server/wiring.xml b/src/site/xdoc/server/wiring.xml
deleted file mode 100644
index 28e5bd1..0000000
--- a/src/site/xdoc/server/wiring.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<document>
-
- <properties>
- <title>Apache James Server 3 - Wiring</title>
- </properties>
-
- <body>
-
- <section name="Available wiring options">
- <p>James components are assembled in various way, called wiring.</p>
-
- <ul>The wiring you choose will influence:
- <li>Your java requirement</li>
- <li>The protocol the mail server supports</li>
- <li>The components you can use</li>
- </ul>
-
- <p>Thus, one must carefully choose his wiring.</p>
-
- <ul>To help you doing this, here is a list of available packages:
- <li><a href="https://github.com/apache/james-project/tree/master/server/app">Spring</a>: Allows you to
- choose across various available implementations for each component. Requires more configuration effort.</li>
- <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-guice">
- Cassandra-guice</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch.</li>
- <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/cassandra-ldap-guice">
- Cassandra-guice-ldap</a>: Ships a James server storing emails in Cassandra and index them in ElasticSearch. User are authenticated against a LDAP server.</li>
- <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/jpa-guice">
- Jpa-Guice</a>: Ships a James server storing emails in a SQL database (derby by default) accessed with JPA and Lucene to index emails.</li>
- <li><a href="https://github.com/apache/james-project/tree/master/server/container/guice/jpa-smtp">
- Jpa-Smtp</a>: A tiny SMTP server shiped without mailbox, using SQL database to store data, accessed by JPA.</li>
- </ul>
-
- <p>Note: Especially using Guice, one can easily define new modules for existing James components, as well as
- for third party code. Note that building your own combination of components will lead to an untested and unsupported server.
- </p>
- </section>
-
- <section name="Support matrix">
- <p>
- <table>
- <tr>
- <th>wiring</th>
- <th>Spring</th>
- <th>Cassandra-guice</th>
- <th>Cassandra-ldap-guice</th>
- <th>Jpa-guice</th>
- <th>Jpa-smtp</th>
- </tr>
- <tr>
- <td>IoC framework</td>
- <td>Spring</td>
- <td>Guice</td>
- <td>Guice</td>
- <td>Guice</td>
- <td>Guice</td>
- </tr>
- <tr>
- <td>Java version</td>
- <td>Java 6</td>
- <td>Java 8</td>
- <td>Java 8</td>
- <td>Java 8</td>
- <td>Java 8</td>
- </tr>
- <tr>
- <td>Docker image</td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/spring">Available</a></td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/cassandra">Available</a></td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfilehttps://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpas/run/guice/cassandra-ldap">Available</a></td>
- <td><a href="https://github.com/apache/james-project/tree/master/dockerfiles/run/guice/jpa">Available</a></td>
- <td>None</td>
- </tr>
- <tr>
- <td>Supports SMTP</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Supports IMAP</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Supports JMAP</td>
- <td>No</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Supports POP3</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Supports FetchMail</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Supports CLI</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Supports WebAdmin</td>
- <td>No</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>Yes</td>
- </tr>
- <tr>
- <td>Supports Grafana metrics</td>
- <td>No</td>
- <td>Yes</td>
- <td>Yes</td>
- <td>No</td>
- <td>No</td>
- </tr>
- <tr>
- <td>Mailbox implementation</td>
- <td>JPA/MailDir/JCR/Memory</td>
- <td>Cassandra</td>
- <td>Cassandra</td>
- <td>JPA</td>
- <td>JPA</td>
- </tr>
- <tr>
- <td>Indexer implementation</td>
- <td>Lucene/None</td>
- <td>ElasticSearch</td>
- <td>ElasticSearch</td>
- <td>Lucene</td>
- <td>None</td>
- </tr>
- <tr>
- <td>Server data implementation</td>
- <td>JPA/File/HBase/JCR</td>
- <td>Cassandra</td>
- <td>Cassandra</td>
- <td>JPA</td>
- <td>JPA</td>
- </tr>
- <tr>
- <td>Mail queue implementation</td>
- <td>ActiveMQ</td>
- <td>ActiveMQ</td>
- <td>ActiveMQ</td>
- <td>ActiveMQ</td>
- <td>ActiveMQ</td>
- </tr>
- <tr>
- <td>Sieve</td>
- <td>Experimental</td>
- <td>Experimental</td>
- <td>Experimental</td>
- <td>Experimental</td>
- <td>No</td>
- </tr>
- </table>
- </p>
- </section>
-
- </body>
-
-</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org