james-mailet-api mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r647985 - in /james/mailet/crypto/trunk: ./ README.txt build.xml default.properties include.properties pom.xml src/test/resources/
Date Mon, 14 Apr 2008 20:23:00 GMT
Author: rdonkin
Date: Mon Apr 14 13:22:57 2008
New Revision: 647985

URL: http://svn.apache.org/viewvc?rev=647985&view=rev
Log:
First cut at crypto mailet build

Added:
    james/mailet/crypto/trunk/README.txt
    james/mailet/crypto/trunk/src/test/resources/
Modified:
    james/mailet/crypto/trunk/   (props changed)
    james/mailet/crypto/trunk/build.xml
    james/mailet/crypto/trunk/default.properties
    james/mailet/crypto/trunk/include.properties
    james/mailet/crypto/trunk/pom.xml

Propchange: james/mailet/crypto/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 13:22:57 2008
@@ -1,2 +1,3 @@
 .*
 target
+dist

Added: james/mailet/crypto/trunk/README.txt
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/README.txt?rev=647985&view=auto
==============================================================================
--- james/mailet/crypto/trunk/README.txt (added)
+++ james/mailet/crypto/trunk/README.txt Mon Apr 14 13:22:57 2008
@@ -0,0 +1,4 @@
+JAMES Crytographic Mailets
+-------------------------
+
+Contains mailets dealing with crytography.
\ No newline at end of file

Modified: james/mailet/crypto/trunk/build.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/build.xml?rev=647985&r1=647984&r2=647985&view=diff
==============================================================================
--- james/mailet/crypto/trunk/build.xml (original)
+++ james/mailet/crypto/trunk/build.xml Mon Apr 14 13:22:57 2008
@@ -1,14 +1,6 @@
 <?xml version="1.0"?>
-  <!DOCTYPE project [
-    <!ENTITY check-targets SYSTEM "file:./check-targets.xml">
-  ]>
 
 <!-- 
-==========================================================================
-
-Mailet  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        
@@ -25,8 +17,6 @@
   KIND, either express or implied.  See the License for the    
   specific language governing permissions and limitations      
   under the License.                                           
- 
-==============================================================================
 -->
 
 <project default="main" basedir=".">
@@ -36,7 +26,6 @@
     -->
     <property file=".ant.properties"/>
     <property file="${user.home}/.ant.properties"/>
-    <property file="check-targets.properties"/>
     <property file="include.properties"/>
     <property file="default.properties"/>
 
@@ -49,21 +38,15 @@
     <path id="project.class.path">
         <pathelement path="${javax-mail.jar}"/>
         <pathelement path="${javax-activation.jar}"/>
+    	<pathelement path="${mailet.jar}"/>
+    	<pathelement path="${bc-workaround.jar}"/>
+    	<pathelement path="${bc.jar}"/>
         <pathelement path="${java.class.path}" />
         <pathelement path="${build.classes}" />
     </path>
 
     <!--
     ===================================================================
-                                Dependency Check
-    ===================================================================
-    -->
-
-    &check-targets;
-    <target name="check-dependencies" depends="javamail-check,activation-check"/>
-
-    <!--
-    ===================================================================
                                   Main target
     ===================================================================
     -->
@@ -75,7 +58,7 @@
     all targets
     ===================================================================
     -->
-    <target name="prepare" depends="check-dependencies">
+    <target name="prepare">
 
       <echo message="Preparing code"/>
 
@@ -90,11 +73,6 @@
       </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="${xdocs.dir}" includes="**/*.xml" eol="lf" tab="remove" tablength="4"
/>
-      <fixcrlf srcdir="${conf.dir}" includes="**/*.xml" 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>
 
@@ -120,8 +98,7 @@
         <classpath refid="project.class.path"/>
         <src path="${build.src}"/>
         <src path="${java.dir}"/>
-        <include name="org/apache/mailet/**"/>
-        <exclude name="**/samples/*/**"/>
+        <include name="org/apache/james/**"/>
       </javac>
       <copy todir="${build.classes}">
         <fileset dir="${java.dir}">
@@ -143,7 +120,10 @@
 
       <delete dir="${build.javadocs}"/>
       <mkdir dir="${build.javadocs}"/>
-      <javadoc failonerror="yes" packagenames="org.apache.mailet.*" excludepackagenames="org.apache.mailet.samples.*"
destdir="${build.javadocs}">
+      <javadoc 
+      		failonerror="yes" 
+      		packagenames="org.apache.james.*" 
+      		destdir="${build.javadocs}">
         <sourcepath>
             <pathelement path="${java.dir}"/>
             <pathelement path="${build.src}"/>            
@@ -158,82 +138,17 @@
           <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;"/>
