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 2018/02/01 02:07:31 UTC

[1/6] james-project git commit: JAMES-2324 Include LDAP build in packaging

Repository: james-project
Updated Branches:
  refs/heads/master 6f6513dff -> 6aa2607e8


JAMES-2324 Include LDAP build in packaging


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7aa3aec9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7aa3aec9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7aa3aec9

Branch: refs/heads/master
Commit: 7aa3aec90f5e931e15d45e8cd06b8cdf17b9e03e
Parents: 6f6513d
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Wed Jan 31 17:38:08 2018 +0100
Committer: Raphael Ouazana <ra...@linagora.com>
Committed: Wed Jan 31 17:47:19 2018 +0100

----------------------------------------------------------------------
 README.adoc                                           | 14 ++++++++++++--
 dockerfiles/packaging/guice/cassandra/Dockerfile      | 12 +++++++++---
 dockerfiles/packaging/guice/cassandra/package.sh      | 10 +++++++++-
 .../packaging/guice/cassandra/scripts/james.postinst  |  4 ++++
 .../guice/cassandra/scripts/james.postremove          |  4 ++++
 .../guice/cassandra/scripts/james.rpm.postinst        |  3 +++
 .../guice/cassandra/scripts/james.rpm.postremove      |  2 ++
 .../packaging/guice/cassandra/scripts/package.sh      |  3 ++-
 8 files changed, 45 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 6426eab..0d0b4e4 100644
--- a/README.adoc
+++ b/README.adoc
@@ -425,13 +425,17 @@ First step, you have to build the Docker image used to generate the package
     $ docker build -t build-james-packages \
         --build-arg RELEASE=3.0-beta6 \
         --build-arg ITERATION=1 \
-        --build-arg BASE=linagora/james-project
+        --build-arg BASE=linagora/james-project \
+        --build-arg BASE_LDAP=linagora/james-ldap-project \
+        --build-arg TAG=latest \
         dockerfiles/packaging/guice/cassandra
 
 Where:
 
 - ITERATION is the release number used after the last hyphen (e.g. 3.0-beta6-1, 3.0-beta6-2, 3.0-beta6-3...)
-- BASE is the image jar and executable are copied from. Defaults to linagora/james-project:latest
+- BASE is the image jar and executable are copied from. Defaults to linagora/james-project
+- BASE_LDAP is the image jar and executable are copied from for a deployment with an LDAP user repository. Defaults to linagora/james-ldap-project
+- TAG is the tag of these docker images. Defaults to latest.
 
 Then, you have to run the container:
 
@@ -445,4 +449,10 @@ Note: A helper script is provided for the generation of packages for a specific
 
     $ sh dockerfiles/packaging/guice/cassandra/package.sh 3.0.1 1 c298195e84 $PWD/result
 
+The generated package allow you to choose between a deployment with or without LDAP using update-alternatives.
+Once installed, try:
+
+    $ update-alternatives --config james
+
+By default James is configured without LDAP support.
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/Dockerfile b/dockerfiles/packaging/guice/cassandra/Dockerfile
index 632a40d..2718d43 100644
--- a/dockerfiles/packaging/guice/cassandra/Dockerfile
+++ b/dockerfiles/packaging/guice/cassandra/Dockerfile
@@ -1,5 +1,8 @@
-ARG BASE=linagora/james-project:latest
-FROM ${BASE} as source
+ARG BASE=linagora/james-project
+ARG BASE_LDAP=linagora/james-ldap-project
+ARG TAG=latest
+FROM ${BASE}:${TAG} as source
+FROM ${BASE_LDAP}:${TAG} as sourceLdap
 
 FROM debian:8.1
 
@@ -11,8 +14,11 @@ RUN apt-get install -y rpm
 ADD scripts/ /packages
 
 COPY scripts/james.service /packages/package/usr/share/james/
