Author: bago
Date: Wed Mar 21 13:11:26 2007
New Revision: 520987
URL: http://svn.apache.org/viewvc?view=rev&rev=520987
Log:
Made james.sar/SAR-INF/lib folder "flat" (JAMES-779)
Modified:
james/server/trunk/include.properties
james/server/trunk/phoenix-deployment/build.xml
Modified: james/server/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/server/trunk/include.properties?view=diff&rev=520987&r1=520986&r2=520987
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Wed Mar 21 13:11:26 2007
@@ -70,102 +70,146 @@
# --------------------------------------------------
# ----- Avalon Framework -----
-avalon-framework.jar=${path.lib.avalon}/avalon-framework-api-4.3.jar
+jarname.avalon-framework.jar=avalon-framework-api-4.3.jar
+avalon-framework.jar=${path.lib.avalon}/${jarname.avalon-framework.jar}
# ----- Avalon Framework -----
-avalon-framework-impl.jar=${path.lib.avalon}/avalon-framework-impl-4.3.jar
+jarnama.avalon-framework-impl.jar=avalon-framework-impl-4.3.jar
+avalon-framework-impl.jar=${path.lib.avalon}/${jarnama.avalon-framework-impl.jar}
# ----- From lib
# ----- Excalibur datasource -----
-excalibur-datasource.jar=${path.lib.excaliburdatasource}/excalibur-datasource-2.1.jar
+jarname.excalibur-datasource.jar=excalibur-datasource-2.1.jar
+excalibur-datasource.jar=${path.lib.excaliburdatasource}/${jarname.excalibur-datasource.jar}
# ----- Javax mail -----
-javax-mail.jar=${path.lib.javamail}/${javamail.id}.jar
+jarname.javax-mail.jar=${javamail.id}.jar
+javax-mail.jar=${path.lib.javamail}/${jarname.javax-mail.jar}
# ----- Activation -----
-javax-activation.jar=${path.lib.activation}/${activation.id}.jar
+jarname.javax-activation.jar=${activation.id}.jar
+javax-activation.jar=${path.lib.activation}/${jarname.javax-activation.jar}
# ----- DNS -----
-dns.jar=${path.lib.dns}/dnsjava-2.0.3.jar
+jarname.dns.jar=dnsjava-2.0.3.jar
+dns.jar=${path.lib.dns}/${jarname.dns.jar}
# ----- Commons -----
-commons-dbcp.jar=${path.lib.commonsdbcp}/commons-dbcp-1.2.1.jar
-commons-pool.jar=${path.lib.commonspool}/commons-pool-1.2.jar
-commons-collections.jar=${path.lib.commonscollections}/commons-collections-3.1.jar
+jarname.commons-dbcp.jar=commons-dbcp-1.2.1.jar
+commons-dbcp.jar=${path.lib.commonsdbcp}/${jarname.commons-dbcp.jar}
+jarname.commons-pool.jar=commons-pool-1.2.jar
+commons-pool.jar=${path.lib.commonspool}/${jarname.commons-pool.jar}
+jarname.commons-collections.jar=commons-collections-3.1.jar
+commons-collections.jar=${path.lib.commonscollections}/${jarname.commons-collections.jar}
# ----- Jakarta ORO -----
-jakarta-oro.jar=${path.lib.oro}/jakarta-oro-2.0.8.jar
+jarname.jakarta-oro.jar=jakarta-oro-2.0.8.jar
+jakarta-oro.jar=${path.lib.oro}/${jarname.jakarta-oro.jar}
# ----- Cornerstone threads, version 1.0 or later -----
-cornerstone-threads-api.jar=${path.lib.cornerstonethreads}/cornerstone-threads-api-2.1.jar
-cornerstone-threads-impl.jar=${path.lib.cornerstonethreads}/cornerstone-threads-impl-2.1.jar
+jarname.cornerstone-threads-api.jar=cornerstone-threads-api-2.1.jar
+cornerstone-threads-api.jar=${path.lib.cornerstonethreads}/${jarname.cornerstone-threads-api.jar}
+jarname.cornerstone-threads-impl.jar=cornerstone-threads-impl-2.1.jar
+cornerstone-threads-impl.jar=${path.lib.cornerstonethreads}/${jarname.cornerstone-threads-impl.jar}
# ----- Cornerstone connection, version 1.0 or later -----
-cornerstone-connection-api.jar=${path.lib.cornerstoneconnection}/cornerstone-connection-api-2.1.jar
-cornerstone-connection-impl.jar=${path.lib.cornerstoneconnection}/cornerstone-connection-impl-2.1.jar
+jarname.cornerstone-connection-api.jar=cornerstone-connection-api-2.1.jar
+cornerstone-connection-api.jar=${path.lib.cornerstoneconnection}/${jarname.cornerstone-connection-api.jar}
+jarname.cornerstone-connection-impl.jar=cornerstone-connection-impl-2.1.jar
+cornerstone-connection-impl.jar=${path.lib.cornerstoneconnection}/${jarname.cornerstone-connection-impl.jar}
# ----- Cornerstone masterstore, version 1.0 or later -----
-cornerstone-store-api.jar=${path.lib.cornerstonestore}/cornerstone-store-api-2.1.jar
+jarname.cornerstone-store-api.jar=cornerstone-store-api-2.1.jar
+cornerstone-store-api.jar=${path.lib.cornerstonestore}/${jarname.cornerstone-store-api.jar}
# ----- Cornerstone sockets, version 1.0 or later -----
-cornerstone-sockets-api.jar=${path.lib.cornerstonesockets}/cornerstone-sockets-api-2.1.jar
-cornerstone-sockets-impl.jar=${path.lib.cornerstonesockets}/cornerstone-sockets-impl-2.1-patched.jar
+jarname.cornerstone-sockets-api.jar=cornerstone-sockets-api-2.1.jar
+cornerstone-sockets-api.jar=${path.lib.cornerstonesockets}/${jarname.cornerstone-sockets-api.jar}
+jarname.cornerstone-sockets-impl.jar=cornerstone-sockets-impl-2.1-patched.jar
+cornerstone-sockets-impl.jar=${path.lib.cornerstonesockets}/${jarname.cornerstone-sockets-impl.jar}
# ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-scheduler-api.jar=${path.lib.cornerstonescheduler}/cornerstone-scheduler-api-2.1.jar
-cornerstone-scheduler-impl.jar=${path.lib.cornerstonescheduler}/cornerstone-scheduler-impl-2.1.jar
+jarname.cornerstone-scheduler-api.jar=cornerstone-scheduler-api-2.1.jar
+cornerstone-scheduler-api.jar=${path.lib.cornerstonescheduler}/${jarname.cornerstone-scheduler-api.jar}
+jarname.cornerstone-scheduler-impl.jar=cornerstone-scheduler-impl-2.1.jar
+cornerstone-scheduler-impl.jar=${path.lib.cornerstonescheduler}/${jarname.cornerstone-scheduler-impl.jar}
# ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-datasources-api.jar=${path.lib.cornerstonedatasources}/cornerstone-datasources-api-2.1.jar
-cornerstone-datasources-impl.jar=${path.lib.cornerstonedatasources}/cornerstone-datasources-impl-2.1-patched.jar
+jarname.cornerstone-datasources-api.jar=cornerstone-datasources-api-2.1.jar
+cornerstone-datasources-api.jar=${path.lib.cornerstonedatasources}/${jarname.cornerstone-datasources-api.jar}
+jarname.cornerstone-datasources-impl.jar=cornerstone-datasources-impl-2.1-patched.jar
+cornerstone-datasources-impl.jar=${path.lib.cornerstonedatasources}/${jarname.cornerstone-datasources-impl.jar}
# ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread-api.jar=${path.lib.excaliburthread}/excalibur-thread-api-2.1.jar
-excalibur-thread-impl.jar=${path.lib.excaliburthread}/excalibur-thread-impl-2.1.jar
+jarname.excalibur-thread-api.jar=excalibur-thread-api-2.1.jar
+excalibur-thread-api.jar=${path.lib.excaliburthread}/${jarname.excalibur-thread-api.jar}
+jarname.excalibur-thread-impl.jar=excalibur-thread-impl-2.1.jar
+excalibur-thread-impl.jar=${path.lib.excaliburthread}/${jarname.excalibur-thread-impl.jar}
# ----- Excalibur pool -----
-excalibur-pool-api.jar=${path.lib.excaliburpool}/excalibur-pool-api-2.1.jar
-excalibur-pool-impl.jar=${path.lib.excaliburpool}/excalibur-pool-impl-2.1.jar
-
-concurrent.jar=${path.lib.concurrent}/concurrent-1.3.4.jar
-
-derby.jar=${path.lib.derby}/derby.jar
-
-bcmail.jar=${path.lib.bouncycastle}/bcmail-jdk14-129.jar
-bcmail-workaround.jar=${path.lib.bouncycastle}/bcmail-jdk14-129-workaround.jar
+jarname.excalibur-pool-api.jar=excalibur-pool-api-2.1.jar
+excalibur-pool-api.jar=${path.lib.excaliburpool}/${jarname.excalibur-pool-api.jar}
+jarname.excalibur-pool-impl.jar=excalibur-pool-impl-2.1.jar
+excalibur-pool-impl.jar=${path.lib.excaliburpool}/${jarname.excalibur-pool-impl.jar}
+
+jarname.concurrent.jar=concurrent-1.3.4.jar
+concurrent.jar=${path.lib.concurrent}/${jarname.concurrent.jar}
+
+jarname.derby.jar=derby.jar
+derby.jar=${path.lib.derby}/${jarname.derby.jar}
+
+jarname.bcmail.jar=bcmail-jdk14-129.jar
+bcmail.jar=${path.lib.bouncycastle}/${jarname.bcmail.jar}
+jarname.bcmail-workaround.jar=bcmail-jdk14-129-workaround.jar
+bcmail-workaround.jar=${path.lib.bouncycastle}/${jarname.bcmail-workaround.jar}
# ----- jSPF -----
-jspf.jar=${path.lib.james}/jspf-0.9-SNAPSHOT.jar
+jarname.jspf.jar=jspf-0.9-SNAPSHOT.jar
+jspf.jar=${path.lib.james}/${jarname.jspf.jar}
# ----- mstor -----
-mstor.jar=${path.lib.mstor}/mstor.jar
-commons-logging.jar=${path.lib.commonslogging}/commons-logging.jar
-jdom.jar=${path.lib.jdom}/jdom.jar
-xstream.jar=${path.lib.xstream}/xstream.jar
+jarname.mstor.jar=mstor.jar
+mstor.jar=${path.lib.mstor}/${jarname.mstor.jar}
+jarname.commons-logging.jar=commons-logging.jar
+commons-logging.jar=${path.lib.commonslogging}/${jarname.commons-logging.jar}
+jarname.jdom.jar=jdom.jar
+jdom.jar=${path.lib.jdom}/${jarname.jdom.jar}
+jarname.xstream.jar=xstream.jar
+xstream.jar=${path.lib.xstream}/${jarname.xstream.jar}
# ----- torque -----
-torque.jar=${path.lib.torque}/torque-3.3-RC1.jar
-village.jar=${path.lib.village}/village-2.0.jar
-commons-lang.jar=${path.lib.commonslang}/commons-lang-2.1.jar
-commons-configuration.jar=${path.lib.commonsconfiguration}/commons-configuration-1.1.jar
-commons-beanutils.jar=${path.lib.commonsbeanutils}/commons-beanutils-1.7.0.jar
+jarname.torque.jar=torque-3.3-RC1.jar
+torque.jar=${path.lib.torque}/${jarname.torque.jar}
+jarname.village.jar=village-2.0.jar
+village.jar=${path.lib.village}/${jarname.village.jar}
+jarname.commons-lang.jar=commons-lang-2.1.jar
+commons-lang.jar=${path.lib.commonslang}/${jarname.commons-lang.jar}
+jarname.commons-configuration.jar=commons-configuration-1.1.jar
+commons-configuration.jar=${path.lib.commonsconfiguration}/${jarname.commons-configuration.jar}
+jarname.commons-beanutils.jar=commons-beanutils-1.7.0.jar
+commons-beanutils.jar=${path.lib.commonsbeanutils}/${jarname.commons-beanutils.jar}
# ----- javax.management -----
-
-javax.management=${path.lib.mx4j}/mx4j-jmx.jar
+jarname.javax.management=mx4j-jmx.jar
+javax.management=${path.lib.mx4j}/${jarname.javax.management}
# ----- sieve-----
-jsieve.jar=${path.lib.james}/jsieve-0.2-SNAPSHOT.jar
-commons-digester.jar=${path.lib.commonsdigester}/commons-digester-1.8.jar
+jarname.jsieve.jar=jsieve-0.2-SNAPSHOT.jar
+jsieve.jar=${path.lib.james}/${jarname.jsieve.jar}
+jarname.commons-digester.jar=commons-digester-1.8.jar
+commons-digester.jar=${path.lib.commonsdigester}/${jarname.commons-digester.jar}
# ----- Logging
-avalon-logkit.jar=${path.lib.logkit}/avalon-logkit-2.1.jar
+jarname.avalon-logkit.jar=avalon-logkit-2.1.jar
+avalon-logkit.jar=${path.lib.logkit}/${jarname.avalon-logkit.jar}
# --------------------------------------------------
# TEST LIBRARIES
# --------------------------------------------------
-commons-net.jar=${path.lib.commonsnet}/commons-net-1.4.1.jar
-jmock.jar=${path.lib.jmock}/jmock-1.1.0.jar
+jarname.commons-net.jar=commons-net-1.4.1.jar
+commons-net.jar=${path.lib.commonsnet}/${jarname.commons-net.jar}
+jarname.jmock.jar=jmock-1.1.0.jar
+jmock.jar=${path.lib.jmock}/${jarname.jmock.jar}
Modified: james/server/trunk/phoenix-deployment/build.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/build.xml?view=diff&rev=520987&r1=520986&r2=520987
==============================================================================
--- james/server/trunk/phoenix-deployment/build.xml (original)
+++ james/server/trunk/phoenix-deployment/build.xml Wed Mar 21 13:11:26 2007
@@ -504,50 +504,45 @@
<include name="mailet-${mailet-version}.jar"/>
<include name="${name}-${version}.jar"/>
</lib>
- <lib dir="${lib.dir}">
- <include name="${dns.jar}"/>
- <include name="${jakarta-oro.jar}"/>
- <include name="${derby.jar}"/>
- <include name="${excalibur-datasource.jar}"/>
- <include name="${javax-activation.jar}"/>
- <include name="${javax-mail.jar}"/>
- <include name="${commons-dbcp.jar}"/>
- <include name="${commons-pool.jar}"/>
- <include name="${bcmail.jar}"/>
- <include name="${bcmail-workaround.jar}"/>
- <include name="${excalibur-thread-api.jar}"/>
- <include name="${excalibur-thread-impl.jar}"/>
- <include name="${excalibur-pool-api.jar}"/>
- <include name="${excalibur-pool-impl.jar}"/>
- <include name="${commons-collections.jar}"/>
- <include name="${cornerstone-threads-api.jar}"/>
- <include name="${cornerstone-threads-impl.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-scheduler-impl.jar}"/>
- <include name="${cornerstone-sockets-api.jar}"/>
- <include name="${cornerstone-sockets-impl.jar}"/>
- <include name="${cornerstone-datasources-api.jar}"/>
- <include name="${cornerstone-datasources-impl.jar}"/>
- <include name="${concurrent.jar}"/>
- <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="${commons-beanutils.jar}"/>
-
- <include name="${jsieve.jar}"/>
- <include name="${commons-digester.jar}"/>
-
- </lib>
+ <lib dir="${lib.dir}/${path.lib.dns}"
includes="${jarname.dns.jar}" />
+ <lib dir="${lib.dir}/${path.lib.oro}"
includes="${jarname.jakarta-oro.jar}" />
+ <lib dir="${lib.dir}/${path.lib.derby}"
includes="${jarname.derby.jar}" />
+ <lib dir="${lib.dir}/${path.lib.excaliburdatasource}"
includes="${jarname.excalibur-datasource.jar}" />
+ <lib dir="${lib.dir}/${path.lib.activation}"
includes="${jarname.javax-activation.jar}" />
+ <lib dir="${lib.dir}/${path.lib.javamail}"
includes="${jarname.javax-mail.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonsdbcp}"
includes="${jarname.commons-dbcp.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonspool}"
includes="${jarname.commons-pool.jar}" />
+ <lib dir="${lib.dir}/${path.lib.bouncycastle}"
includes="${jarname.bcmail.jar}" />
+ <lib dir="${lib.dir}/${path.lib.bouncycastle}"
includes="${jarname.bcmail-workaround.jar}" />
+ <lib dir="${lib.dir}/${path.lib.excaliburthread}"
includes="${jarname.excalibur-thread-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.excaliburthread}"
includes="${jarname.excalibur-thread-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.excaliburpool}"
includes="${jarname.excalibur-pool-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.excaliburpool}"
includes="${jarname.excalibur-pool-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonscollections}"
includes="${jarname.commons-collections.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonethreads}"
includes="${jarname.cornerstone-threads-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonethreads}"
includes="${jarname.cornerstone-threads-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstoneconnection}"
includes="${jarname.cornerstone-connection-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstoneconnection}"
includes="${jarname.cornerstone-connection-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonestore}"
includes="${jarname.cornerstone-store-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonescheduler}"
includes="${jarname.cornerstone-scheduler-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonescheduler}"
includes="${jarname.cornerstone-scheduler-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonesockets}"
includes="${jarname.cornerstone-sockets-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonesockets}"
includes="${jarname.cornerstone-sockets-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonedatasources}"
includes="${jarname.cornerstone-datasources-api.jar}" />
+ <lib dir="${lib.dir}/${path.lib.cornerstonedatasources}"
includes="${jarname.cornerstone-datasources-impl.jar}" />
+ <lib dir="${lib.dir}/${path.lib.concurrent}"
includes="${jarname.concurrent.jar}" />
+ <lib dir="${lib.dir}/${path.lib.james}"
includes="${jarname.jspf.jar}" />
+ <lib dir="${lib.dir}/${path.lib.mstor}"
includes="${jarname.mstor.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonslogging}"
includes="${jarname.commons-logging.jar}" />
+ <lib dir="${lib.dir}/${path.lib.jdom}"
includes="${jarname.jdom.jar}" />
+ <lib dir="${lib.dir}/${path.lib.xstream}"
includes="${jarname.xstream.jar}" />
+ <lib dir="${lib.dir}/${path.lib.torque}"
includes="${jarname.torque.jar}" />
+ <lib dir="${lib.dir}/${path.lib.village}"
includes="${jarname.village.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonslang}"
includes="${jarname.commons-lang.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonsconfiguration}"
includes="${jarname.commons-configuration.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonsbeanutils}"
includes="${jarname.commons-beanutils.jar}" />
+ <lib dir="${lib.dir}/${path.lib.james}"
includes="${jarname.jsieve.jar}" />
+ <lib dir="${lib.dir}/${path.lib.commonsdigester}"
includes="${jarname.commons-digester.jar}" />
<zipfileset dir="${conf.dir}" fullpath="conf/sqlResources.xml">
<include name="sqlResources.xml"/>
</zipfileset>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
