Author: rdonkin
Date: Thu May 28 08:41:43 2009
New Revision: 779482
URL: http://svn.apache.org/viewvc?rev=779482&view=rev
Log:
JAMES-909 Bundle Apache Crypto Mailets. Only a SNAPSHOT for now.
https://issues.apache.org/jira/browse/JAMES-909
Added:
james/server/trunk/stage/org.apache.james/jars/apache-crypto-mailets-1.1-SNAPSHOT.jar
(with props)
james/server/trunk/stage/org.bouncycastle/
james/server/trunk/stage/org.bouncycastle/jars/
james/server/trunk/stage/org.bouncycastle/jars/BouncyCastle.LICENSE
james/server/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar (with
props)
james/server/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar (with
props)
Modified:
james/server/trunk/include.properties
james/server/trunk/phoenix-deployment/build.xml
james/server/trunk/phoenix-deployment/src/conf/james-config.xml
james/server/trunk/spring-deployment/build.xml
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
Modified: james/server/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/include.properties?rev=779482&r1=779481&r2=779482&view=diff
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Thu May 28 08:41:43 2009
@@ -47,7 +47,7 @@
# --------------------------------------------------
# Groups
# --------------------------------------------------
-path.lib.bouncycastle=org.bouncycastle/jars
+path.lib.bc=org.bouncycastle/jars
path.lib.james=org.apache.james/jars
# Sun's JavaMail Implementation
path.lib.javamail=javax.mail/jars
@@ -281,6 +281,12 @@
jarname.commons-io.jar=commons-io-1.2.jar
commons-io.jar=${path.lib.commonsio}/${jarname.commons-io.jar}
+jarname.mailet.crypto=apache-crypto-mailets-1.1-SNAPSHOT.jar
+mailet.crypto.jar=${path.lib.james}/${jarname.mailet.crypto}
+jarname.bc.mail=bcmail-jdk15-143.jar
+bc.mail.jar=${path.lib.bc}/${jarname.bc.mail}
+jarname.bc.prov=bcprov-jdk15-143.jar
+bc.prov.jar=${path.lib.bc}/${jarname.bc.prov}
# ----- Mime4J-----
jarname.mime4j.jar=apache-mime4j-0.6.jar
Modified: james/server/trunk/phoenix-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=779482&r1=779481&r2=779482&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Thu May 28 08:41:43 2009
@@ -599,7 +599,12 @@
<lib dir='${lib.dir}/${path.lib.james}'>
<include name='apache-james-imap*.jar' />
<include name='apache-jsieve*.jar' />
+ <include name='${jarname.mailet.crypto}'/>
</lib>
+ <lib dir='${lib.dir}/${path.lib.bc}'>
+ <include name='${jarname.bc.mail}' />
+ <include name='${jarname.bc.prov}'/>
+ </lib>
<zipfileset dir="${conf.dir}"
fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml" />
</zipfileset>
Modified: james/server/trunk/phoenix-deployment/src/conf/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/conf/james-config.xml?rev=779482&r1=779481&r2=779482&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/conf/james-config.xml (original)
+++ james/server/trunk/phoenix-deployment/src/conf/james-config.xml Thu May 28
08:41:43 2009
@@ -154,14 +154,14 @@
<mailetpackages>
<mailetpackage>org.apache.james.transport.mailets</mailetpackage>
<!-- Cryptography Mailets -->
- <mailetpackage>org.apache.james.transport.mailets.smime</mailetpackage>
+ <mailetpackage>org.apache.james.mailet.crypto.mailet</mailetpackage>
<!-- Sieve Mail Scripting -->
<mailetpackage>org.apache.james.imapserver.sieve</mailetpackage>
</mailetpackages>
<matcherpackages>
<matcherpackage>org.apache.james.transport.matchers</matcherpackage>
<!-- Crytographic mailets -->
-
<matcherpackage>org.apache.james.transport.matchers.smime</matcherpackage>
+ <matcherpackage>org.apache.james.mailet.crypto.matchers</matcherpackage>
</matcherpackages>
<!-- The James Spool Manager block -->
@@ -308,9 +308,6 @@
-->
<!-- sample SMIME mailets configuration -->
- <!-- In order to use SMIME capabilities you need to install the
bouncycastle JCE -->
- <!-- provider in your environment (james/lib) -->
- <!-- e.g: bcprov-jdk14-129.jar from
http://www.bouncycastle.org/latest_releases.html -->
<!--
<mailet match="IsSMIMEEncrypted" class="SMIMEDecrypt">
<keyStoreType>pkcs12</keyStoreType>
@@ -510,9 +507,6 @@
</mailet>
<!-- Add a server-side signature -->
- <!-- In order to use SMIME capabilities you need to install the
bouncycastle JCE -->
- <!-- provider in your environment (james/lib) -->
- <!-- e.g: bcprov-jdk14-129.jar from
http://www.bouncycastle.org/latest_releases.html -->
<!--
<mailet match="All" class="SMIMESign" onMailetException="ignore">
<keyStoreType>jks</keyStoreType>
Modified: james/server/trunk/spring-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/build.xml?rev=779482&r1=779481&r2=779482&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/build.xml (original)
+++ james/server/trunk/spring-deployment/build.xml Thu May 28 08:41:43 2009
@@ -137,6 +137,9 @@
<include name="${jsr250.jar}"/>
<!-- Protocols should be coupled by deployment only -->
<include name='${path.lib.james}/apache-james-imap*.jar'/>
+ <include name='${path.lib.james}/${jarname.mailet.crypto}'/>
+ <include name='${path.lib.bc}/{${jarname.bc.mail}'/>
+ <include name='${path.lib.bc}/{${jarname.bc.prov}'/>
</fileset>
<!-- from phoenix-deployment build.xml -->
Modified:
james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/spring-deployment/src/main/config/james/james-config.xml?rev=779482&r1=779481&r2=779482&view=diff
==============================================================================
--- james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
(original)
+++ james/server/trunk/spring-deployment/src/main/config/james/james-config.xml
Thu May 28 08:41:43 2009
@@ -154,14 +154,14 @@
<mailetpackages>
<mailetpackage>org.apache.james.transport.mailets</mailetpackage>
<!-- Cryptography Mailets -->
- <mailetpackage>org.apache.james.transport.mailets.smime</mailetpackage>
+ <mailetpackage>org.apache.james.mailet.crypto.mailet</mailetpackage>
<!-- Sieve Mail Scripting -->
<mailetpackage>org.apache.james.imapserver.sieve</mailetpackage>
</mailetpackages>
<matcherpackages>
<matcherpackage>org.apache.james.transport.matchers</matcherpackage>
<!-- Crytographic mailets -->
-
<matcherpackage>org.apache.james.transport.matchers.smime</matcherpackage>
+ <matcherpackage>org.apache.james.mailet.crypto.matchers</matcherpackage>
</matcherpackages>
<!-- The James Spool Manager block -->
@@ -308,9 +308,6 @@
-->
<!-- sample SMIME mailets configuration -->
- <!-- In order to use SMIME capabilities you need to install the
bouncycastle JCE -->
- <!-- provider in your environment (james/lib) -->
- <!-- e.g: bcprov-jdk14-129.jar from
http://www.bouncycastle.org/latest_releases.html -->
<!--
<mailet match="IsSMIMEEncrypted" class="SMIMEDecrypt">
<keyStoreType>pkcs12</keyStoreType>
@@ -510,9 +507,6 @@
</mailet>
<!-- Add a server-side signature -->
- <!-- In order to use SMIME capabilities you need to install the
bouncycastle JCE -->
- <!-- provider in your environment (james/lib) -->
- <!-- e.g: bcprov-jdk14-129.jar from
http://www.bouncycastle.org/latest_releases.html -->
<!--
<mailet match="All" class="SMIMESign" onMailetException="ignore">
<keyStoreType>jks</keyStoreType>
Added:
james/server/trunk/stage/org.apache.james/jars/apache-crypto-mailets-1.1-SNAPSHOT.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.apache.james/jars/apache-crypto-mailets-1.1-SNAPSHOT.jar?rev=779482&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
james/server/trunk/stage/org.apache.james/jars/apache-crypto-mailets-1.1-SNAPSHOT.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.bouncycastle/jars/BouncyCastle.LICENSE
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.bouncycastle/jars/BouncyCastle.LICENSE?rev=779482&view=auto
==============================================================================
--- james/server/trunk/stage/org.bouncycastle/jars/BouncyCastle.LICENSE (added)
+++ james/server/trunk/stage/org.bouncycastle/jars/BouncyCastle.LICENSE Thu May
28 08:41:43 2009
@@ -0,0 +1,22 @@
+Copyright (c) 2000 The Legion Of The Bouncy Castle
(http://www.bouncycastle.org)
+[http://www.bouncycastle.org/license.html]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
Added: james/server/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar?rev=779482&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.bouncycastle/jars/bcmail-jdk15-143.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: james/server/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar
URL:
http://svn.apache.org/viewvc/james/server/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar?rev=779482&view=auto
==============================================================================
Binary file - no diff available.
Propchange: james/server/trunk/stage/org.bouncycastle/jars/bcprov-jdk15-143.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
