Author: rdonkin Date: Thu Apr 24 12:16:56 2008 New Revision: 651351 URL: http://svn.apache.org/viewvc?rev=651351&view=rev Log: Fix up scripts and documentation
Modified: james/mailet/standard/trunk/NOTICE.txt james/mailet/standard/trunk/README.txt james/mailet/standard/trunk/build.xml james/mailet/standard/trunk/default.properties james/mailet/standard/trunk/include.properties james/mailet/standard/trunk/pom.xml james/mailet/standard/trunk/src/site/xdoc/conf.xml james/mailet/standard/trunk/src/site/xdoc/index.xml Modified: james/mailet/standard/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/NOTICE.txt?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/NOTICE.txt (original) +++ james/mailet/standard/trunk/NOTICE.txt Thu Apr 24 12:16:56 2008 @@ -2,7 +2,7 @@ == NOTICE file for use with the Apache License, Version 2.0, == ========================================================================= - Apache JAMES Crytographic Mailets + Apache JAMES Standard Mailets Copyright 2008 The Apache Software Foundation This product includes software developed at @@ -10,7 +10,6 @@ This product also includes software developed by : - Sun Microsystems (http://java.sun.com/) - - The Legion Of The Bouncy Castle (http://www.bouncycastle.org) Please read the LICENSE.txt and README.txt files in the root directory of this distribution. Modified: james/mailet/standard/trunk/README.txt URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/README.txt?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/README.txt (original) +++ james/mailet/standard/trunk/README.txt Thu Apr 24 12:16:56 2008 @@ -1,36 +1,4 @@ -JAMES Crytographic Mailets -------------------------- +JAMES Standard Mailets +---------------------- -Contains mailets dealing with crytography. - -Cryptography Notice -------------------- - - This distribution includes cryptographic software. The country in - which you currently reside may have restrictions on the import, - possession, use, and/or re-export to another country, of - encryption software. BEFORE using any encryption software, please - check your country's laws, regulations and policies concerning the - import, possession, or use, and re-export of encryption software, to - see if this is permitted. See http://www.wassenaar.org for more - information. - - The U.S. Government Department of Commerce, Bureau of Industry and - Security (BIS), has classified this software as Export Commodity - Control Number (ECCN) 5D002.C.1, which includes information security - software using or performing cryptographic functions with asymmetric - algorithms. The form and manner of this Apache Software Foundation - distribution makes it eligible for export 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. - - The following provides more details on the included cryptographic - software: - - This library provides high level crytographic operations - based on lower level crytographic libraries created - by The Legion of the Bouncy Castle (http://www.bouncycastle.org/). - - Export classifications and source links can be found - at http://www.apache.org/licenses/exports/. +A collection of generally useful mailet implementations Modified: james/mailet/standard/trunk/build.xml URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/build.xml?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/build.xml (original) +++ james/mailet/standard/trunk/build.xml Thu Apr 24 12:16:56 2008 @@ -38,8 +38,6 @@ <pathelement path="${javax-mail.jar}"/> <pathelement path="${javax-activation.jar}"/> <pathelement path="${mailet.jar}"/> - <pathelement path="${bc-workaround.jar}"/> - <pathelement path="${bc.jar}"/> <pathelement path="${java.class.path}" /> <pathelement path="${build.classes}" /> </path> @@ -160,7 +158,7 @@ <mkdir dir="${build.lib}"/> <!-- Make Mailet jar--> - <echo message="Making Mailet Jar (${name}-${version}.jar)"/> + <echo message="Making Mailet Jar (${project}-${name}-${version}.jar)"/> <jar jarfile="${build.lib}/${project}-${name}-${version}.jar" basedir="${build.classes}"> Modified: james/mailet/standard/trunk/default.properties URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/default.properties?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/default.properties (original) +++ james/mailet/standard/trunk/default.properties Thu Apr 24 12:16:56 2008 @@ -7,8 +7,8 @@ # See also: include.properties project=apache-james -name=crypto-mailets -Name=Cryptography Mailets +name=standard-mailets +Name=Standard Mailets version=1.0-SNAPSHOT manifestVersion=3.0 year=2008 @@ -16,8 +16,8 @@ vendor=The Apache Software Foundation vendor.id=org.apache creator=James Project Of The Apache Software Foundation -title.spec=Apache Cryptography Mailets API -title.impl=Apache Cryptography Mailets +title.spec=Apache Standard Mailets API +title.impl=Apache Standard Mailets # # compiler options Modified: james/mailet/standard/trunk/include.properties URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/include.properties?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/include.properties (original) +++ james/mailet/standard/trunk/include.properties Thu Apr 24 12:16:56 2008 @@ -27,8 +27,4 @@ javax-activation.jar=stage/activation/jars/${activation.id}.jar # ----- Mailet ----- -mailet.jar=stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar - -# ----- Bouncy Castle ----- -bc-workaround.jar=stage/org.bouncycastle/jars/bcmail-jdk14-workaround-129.jar -bc.jar=stage/org.bouncycastle/jars/bcmail-jdk14-129.jar \ No newline at end of file +mailet.jar=stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar \ No newline at end of file Modified: james/mailet/standard/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/pom.xml?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/pom.xml (original) +++ james/mailet/standard/trunk/pom.xml Thu Apr 24 12:16:56 2008 @@ -29,12 +29,12 @@ --> <modelVersion>4.0.0</modelVersion> <groupId>org.apache.james</groupId> - <artifactId>crypto-mailets</artifactId> - <name>Apache JAMES Cryptographic Mailets</name> + <artifactId>standard-mailets</artifactId> + <name>Apache JAMES Standard Mailets</name> <version>1.0-SNAPSHOT</version> <packaging>jar</packaging> <description> - Apache JAMES Cryptographic Mailets + Apache JAMES Standard Mailets </description> <parent> <groupId>org.apache.james</groupId> @@ -42,13 +42,13 @@ <version>1.1</version> <relativePath>stage/org.apache.james/poms/james-project-1.1.pom</relativePath> </parent> - <url>http://james.apache.org/mailet/crypto</url> + <url>http://james.apache.org/mailet/standard</url> <inceptionYear>2008</inceptionYear> <distributionManagement> <site> - <id>crypto-mailet-website</id> - <url>scp://people.apache.org/www/james.apache.org/mailet/crypto</url> + <id>standard-mailet-website</id> + <url>scp://people.apache.org/www/james.apache.org/mailet/standard</url> </site> </distributionManagement> @@ -59,13 +59,13 @@ <scm> <connection> - scm:svn:http://svn.apache.org/repos/asf/james/mailet/crypto/trunk + scm:svn:http://svn.apache.org/repos/asf/james/mailet/standard/trunk </connection> <developerConnection> - scm:svn:https://svn.apache.org/repos/asf/james/mailet/crypto/trunk + scm:svn:https://svn.apache.org/repos/asf/james/mailet/standard/trunk </developerConnection> <url> - http://svn.apache.org/viewcvs.cgi/james/mailet/crypto/trunk/?root=Apache-SVN + http://svn.apache.org/viewcvs.cgi/james/mailet/standard/trunk/?root=Apache-SVN </url> </scm> @@ -76,16 +76,6 @@ <version>1.4</version> </dependency> <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk14</artifactId> - <version>129</version> - </dependency> - <dependency> - <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk14-workaround</artifactId> - <version>129</version> - </dependency> - <dependency> <groupId>org.apache.james</groupId> <artifactId>mailet</artifactId> <version>3.0-SNAPSHOT</version> @@ -94,7 +84,7 @@ <repositories> <repository> - <id>crypto-mailet-stage-repository</id> + <id>mailet-stage-repository</id> <name>Stage repository</name> <url>file://${basedir}/stage</url> <layout>legacy</layout> Modified: james/mailet/standard/trunk/src/site/xdoc/conf.xml URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/site/xdoc/conf.xml?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/src/site/xdoc/conf.xml (original) +++ james/mailet/standard/trunk/src/site/xdoc/conf.xml Thu Apr 24 12:16:56 2008 @@ -26,89 +26,6 @@ </properties> <body> <section name="JAMES Configuration"> - <p> - To use cryptography mailets, the required - <a href='http://www.bouncycastle.org'>Bouncy Castle</a> - libraries must be installed in - <code>james/lib</code> - . It is recommended that the correct versions for the JVM are - used. - </p> - <p> - Ensure that the - <code>org.apache.james.transport.mailets.smime</code> - package is available to load mailets and matchers. For example: - </p> - <source> - <pre> - <mailetpackages> - <mailetpackage>org.apache.james.transport.mailets</mailetpackage> - <mailetpackage>org.apache.james.transport.mailets.smime</mailetpackage> - </mailetpackages> - <matcherpackages> - <matcherpackage>org.apache.james.transport.matchers </matcherpackage> - <matcherpackage>org.apache.james.transport.matchers.smime</matcherpackage> - </matcherpackages> - </pre> - </source> - <p>Example SMIME mailet configurations:</p> - <source> - <pre> - <mailet match="IsSMIMEEncrypted" class="SMIMEDecrypt"> - <keyStoreType>pkcs12</keyStoreType> - <keyStoreFileName>c:/path.pfx</keyStoreFileName> - <keyStorePassword>myKeyStorePass</keyStorePassword> - <keyAlias>myKeyAlias</keyAlias> - <keyAliasPassword>myKeyPass</keyAliasPassword> - </mailet> - - <mailet match="IsSMIMESigned" class="SMIMECheckSignature"> - <keyStoreType>pkcs12</keyStoreType> - <keyStoreFileName>c:/path.pfx</keyStoreFileName> - <keyStorePassword> myKeyStorePass - </keyStorePassword> <strip>false</strip> - <onlyTrusted>true</onlyTrusted> - </mailet> - </pre> - </source> - <p></p> - Matcher example: messages signed by trusted users never are spam - Messages with valid signatures will never be considered spam. This - can be a valid policy *if* SMIMECheckSignature was invoked with - <onlyTrusted>true</onlyTrusted> - set - <source> - <pre> - <mailet - match="HasMailAttribute=org.apache.james.SMIMECheckSignature" - class="ToProcessor"> - <processor>transport</processor> - </mailet> - </pre> - </source> - <p>Signing example: Add a server-side signature to all mail.</p> - <source> - <pre> - <mailet - match="HasMailAttribute=org.apache.james.SMIMECheckSignature" - class="SetMimeHeader"> - <name>X-WasSigned</name> - <value>true</value> - </mailet> - - <mailet match="All" class="SMIMESign" onMailetException="ignore"> - <keyStoreType>jks</keyStoreType> - <keyStoreFileName>path.keystore</keyStoreFileName> - <keyStorePassword>myKeyStorePass</keyStorePassword> - <keyAlias>myKeyAlias</keyAlias> - <keyAliasPassword>myKeyPass</keyAliasPassword> - <signerName>XXX Trusted Server</signerName> - <rebuildFrom>true</rebuildFrom> - <postmasterSigns>true</postmasterSigns> - <debug>true</debug> - </mailet> - </pre> - </source> </section> </body> </document> Modified: james/mailet/standard/trunk/src/site/xdoc/index.xml URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/site/xdoc/index.xml?rev=651351&r1=651350&r2=651351&view=diff ============================================================================== --- james/mailet/standard/trunk/src/site/xdoc/index.xml (original) +++ james/mailet/standard/trunk/src/site/xdoc/index.xml Thu Apr 24 12:16:56 2008 @@ -23,67 +23,8 @@ <author email="server-dev@james.apache.org">JAMES Project Team</author> </properties> <body> - <section name="Crytography Mailets"> - <p>Mailets which encode, decode, sign and verify mail plus cryptology utilities.</p> - </section> - <section name='S/MIME Mailets'> - <p><acronym title='Secure / Multipurpose Internet Mail Extensions'>S/MIME</acronym> provides - cryptographic services for <acronym title='Multipurpose Internet Mail Extensions'> - <a href='http://james.apache.org/server/rfclist/basic/rfc2045.txt'>MIME</a></acronym> messages. - These services include public key digital signature and encryption. - Authentication is certificate based and so uses a hierarchical trust model. - </p><p> - SMIME is standardised by the - <acronym title='Internet Engineering Task Force'> - <a href='http://www.imc.org/ietf-smime/index.html'>IEFT</a></acronym>. - </p> - <p> - JAMES provides: - </p> - <ul> - <li><a href='apidocs/org/apache/james/transport/mailets/smime/SMIMEDecrypt.html'>SMIMECheckSignature</a> - Verifies the S/MIME signature of a message. The s/mime signing ensure that the - private key owner is the real sender of the message.</li> - <li><a href='apidocs/org/apache/james/transport/mailets/smime/SMIMEDecrypt.html'>SMIMEDecrypt</a> - Decrypts a S/MIME encrypted message.</li> - <li><a href='apidocs/org/apache/james/transport/mailets/smime/SMIMESign.html'>SMIMESign</a> - Puts a server-side SMIME signature on a message. - </li> - </ul> - </section> - <section name='Cryptography Notice'> - <p> - This distribution includes cryptographic software. The country in - which you currently reside may have restrictions on the import, - possession, use, and/or re-export to another country, of - encryption software. BEFORE using any encryption software, please - check your country's laws, regulations and policies concerning the - import, possession, or use, and re-export of encryption software, to - see if this is permitted. See - <a href='http://www.wassenaar.org/'>http://www.wassenaar.org</a> for more - information. - </p><p> - The U.S. Government Department of Commerce, Bureau of Industry and - Security (BIS), has classified this software as Export Commodity - Control Number (ECCN) 5D002.C.1, which includes information security - software using or performing cryptographic functions with asymmetric - algorithms. The form and manner of this Apache Software Foundation - distribution makes it eligible for export 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> - The following provides more details on the included cryptographic - software: - </p> - <ul> - <li>This library provides high level crytographic operations - based on lower level crytographic libraries created - by <a href='http://www.bouncycastle.org/'>The Legion of the Bouncy Castle</a>. - </li> - </ul> - <p>Export classifications and source links can be found - <a href='http://www.apache.org/licenses/exports/'>here</a>.</p> + <section name="Standard Mailets"> + <p>A collection of generally useful reusable mailets with minimal depedencies.</p> </section> </body> </document> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]