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 rd...@apache.org on 2008/11/09 18:05:49 UTC

svn commit: r712518 - in /james/jsieve/trunk: ./ mailet/ mailet/src/main/java/org/apache/james/ mailet/src/main/java/org/apache/james/transport/ mailet/src/main/java/org/apache/james/transport/mailets/ mailet/src/test/java/org/apache/james/transport/ m...

Author: rdonkin
Date: Sun Nov  9 09:05:48 2008
New Revision: 712518

URL: http://svn.apache.org/viewvc?rev=712518&view=rev
Log:
Prune other classes copied over.

Added:
    james/jsieve/trunk/mailet/LICENSE.apache
    james/jsieve/trunk/mailet/NOTICE.base
Removed:
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/James.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/JamesMailetLoader.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/JamesMatcherLoader.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/JamesSpoolManager.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/LinearProcessor.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/Loader.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/MailProcessor.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/MailetConfigImpl.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/MailetContainer.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/MailetLoader.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/MatcherConfigImpl.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/MatcherLoader.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/ProcessorList.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/Resources.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/StateAwareProcessorList.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/mailets/LocalDelivery.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/mailets/MailboxDelivery.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/mailets/ToMultiRepository.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/mailets/UsersRepositoryAliasingForwarding.java
    james/jsieve/trunk/mailet/src/main/java/org/apache/james/transport/package.html
    james/jsieve/trunk/mailet/src/test/java/org/apache/james/transport/JamesMailetLoaderTest.java
    james/jsieve/trunk/mailet/src/test/java/org/apache/james/transport/LinearProcessorTest.java
    james/jsieve/trunk/mailet/src/test/java/org/apache/james/transport/mailets/LocalDeliveryTest.java
    james/jsieve/trunk/mailet/src/test/java/org/apache/james/transport/mailets/MailetLoaderTestMailet.java
    james/jsieve/trunk/mailet/src/test/java/org/apache/james/transport/mailets/smime/
Modified:
    james/jsieve/trunk/build.xml
    james/jsieve/trunk/mailet/build.xml
    james/jsieve/trunk/mailet/pom.xml

Modified: james/jsieve/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/build.xml?rev=712518&r1=712517&r2=712518&view=diff
==============================================================================
--- james/jsieve/trunk/build.xml (original)
+++ james/jsieve/trunk/build.xml Sun Nov  9 09:05:48 2008
@@ -36,6 +36,7 @@
             <subant target='@{do}'>
                 <fileset dir='@{dir}' includes='main/build.xml'/>
                 <fileset dir='@{dir}' includes='util/build.xml'/>
+                <fileset dir='@{dir}' includes='mailet/build.xml'/>
 <!-- TODO: Update samples and fix dependency problems 
                 <fileset dir='@{dir}' includes='samples/build.xml'/> -->  
             </subant>   

Added: james/jsieve/trunk/mailet/LICENSE.apache
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/LICENSE.apache?rev=712518&view=auto
==============================================================================
--- james/jsieve/trunk/mailet/LICENSE.apache (added)
+++ james/jsieve/trunk/mailet/LICENSE.apache Sun Nov  9 09:05:48 2008
@@ -0,0 +1,176 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS	
\ No newline at end of file