+          <param name="-bottom" value="&quot;Licensed to the Apache Software Foundation.
Distributed under the Apache License, 2.0.&quot;"/>
         </doclet>
       </javadoc>
     </target>
-
-    <!--
-    ===================================================================
-                                  build xdocs
-    ===================================================================
-    -->
-    <target name="xdocs" depends="prepare">
-      <style style="${docs.src}/stylesheets/site.xsl"
-                basedir="${docs.src}/"
-                destdir="${build.docs}/" 
-                includes="**/*.xml" >
-      </style>
-      <copy todir="${build.docs}" filtering="no">
-        <fileset dir="${docs.src}">
-          <include name="**/*.css"/>
-        </fileset>
-      </copy>
-      <copy todir="${build.docs}/images" filtering="no">
-        <fileset dir="${docs.src}/images">
-          <include name="**/*.gif"/>
-          <include name="**/*.jpeg"/>
-          <include name="**/*.jpg"/>
-          <include name="**/*.png"/>
-        </fileset>
-      </copy>
-      <mkdir dir="${dist.dir}/docs"/>
-      <copy todir="${dist.dir}/docs" filtering="no">
-        <fileset dir="${build.docs}"/>
-      </copy>
-    </target>
-
-    <!--
-    ===================================================================
-                                build   website 
-    ===================================================================
-    -->
-    <target name="website" depends="xdocs,javadocs">
-
-      <echo message="preparing website in ${www.dir}"/>
-      <delete quiet="true">
-        <fileset dir="${www.dir}">
-          <exclude name="CVS/**"/>
-          <exclude name="rfclist/**"/>
-          <exclude name="javadocs/**"/>
-        </fileset>
-      </delete>
-      <mkdir dir="${www.dir}"/>
-      <copy todir="${www.dir}" filtering="no">
-        <fileset dir="${build.docs}"/>
-      </copy>
-      <copy todir="${www.dir}" filtering="no">
-        <fileset dir="${build.dir}">
-          <include name="javadocs/**"/>
-        </fileset>
-      </copy>
-      <fixcrlf srcdir="${www.dir}" includes="**/*.html" eol="lf" tab="remove" tablength="4"
/>
-      <fixcrlf srcdir="${www.dir}" includes="**/*.css" eol="lf" tab="remove" tablength="4"
/>
-    </target>
-
-    <!--
-    ===================================================================
-                Build everything
-    ===================================================================
-    -->
-    <target name="everything" depends="clean,website,dist-bin,dist-src"/>
-
+	
     <!--
     ===================================================================
                                   Build all distributions
     ===================================================================
     -->
-    <target name="dist" depends="dist-bin,dist-src"/>
+    <target name="dist" depends="clean,dist-bin,dist-src"/>
 
     <!--
     ===================================================================
@@ -250,7 +165,7 @@
       <jar 
             jarfile="${build.lib}/${name}-${version}.jar" 
             basedir="${build.classes}">
-          <include name="org/apache/mailet/**"/>
+          <include name="org/apache/james/**"/>
           <include name="META-INF/**"/> 
           <exclude name="**/junit/*/**"/>
           <exclude name="**/samples/*/**"/>
@@ -298,7 +213,7 @@
     ===================================================================
     -->
 
-    <target name="dist-bin" depends="dist-lite,xdocs,javadocs">
+    <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}"/>
@@ -325,7 +240,7 @@
                                   source distributions
     ===================================================================
     -->
-    <target name="dist-src" depends="dist-lite,xdocs,javadocs">
+    <target name="dist-src" depends="dist-lite, javadocs">
         <echo message ="Building source distributions"/>
 
         <property name="dist.source.dir" value="${dist.dir}/downloads/src"/>
@@ -387,9 +302,8 @@
         <echo message="   test      --> tests the compiled classes"/>
         <echo message="   website   --> makes all the docs and javadocs"/>
         <echo message="   compile   --> compiles the source code"/>
-        <echo message="   dist      --> generates all the Mailet distributions, packed"/>
+        <echo message="   dist      --> generates all the distributions, packed"/>
         <echo message="   clean     --> cleans up the directory"/>
-        <echo message="   xdocs     --> creates the documentation for Mailet"/>
         <echo message="   javadocs  --> creates the Javadoc"/>
         <echo message=""/>
         <echo message=" See the comments inside the build.xml file for more details."/>

Modified: james/mailet/crypto/trunk/default.properties
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/default.properties?rev=647985&r1=647984&r2=647985&view=diff
==============================================================================
--- james/mailet/crypto/trunk/default.properties (original)
+++ james/mailet/crypto/trunk/default.properties Mon Apr 14 13:22:57 2008
@@ -6,17 +6,17 @@
 # Not user-editable; use ant.properties files instead
 # See also: include.properties
 
