Author: bago
Date: Sun Aug 10 03:14:07 2008
New Revision: 684444
URL: http://svn.apache.org/viewvc?rev=684444&view=rev
Log:
Phoenix-deployment uses its own ant build mechanism. Updating to support util
modules.
Modified:
james/server/trunk/build-tools/common-build.xml
james/server/trunk/phoenix-deployment/build.xml
Modified: james/server/trunk/build-tools/common-build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/build-tools/common-build.xml?rev=684444&r1=684443&r2=684444&view=diff
==============================================================================
--- james/server/trunk/build-tools/common-build.xml (original)
+++ james/server/trunk/build-tools/common-build.xml Sun Aug 10 03:14:07 2008
@@ -260,14 +260,14 @@
<path
id='classpath.dependencies.util'
description="Convenient way to import all Utils">
- <!-- TODO Add content when APIs are broken out -->
+ <!-- TODO Add content when Utilss are broken out -->
<fileset dir="${lib.dir}/${path.lib.james}">
<include name="${jars-prefix}*-util-${version}.jar" />
</fileset>
</path>
<path
id='classpath.dependencies.libraries'
- description="Convenient way to import all libraries and APIs">
+ description="Convenient way to import all libraries, APIs and
Utils">
<!-- TODO Add content when libraries are broken out -->
<path refid='classpath.dependencies.api'/>
<path refid='classpath.dependencies.util'/>
@@ -277,7 +277,7 @@
</path>
<path
id='classpath.dependencies.functions'
- description="Convenient way to import all functions, libraries
and APIs">
+ description="Convenient way to import all functions,
libraries, APIs and Utils">
<!-- TODO Add content when functions are broken out -->
<path refid='classpath.dependencies.libraries'/>
<fileset dir="${lib.dir}/${path.lib.james}">
@@ -303,7 +303,7 @@
</path>
<path
id='classpath.test.dependencies.libraries'
- description="Convenient way to import all library and API
tests">
+ description="Convenient way to import all library, API and
Util tests">
<!-- TODO Add content when libraries are broken out -->
<path refid='classpath.test.dependencies.api'/>
<path refid='classpath.test.dependencies.util'/>
@@ -313,7 +313,7 @@
</path>
<path
id='classpath.test.dependencies.functions'
- description="Convenient way to import all function, librarie
and API tests">
+ description="Convenient way to import all function, libraries,
APIs and Utils tests">
<!-- TODO Add content when functions are broken out -->
<path refid='classpath.test.dependencies.libraries'/>
<fileset dir="${lib.dir}/${path.lib.james}">
Modified: james/server/trunk/phoenix-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?rev=684444&r1=684443&r2=684444&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Sun Aug 10 03:14:07 2008
@@ -100,7 +100,7 @@
<include name="${commons-configuration.jar}"/>
<include name="${base-mailet.jar}"/>
<include name="${jsieve.jar}"/>
- <include name="${mailet.jar}"/>
+ <include name="${mailet.jar}"/>
<include name="${commons-digester.jar}"/>
<include name="${mime4j.jar}"/>
<include name="${commons-io.jar}"/>
@@ -110,6 +110,7 @@
<include name="${jcr.jar}"/>
<!-- TODO: include libraries without wildcards -->
<include
name="${path.lib.james}/${jars-prefix}*-api-${version}.jar"/>
+ <include
name="${path.lib.james}/${jars-prefix}*-util-${version}.jar"/>
<include
name="${path.lib.james}/${jars-prefix}*-library-${version}.jar"/>
<include
name="${path.lib.james}/${jars-prefix}*-function-${version}.jar"/>
</fileset>
@@ -571,6 +572,7 @@
<!-- TODO this should list exactly the module defined, without
wildcards -->
<lib dir="${lib.dir}/${path.lib.james}">
<include name="${jars-prefix}*-api-${version}.jar" />
+ <include name="${jars-prefix}*-util-${version}.jar" />
<include name="${jars-prefix}*-library-${version}.jar" />
<include name="${jars-prefix}*-function-${version}.jar" />
</lib>
@@ -932,6 +934,7 @@
</fileset>
<fileset dir="${lib.dir}/${path.lib.james}">
<include name="${jars-prefix}*-api-test-${version}.jar" />
+ <include name="${jars-prefix}*-util-test-${version}.jar" />
<include name="${jars-prefix}*-library-test-${version}.jar"
/>
<include name="${jars-prefix}*-function-test-${version}.jar"
/>
</fileset>
@@ -1035,10 +1038,13 @@
<classpathentry kind="src" output="target/test-classes"
path="src/test"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con"
path="org.eclipse.jdt.USER_LIBRARY/james"/>
+ <classpathentry combineaccessrules="false" kind='src'
path='/common-util'/>
+ <classpathentry combineaccessrules="false" kind='src'
path='/mailnotification-util'/>
<classpathentry combineaccessrules="false" kind='src'
path='/domain-api'/>
<classpathentry combineaccessrules="false" kind='src'
path='/imap-api'/>
<classpathentry combineaccessrules="false" kind="src"
path="/user-api"/>
<classpathentry combineaccessrules="false" kind="src"
path="/core-library"/>
+ <classpathentry combineaccessrules="false" kind='src'
path='/avalon-socket-library'/>
<classpathentry combineaccessrules="false" kind="src"
path="/imap-codec-library"/>
<classpathentry combineaccessrules="false" kind="src"
path="/imap-command-library"/>
<classpathentry combineaccessrules="false" kind="src"
path="/imapmailbox-library"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
