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 ie...@apache.org on 2012/12/28 15:35:01 UTC

svn commit: r1426520 - in /james/mailet/trunk: ./ api/ api/src/main/java/org/apache/mailet/ src/site/ src/site/apt/ src/site/markdown/ src/site/resources/images/logos/ src/site/xdoc/ src/site/xdoc/ai/ src/site/xdoc/api/ src/site/xdoc/base/ src/site/xdo...

Author: ieugen
Date: Fri Dec 28 14:35:00 2012
New Revision: 1426520

URL: http://svn.apache.org/viewvc?rev=1426520&view=rev
Log:
MAILET-46 Preparing for new site

* removed old information from wweb pages
* merged old release notes and linked from new Markdown based release notes
* added doxia plugin for rendering markdown based pages
* added info page for working with mailets

Added:
    james/mailet/trunk/src/site/apt/release-notes-old.apt
    james/mailet/trunk/src/site/markdown/
    james/mailet/trunk/src/site/markdown/quickstart.md
    james/mailet/trunk/src/site/markdown/release-notes.md
    james/mailet/trunk/src/site/resources/images/logos/james-logo.jpg
      - copied, changed from r1425932, james/mailet/trunk/src/site/xdoc/images/james-logo.jpg
    james/mailet/trunk/src/site/resources/images/logos/void.gif
      - copied, changed from r1425932, james/mailet/trunk/src/site/xdoc/images/void.gif
Removed:
    james/mailet/trunk/src/site/apt/release-notes-base.apt
    james/mailet/trunk/src/site/apt/release-notes-crypto.apt
    james/mailet/trunk/src/site/apt/release-notes-mailetdoc.apt
    james/mailet/trunk/src/site/apt/release-notes-standard.apt
    james/mailet/trunk/src/site/apt/release-notes.apt
    james/mailet/trunk/src/site/xdoc/images/james-logo.jpg
    james/mailet/trunk/src/site/xdoc/images/void.gif
Modified:
    james/mailet/trunk/api/pom.xml
    james/mailet/trunk/api/src/main/java/org/apache/mailet/MailetContext.java
    james/mailet/trunk/pom.xml
    james/mailet/trunk/src/site/site.xml
    james/mailet/trunk/src/site/xdoc/ai/index.xml
    james/mailet/trunk/src/site/xdoc/api/index.xml
    james/mailet/trunk/src/site/xdoc/base/index.xml
    james/mailet/trunk/src/site/xdoc/crypto/conf.xml
    james/mailet/trunk/src/site/xdoc/crypto/index.xml
    james/mailet/trunk/src/site/xdoc/index.xml
    james/mailet/trunk/src/site/xdoc/mailetdocs-maven-plugin/index.xml
    james/mailet/trunk/src/site/xdoc/standard/index.xml

Modified: james/mailet/trunk/api/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/api/pom.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/api/pom.xml (original)
+++ james/mailet/trunk/api/pom.xml Fri Dec 28 14:35:00 2012
@@ -48,13 +48,4 @@
         </dependency>
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.james</groupId>
-                <artifactId>maven-mailetdocs-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>

