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/09/07 17:58:11 UTC
svn commit: r692884 - in /james/protocols/imap/trunk:
build-tools/common-build.xml build-tools/deployment-build.xml
torque/build.xml
Author: rdonkin
Date: Sun Sep 7 08:58:11 2008
New Revision: 692884
URL: http://svn.apache.org/viewvc?rev=692884&view=rev
Log:
Restricted torque dependency to specific module
Modified:
james/protocols/imap/trunk/build-tools/common-build.xml
james/protocols/imap/trunk/build-tools/deployment-build.xml
james/protocols/imap/trunk/torque/build.xml
Modified: james/protocols/imap/trunk/build-tools/common-build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/common-build.xml?rev=692884&r1=692883&r2=692884&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/common-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/common-build.xml Sun Sep 7 08:58:11 2008
@@ -184,70 +184,36 @@
<sequential>
<path id='classpath.base'>
<fileset dir="${lib.dir}">
- <include name='${jms-spec.jar}'/>
- <include name='${activemq-core.jar}'/>
- <include name="${avalon-framework.jar}"/>
- <include name="${avalon-framework-impl.jar}"/>
- <include name="${dns.jar}"/>
<include name="${commons-collections.jar}"/>
- <include name="${commons-dbcp.jar}"/>
- <include name="${commons-pool.jar}"/>
- <include name="${jakarta-oro.jar}"/>
- <include name="${excalibur-pool-api.jar}"/>
- <include name="${excalibur-pool-impl.jar}"/>
- <include name="${excalibur-thread-api.jar}"/>
- <include name="${excalibur-datasource.jar}"/>
- <include name="${cornerstone-threads-api.jar}"/>
- <include name="${cornerstone-connection-api.jar}"/>
- <include name="${cornerstone-connection-impl.jar}"/>
- <include name="${cornerstone-store-api.jar}"/>
- <include name="${cornerstone-scheduler-api.jar}"/>
- <include name="${cornerstone-sockets-api.jar}"/>
- <include name="${cornerstone-datasources-api.jar}"/>
<include name="${javax-mail.jar}"/>
<include name="${javax-activation.jar}"/>
- <include name="${bcmail.jar}"/>
- <include name="${bcmail-workaround.jar}"/>
- <include name="${javax.management}"/>
- <include name="${jspf.jar}"/>
- <include name="${mstor.jar}"/>
<include name="${commons-logging.jar}"/>
- <include name="${jdom.jar}"/>
- <include name="${xstream.jar}"/>
- <include name="${torque.jar}"/>
- <include name="${village.jar}"/>
<include name="${commons-lang.jar}"/>
- <include name="${commons-configuration.jar}"/>
- <include name="${jsieve.jar}"/>
- <include name="${mailet.jar}"/>
- <include name="${base-mailet.jar}"/>
- <include name="${std-mailet.jar}"/>
- <include name="${commons-digester.jar}"/>
<include name="${concurrent.jar}"/>
<include name="${mime4j.jar}"/>
- <include name="${commons-io.jar}"/>
- <include name="${jackrabbit-api.jar}"/>
- <include name="${jackrabbit-commons.jar}"/>
- <include name="${jackrabbit-rmi.jar}"/>
- <include name="${jcr.jar}"/>
- <include name="${spring.jar}"/>
- <include name="${log4j.jar}"/>
- <include name="${avalon-phoenix.jar}"/>
- </fileset>
+ <include name="${commons-io.jar}"/>
+ <include name="${log4j.jar}"/>
+ </fileset>
</path>
+
+ <path id='classpath.torque'>
+ <fileset dir="${lib.dir}">
+ <include name="${commons-dbcp.jar}"/>
+ <include name="${commons-pool.jar}"/>
+ <include name="${torque.jar}"/>
+ <include name="${village.jar}"/>
+ <include name="${commons-configuration.jar}"/>
+ <include name="${commons-digester.jar}"/>
+ </fileset>
+ </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="${base-mailet.tests.jar}"/>
- <include name="${std-mailet.tests.jar}"/>
- <include name="${cornerstone-datasources-impl.jar}"/>
- <include name="${cornerstone-sockets-impl.jar}"/>
- <include name="${excalibur-thread-impl.jar}"/>
+ <include name="${commons-beanutils.jar}"/>
<include name="${derby.jar}"/>
</fileset>
</path>
Modified: james/protocols/imap/trunk/build-tools/deployment-build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/deployment-build.xml?rev=692884&r1=692883&r2=692884&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/deployment-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/deployment-build.xml Sun Sep 7 08:58:11 2008
@@ -30,6 +30,7 @@
depends='check-environment, master-module-template.set-classpath'>
<path id='classpath.main'>
<path refid='classpath.base'/>
+ <path refid='classpath.torque'/>
<path refid='classpath.dependencies.functions'/>
</path>
<path id='classpath.test'>
Modified: james/protocols/imap/trunk/torque/build.xml
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/torque/build.xml?rev=692884&r1=692883&r2=692884&view=diff
==============================================================================
--- james/protocols/imap/trunk/torque/build.xml (original)
+++ james/protocols/imap/trunk/torque/build.xml Sun Sep 7 08:58:11 2008
@@ -21,4 +21,23 @@
<description>Builds torque module. This is an function module.</description>
<property name="name.module" value="torque" />
<import file="../build-tools/function-build.xml" optional="no" />
+
+ <target
+ name='set-classpath'
+ depends='check-environment, master-module-template.set-classpath'>
+ <path id='classpath.main'>
+ <path refid='classpath.base'/>
+ <path refid='classpath.torque'/>
+ <path refid='classpath.dependencies.libraries'/>
+ </path>
+ <path id='classpath.test'>
+ <path refid='classpath.main'/>
+ <path refid='classpath.base.test'/>
+ <path refid='classpath.test.dependencies.libraries'/>
+ </path>
+ <path id='classpath.test.runtime'>
+ <path refid='classpath.test'/>
+ </path>
+ </target>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org