Author: rdonkin
Date: Sun May 13 08:33:02 2007
New Revision: 537601
URL: http://svn.apache.org/viewvc?view=rev&rev=537601
Log:
Merged in r537560-537595 from trunk.
Modified:
james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt
james/server/sandbox/seda-imap-modular/build-tools/base-build.xml
james/server/sandbox/seda-imap-modular/build-tools/module-build.xml
james/server/sandbox/seda-imap-modular/default.properties
Modified: james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt?view=diff&rev=537601&r1=537600&r2=537601
==============================================================================
--- james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt (original)
+++ james/server/sandbox/seda-imap-modular/MERGER_HISTORY.txt Sun May 13
08:33:02 2007
@@ -1,2 +1,2 @@
-r537560 Branch created
-
+r537560 Branch created
+r537560-537595 Merged changes from trunk
Modified: james/server/sandbox/seda-imap-modular/build-tools/base-build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/build-tools/base-build.xml?view=diff&rev=537601&r1=537600&r2=537601
==============================================================================
--- james/server/sandbox/seda-imap-modular/build-tools/base-build.xml (original)
+++ james/server/sandbox/seda-imap-modular/build-tools/base-build.xml Sun May
13 08:33:02 2007
@@ -75,6 +75,19 @@
</sequential>
</macrodef>
+ <macrodef name='PopulateMetaData'>
+ <attribute name='bin'/>
+ <attribute name='src'/>
+ <sequential>
+ <copy todir='@{bin}/META-INF'>
+ <fileset dir="@{src}">
+ <include name='LICENSE.txt'/>
+ <include name='NOTICE.txt'/>
+ </fileset>
+ </copy>
+ </sequential>
+ </macrodef>
+
<macrodef name="Compile">
<attribute name='src'/>
<attribute name='resources'/>
@@ -114,6 +127,7 @@
<include name='**/*'/>
</fileset>
</copy>
+ <PopulateMetaData bin='@{bin}' src='.' />
</sequential>
</macrodef>
@@ -188,10 +202,13 @@
</path>
<path id='classpath.base.test'>
<path refid='classpath.base'/>
+ <pathelement location="${dir.build.bin}"/>
<fileset dir="${lib.dir}">
<include name="${junit.jar}"/>
<include name="${commons-net.jar}"/>
<include name="${jmock.jar}"/>
+ <include name="${commons-beanutils.jar}"/>
+ <include name="${derby.jar}"/>
</fileset>
</path>
@@ -311,10 +328,47 @@
<attribute name='Implementation-Version'
value='@{version}'/>
<attribute name='Implementation-Vendor'
value='@{vendor.impl}'/>
<attribute name="Implementation-Vendor-Id"
value="@{vendor.id}"/>
- </manifest>
+ </manifest>
</jar>
</sequential>
</macrodef>
+
+ <macrodef name='CreateJavaDocs'>
+ <attribute name='bin' default='${build.javadocs}'/>
+ <attribute name='src' default='${dir.src.java}'/>
+ <attribute name='classpath-refid' default='classpath.main'/>
+ <sequential>
+ <delete dir="@{bin}"/>
+ <mkdir dir="@{bin}"/>
+ <javadoc
+ packagenames="org.apache.*"
+ sourcepath="@{src}"
+ destdir="@{bin}">
+ <classpath refid="@{classpath-refid}"/>
+ <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="-link" value="http://avalon.apache.org/api"/>
+ <param name="-link"
value="http://avalon.apache.org/phoenix/api"/>
+ <param name="-link"
value="http://avalon.apache.org/cornerstone/api"/>
+ <param name="-link"
value="http://avalon.apache.org/logkit/api"/>
+ <param name="-doctitle" value="${Name} ${version}"/>
+ <param name="-windowtitle" value="${Name} API"/>
+ <param name="-bottom" value="Licensed to the Apache
Software Foundation (ASF) under one or more contributor license agreements. The
ASF licenses this file to you under the Apache License, Version 2.0
(http://www.apache.org/licenses/LICENSE-2.0)."/>
+ <param name="-tag" value="phoenix\:mx\-topic:X"/>
+ <param name="-tag" value="phoenix\:mx\-operation:X"/>
+ <param name="-tag" value="phoenix\:mx\-description:X"/>
+ <param name="-tag" value="phoenix\:mx\-attribute:X"/>
+ <param name="-tag" value="phoenix\:mx\-isWriteable:X"/>
+ </doclet>
+ </javadoc>
+ <PopulateMetaData bin='@{bin}' src='.' />
+ </sequential>
+ </macrodef>
<!--
Targets
Modified: james/server/sandbox/seda-imap-modular/build-tools/module-build.xml
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/build-tools/module-build.xml?view=diff&rev=537601&r1=537600&r2=537601
==============================================================================
--- james/server/sandbox/seda-imap-modular/build-tools/module-build.xml
(original)
+++ james/server/sandbox/seda-imap-modular/build-tools/module-build.xml Sun May
13 08:33:02 2007
@@ -86,6 +86,11 @@
name='${name.module}'
bin='${dir.build.bin}'
lib='${dir.stage.james}'/>
+ <CreateJavaDocs/>
+ <CreateJar
+ name='${name.module}-javadoc'
+ bin='${build.javadocs}'
+ lib='${dir.stage.james}'/>
</target>
<target
Modified: james/server/sandbox/seda-imap-modular/default.properties
URL:
http://svn.apache.org/viewvc/james/server/sandbox/seda-imap-modular/default.properties?view=diff&rev=537601&r1=537600&r2=537601
==============================================================================
--- james/server/sandbox/seda-imap-modular/default.properties (original)
+++ james/server/sandbox/seda-imap-modular/default.properties Sun May 13
08:33:02 2007
@@ -14,7 +14,7 @@
mailet-version=2.4
mailet-api-version=2.4
#package-version=3.0a1
-year=1999-2006
+year=1999-2007
extension.name=org.apache.james
vendor=Apache Software Foundation
vendor.id=org.apache
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