-COPY --from=source /root/*.jar /packages/package/usr/share/james/
+COPY --from=source /root/james-server.jar /packages/package/usr/share/james/james-withoutldap-server.jar
+COPY --from=source /root/james-cli.jar /packages/package/usr/share/james/james-cli.jar
+COPY --from=sourceLdap /root/james-server.jar /packages/package/usr/share/james/james-ldap-server.jar
 COPY --from=source /root/james-server-cassandra-guice.lib/ /packages/package/usr/share/james/james-server-cassandra-guice.lib/
+COPY --from=sourceLdap /root/james-server-cassandra-ldap-guice.lib/ /packages/package/usr/share/james/james-server-cassandra-ldap-guice.lib/
 COPY --from=source /root/james-server-cli.lib/ /packages/package/usr/share/james/james-server-cli.lib/
 
 ARG RELEASE

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/package.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/package.sh b/dockerfiles/packaging/guice/cassandra/package.sh
index 2d4805d..2e58d01 100644
--- a/dockerfiles/packaging/guice/cassandra/package.sh
+++ b/dockerfiles/packaging/guice/cassandra/package.sh
@@ -28,14 +28,22 @@ docker run \
    --volume $PWD:/origin \
    --volume $PWD/dockerfiles/run/guice/cassandra/destination:/cassandra/destination \
    -t james/project -s $SHA1
+docker run \
+   --rm \
+   --volume $PWD/.m2:/root/.m2 \
+   --volume $PWD:/origin \
+   --volume $PWD/dockerfiles/run/guice/cassandra-ldap/destination:/cassandra/destination \
+   -t james/project -s $SHA1
 
 # Build image
 docker build -t james_run dockerfiles/run/guice/cassandra
+docker build -t james_run_ldap dockerfiles/run/guice/cassandra-ldap
 
 # Build packages
 docker build -t build-james-packages \
   --build-arg RELEASE=$RELEASE-$SHA1 \
   --build-arg ITERATION=$ITERATION \
   --build-arg BASE=james_run \
+  --build-arg BASE_LDAP=james_run_ldap \
   dockerfiles/packaging/guice/cassandra
-docker run --rm --name james-packages -v $DIRECTORY:/result build-james-packages
\ No newline at end of file
+docker run --rm --name james-packages -v $DIRECTORY:/result build-james-packages

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/scripts/james.postinst
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.postinst b/dockerfiles/packaging/guice/cassandra/scripts/james.postinst
index 82306a7..a9cbe80 100644
--- a/dockerfiles/packaging/guice/cassandra/scripts/james.postinst
+++ b/dockerfiles/packaging/guice/cassandra/scripts/james.postinst
@@ -2,5 +2,9 @@
 
 ln -s /etc/james /var/lib/james/conf
 
+update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-ldap-server.jar 10
+update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-withoutldap-server.jar 20
+
+
 systemctl enable james
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/scripts/james.postremove
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.postremove b/dockerfiles/packaging/guice/cassandra/scripts/james.postremove
new file mode 100644
index 0000000..29fc7fc
--- /dev/null
+++ b/dockerfiles/packaging/guice/cassandra/scripts/james.postremove
@@ -0,0 +1,4 @@
+#! /bin/sh -e
+
+update-alternatives --remove james /usr/share/james/james-ldap-server.jar
+update-alternatives --remove james /usr/share/james/james-withoutldap-server.jar

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst
index 447b4c1..3fde16c 100644
--- a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst
+++ b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postinst
@@ -2,6 +2,9 @@
  
 ln -s /etc/james /var/lib/james/conf
 
+update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-ldap-server.jar 10
+update-alternatives --install /usr/share/james/james-server.jar james /usr/share/james/james-withoutldap-server.jar 20
+
 #Workaround waiting for https://github.com/jordansissel/fpm/issues/1163 to be released
 cp /usr/share/james/james.service /etc/systemd/system/
 systemctl enable james

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove
index d70a3ed..ed29fa9 100644
--- a/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove
+++ b/dockerfiles/packaging/guice/cassandra/scripts/james.rpm.postremove
@@ -5,3 +5,5 @@ systemctl stop james
 systemctl disable james
 rm /etc/systemd/system/james.service
 
+update-alternatives --remove james /usr/share/james/james-ldap-server.jar
+update-alternatives --remove james /usr/share/james/james-withoutldap-server.jar

http://git-wip-us.apache.org/repos/asf/james-project/blob/7aa3aec9/dockerfiles/packaging/guice/cassandra/scripts/package.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/packaging/guice/cassandra/scripts/package.sh b/dockerfiles/packaging/guice/cassandra/scripts/package.sh
index da86f36..58a95b5 100755
--- a/dockerfiles/packaging/guice/cassandra/scripts/package.sh
+++ b/dockerfiles/packaging/guice/cassandra/scripts/package.sh
@@ -23,6 +23,7 @@ fpm -s dir -t deb \
  -C package \
  --deb-systemd james.service \
  --after-install james.postinst \
+ --after-remove james.postremove \
  --provides mail-transport-agent \
  --provides default-mta \
  --iteration $ITERATION \
@@ -58,4 +59,4 @@ fpm -s dir -t rpm \
  .
 
 cp /packages/james*.deb /result/
-cp /packages/james*.rpm /result/
\ No newline at end of file
+cp /packages/james*.rpm /result/


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


[5/6] james-project git commit: JAMES-2315 Upgrade download section to use https

Posted by bt...@apache.org.
JAMES-2315 Upgrade download section to use https


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6aa2607e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6aa2607e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6aa2607e

Branch: refs/heads/master
Commit: 6aa2607e8b88af674773f73aa25ec7b96673d2ea
Parents: d2fcaef
Author: benwa <bt...@linagora.com>
Authored: Wed Jan 31 16:48:44 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 1 09:05:45 2018 +0700

----------------------------------------------------------------------
 src/site/xdoc/download.xml | 186 ++++++++++++++++++++--------------------
 1 file changed, 93 insertions(+), 93 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/6aa2607e/src/site/xdoc/download.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index d31a456..477a3bc 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -8,7 +8,7 @@
   "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
+    https://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
@@ -41,8 +41,8 @@ functions with asymmetric algorithms. The form and manner of this Apache Softwar
 under the License Exception ENC Technology Software Unrestricted (TSU) exception (see the BIS Export Administration Regulations, Section 740.13) 
 for both object code and source code.
 </p><p>
-More specific details are included below. Export control information for the <a href='http://www.apache.org' rel='tag'>Apache Software Foundation</a> 
-is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
+More specific details are included below. Export control information for the <a href='https://www.apache.org' rel='tag'>Apache Software Foundation</a>
+is found <a href='https://www.apache.org/licenses/exports/'>here</a>.
 </p>
       </div>
     </div>
@@ -56,7 +56,7 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     
     <p>Only current recommended releases are available on the main
        distribution site and its mirrors.  Older releases are available from
-       the <a href="http://archive.apache.org/dist/james/">archive download
+       the <a href="https://archive.apache.org/dist/james/">archive download
        site.</a></p>
     
     <ul>
@@ -75,7 +75,7 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </ul>
  
     <p>(*) James maven repositories can be found on 
-    <a href="http://repo1.maven.org/maven2/org/apache/james/">http://repo1.maven.org/maven2/org/apache/james/</a>.</p>
+    <a href="https://repo1.maven.org/maven2/org/apache/james/">https://repo1.maven.org/maven2/org/apache/james/</a>.</p>
   
     <subsection name="Mirror">
     
@@ -101,7 +101,7 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
       <input type="submit" value="Change" />     
       </form>
       
-      <p>You may also consult the <a href="http://www.apache.org/mirrors/">complete
+      <p>You may also consult the <a href="https://www.apache.org/mirrors/">complete
       list of mirrors</a>.</p>
       
       </subsection>
@@ -111,10 +111,10 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
       files using the PGP or MD5 signatures.</p>
       
       <p>The PGP signatures can be verified using PGP or GPG.  First
-      download the <a href="http://www.apache.org/dist/james/KEYS">KEYS</a>
+      download the <a href="https://www.apache.org/dist/james/KEYS">KEYS</a>
       as well as the <code>asc</code> signature file for the particular
       distribution.  Make sure you get these files from the <a
-      href="http://www.apache.org/dist/james/">main distribution
+      href="https://www.apache.org/dist/james/">main distribution
       directory</a>, rather than from a mirror. Then verify the signatures
       using</p>
       
@@ -159,14 +159,14 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
 
       <ul>
         <li>Source code (ZIP Format):
-          <a href="http://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip">apache-james-3.0.1-app.zip</a>
-          [<a href="http://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip.sha1">SHA1</a>]
-          [<a href="http://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip.asc">PGP</a>]</li>
+          <a href="https://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip">apache-james-3.0.1-app.zip</a>
+          [<a href="https://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip.sha1">SHA1</a>]
+          [<a href="https://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip.asc">PGP</a>]</li>
 
         <li>Binary (ZIP Format): <a
-                href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip">apache-james-3.0.1-app.zip</a> [<a
-                href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sha1">SHA1</a>] [<a
-                href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sig">PGP</a>]</li>
+                href="https://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip">apache-james-3.0.1-app.zip</a> [<a
+                href="https://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sha1">SHA1</a>] [<a
+                href="https://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sig">PGP</a>]</li>
 
       </ul>
 
@@ -176,7 +176,7 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     
       <p>This release has many enhancements and bug fixes over the previous
       release.  See the <a
-      href="http://james.apache.org/server/2/release-notes.html">Release Notes</a>
+      href="https://james.apache.org/server/2/release-notes.html">Release Notes</a>
       for a detailed list of changes.  Some of the earlier defects could
       turn a James mail server into an Open Relay and allow files to be written on disk.  All users of James Server are urged to upgrade to version v2.3.2.1 as soon as
       possible.</p>
@@ -190,8 +190,8 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
           </p>
           <ul>
             <li><code>bcmail</code> by "The Legion of the Bouncy
-              Castle" <a href='http://www.bouncycastle.org'>http://www.bouncycastle.org</a>,</li>
-            <li>and the <a href='http://www.java.com/'>Java Runtime Environment</a>.</li>
+              Castle" <a href='https://www.bouncycastle.org'>https://www.bouncycastle.org</a>,</li>
+            <li>and the <a href='https://www.java.com/'>Java Runtime Environment</a>.</li>
           </ul>
         </div>
       </div>
@@ -200,25 +200,25 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
       
         <li>Binary (Unix TAR): <a
             href="[preferred]/james/server/james-binary-2.3.2.1.tar.gz">james-binary-2.3.2.1.tar.gz</a> [<a
-            href="http://www.apache.org/dist/james/server/james-binary-2.3.2.1.tar.gz.asc">PGP</a>]</li>
+            href="https://www.apache.org/dist/james/server/james-binary-2.3.2.1.tar.gz.asc">PGP</a>]</li>
       
         <li>Binary (ZIP Format): <a
             href="[preferred]/james/server/james-binary-2.3.2.1.zip">james-binary-2.3.2.1.zip</a> [<a
-            href="http://www.apache.org/dist/james/server/james-binary-2.3.2.1.zip.asc">PGP</a>]</li>
+            href="https://www.apache.org/dist/james/server/james-binary-2.3.2.1.zip.asc">PGP</a>]</li>
       
         <li>Source (Unix TAR): <a
             href="[preferred]/james/server/james-2.3.2.1-src.tar.gz">james-2.3.2.1-src.tar.gz</a> [<a
-            href="http://www.apache.org/dist/james/server/james-2.3.2.1-src.tar.gz.asc">PGP</a>]</li>
+            href="https://www.apache.org/dist/james/server/james-2.3.2.1-src.tar.gz.asc">PGP</a>]</li>
       
           <li>Source (ZIP Format): <a
               href="[preferred]/james/server/james-2.3.2.1-src.zip">james-2.3.2.1-src.zip</a> [<a
-              href="http://www.apache.org/dist/james/server/james-2.3.2.1-src.zip.asc">PGP</a>]</li>
+              href="https://www.apache.org/dist/james/server/james-2.3.2.1-src.zip.asc">PGP</a>]</li>
       
       </ul>
     
     <subsection name="Earlier Releases">
     
-      <p>Are now <a href='http://archive.apache.org/dist/james/server'>archived</a></p>
+      <p>Are now <a href='https://archive.apache.org/dist/james/server'>archived</a></p>
 
     </subsection>
 
@@ -243,9 +243,9 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar.asc">PGP</a>]
       </p>
 
     <p>In order to use Mime-4j DOM:</p>
@@ -261,9 +261,9 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar.asc">PGP</a>]
     </p>
 
     <p>An aggregator project is also available:</p>
@@ -279,15 +279,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -309,15 +309,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -339,15 +339,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -369,15 +369,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.asc">PGP</a>]
     </p>
 
     <p>An aggregator project is also available:</p>
@@ -393,9 +393,9 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz">(Tar Gz)</a>
-      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz">(Tar Gz)</a>
+      [<a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.asc">PGP</a>]
     </p>
 
   
@@ -416,15 +416,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.asc">PGP</a>]
     </p>
     
   </section>
@@ -444,15 +444,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.asc">PGP</a>]
     </p>
 
   </section>
@@ -472,15 +472,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.asc">PGP</a>]
     </p>
 
   </section>
@@ -516,15 +516,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar">(Jar)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar">(Jar)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar.asc">PGP</a>]
     </p>
 
     <p>Sources:
-      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip">(Zip)</a>
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip.sha1">SHA-1</a>]
-      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip.asc">PGP</a>]
+      <a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip">(Zip)</a>
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="https://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip.asc">PGP</a>]
     </p>
     
   </section>
@@ -552,17 +552,17 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     <ul>
     
     <li>Source (Unix TAR): <a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a> [<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>][<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.md5">MD5</a>]</li>
+    href="https://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a> [<a
+    href="https://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>][<a
+    href="https://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.md5">MD5</a>]</li>
     
     <li>Source (ZIP Format): <a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip">apache-james-mpt-0.1-src.zip</a> [<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.asc">PGP</a>][<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.md5">MD5</a>]</li>
+    href="https://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip">apache-james-mpt-0.1-src.zip</a> [<a
+    href="https://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.asc">PGP</a>][<a
+    href="https://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.md5">MD5</a>]</li>
     
     <li>Jars (including source and javadocs) for the modules are distributed through the standard 
-    <a href='http://maven.apache.org'>Maven</a> repositories on <a href="http://repo1.maven.org/maven2/org/apache/james/">http://repo1.maven.org/maven2/org/apache/james/</a>.</li>
+    <a href='https://maven.apache.org'>Maven</a> repositories on <a href="https://repo1.maven.org/maven2/org/apache/james/">https://repo1.maven.org/maven2/org/apache/james/</a>.</li>
     </ul>
   
   </section>
@@ -573,17 +573,17 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     <ul>
     
     <li>Binary (Java WAR): <a
-    href="http://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war">hupa-0.0.2.war</a> [<a
-    href="http://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war.asc">PGP</a>][<a
-    href="http://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war.asc.md5">MD5</a>]</li>
+    href="https://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war">hupa-0.0.2.war</a> [<a
+    href="https://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war.asc">PGP</a>][<a
+    href="https://repo1.maven.org/maven2/org/apache/james/hupa/hupa/0.0.2/hupa-0.0.2.war.asc.md5">MD5</a>]</li>
     
     <li>Source (ZIP Format): <a
-    href="http://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2-source-release.zip">hupa-parent-0.0.2-source-release.zip</a> [<a
-    href="http://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2-source-release.zip.asc">PGP</a>][<a
-    href="http://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2.pom.asc.md5">MD5</a>]</li>
+    href="https://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2-source-release.zip">hupa-parent-0.0.2-source-release.zip</a> [<a
+    href="https://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2-source-release.zip.asc">PGP</a>][<a
+    href="https://repo1.maven.org/maven2/org/apache/james/hupa/hupa-parent/0.0.2/hupa-parent-0.0.2.pom.asc.md5">MD5</a>]</li>
     
     <li>Jars (including source and javadocs) for the modules are distributed through the standard 
-    <a href='http://maven.apache.org'>Maven</a> repositories on <a href="http://repo1.maven.org/maven2/org/apache/james/hupa">http://repo1.maven.org/maven2/org/apache/james/hupa</a>.</li>
+    <a href='https://maven.apache.org'>Maven</a> repositories on <a href="https://repo1.maven.org/maven2/org/apache/james/hupa">https://repo1.maven.org/maven2/org/apache/james/hupa</a>.</li>
     </ul>
   
   </section>


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


[2/6] james-project git commit: Fix eclipse warnings

Posted by bt...@apache.org.
Fix eclipse warnings


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f7db5863
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f7db5863
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f7db5863

Branch: refs/heads/master
Commit: f7db5863c979c350d3524b558f9d5cc8d7be7e2b
Parents: 7aa3aec
Author: Raphael Ouazana <ra...@linagora.com>
Authored: Tue Jan 30 15:43:43 2018 +0100
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 1 09:05:14 2018 +0700

----------------------------------------------------------------------
 .../mailrepository/jcr/JCRMailRepository.java   | 10 ++--------
 .../impl/JamesMailetContext.java                |  8 +++++---
 .../remote/delivery/RemoteDeliveryTest.java     |  1 -
 .../apache/james/smtpserver/SMTPServerTest.java |  1 -
 .../webadmin/routes/MailQueueRoutesTest.java    | 20 ++++++++++----------
 5 files changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/f7db5863/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
----------------------------------------------------------------------
diff --git a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
index 3fd5754..0b36906 100644
--- a/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
+++ b/server/data/data-jcr/src/main/java/org/apache/james/mailrepository/jcr/JCRMailRepository.java
@@ -128,7 +128,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
             try {
                 Collection<String> keys = new ArrayList<>();
                 QueryManager manager = session.getWorkspace().getQueryManager();
-                @SuppressWarnings("deprecation")
                 Query query = manager.createQuery("/jcr:root/" + MAIL_PATH + "//element(*,james:mail)", Query.XPATH);
                 NodeIterator iterator = query.execute().getNodes();
                 while (iterator.hasNext()) {
@@ -150,7 +149,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
             try {
                 String name = toSafeName(key);
                 QueryManager manager = session.getWorkspace().getQueryManager();
-                @SuppressWarnings("deprecation")
                 Query query = manager.createQuery("/jcr:root/" + MAIL_PATH + "//element(" + name + ",james:mail)", Query.XPATH);
                 NodeIterator iterator = query.execute().getNodes();
                 if (iterator.hasNext()) {
@@ -493,7 +491,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
             node = node.getProperty("jcr:content").getNode();
         }
 
-        try (@SuppressWarnings("deprecation") InputStream stream = node.getProperty("jcr:data").getStream()) {
+        try (InputStream stream = node.getProperty("jcr:data").getStream()) {
             Properties properties = System.getProperties();
             return new MimeMessage(javax.mail.Session.getDefaultInstance(properties), stream);
         }
@@ -514,7 +512,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
      * @throws IOException
      *             if an IO error occurs
      */