-name=mailet
-Name=Mailet API
-version=3.0-SNAPSHOT
+name=crypto-mailets
+Name=Cryptography Mailets
+version=1.0-SNAPSHOT
 manifestVersion=3.0
-year=2007
-extension.name=org.apache.mailet
+year=2008
+extension.name=org.apache.james
 vendor=The Apache Software Foundation
 vendor.id=org.apache
 creator=James Project Of The Apache Software Foundation
-title.spec=Apache Mailet API
-title.impl=Apache Mailet
+title.spec=Apache Cryptography Mailets API
+title.impl=Apache Cryptography Mailets
 
 #
 # compiler options
@@ -49,7 +49,7 @@
 #  location of intermediate products
 #
 
-build.dir = ${mailet.dir}/build
+build.dir = ${mailet.dir}/target
 build.lib = ${build.dir}/lib
 build.src = ${build.dir}/src
 build.classes = ${build.dir}/classes

Modified: james/mailet/crypto/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/include.properties?rev=647985&r1=647984&r2=647985&view=diff
==============================================================================
--- james/mailet/crypto/trunk/include.properties (original)
+++ james/mailet/crypto/trunk/include.properties Mon Apr 14 13:22:57 2008
@@ -25,3 +25,10 @@
 
 # ----- Activation -----
 javax-activation.jar=stage/activation/jars/${activation.id}.jar
+
+# ----- Mailet -----
+mailet.jar=stage/org.apache.james/jars/mailet-3.0-SNAPSHOT.jar
+
+# ----- Bouncy Castle -----
+bc-workaround.jar=stage/org.bouncycastle/jars/bcmail-jdk14-workaround-129.jar
+bc.jar=stage/org.bouncycastle/jars/bcmail-jdk14-129.jar
\ No newline at end of file

Modified: james/mailet/crypto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mailet/crypto/trunk/pom.xml?rev=647985&r1=647984&r2=647985&view=diff
==============================================================================
--- james/mailet/crypto/trunk/pom.xml (original)
+++ james/mailet/crypto/trunk/pom.xml Mon Apr 14 13:22:57 2008
@@ -29,12 +29,12 @@
    -->
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.james</groupId>
-  <artifactId>mailet</artifactId>
-  <name>Apache Mailet API</name>
-  <version>3.0-SNAPSHOT</version>
+  <artifactId>crypto-mailets</artifactId>
+  <name>Apache JAMES Cryptographic Mailets</name>
+  <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <description>
-    Apache Mailet API
+    Apache JAMES Cryptographic Mailets
   </description>
   <parent>
     <groupId>org.apache.james</groupId>
@@ -42,13 +42,13 @@
     <version>1.1-SNAPSHOT</version>
     <relativePath>../james-project/project/pom.xml</relativePath>
   </parent>
-  <url>http://james.apache.org/mailet</url>
-  <inceptionYear>2007</inceptionYear>
+  <url>http://james.apache.org/mailet/crypto</url>
+  <inceptionYear>2008</inceptionYear>
 
   <distributionManagement>
     <site>
-      <id>mailet-website</id>
-      <url>scp://people.apache.org/www/james.apache.org/mailet/</url>
+      <id>crypto-mailet-website</id>
+      <url>scp://people.apache.org/www/james.apache.org/mailet/crypto</url>
     </site>
   </distributionManagement>
 
@@ -59,33 +59,40 @@
 
   <scm>
     <connection>
-      scm:svn:http://svn.apache.org/repos/asf/james/mailet/trunk
+      scm:svn:http://svn.apache.org/repos/asf/james/mailet/crypto/trunk
     </connection>
     <developerConnection>
-      scm:svn:https://svn.apache.org/repos/asf/james/mailet/trunk
+      scm:svn:https://svn.apache.org/repos/asf/james/mailet/crypto/trunk
     </developerConnection>
     <url>
-      http://svn.apache.org/viewcvs.cgi/james/mailet/trunk/?root=Apache-SVN
+      http://svn.apache.org/viewcvs.cgi/james/mailet/crypto/trunk/?root=Apache-SVN
     </url>
   </scm>
 
-  <!-- This is here because of http://jira.codehaus.org/browse/MRRESOURCES-6 -->
-  <properties>
-    <maven.test.skip>true</maven.test.skip>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>javax.mail</groupId>
       <artifactId>mail</artifactId>
       <version>1.4</version>
     </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcmail-jdk14-workaround</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.james</groupId>
+      <artifactId>mailet</artifactId>
+    </dependency>
   </dependencies>
 
 	<repositories>
     <repository>
-      <id>mailet-stage-repository</id>
-      <name>Mailet stage repository</name>
+      <id>crypto-mailet-stage-repository</id>
+      <name>Stage repository</name>
       <url>file://${basedir}/stage</url>
       <layout>legacy</layout>
       <releases>



Mime
View raw message