Added: james/jsieve/trunk/mailet/NOTICE.base
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/NOTICE.base?rev=712518&view=auto
==============================================================================
--- james/jsieve/trunk/mailet/NOTICE.base (added)
+++ james/jsieve/trunk/mailet/NOTICE.base Sun Nov  9 09:05:48 2008
@@ -0,0 +1,10 @@
+   =========================================================================
+   ==      NOTICE file for use with the Apache License, Version 2.0,      ==
+   =========================================================================
+
+   Apache James JSieve Library
+   Copyright 2008 The Apache Software Foundation
+
+   This product includes software developed at
+   The Apache Software Foundation (http://www.apache.org/).
+

Modified: james/jsieve/trunk/mailet/build.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/build.xml?rev=712518&r1=712517&r2=712518&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/build.xml (original)
+++ james/jsieve/trunk/mailet/build.xml Sun Nov  9 09:05:48 2008
@@ -1,24 +1,440 @@
-<?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
-  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.    
+<?xml version="1.0"?>
+<!-- 
+==========================================================================
+
+ jSieve build file 
+
+
+  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.                                           
+ 
+==============================================================================
 -->
-<project default="main" name="spoolmanager-function">
-  <description>Builds spoolmanager-function module. This is an function module.</description>
-  <property name="name.module" value="spoolmanager-function" />
-  <import file="../build-tools/function-build.xml" optional="no" />
-</project>
+
+<project name='Apache JAMES JSieve Utilities' default="main" basedir=".">
+    <!--
+    Give user a chance to override without editing this file
+    (and without typing -D each time he compiles it)
+    -->
+    <property file=".ant.properties"/>
+    <property file="${user.home}/.ant.properties"/>
+    <property file="../include.properties"/>
+    <property file="../default.properties"/>
+
+    <!--
+    ===================================================================
+    Set the classpath
+    ===================================================================
+    -->
+	 
+	<path id="mail.class.path">
+	    <pathelement location='${mail.jar}'/>
+	    <pathelement location='${activation.jar}'/>   
+	</path>  
+	
+    <path id="project.class.path">
+        <pathelement location="${commons-logging.jar}"/>
+        <pathelement location="${log4j.jar}"/>
+        <pathelement location="${junit.jar}"/>
+    	<pathelement location='${lib.jsieve.dir}/${name}-${version}.jar'/>
+    	<pathelement location="${mailet.jar}"/>
+    	<path refid="mail.class.path"/>
+        <pathelement path="${java.class.path}" />
+        <pathelement path="${build.classes}" />
+    </path>
+    
+    <path id="project.test.class.path">
+        <path refid="project.class.path"/>  
+    </path>   
+
+    <!--
+    ===================================================================
+                                Dependency Check
+    ===================================================================
+    -->
+
+    <!--
+    ===================================================================
+                                  Main target
+    ===================================================================
+    -->
+    <target name="main" depends="dist-lite"/>
+
+    <!--
+    ===================================================================
+    Prepare-common target - common tasks executed in preparation for
+    all targets
+    ===================================================================
+    -->
+    <target name="prepare-common">
+
+      <echo message="Preparing code"/>
+
+      <tstamp/>
+      <mkdir dir="${dist.dir}"/>
+      <copy todir="${dist.dir}">
+        <fileset dir=".">
+          <include name="LICENSE.txt"/>
+          <include name="README.txt"/>
+          <include name="NOTICE.txt"/>
+        </fileset>
+      </copy>
+      <fixcrlf srcdir="${java.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+      <fixcrlf srcdir="${java.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4" />
+      <fixcrlf srcdir="${test.dir}" includes="**/*.java" eol="lf" tab="remove" tablength="4" />
+      <fixcrlf srcdir="${conf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+      <fixcrlf srcdir="${testconf.dir}" includes="**/*.properties" eol="lf" tab="remove" tablength="4" />
+      <fixcrlf srcdir="." includes="build.sh" eol="lf"/>
+      <fixcrlf srcdir="." includes="build.bat" eol="crlf"/>
+      <fixcrlf srcdir="." includes="build.xml" eol="lf"/>
+      <mkdir dir="${build.src}"/>
+    </target>
+
+    <!--
+    ===================================================================
+                                  Prepare target
+    ===================================================================
+    -->
+    <target name="prepare" depends="prepare-common">
+        <available 
+            classname="javax.mail.Message" 
+            property="is.available.javamail" 
+            classpathref="project.test.class.path"/> 
+        <available 
+            classname="javax.activation.MimeType" 
+            property="is.available.activation" 
+            classpathref="project.test.class.path"/> 
+        <condition property="is.available.libs.test">
+            <and>
+                <isset property='is.available.javamail'/>   
+                <isset property='is.available.activation'/>   
+            </and>   
+        </condition>   
+    </target>   
+
+    <!--
+    ===================================================================
+                                  compile
+    ===================================================================
+    -->
+    <target name="compile" depends="compile-main, compile-tests"/>
+    
+    <target name="compile-main" depends="prepare">
+      <echo message="Compiling jSieve Java sources"/>
+      <mkdir dir="${build.classes}"/>
+      <javac 
+            destdir="${build.classes}" 
+            debug="${debug}" 
+            optimize="${optimize}" 
+            deprecation="${deprecation}"
+            source="${jdk.source}"
+            target="${jdk.target}" 
+            >
+        <classpath refid="project.class.path"/>
+        <src path="${build.src}"/>
+        <src path="${java.dir}"/>
+        <include name="org/apache/jsieve/**"/>
+      </javac>
+      <copy todir="${build.classes}">
+        <fileset dir="${conf.dir}">
+          <include name="**/*.properties"/>
+        </fileset>
+      </copy>   
+      <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt"/>
+      <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base'/>   
+    </target>
+    
+    <target 
+        name="compile-tests" 
+        depends="prepare, compile-main">
+      <fail unless="is.available.libs.test">JavaMail is required for testing</fail>   
+      <echo message="Compiling jSieve test sources"/>
+      <mkdir dir="${build.classes.test}"/>
+      <javac 
+            destdir="${build.classes.test}" 
+            debug="${debug}" 
+            optimize="${optimize}" 
+            deprecation="${deprecation}"
+            source="${jdk.source}"
+            target="${jdk.target}" 
+            >
+        <classpath refid="project.test.class.path"/>
+        <src path="${test.dir}"/>
+        <!--<include name="org/apache/jsieve/**"/>-->
+      	<exclude name="**"/>
+      </javac>
+      <copy todir="${build.classes}">
+        <fileset dir="${java.dir}">
+          <include name="**/*.properties"/>
+        </fileset>
+      </copy>  
+        <copy todir="${build.classes.test}">
+          <fileset dir="${testconf.dir}">
+            <include name="**/*.properties"/>
+          </fileset>
+        </copy>   
+      <copy file='LICENSE.apache' tofile="${build.classes}/META-INF/LICENSE.txt"/>
+      <copy tofile="${build.classes}/META-INF/NOTICE.txt" file='NOTICE.base'/>   
+    </target>
+
+    <!--
+    ===================================================================
+                                  Javadocs
+    ===================================================================
+    -->
+    <target name="javadocs" depends="compile">
+<!--
+      <echo message="Making jSieve Javadocs"/>
+
+      <delete dir="${build.javadocs}"/>
+      <mkdir dir="${build.javadocs}"/>
+      <javadoc failonerror="yes" packagenames="org.apache.jsieve.*" destdir="${build.javadocs}">
+        <sourcepath>
+            <pathelement path="${java.dir}"/>
+            <pathelement path="${build.src}"/>            
+        </sourcepath> 
+        <classpath refid="project.class.path"/>
+        <doclet name="com.sun.tools.doclets.standard.Standard">
+          <param name="-author"/>
+          <param name="-version"/>
+          <param name="-use"/>
+          <param name="-breakiterator"/>
+          <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api"/>
+          <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api"/>
+          <param name="-doctitle" value="${Name} ${version}"/>
+          <param name="-windowtitle" value="${Name} API"/>
+          <param name="-bottom" value="&quot;Copyright &#169; ${year} Apache Jakarta Project. All Rights Reserved.&quot;"/>
+        </doclet>
+      </javadoc>
+      -->
+    </target>
+
+    <!--
+    ===================================================================
+                Build everything
+    ===================================================================
+    -->
+    <target name="all">
+        <antcall target='clean'/>
+        <antcall target='dist'/>
+    </target>   
+
+    <!--
+    ===================================================================
+                                  Build all distributions
+    ===================================================================
+    -->
+    <target name="dist" depends="dist-bin,dist-src"/>
+
+    <!--
+    ===================================================================
+                                  Make jSieve jars
+    ===================================================================
+    -->
+
+    <target name="jar" depends="compile">
+
+      <mkdir dir="${build.lib}"/>
+
+      <!-- Make jSieve jar-->
+      <echo message="Making jSieve Jar (${name}-${version}-utils.jar)"/>
+      <jar 
+            jarfile="${build.lib}/${name}-${version}-utils.jar" 
+            basedir="${build.classes}">
+          <include name="org/apache/jsieve/**"/>
+          <include name="META-INF/**"/> 
+          <manifest> 
+            <attribute name="Extension-Name" value='${extension.name}'/>
+            <attribute name="Specification-Title" value='${title.spec}'/>
+            <attribute name="Specification-Vendor" value='${vendor}'/>
+            <attribute name="Specification-Version" value='${version}'/>
+            <attribute name="Implementation-Vendor-Id" value='${vendor.id}'/>
+            <attribute name="Implementation-Title" value='${title.impl}'/>
+            <attribute name="Implementation-Vendor" value='${vendor}'/>
+            <attribute name="Implementation-Version" value='${version}'/>
+            <attribute name="X-Compile-Source-JDK" value='${jdk.source}'/>
+            <attribute name="X-Compile-Target-JDK" value='${jdk.target}'/> 
+          </manifest> 
+      </jar>
+     
+      <taskdef 
+            resource="aQute/bnd/ant/taskdef.properties" 
+            classpath="${bnd.jar.relative}"/> 
+      <bndwrap 
+            jars='${build.lib}/${name}-${version}-utils.jar'
+            output='${build.lib}/${name}-${version}-utils.jar'
+            definitions="."/>
+    </target>
+
+    <!--
+    ===================================================================
+            Make dist directory with unpacked dist ready to run
+    ===================================================================
+    -->
+    <target name="dist-lite" depends="dist-lite-test"/>
+
+    <target name="dist-lite-build" depends="jar">
+
+      <echo message="Installing jSieve to ${dist.dir}"/>
+
+      <!--Copies the jSieve jars into ./dist/lib -->
+      <copy todir="${dist.dir}/lib">
+        <fileset dir="${build.lib}">
+          <include name="*.jar"/>
+        </fileset>
+      </copy>
+
+      <!--Copies the required support jars -->
+      <copy todir="${dist.dir}/lib" file="${commons-logging.jar}"/>
+      <copy todir="${dist.dir}/lib" file="${log4j.jar}"/>
+      <copy todir="${dist.dir}/lib" file="${junit.jar}"/>
+ 
+    </target>
+
+    <!--
+    ===================================================================
+                                  Test the dist-lite build
+    ===================================================================
+    -->    
+    <target name="dist-lite-test" depends="dist-lite-build">
+        <echo message="Testing dist-lite build"/>
+        <mkdir dir="${dist.dir}/reports"/>
+        <junit printsummary="yes" haltonfailure="yes" filtertrace="on">
+            <!-- Uncomment this to remotely debug the tests
+            <jvmarg line="-Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/>
+            -->
+            <classpath id="junit.class.path">
+            	<pathelement location="${testconf.dir}"/>
+                <fileset dir="${dist.dir}/lib">
+                    <include name="**/*.jar"/>
+                </fileset>
+                <pathelement location="${dist.dir}/conf/"/>
+                <pathelement path="${java.class.path}"/>
+                <pathelement location="${junit.jar}"/>
+                <path refid='mail.class.path'/>   
+            </classpath>
+            <formatter type="plain"/>
+            <batchtest fork="yes" todir="${dist.dir}/reports">
+                <fileset dir="${build.classes.test}">
+                    <include name="**/*Test.class"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
+
+    <!--
+    ===================================================================
+                                  binary distribution
+    ===================================================================
+    -->
+
+    <target name="dist-bin" depends="dist-lite,javadocs">
+      <echo message ="Building binary distribution"/>
+      <property name="dist.binary.dir" value="${dist.dir}/downloads/bin"/>
+      <mkdir dir="${dist.binary.dir}"/>
+        <zip zipfile="${dist.binary.dir}/${dist.name}-bin.zip">
+            <fileset dir="${dist.dir}">
+                <include name="lib/**"/>
+                <include name="*.txt"/>
+                <include name="KEYS"/>
+            </fileset>
+        </zip>
+        <tar longfile="gnu" tarfile="${dist.binary.dir}/${dist.name}-bin.tar">
+            <tarfileset dir="${dist.dir}" username="${name}" group="${name}">
+                <include name="lib/**"/>
+                <include name="*.txt"/>
+                <include name="KEYS"/>
+            </tarfileset>
+        </tar>
+        <gzip zipfile="${dist.binary.dir}/${dist.name}-bin.tar.gz" src="${dist.binary.dir}/${dist.name}-bin.tar"/>
+        <delete file="${dist.binary.dir}/${dist.name}-bin.tar"/>
+    </target>
+
+    <!--
+    ===================================================================
+                                  source distributions
+    ===================================================================
+    -->
+    <target name="dist-src" depends="dist-lite,javadocs">
+        <echo message ="Building source distributions"/>
+
+        <property name="dist.source.dir" value="${dist.dir}/downloads/src"/>
+        <mkdir dir="${dist.source.dir}"/>
+        <zip zipfile="${dist.source.dir}/${dist.name}-src.zip">
+            <fileset dir=".">
+                <include name="src/**"/>
+                <include name="lib/**"/>
+                <include name="*.xml"/>
+                <include name="*.properties"/>
+                <include name="*.txt"/>
+                <include name="KEYS"/>
+            </fileset>
+        </zip>
+        <tar longfile="gnu" tarfile="${dist.source.dir}/${dist.name}-src.tar">
+            <tarfileset dir="." username="${name}" group="${name}">
+                <include name="src/**"/>
+                <include name="lib/**"/>
+                <include name="*.xml"/>
+                <include name="*.properties"/>
+                <include name="*.txt"/>
+                <include name="KEYS"/>
+            </tarfileset>
+        </tar>
+        <gzip zipfile="${dist.source.dir}/${dist.name}-src.tar.gz" src="${dist.source.dir}/${dist.name}-src.tar"/>
+        <delete file="${dist.source.dir}/${dist.name}-src.tar"/>
+    </target>
+    
+    <!--
+    ===================================================================
+                                  delete dist/, build/ and www/
+    ===================================================================
+    -->
+    <target name="clean">
+        <echo message ="deleting working directories ready for a clean build"/>
+        <delete dir="${dist.base}"/>
+        <mkdir dir="${dist.base}"/>
+        <delete dir="${build.dir}"/>
+        <delete dir='target'/>
+    </target>
+
+    <!--
+    ===================================================================
+                                   Help on usage                                                       
+    =================================================================== 
+    -->
+    <target name="usage">
+        <echo message=""/>
+        <echo message=""/>
+        <echo message="jSieve Build file"/>
+        <echo message="-------------------------------------------------------------"/>
+        <echo message=""/>
+        <echo message=" available targets are:"/>
+        <echo message=""/>
+        <echo message="   dist-lite --> generates unpacked distribution (default)"/>
+        <echo message="   dist-lite-test --> tests the jarred classes"/>
+        <echo message="   compile   --> compiles the source code"/>
+        <echo message="   dist      --> generates all the jSieve distributions, packed"/>
+        <echo message="   clean     --> cleans up the directory"/>
+        <echo message="   javadocs  --> creates the Javadoc"/>
+        <echo message=""/>
+        <echo message=" See the comments inside the build.xml file for more details."/>
+        <echo message="-------------------------------------------------------------"/>
+        <echo message=""/>
+        <echo message=""/>
+    </target>
+  
+</project>

Modified: james/jsieve/trunk/mailet/pom.xml
URL: http://svn.apache.org/viewvc/james/jsieve/trunk/mailet/pom.xml?rev=712518&r1=712517&r2=712518&view=diff
==============================================================================
--- james/jsieve/trunk/mailet/pom.xml (original)
+++ james/jsieve/trunk/mailet/pom.xml Sun Nov  9 09:05:48 2008
@@ -1,122 +1,394 @@
-<?xml version="1.0" encoding="ISO-8859-15"?>
-<!--
-  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.    
--->
-<project>
-  <parent>
-    <artifactId>james-server</artifactId>
-    <groupId>org.apache.james</groupId>
-    <version>3.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.james</groupId>
-  <artifactId>james-server-spoolmanager-function</artifactId>
-  <name>Apache JAMES Server SpoolManager function</name>
-  <dependencies>
-    <dependency>
-      <groupId>${javax.mail.groupId}</groupId>
-      <artifactId>${javax.mail.artifactId}</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-mailet</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-javamail-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-user-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-domain-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-user-library</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailet-base</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.framework</groupId>
-      <artifactId>avalon-framework-impl</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-collections</groupId>
-      <artifactId>commons-collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.avalon.cornerstone.store</groupId>
-      <artifactId>cornerstone-store-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-jsieve</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-mime4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>standard-mailets</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-core-library</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>apache-james-mailet-base</artifactId>
-      <classifier>tests</classifier>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.james</groupId>
-      <artifactId>james-server-user-library</artifactId>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <!--
+    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.    
+  -->
+  <parent>
+    <artifactId>james-project</artifactId>
+    <groupId>org.apache.james</groupId>
+    <version>1.2</version>
+    <!-- Either this really points to the james-project/pom.xml or you
+         will have to tune the local repository, later, in this file -->
+    <relativePath>../james-project/project/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.james</groupId>
+  <artifactId>apache-jsieve-mailet</artifactId>
+  <name>Apache JAMES jSieve</name>
+  <version>0.3-SNAPSHOT</version>
+  <packaging>jar</packaging>
+  <description>
+Apache jSieve is a server side mail filtering system 
+implementing RFC3028. Apache jSieve is developed by the 
+JAMES project.
+  </description>
+  <url>http://james.apache.org/jsieve</url>
+  <inceptionYear>2004</inceptionYear>
+
+  <distributionManagement>
+    <site>
+      <id>jsieve-website</id>
+      <url>scp://people.apache.org/www/james.apache.org/jsieve/</url>
+    </site>
+  </distributionManagement>
+
+  <issueManagement>
+    <system>JIRA</system>
+    <url>http://issues.apache.org/jira/browse/JSIEVE</url>
+  </issueManagement>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/james/jsieve/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jsieve/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/james/jsieve/trunk/</url>
+  </scm>
+  
+  <repositories>
+  	<!-- enable central that is otherwise disabled by the parent pom. -->
+  	<repository>
+  		<id>central</id>
+  		<url>http://repo1.maven.org/maven2</url>
+  		<releases>
+  			<enabled>true</enabled>
+  		</releases>
+  	</repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.1.1</version>
+      <exclusions>
+          <exclusion>
+            <groupId>avalon-framework</groupId>
+            <artifactId>avalon-framework</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>logkit</groupId>
+            <artifactId>logkit</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+       </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.14</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>activation</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.4</source>
+          <target>1.4</target>
+          <encoding>iso8859-1</encoding>
+        </configuration>
+      </plugin>      
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>javacc-maven-plugin</artifactId>
+        <version>2.4.1</version>
+        <executions>
+          <execution>
+            <id>generate-jjtree</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>jjtree-javacc</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.2</version>
+        <configuration>
+          <archive>
+          <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+            <manifestEntries>
+              <Specification-Title>Apache jSieve</Specification-Title>
+              <Specification-Version>${pom.version}</Specification-Version>
+              <Specification-Vendor>The Apache Software Foundation</Specification-Vendor>
+              <Implementation-Title>Apache jSieve</Implementation-Title>
+              <Implementation-Version>${pom.version}</Implementation-Version>
+              <Implementation-Vendor>The Apache Software Foundation</Implementation-Vendor>
+              <Implementation-Vendor-Id>org.apache</Implementation-Vendor-Id>
+              <url>${pom.url}</url>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.4</version>
+        <executions>
+          <execution>
+            <id>create-javadocs</id> <!-- this is used for inheritance merges -->
+            <phase>package</phase> <!-- append to the packaging phase. -->
+            <goals>
+              <goal>javadoc</goal> <!-- goals == mojos -->
+              <goal>jar</goal> <!-- goals == mojos -->
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <executions>
+          <execution>
+            <phase>verify</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <!-- Add NOTICE and LICENSE to generated JAR -->
+      <plugin>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <version>1.0</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+              </resourceBundles>
+              <properties>
+	              <addLicense>true</addLicense>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+      	<groupId>org.apache.felix</groupId>
+      	<artifactId>maven-bundle-plugin</artifactId>
+      	<version>1.4.3</version>
+      	<executions>
+      		<execution>
+      			<id>bundle-manifest</id>
+      			<phase>process-classes</phase>
+      			<goals>
+      				<goal>manifest</goal>
+      			</goals>
+      		</execution>
+      	</executions>
+      	<extensions>true</extensions>
+      	<configuration>
+      		<instructions>
+      			<Export-Package>org.apache.jsieve.*</Export-Package>
+      			<Embed-Dependency>*;scope=runtime</Embed-Dependency>
+      		</instructions>
+      	</configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.0.4</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-2</version>
+        <configuration>
+          <descriptorSourceDirectory>${basedir}/src/assemble/</descriptorSourceDirectory>
+        </configuration>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase> <!-- append to the packaging phase. -->
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-doap-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>site</id>
+            <phase>site</phase>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+         <doapOptions>
+           <programmingLanguage>java</programmingLanguage>
+           <category>mail</category>
+           <download-page>http://james.apache.org/download.cgi</download-page>
+         </doapOptions>
+
+         <asfExtOptions>
+           <included>true</included>
+           <pmc>http://james.apache.org</pmc>
+           <name>Apache JAMES</name>
+           <standards>
+            <standard>
+              <id>RFC3028</id>
+              <title>Sieve: A Mail Filtering Language</title>
+              <body>IEFT</body>
+              <url>http://www.ietf.org/rfc/rfc3028.txt</url>
+            </standard>
+           </standards>
+         </asfExtOptions>
+
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.4.3</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-report-plugin</artifactId>
+        <version>2.4.3</version>
+      </plugin> 
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.4</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jxr-plugin</artifactId>
+        <version>2.1</version>
+      </plugin>
+      <plugin>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>2.4</version>
+        <configuration>
+          <targetjdk>1.4</targetjdk>
+          <rulesets>
+            <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/controversial.xml</ruleset>
+          </rulesets>
+          <format>xml</format>
+          <linkXref>true</linkXref>
+          <sourceEncoding>utf-8</sourceEncoding>
+          <minimumTokens>100</minimumTokens>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>2.0-beta-7</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <configuration>
+          <excludes>
+            <exclude>NOTICE.base</exclude>
+            <exclude>LICENSE.apache</exclude>
+            <exclude>release.properties</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>taglist-maven-plugin</artifactId>
+        <version>2.2</version>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>javacc-maven-plugin</artifactId>
+        <version>2.4.1</version>
+      </plugin>
+    </plugins>
+  </reporting>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Apache James User</name>
+      <subscribe>server-user-subscribe@james.apache.org</subscribe>
+      <unsubscribe>server-user-unsubscribe@james.apache.org</unsubscribe>
+      <post>server-user@james.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Apache James Developer</name>
+      <subscribe>server-dev-subscribe@james.apache.org</subscribe>
+      <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
+      <post>server-dev@james.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
+    </mailingList>
+  </mailingLists>
+
 </project>



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