Modified: james/mailet/trunk/api/src/main/java/org/apache/mailet/MailetContext.java
URL: http://svn.apache.org/viewvc/james/mailet/trunk/api/src/main/java/org/apache/mailet/MailetContext.java?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/api/src/main/java/org/apache/mailet/MailetContext.java (original)
+++ james/mailet/trunk/api/src/main/java/org/apache/mailet/MailetContext.java Fri Dec 28 14:35:00 2012
@@ -20,45 +20,44 @@
 
 package org.apache.mailet;
 
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
 /**
  * Defines a set of methods that can be used to interact with the mailet
  * container. For example, it can be used to send a new message, to deliver
  * a message locally, or to write to a log file.
- * <p>
+ * <p/>
  * Mailets and Matchers can retrieve a MailetContext through their
  * respective MailetConfig and MatcherConfig objects, which are provided
  * to them by the mailet container when they are initialized.
- * <p>
+ * <p/>
  * <b>Mailet Context Attributes</b>
- * <p>
+ * <p/>
  * The Mailet Context can provide additional configuration or other
  * information not defined in this interface to Mailets and Matchers
  * by using attributes. See your server documentation for information
  * on the attributes it provides.
- * <p>
+ * <p/>
  * Every attribute consists of a name and a value.
  * Attribute names should follow the same convention as package names.
  * The Mailet API specification reserves names matching
  * <i>org.apache.james.*</i> and <i>org.apache.mailet.*</i>.
  * Attribute values can be arbitrary objects.
- * <p>
+ * <p/>
  * The list of attributes which are currently associated with a mailet
  * context can be retrieved using the {@link #getAttributeNames}
  * method, and given its name, the value of an attribute can be
  * retrieved using the {@link #getAttribute} method.
- *
  */
 public interface MailetContext {
-    
+
     /**
      * Loglevel for logging operations
+     *
      * @since Mailet API v2.5
      */
     public static enum LogLevel {
@@ -67,15 +66,16 @@ public interface MailetContext {
         WARN,
         ERROR
     }
-    
+
     /**
      * DNS Record Types for lookup operations
+     *
      * @since Mailet API v2.5
      */
     public enum RecordType {
-    	A, AAAA, PTR, MX, TXT, SPF
+        A, AAAA, PTR, MX, TXT, SPF
     }
-    
+
     /**
      * Returns the major version number of the Mailet API that this mailet
      * container supports. For example, if the mailet container supports
@@ -97,7 +97,7 @@ public interface MailetContext {
     /**
      * Returns the name and version of the mailet container on which
      * the mailet is running.
-     * <p>
+     * <p/>
      * The returned string is of the form {@code <servername>/<versionnumber>},
      * optionally followed by additional information in parentheses. For example,
      * the JAMES mailet container may return the string {@code "JAMES/1.2"}
@@ -110,14 +110,14 @@ public interface MailetContext {
     /**
      * Returns an Iterator over the names of all attributes which are set
      * in this mailet context.
-     * <p>
+     * <p/>
      * The {@link #getAttribute} method can be called to
      * retrieve an attribute's value given its name.
      *
      * @return an Iterator (of Strings) over all attribute names
      */
     Iterator<String> getAttributeNames();
-    
+
     /**
      * Returns the value of the named mailet context attribute,
      * or null if the attribute does not exist.
@@ -126,7 +126,7 @@ public interface MailetContext {
      * @return the attribute value, or null if the attribute does not exist
      */
     Object getAttribute(String name);
-    
+
     /**
      * Binds an object to a given attribute name in this mailet context.  If the name
      * specified is already used for an attribute, this method will remove the old
@@ -138,22 +138,22 @@ public interface MailetContext {
      * @param name - a String specifying the name of the attribute
      * @param object - an Object representing the attribute to be bound
      */
-    
+
     /**
      * Associates an attribute with the given name and value with this mailet context.
-     * <p>
+     * <p/>
      * If an attribute with the given name already exists, it is replaced, and the
      * previous value is returned.
-     * <p>
+     * <p/>
      * Attribute names should follow the same convention as package names.
      * The Mailet API specification reserves names matching
      * <i>org.apache.james.*</i> and <i>org.apache.mailet.*</i>.
      *
-     * @param name the attribute name
+     * @param name  the attribute name
      * @param value the attribute value
      */
     void setAttribute(String name, Object value);
-    
+
     /**
      * Removes the attribute with the given name from this Mail instance.
      *
@@ -178,20 +178,19 @@ public interface MailetContext {
      * is specific to the mailet container.
      *
      * @param message the message to be written to the log
-     * @param t the Throwable whose stack trace is to be written to the log
+     * @param t       the Throwable whose stack trace is to be written to the log
      * @deprecated use {@link #log(LogLevel level, String message, Throwable t)}
      */
     @Deprecated
     void log(String message, Throwable t);
-    
-    
+
+
     /**
      * Writes the specified message to a mailet log. The name and type of
      * the mailet log is specific to the mailet container.
      *
-     * @param level {@link LogLevel} to use
+     * @param level   {@link LogLevel} to use
      * @param message the message to be written to the log
-     * 
      * @since 2.5
      */
     void log(LogLevel level, String message);
@@ -202,20 +201,19 @@ public interface MailetContext {
      * is specific to the mailet container.
      *
      * @param message the message to be written to the log
-     * @param t the Throwable whose stack trace is to be written to the log
-     * @param level {@link LogLevel} to use
-     * 
+     * @param t       the Throwable whose stack trace is to be written to the log
+     * @param level   {@link LogLevel} to use
      * @since 2.5
      */
     void log(LogLevel level, String message, Throwable t);
-    
+
     /**
      * Returns the Postmaster address for this mailet context.
      *
      * @return the Postmaster address
      */
     MailAddress getPostmaster();
-    
+
     /**
      * Checks if a host name is local, i.e. this server is the
      * final delivery destination for messages sent to this host.
@@ -229,18 +227,18 @@ public interface MailetContext {
      * Checks if a user account is local, i.e. the account exists locally
      * and this server is the final delivery destination for messages
      * sent to this address.
-     * <p>
+     * <p/>
      * This given user account string should contain the full
      * user address, i.e. user@domain. If the domain part is
      * missing, "localhost" will be used as the domain name.
      *
      * @param userAccount the full address of the account to be checked
      * @return true if the account is a local account, false otherwise
-     * @deprecated use {@link #isLocalEmail(MailAddress)} instead 
+     * @deprecated use {@link #isLocalEmail(MailAddress)} instead
      */
     @Deprecated
     boolean isLocalUser(String userAccount);
-    
+
     /**
      * Checks if an address is local, i.e. its account exists locally
      * and this server is the final delivery destination for messages
@@ -248,24 +246,22 @@ public interface MailetContext {
      *
      * @param mailAddress the full address of the account to be checked
      * @return true if the account is a local account, false otherwise
-     * 
      * @since Mailet API 2.4
      */
     boolean isLocalEmail(MailAddress mailAddress);
-    
+
     /**
      * Returns the hostnames that are specified as mail handlers for
      * the given domain name. The host names are determined using DNS
      * lookup of MX records and are returned sorted by priority
      * (as detailed in the SMTP RFC).
-     *     
+     *
      * @param domain the domain name whose mail handling hosts are requested
      * @return the sorted mail-handling hostnames for the domain
-     * 
      * @deprecated use the generic dnsLookup method
      */
     Collection<String> getMailServers(String domain);
-    
+
     /**
      * Returns the SMTP host addresses specified as mail handlers for
      * the given domain name. This is equivalent to calling the
@@ -274,11 +270,10 @@ public interface MailetContext {
      * The results are returned as instances of {@link HostAddress}
      * containing the host and address information.
      *
-     * @since Mailet API v2.3
      * @param domain the domain whose mail handling SMTP host addresses are requested
      * @return an Iterator over HostAddress, in proper order of priority, or
      *         an empty iterator if no hosts are found
-     *         
+     * @since Mailet API v2.3
      * @deprecated use the generic dnsLookup method
      */
     Iterator<HostAddress> getSMTPHostAddresses(String domain);
@@ -293,34 +288,34 @@ public interface MailetContext {
      * @throws MessagingException if an error occurs accessing or sending the message
      */
     void sendMail(MimeMessage message)
-        throws MessagingException;
+            throws MessagingException;
 
     /**
      * Sends an outgoing message to the top of this mailet container's root queue.
      * This is functionally equivalent to having opened an SMTP session to the local
      * host and delivering the message using the given sender and recipients.
      *
-     * @param sender the message sender
+     * @param sender     the message sender
      * @param recipients the message recipients as a Collection of MailAddress objects
-     * @param message the message to send
+     * @param message    the message to send
      * @throws MessagingException if an error occurs accessing or sending the message
      */
     void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage message)
-        throws MessagingException;
+            throws MessagingException;
 
     /**
      * Sends an outgoing message to the top of this mailet container's queue for the
      * specified processor.
      *
-     * @param sender the message sender
+     * @param sender     the message sender
      * @param recipients the message recipients as a Collection of MailAddress objects
-     * @param message the message to send
-     * @param state the state of the message, indicating the name of the processor for
-     *        which the message will be queued
+     * @param message    the message to send
+     * @param state      the state of the message, indicating the name of the processor for
+     *                   which the message will be queued
      * @throws MessagingException if an error occurs accessing or sending the message
      */
     void sendMail(MailAddress sender, Collection<MailAddress> recipients, MimeMessage message, String state)
-        throws MessagingException;
+            throws MessagingException;
 
     /**
      * Sends an outgoing message to the top of this mailet container's root queue.
@@ -332,15 +327,15 @@ public interface MailetContext {
      */
     void sendMail(Mail mail)
             throws MessagingException;
-    
+
     /**
      * Bounces the message using a standard format with the given message.
-     * <p>
-     * The message will be sent to the original sender from the postmaster address 
+     * <p/>
+     * The message will be sent to the original sender from the postmaster address
      * as configured in this mailet context, adding the message to top of mail
      * server queue using {@code sendMail}.
      *
-     * @param mail the message to bounce, with the original sender
+     * @param mail    the message to bounce, with the original sender
      * @param message a descriptive message explaining why the message bounced
      * @throws MessagingException if an error occurs accessing or sending the message
      */
@@ -348,28 +343,27 @@ public interface MailetContext {
 
     /**
      * Bounces the message using a standard format with the given message.
-     * <p>
+     * <p/>
      * The message will be sent to the original sender from the given address,
      * adding the message to top of mail server queue using {@code sendMail}.
      *
-     * @param mail the message to bounce, with the original sender
+     * @param mail    the message to bounce, with the original sender
      * @param message a descriptive message explaining why the message bounced
      * @param bouncer the address used as the sender of the bounce message
      * @throws MessagingException if an error occurs accessing or sending the message
      */
     void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException;
-    
+
 
     /**
      * Lookups the DNS system for a given record type.
      * In case of MX records the returned List will be sorted using the priority score, ascending.
-     * 
+     *
      * @param name the host/domain name to lookup
-     * @param type the "IN" record type to lookup 
+     * @param type the "IN" record type to lookup
      * @return a String list with result records with at least 1 element.
      * @throws TemporaryLookupException on timeout or servfail
-     * @throws LookupException on host not found, record type not found, name syntax issues and other permanent exceptions.
-     * 
+     * @throws LookupException          on host not found, record type not found, name syntax issues and other permanent exceptions.
      * @since Mailet API v2.5
      */
     List<String> dnsLookup(String name, RecordType type) throws TemporaryLookupException, LookupException;

Modified: james/mailet/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/pom.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/pom.xml (original)
+++ james/mailet/trunk/pom.xml Fri Dec 28 14:35:00 2012
@@ -53,7 +53,7 @@
         <maven-plugin-api.version>3.0.4</maven-plugin-api.version>
         <maven-reporting-impl.version>2.2</maven-reporting-impl.version>
         <maven-reporting-api.version>3.0</maven-reporting-api.version>
-        <qdox.version>1.12</qdox.version>
+        <qdox.version>1.12.1</qdox.version>
     </properties>
 
 
@@ -183,6 +183,7 @@
                                 <exclude>**/LICENSE*</exclude>
                                 <exclude>**/target/**</exclude>
                                 <exclude>**/*.iml</exclude>
+                                <exclude>src/site/**</exclude>
                             </excludes>
                         </configuration>
                     </execution>
@@ -215,13 +216,17 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
+                <version>3.2</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.maven.doxia</groupId>
+                        <artifactId>doxia-module-markdown</artifactId>
+                        <version>1.3</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
-                    <reportPlugins combine.children="append">
-                        <plugin>
-                            <groupId>org.apache.james</groupId>
-                            <artifactId>maven-mailetdocs-plugin</artifactId>
-                        </plugin>
-                    </reportPlugins>
+                    <inputEncoding>UTF-8</inputEncoding>
+                    <outputEncoding>UTF-8</outputEncoding>
                 </configuration>
             </plugin>
         </plugins>

Added: james/mailet/trunk/src/site/apt/release-notes-old.apt
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/apt/release-notes-old.apt?rev=1426520&view=auto
==============================================================================
--- james/mailet/trunk/src/site/apt/release-notes-old.apt (added)
+++ james/mailet/trunk/src/site/apt/release-notes-old.apt Fri Dec 28 14:35:00 2012
@@ -0,0 +1,166 @@
+ ------
+ Old Release Notes (aggregated)
+ ------
+ Apache JAMES Project Team
+ ------
+ 2011
+ ------
+
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements.  See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership.  The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License.  You may obtain a copy of the License at
+~~
+~~   http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied.  See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+AI Mailets Release Notes
+
+   Apache James AI Mailets 0.1 is expect to be the first independent release of this code.
+
+   Previously released in {{{http://james.apache.org/server/index.html'}Apache James Server}} 2.
+   
+   {{{http://maven.apache.org}Maven 3}} is used to build this project.
+
+
+MailetDocs Release Notes (2009-01-17)
+
+ The MailetDocs plugin for {{{http://maven.apache.org}Apache Maven}} documents
+ implementations of the {{{http://james.apache.org/mailet/api}Apache Mailet API}}.
+ A mailet is an independent mail processor designed to be run in a mailet container.
+ A catalog of mailets and matchers is created, together with reports on each one.
+
+0.1
+
+ 0.1 is the first release of this plugin. Basic function is complete but the API may change
+ as the code is developed. Feedback to server-dev@james.apache.org is appreciated.
+
+
+Apache James Mailet Base Release Notes (2009-04-01)
+
+  Apache James Mailets Base collects a number of utilites and lightweight
+  frameworks useful when working with the
+  {{{http://james.apache.org/mailet} Apache Mailet API}} (a framework
+  assisting the rapid development of email processing functionality).
+  Mailets base is used as the basis
+  for the email processing functions shipped with the
+  {{{http://james.apache.org/server} Apache James server}}
+  (an advanced mail server) but is not dependent on that server.
+
+ Version 1.0
+
+  This is the first independent release of these mature components last
+  shipped with Apache James 2.3.
+
+ Earlier Releases
+
+  Previous versions of the components in base shipped with Apache James
+  server. This product contains repackaged versions which are otherwise
+  compatible with these versions. All classes are package
+  org.apache.mailet.base except test helpers (which are now packaged in
+  org.apache.mailet.base.test).
+
+  It is recommended that anyone using these older versions updates to
+ the new library.
+
+ Apache James Mailet Crypto Release Notes (2009-02-09)
+
+    Apache James Cryptographic Mailets encode, decode, sign and
+    verify mail, together with related cryptology utilities.
+    Mailets are defined by the
+    {{{http://james.apache.org/mailet}Apache Mailet API}} (a framework
+    assisting the rapid development of email processing functionality).
+
+    {{{http://maven.apache.org}Maven 2}} is used to build this project.
+
+ 1.1 (In Preparation)
+
+    Is a JRE update release upgrading dependencies and code to Java 1.5
+
+  * Upgrading to BouncyCastle 1.43 from 1.29 adds numerous features,
+    resolves many defects and addresses some security advisories.
+    See the {{{http://www.bouncycastle.org/releasenotes.html} release notes}}
+    for more details.
+
+  * The secondary Ant build has now been removed. Maven should be used
+    to build. The Maven build now inherits and uses the Apache standard
+    pom.
+
+ 1.0
+
+    This is the first independent release of this code. Previously
+    it was shipped as part of the
+    {{{http://james.apache.org/mailet}Apache James Mail Server}}
+    (an advanced mail server). This release is not dependent on
+    that server but can be used in any Mailet container.
+
+ 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/.
+
+Apache James Standard Mailet Release Notes (2009-02-09)
+
+   Apache James Standard Mailets are a collection of general purpose
+   mail processing agents with minimal dependencies.
+   Mailets are defined by the
+   {{{http://james.apache.org/mailet}Apache Mailet API}} (a framework
+   assisting the rapid development of email processing functionality).
+
+1.0
+
+   This is the first independent release of this code. Previously
+   it was shipped as part of the
+   {{{http://james.apache.org/mailet}Apache James Mail Server}}
+   (an advanced mail server). This release is not dependent on
+   that server but can be used in any Mailet container.
+
+*Since James Server 2.3.1
+
+  * Upgrade to Apache Mailet API 2.4 and Apache Mailets Base 1.0
+
+  * [{{{https://issues.apache.org/jira/browse/JAMES-728}JAMES-728}}]
+    - ClamAV and IOUtil updates to close streams/readers/writers and sockets
+
+  * [{{{https://issues.apache.org/jira/browse/JAMES-733}JAMES-733}}]
+    - Fix javadoc
+
+  * [{{{https://issues.apache.org/jira/browse/JAMES-579}JAMES-579}}]
+    -  Update license headers and NOTICE to follow the latest ASF requirements
+
+

Added: james/mailet/trunk/src/site/markdown/quickstart.md
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/markdown/quickstart.md?rev=1426520&view=auto
==============================================================================
--- james/mailet/trunk/src/site/markdown/quickstart.md (added)
+++ james/mailet/trunk/src/site/markdown/quickstart.md Fri Dec 28 14:35:00 2012
@@ -0,0 +1,35 @@
+Mailets for developers
+======================
+
+## Artifact names
+
+All binary (and source) artifacts are available via [Maven Central](http://repo.maven.apache.org/maven2).
+
+The project **groupId** is *org.apache.james* and the artifact names are:
+
+* **apache-mailet-api** - for the Mailet API
+* **apache-mailet-base** - for base Mailets
+* **apache-mailet-standard** - for Standard Mailets
+* **apache-mailet-crypto** - for Crypto Mailets
+* **mailetdocs-maven-plugin** if you wish to extract documentation from sources
+
+Just include something like this in your *pom.xml*
+
+~~~
+<dependencies>
+    <dependency>
+        <groupId>org.apache.james</groupId>
+        <artifactId>apache-mailet-api</artifactId>
+        <version>2.5.0</version>
+    </dependency>
+    <!-- other dependencies -->
+</dependencies>
+~~~
+
+### Write your own mailets
+
+To learn how to write your own mailets please have a look at <a href="#">Generic Matcher</a> and
+<a href="">Generic Mailet</a>.
+
+Another good learning source are the unit tests from <a href="#">Standard Mailets</a>
+

Added: james/mailet/trunk/src/site/markdown/release-notes.md
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/markdown/release-notes.md?rev=1426520&view=auto
==============================================================================
--- james/mailet/trunk/src/site/markdown/release-notes.md (added)
+++ james/mailet/trunk/src/site/markdown/release-notes.md Fri Dec 28 14:35:00 2012
@@ -0,0 +1,15 @@
+#Release Notes
+
+Apache JamesProject Team (2012/12/28)
+
+##Release Notes
+
+2.5.0 Release 2.5.0 marks a new milestone in Apache Mailet life. All Apache James mailet related sub-projects
+  (Api, Base, Crypto, Standard) have been merged as a multi-module maven project.
+  They share the same version number, a common naming scheme and will be released together.Apart from bug fixing, one
+  notable release characteristic is that 2.5.0 jars are OSGi bundles.
+
+##Earlier Releases
+
+For information regarding the **Release notes** of earlier releases, please visit
+<a href="release-note-old.html">Old releases</a> page.
\ No newline at end of file

Copied: james/mailet/trunk/src/site/resources/images/logos/james-logo.jpg (from r1425932, james/mailet/trunk/src/site/xdoc/images/james-logo.jpg)
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/resources/images/logos/james-logo.jpg?p2=james/mailet/trunk/src/site/resources/images/logos/james-logo.jpg&p1=james/mailet/trunk/src/site/xdoc/images/james-logo.jpg&r1=1425932&r2=1426520&rev=1426520&view=diff
==============================================================================
Binary files - no diff available.

Copied: james/mailet/trunk/src/site/resources/images/logos/void.gif (from r1425932, james/mailet/trunk/src/site/xdoc/images/void.gif)
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/resources/images/logos/void.gif?p2=james/mailet/trunk/src/site/resources/images/logos/void.gif&p1=james/mailet/trunk/src/site/xdoc/images/void.gif&r1=1425932&r2=1426520&rev=1426520&view=diff
==============================================================================
Binary files - no diff available.

Modified: james/mailet/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/site.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/site.xml (original)
+++ james/mailet/trunk/src/site/site.xml Fri Dec 28 14:35:00 2012
@@ -20,7 +20,7 @@
 <project name='mailets'>
 
     <bannerLeft>
-        <name>James Project</name>
+        <name>Apache James Project</name>
         <src>images/logos/james-mailets-logo.gif</src>
         <href>http://james.apache.org/index.html</href>
         <alt>james-mailets-logo.gif</alt>
@@ -33,71 +33,17 @@
             <item name="Basic Mailet Toolkit" href="http://james.apache.org/mailet/base"/>
             <item name="Crypto Mailets" href="http://james.apache.org/mailet/crypto"/>
             <item name="MailetDocs" href="http://james.apache.org/mailet/mailetdocs-maven-plugin"/>
-            <item name="Sieve Mailet" href='http://james.apache.org/jsieve/mailet/index.html'/>
+            <item name="Sieve Mailet" href='http://james.apache.org/jsieve/mailet/'/>
             <item name="Standard Mailets" href="http://james.apache.org/mailet/standard"/>
         </menu>
 
         <menu name="Useful Information">
-
+            <item name="Java Docs" href="http://james.apache.org/mailet/apidocs"/>
+            <item name="Quick Start" href="quickstart.html"/>
+            <item name="Release Notes" href="release-notes.html"/>
         </menu>
 
-        <menu ref="reports" />
-
-        <!--<menu name="Standard Mailets">-->
-            <!--<item name="Overview" href="index.html"/>-->
-            <!--<item name="Configuration" href="conf.html"/>-->
-            <!--<item name="Catalog" href="mailet-report.html" />-->
-            <!--<item name="Release Notes" href="release-notes.html" />-->
-            <!--<item-->
-                    <!--name="DOAP"-->
-                    <!--href="doap_apache-standard-mailets.rdf"-->
-                    <!--img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>-->
-        <!--</menu>-->
-
-        <!--<menu name="MailetDocs Maven Plugin">-->
-            <!--<item name="Introduction" href="index.html"/>-->
-            <!--<item name="Goals" href="plugin-info.html"/>-->
-            <!--<item name="Usage" href="usage.html"/>-->
-            <!--<item name="Release Notes" href="release-notes.html"/>-->
-            <!--<item-->
-                    <!--name="DOAP"-->
-                    <!--href="doap_maven-mailetdocs-plugin.rdf"-->
-                    <!--img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>-->
-        <!--</menu>-->
-        <!--<menu name='Examples'>-->
-            <!--<item name='Large Catalog' href='examples/standard.html'/>-->
-        <!--</menu>-->
-
-
-        <!--<menu name="Cryptography Mailets">-->
-            <!--<item name="Overview" href="index.html"/>-->
-            <!--<item name="Configuration" href="conf.html"/>-->
-            <!--<item name="Catalog" href="mailet-report.html" />-->
-            <!--<item name="Release Notes" href="release-notes.html" />-->
-            <!--<item-->
-                    <!--name="DOAP"-->
-                    <!--href="doap_apache-crypto-mailets.rdf"-->
-                    <!--img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>-->
-        <!--</menu>-->
-
-
-        <!--<menu name="Basic Mailet Toolkit">-->
-            <!--<item name="Overview" href="index.html"/>-->
-            <!--<item name="Release Notes" href="release-notes.html"/>-->
-            <!--<item-->
-                    <!--name="DOAP"-->
-                    <!--href="doap_apache-mailet-base.rdf"-->
-                    <!--img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>-->
-        <!--</menu>-->
-
-
-        <!--<menu name="Mailet API">-->
-            <!--<item name="Overview" href="index.html"/>-->
-            <!--<item-->
-                    <!--name="DOAP"-->
-                    <!--href="doap_mailet.rdf"-->
-                    <!--img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>-->
-        <!--</menu>-->
+        <menu ref="reports"/>
 
     </body>
 

Modified: james/mailet/trunk/src/site/xdoc/ai/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/ai/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/ai/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/ai/index.xml Fri Dec 28 14:35:00 2012
@@ -24,14 +24,12 @@
     </properties>
     <body>
         <section name="Artificial Intelligence Mailets">
-            <p>Mail processors with artificial intelligence (AI).</p>
-            <subsection name='Releases'>
-                <p>
-                    Previously released in
-                    <a href='/server/index.html'>Apache James Server</a>
-                    2. Apache James AI Mailets 0.1 is expect to be the first independent release of this code.
-                </p>
-            </subsection>
+            <p>Mail processors with artificial intelligence (AI). Their purpose is to use AI algorithms to process
+                emails - things like identify<a href="http://en.wikipedia.org/wiki/Spam_(electronic)">SPAM</a>,
+                <a href="http://en.wikipedia.org/wiki/Phishing">phishing</a>
+                attempts, etc.
+            </p>
+            <p>The code is still young, feel free to join if you are interested.</p>
         </section>
     </body>
 </document>
\ No newline at end of file

Modified: james/mailet/trunk/src/site/xdoc/api/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/api/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/api/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/api/index.xml Fri Dec 28 14:35:00 2012
@@ -34,42 +34,8 @@
             <p>
                 The Mailet API is a subproject of<a href='http://james.apache.org'>Apache James</a>.
                 All who are interested in developing the Mailet API and James will be warmly
-                welcomed on the<a href='mail-lists.html'>mailing lists</a>.
+                welcomed on the<a href='/mail-lists.html'>mailing lists</a>.
             </p>
-            <subsection name='Releases'>
-                <p>
-                    <strong>Apache Mailet 2.4</strong>
-                    is the current release and can be downloaded
-                    <a href='http://james.apache.org/download.cgi'>here</a>.
-                </p>
-                <p>
-                    <strong>2.4</strong>
-                    is the first independent release of the API.
-                    Earlier versions were released as part of the
-                    <a href='http://james.apache.org/server/index.html' rel='tag'>Apache James Server</a>
-                    and are versioned accordingly. 2.4 differs from the last version shipped
-                    (with Server<strong>2.3</strong>) only by minor bug fixes and is compatible with it.
-                </p>
-            </subsection>
-            <subsection name='Upgrading From 2.3.1 Server Release'>
-                <p>
-                    A small number of methods were added to the Mailet API version in the
-                    <code>2.3.2</code>
-                    codestream after
-                    <code>2.3.1</code>
-                    but before Mailet API release<code>2.4</code>. If
-                    these methods are used then
-                    <code>apache-mailet-2.4.jar</code>
-                    must be inserted into
-                    the startup classpath before the main server classes.
-                </p>
-                <p>
-                    Some useful development classes bundled with
-                    <code>2.3.1</code>
-                    are now available
-                    as the independent<a href='http://james.apache.org/mailet/base'>Mailet Base Tookit</a>.
-                </p>
-            </subsection>
         </section>
         <section name="Quick Start">
             <subsection name='What Is A Mailet?'>

Modified: james/mailet/trunk/src/site/xdoc/base/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/base/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/base/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/base/index.xml Fri Dec 28 14:35:00 2012
@@ -30,21 +30,12 @@
             <p>
                 <a href='http://james.apache.org/mailet/base'>Apache James Mailets Base</a>
                 collects a number of utilities and lightweight frameworks useful when working with the
-                <a href='http://james.apache.org/mailet'>Apache Mailet API</a>
+                <a href='http://james.apache.org/mailet/api'>Apache Mailet API</a>
                 (a framework assisting the rapid development of email processing functionality).
                 Mailets base is used as the basis for the email processing functions shipped with the
                 <a href='http://james.apache.org/server'>Apache James</a>
                 server but is not dependent on that server.
             </p>
-            <subsection name='Releases'>
-                <p>
-                    Apache Mailet Base 1.0 is available to
-                    <a href='http://james.apache.org/download.cgi#Apache%20Mailet%20Base'>download</a>. This is the
-                    first independent release of this code base which was previously shipped as part of
-                    <a href='http://james.apache.org/server'>Apache James Server</a>. It should therefore be considered
-                    mature.
-                </p>
-            </subsection>
         </section>
     </body>
 </document>
\ No newline at end of file

Modified: james/mailet/trunk/src/site/xdoc/crypto/conf.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/crypto/conf.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/crypto/conf.xml (original)
+++ james/mailet/trunk/src/site/xdoc/crypto/conf.xml Fri Dec 28 14:35:00 2012
@@ -21,11 +21,11 @@
     <properties>
         <title>Configuration</title>
         <author email="server-dev@james.apache.org">
-            JAMES Project Team
+            James Project Team
         </author>
     </properties>
     <body>
-        <section name="JAMES Configuration">
+        <section name="James Configuration">
             <p>
                 To use cryptography mailets, the required
                 <a href='http://www.bouncycastle.org'>Bouncy Castle</a>

Modified: james/mailet/trunk/src/site/xdoc/crypto/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/crypto/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/crypto/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/crypto/index.xml Fri Dec 28 14:35:00 2012
@@ -18,100 +18,87 @@
   under the License.    
 -->
 <document>
-  <properties>
-    <title>Overview</title>
-    <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>
-        <subsection name='Releases'>
-          <p>
-          <strong>Apache Crypto Mailets 1.0</strong> is the current release and can be downloaded
-          <a href='http://james.apache.org/download.cgi'>here</a>. 
-          </p>
-          <table>
-            <thead>
-              <tr><td>Cryptography Mailets</td><td>Java</td><td>Latest Stable For JRE</td><td>Download</td></tr>
-            </thead>
-            <tbody>
-              <tr><td><strong>1.0</strong></td><td>1.4</td><td><strong>Yes</strong></td><td><a href='http://james.apache.org/download.cgi'>Release</a></td></tr>
-            </tbody>
-          </table>
-        </subsection>
-        <subsection name='Road Map'>
-          <p>
-            A detailed road map is available in
-            <a
-              href='https://issues.apache.org/jira/browse/MAILETCRYPTO?report=com.atlassian.jira.plugin.system.project:roadmap-panel'>
-              JIRA
-            </a>.
-          </p>
-          <subsection name='1.1'>
-            <p>
-            Is a JRE update release: upgrading dependencies and code for Java 1.5
-            </p>
-          </subsection>
-        </subsection>
-    </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>
-  </body>
+    <properties>
+        <title>Overview</title>
+        <author email="server-dev@james.apache.org">JAMES Project Team</author>
+    </properties>
+    <body>
+        <section name="Cryptography 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 software uses cryptographic API. 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 cryptographic operations
+                    based on lower level cryptographic 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>
+    </body>
 </document>
\ No newline at end of file

Modified: james/mailet/trunk/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/index.xml Fri Dec 28 14:35:00 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
   Licensed to the Apache Software Foundation (ASF) under one
   or more contributor license agreements.  See the NOTICE file
@@ -33,22 +33,26 @@
                     <a href='http://james.apache.org/mailet/api/index.html'>Mailet API</a>.
                 </p>
                 <p>
-                    Apache Mailet 2.4 is the latest release and can be downloaded
-                    <a href='http://james.apache.org/download.cgi'>here</a>.
-                </p>
-            </subsection>
-            <subsection name="What Use Is A Mailet?">
-                <p>
                     Mailets are both flexible and powerful. So they can be used for a very wide range of purposes.
                     The
-                    <a href='http://james.apache.org/server/index.html'>JAMES email server</a>
-                    factors most of it's
-                    mail processing functionality into mailets. These mailets can be used independently
-                    in any compatible Mailet container.
+                    <a href='http://james.apache.org/server/index.html'>James email server</a>
+                    factors most of it's mail processing functionality into mailets. These mailets can be used
+                    independently in any compatible Mailet container.
+                </p>
+                <p>
+                    Apache Mailet 2.5.0 is the latest release and can be downloaded
+                    <a href='http://james.apache.org/download.cgi'>here</a>.
                 </p>
             </subsection>
             <subsection name='News'>
                 <ul>
+                    <li>2012 December -
+                        <a href="http://james.apache.org/mailet/">Apache Mailet</a>
+                        2.5.0 released.
+                        This release brings all components under the same project so future releases will be made with
+                        all of them. All Mailet artifact have the same version, names that start with apache-mailet-*
+                        and are OSGi bundles.
+                    </li>
                     <li>2009 May -
                         <a href='http://james.apache.org/mailet/crypto' rel='tag'>Apache Crypto Mailets</a>
                         1.0 released. This package contains mailets which encode, decode, sign and verify mail
@@ -84,28 +88,28 @@
             <ul>
                 <li>
                     <a href='api/index.html'>
-                        <img src='api/images/james-mailetapi-logo.gif' alt='Mailet API logo'/>
+                        <img src='images/logos/james-mailetapi-logo.gif' alt='Mailet API logo'/>
                     </a>
                     <br/>
                     describes the API implemented by Mailets
                 </li>
                 <li>
                     <a href='base/index.html'>
-                        <img src='base/images/james-mailet-base-logo.gif' alt='Mailet Base logo'/>
+                        <img src='images/logos/james-mailet-base-logo.gif' alt='Mailet Base logo'/>
                     </a>
                     <br/>
                     is a basic toolkit aimed at developers of Mailet implementations
                 </li>
                 <li>
                     <a href='standard/index.html'>
-                        <img src='standard/images/james-standard-mailets-logo.gif' alt='Standard Mailets logo'/>
+                        <img src='images/logos/james-standard-mailets-logo.gif' alt='Standard Mailets logo'/>
                     </a>
                     <br/>
                     is a collection of basic Mailets with minimal dependencies
                 </li>
                 <li>
                     <a href='crypto/index.html'>
-                        <img src='crypto/images/james-crypto-mailets-logo.gif' alt='Crypto Mailets logo'/>
+                        <img src='images/logos/james-crypto-mailets-logo.gif' alt='Crypto Mailets logo'/>
                     </a>
                     <br/>
                     contains cryptographic Mailets which can be used to sign and verify signatures
@@ -121,7 +125,7 @@
                 </li>
                 <li>
                     <a href='mailetdocs-maven-plugin/index.html'>
-                        <img src='mailetdocs-maven-plugin/images/james-mailetdocs-logo.gif' alt='Mailetdocs logo'/>
+                        <img src='images/logos/james-mailetdocs-logo.gif' alt='Mailetdocs logo'/>
                     </a>
                     <br/>
                     generates catelogs and documentation for mailets.

Modified: james/mailet/trunk/src/site/xdoc/mailetdocs-maven-plugin/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/mailetdocs-maven-plugin/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/mailetdocs-maven-plugin/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/mailetdocs-maven-plugin/index.xml Fri Dec 28 14:35:00 2012
@@ -47,12 +47,5 @@
                 </ul>
             </subsection>
         </section>
-        <section name='Releases'>
-            <p>
-                <strong>0.1</strong>
-                is the first release and is available from the
-                standard repositories.
-            </p>
-        </section>
     </body>
 </document>
\ No newline at end of file

Modified: james/mailet/trunk/src/site/xdoc/standard/index.xml
URL: http://svn.apache.org/viewvc/james/mailet/trunk/src/site/xdoc/standard/index.xml?rev=1426520&r1=1426519&r2=1426520&view=diff
==============================================================================
--- james/mailet/trunk/src/site/xdoc/standard/index.xml (original)
+++ james/mailet/trunk/src/site/xdoc/standard/index.xml Fri Dec 28 14:35:00 2012
@@ -31,19 +31,6 @@
         <a href='http://james.apache.org/mailet/'>Mailet API</a>
         and so are independent of the server.
         </p>
-        <subsection name='Releases'>
-          <p>
-            <strong>Apache Mailet Standard 1.0</strong>
-            is the current release and can be downloaded
-            <a href='http://james.apache.org/download.cgi'>here</a>.
-          </p>
-        <p>
-          <strong>1.0</strong>
-          is the first independent release of the API.
-          Earlier versions were released as part of the
-          <a href='http://james.apache.org/server/index.html' rel='tag'>Apache James Server</a> and are versioned accordingly.
-        </p>
-      </subsection> 
     <subsection name='Catalog'>
         <p>A full category is available <a href='mailet-report.html'>here</a>.</p>
     </subsection>



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