-    @SuppressWarnings("deprecation")
     private void setMessage(Node node, final MimeMessage message) throws RepositoryException, IOException {
         try {
             node = node.getNode("jcr:content");
@@ -554,7 +551,7 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
             Property property = iterator.nextProperty();
             String name = Text.unescapeIllegalJcrChars(property.getName().substring("jamesattr:".length()));
             if (property.getType() == PropertyType.BINARY) {
-                try (@SuppressWarnings("deprecation") InputStream input = property.getStream()) {
+                try (InputStream input = property.getStream()) {
                     ObjectInputStream stream = new ObjectInputStream(input);
                     mail.setAttribute(name, (Serializable) stream.readObject());
                 } catch (ClassNotFoundException e) {
@@ -578,7 +575,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
      * @throws IOException
      *             if an IO error occurs
      */
-    @SuppressWarnings("deprecation")
     private void setAttributes(Node node, Mail mail) throws RepositoryException, IOException {
         Iterator<String> iterator = mail.getAttributeNames();
         while (iterator.hasNext()) {
@@ -604,7 +600,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
             try {
                 String name = ISO9075.encode(Text.escapeIllegalJcrChars(key));
                 QueryManager manager = session.getWorkspace().getQueryManager();
-                @SuppressWarnings("deprecation")
                 Query query = manager.createQuery("/jcr:root/" + MAIL_PATH + "//element(" + name + ",james:mail)", Query.XPATH);
                 NodeIterator nodes = query.execute().getNodes();
                 if (nodes.hasNext()) {
@@ -633,7 +628,6 @@ public class JCRMailRepository extends AbstractMailRepository implements MailRep
                 final String xpath = "/jcr:root/" + MAIL_PATH + "//element(" + name + ",james:mail)";
 
                 QueryManager manager = session.getWorkspace().getQueryManager();
-                @SuppressWarnings("deprecation")
                 Query query = manager.createQuery(xpath, Query.XPATH);
                 NodeIterator iterator = query.execute().getNodes();
 

http://git-wip-us.apache.org/repos/asf/james-project/blob/f7db5863/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
index dcee0ed..209faa8 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailetContext.java
@@ -53,7 +53,6 @@ import org.apache.james.queue.api.MailQueueFactory;
 import org.apache.james.server.core.MailImpl;
 import org.apache.james.user.api.UsersRepository;
 import org.apache.james.user.api.UsersRepositoryException;
-import org.apache.mailet.HostAddress;
 import org.apache.mailet.LookupException;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailetContext;
@@ -296,13 +295,14 @@ public class JamesMailetContext implements MailetContext, Configurable {
      * @since Mailet API v2.2.0a16-unstable
      */
     @Override
-    public Iterator<HostAddress> getSMTPHostAddresses(String domainName) {
+    @Deprecated
+    public Iterator<org.apache.mailet.HostAddress> getSMTPHostAddresses(String domainName) {
         try {
             return new MXHostAddressIterator(dns.findMXRecords(domainName).iterator(), dns, false);
         } catch (TemporaryResolutionException e) {
             // TODO: We only do this to not break backward compatiblity. Should
             // fixed later
-            return ImmutableSet.<HostAddress>of().iterator();
+            return ImmutableSet.<org.apache.mailet.HostAddress>of().iterator();
         }
     }
 
@@ -334,6 +334,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
     }
 
     @Override
+    @Deprecated
     public void log(LogLevel logLevel, String s) {
         switch (logLevel) {
             case INFO:
@@ -351,6 +352,7 @@ public class JamesMailetContext implements MailetContext, Configurable {
     }
 
     @Override
+    @Deprecated
     public void log(LogLevel logLevel, String s, Throwable throwable) {
         switch (logLevel) {
             case INFO:

http://git-wip-us.apache.org/repos/asf/james-project/blob/f7db5863/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
index 79850b0..d9f84fc 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/remote/delivery/RemoteDeliveryTest.java
@@ -99,7 +99,6 @@ public class RemoteDeliveryTest {
     private ManageableMailQueue mailQueue;
 
     @Before
-    @SuppressWarnings("unchecked")
     public void setUp() {
         MailQueueFactory<ManageableMailQueue> queueFactory = new MemoryMailQueueFactory(new RawMailQueueItemDecoratorFactory());
         mailQueue = queueFactory.createQueue(RemoteDeliveryConfiguration.OUTGOING);

http://git-wip-us.apache.org/repos/asf/james-project/blob/f7db5863/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
index fd26ff6..35a5ebf 100644
--- a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
+++ b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SMTPServerTest.java
@@ -74,7 +74,6 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableList;
 
-@SuppressWarnings("deprecation")
 public class SMTPServerTest {
 
     final class AlterableDNSServer implements DNSService {

http://git-wip-us.apache.org/repos/asf/james-project/blob/f7db5863/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
index f0f99d6..3a33798 100644
--- a/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailqueue/src/test/java/org/apache/james/webadmin/routes/MailQueueRoutesTest.java
@@ -402,7 +402,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldReturnNoContent() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "true")
@@ -426,7 +426,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryRequiresDelayedParameter() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .body("{\"delayed\": \"false\"}")
@@ -438,7 +438,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectFalseDelayedParam() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "false")
@@ -451,7 +451,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectNonBooleanDelayedParam() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "wrong")
@@ -464,7 +464,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectRequestWithoutBody() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "true")
@@ -543,7 +543,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectRequestWithoutDelayedParameter() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "true")
@@ -556,7 +556,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldAcceptRequestWithUnknownFields() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "true")
@@ -572,7 +572,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectMalformedJsonPayload() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "true")
@@ -585,7 +585,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectTrueDelayedAttribute() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "false")
@@ -610,7 +610,7 @@ public class MailQueueRoutesTest {
 
     @Test
     public void forcingDelayedMailsDeliveryShouldRejectStringDelayedAttribute() throws Exception {
-        MemoryMailQueue queue = mailQueueFactory.createQueue(FIRST_QUEUE);
+        mailQueueFactory.createQueue(FIRST_QUEUE);
 
         given()
             .queryParam("delayed", "false")


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


[6/6] james-project git commit: JAMES-2316 Drop dead link to MPT binaries

Posted by bt...@apache.org.
JAMES-2316 Drop dead link to MPT binaries


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/753b1b15
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/753b1b15
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/753b1b15

Branch: refs/heads/master
Commit: 753b1b15b933f168ab198e0365a6fbbb11670054
Parents: f7db586
Author: benwa <bt...@linagora.com>
Authored: Wed Jan 31 11:07:48 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 1 09:05:45 2018 +0700

----------------------------------------------------------------------
 src/site/xdoc/download.xml | 10 ----------
 1 file changed, 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/753b1b15/src/site/xdoc/download.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index 68ebba3..539081e 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -492,16 +492,6 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     <p>Apache MPT 0.1 is the latest stable version:</p>
     <ul>
     
-    <li>Binary (Unix TAR): <a
-    href="[preferred]/james/mpt/0.1/apache-james-mpt-0.1-bin.tar.gz">apache-james-mpt-0.1.tar.gz</a> [<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-bin.tar.gz.asc">PGP</a>][<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-bin.tar.gz.md5">MD5</a>]</li>
-    
-    <li>Binary (ZIP Format): <a
-    href="[preferred]/james/mpt/0.1/apache-james-mpt-0.1-bin.zip">apache-james-mpt-0.1.zip</a> [<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-bin.zip.asc">PGP</a>][<a
-    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-bin.zip.md5">MD5</a>]</li>
-    
     <li>Source (Unix TAR): <a
     href="[preferred]/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a> [<a
     href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>][<a


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


[3/6] james-project git commit: JAMES-2316 Correct GPG command

Posted by bt...@apache.org.
JAMES-2316 Correct GPG command


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/2c4baab0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/2c4baab0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/2c4baab0

Branch: refs/heads/master
Commit: 2c4baab0e1d613271018bd48bb5a225f29d50ce4
Parents: 753b1b1
Author: benwa <bt...@linagora.com>
Authored: Wed Jan 31 11:09:11 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 1 09:05:45 2018 +0700

----------------------------------------------------------------------
 src/site/xdoc/download.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/2c4baab0/src/site/xdoc/download.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index 539081e..bc89c4b 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -130,7 +130,7 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
       <em>or</em><br />
       <code>
       % gpg --import KEYS<br />
-      % gpg --verify james-<i>version</i>.tar.gz.asc
+      % gpg --verify james-<i>version</i>.tar.gz.asc james-<i>version</i>.tar.gz
       </code></p>
     
     </subsection>


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


[4/6] james-project git commit: JAMES-2315 Correct download links

Posted by bt...@apache.org.
JAMES-2315 Correct download links

We MUST rely on Apache mirrors.

I manually tested every link I modified.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d2fcaef1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d2fcaef1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d2fcaef1

Branch: refs/heads/master
Commit: d2fcaef1eef78c31cef94dc420ef8225c8a9bc0b
Parents: 2c4baab
Author: benwa <bt...@linagora.com>
Authored: Wed Jan 31 11:37:34 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Feb 1 09:05:45 2018 +0700

----------------------------------------------------------------------
 src/site/xdoc/download.xml | 129 +++++++++++++++++++++++++++++-----------
 1 file changed, 94 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/d2fcaef1/src/site/xdoc/download.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/download.xml b/src/site/xdoc/download.xml
index bc89c4b..d31a456 100644
--- a/src/site/xdoc/download.xml
+++ b/src/site/xdoc/download.xml
@@ -158,11 +158,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
       </div>
 
       <ul>
-        <li>Source code <a href="https://github.com/apache/james-project/releases/tag/james-project-3.0.1">on GitHub</a></li>
+        <li>Source code (ZIP Format):
+          <a href="http://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip">apache-james-3.0.1-app.zip</a>
+          [<a href="http://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip.sha1">SHA1</a>]
+          [<a href="http://www.apache.org/dist/james/server/james-server-sources-3.0.1.zip.asc">PGP</a>]</li>
 
         <li>Binary (ZIP Format): <a
                 href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip">apache-james-3.0.1-app.zip</a> [<a
-                href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.md5.sig">PGP</a>]</li>
+                href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sha1">SHA1</a>] [<a
+                href="http://www.apache.org/dist/james/server/james-server-app-3.0.1-app.zip.sig">PGP</a>]</li>
 
       </ul>
 
@@ -239,7 +243,9 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mime4j-core/0.8.1/apache-mime4j-core-0.8.1.jar">(Jar)</a>
+      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-core-0.8.1.jar.asc">PGP</a>]
       </p>
 
     <p>In order to use Mime-4j DOM:</p>
@@ -255,7 +261,9 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mime4j-dom/0.8.1/apache-mime4j-dom-0.8.1.jar">(Jar)</a>
+      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-dom-0.8.1.jar.asc">PGP</a>]
     </p>
 
     <p>An aggregator project is also available:</p>
@@ -271,10 +279,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mime4j/0.8.1/apache-mime4j-0.8.1-bin.tar.gz">(Tar)</a>
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip">(Zip)</a>
-      <a href="https://github.com/apache/james-mime4j/archive/apache-mime4j-project-0.8.1.zip">(Sources Zip)</a>
-      <a href="https://github.com/apache/james-mime4j/archive/apache-mime4j-project-0.8.1.tar.gz">(Sources tar.gz)</a>
+      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/apache-mime4j-0.8.1-bin.zip.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mime4j/0.8.1/james-mime4j-sources-0.8.1.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -296,9 +309,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-jspf/0.9.5/apache-jspf-0.9.5.jar">(Jar)</a>
-      <a href="https://github.com/apache/james-jspf/archive/apache-jspf-project-1.0.1.zip">(Sources Zip)</a>
-      <a href="https://github.com/apache/james-jspf/archive/apache-jspf-project-1.0.1.tar.gz">(Sources tar.gz)</a>
+      <a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-1.0.1-bin.zip.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jspf/1.0.1/apache-jspf-sources-1.0.1.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -320,10 +339,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/jdkim/apache-jdkim/0.2/apache-jdkim-0.2-bin.tar.gz">(Tar)</a>
-      <a href="http://central.maven.org/maven2/org/apache/james/jdkim/apache-jdkim/0.2/apache-jdkim-0.2-bin.zip">(Zip)</a>
-      <a href="https://github.com/apache/james-jdkim/archive/apache-jdkim-project-0.2.zip">(Sources Zip)</a>
-      <a href="https://github.com/apache/james-jdkim/archive/apache-jdkim-project-0.2.tar.gz">(Sources tar.gz)</a>
+      <a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-0.2-bin.zip.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jdkim/apache-jdkim-project-0.2-source-release.zip.asc">PGP</a>]
     </p>
   
   </section>
@@ -345,9 +369,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-jsieve-core/0.7/apache-jsieve-core-0.7.jar">(Jar)</a>
-      <a href="https://github.com/apache/james-jsieve/archive/apache-jsieve-0.7.zip">(Sources Zip)</a>
-      <a href="https://github.com/apache/james-jsieve/archive/apache-jsieve-0.7.tar.gz">(Sources tar.gz)</a>
+      <a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-core-0.7.jar.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-sources-0.7.zip.asc">PGP</a>]
     </p>
 
     <p>An aggregator project is also available:</p>
@@ -363,9 +393,11 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-jsieve/0.7/apache-jsieve-0.7-project.tar.gz">(Tar)</a>
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-jsieve/0.7/apache-jsieve-0.7-project.zip">(Zip)</a>
+      <a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz">(Tar Gz)</a>
+      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/jsieve/0.7/apache-jsieve-0.7-all.tar.gz.asc">PGP</a>]
     </p>
+
   
   </section>
 
@@ -384,9 +416,15 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mailet-api/3.0.1/apache-mailet-api-3.0.1.jar">(Jar)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.zip">(Sources are in the <code>mailet/api</code> folder Zip)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.tar.gz">(Sources are in the <code>mailet/api</code> folder tar.gz)</a>
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-api-3.0.1.jar.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-api-sources-3.0.1.zip.asc">PGP</a>]
     </p>
     
   </section>
@@ -406,9 +444,16 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mailet-base/3.0.1/apache-mailet-base-3.0.1.jar">(Jar)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.zip">(Sources are in the <code>mailet/base</code> folder Zip)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.tar.gz">(Sources are in the <code>mailet/base</code> folder tar.gz)</a>    </p>
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-base-3.0.1.jar.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-base-sources-3.0.1.zip.asc">PGP</a>]
+    </p>
 
   </section>
 
@@ -427,9 +472,16 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     </pre>
 
     <p>Direct download link:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mailet-standard/3.0.1/apache-mailet-standard-3.0.1.jar">(Jar)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.zip">(Sources are in the <code>mailet/standard</code> folder Zip)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.tar.gz">(Sources are in the <code>mailet/standard</code> folder tar.gz)</a>    </p>
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-standard-3.0.1.jar.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-standard-sources-3.0.1.zip.asc">PGP</a>]
+    </p>
 
   </section>
 
@@ -463,10 +515,17 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
       </code>
     </pre>
 
-    <p>Direct download links:
-      <a href="http://central.maven.org/maven2/org/apache/james/apache-mailet-ai/3.0.1/apache-mailet-ai-3.0.1.jar">(Jar)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.zip">(Sources are in the <code>mailet/ai</code> folder Zip)</a>
-      <a href="https://github.com/apache/james-project/archive/james-project-3.0.1.tar.gz">(Sources are in the <code>mailet/ai</code> folder tar.gz)</a>    </p>
+    <p>Direct download link:
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar">(Jar)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-mailet-ai-3.0.1.jar.asc">PGP</a>]
+    </p>
+
+    <p>Sources:
+      <a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip">(Zip)</a>
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip.sha1">SHA-1</a>]
+      [<a href="http://www.apache.org/dist/james/mailets/3.0.1/apache-james-mailet-ai-sources-3.0.1.zip.asc">PGP</a>]
+    </p>
     
   </section>
 
@@ -493,12 +552,12 @@ is found <a href='http://www.apache.org/licenses/exports/'>here</a>.
     <ul>
     
     <li>Source (Unix TAR): <a
-    href="[preferred]/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a> [<a
+    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz">apache-james-mpt-0.1-src.tar.gz</a> [<a
     href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.asc">PGP</a>][<a
     href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.tar.gz.md5">MD5</a>]</li>
     
     <li>Source (ZIP Format): <a
-    href="[preferred]/james/mpt/0.1/apache-james-mpt-0.1-src.zip">apache-james-mpt-0.1-src.zip</a> [<a
+    href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip">apache-james-mpt-0.1-src.zip</a> [<a
     href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.asc">PGP</a>][<a
     href="http://www.apache.org/dist/james/mpt/0.1/apache-james-mpt-0.1-src.zip.md5">MD5</a>]</li>
     


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