james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r516704 - in /james/server/trunk: ./ pheonix-deployment/ pheonix-deployment/lib/ pheonix-deployment/tools/lib/ stage/ stage/activation/ stage/activation/jars/ stage/avalon-framework/ stage/avalon-framework/jars/ stage/avalon-logkit/ stage/a...
Date Sat, 10 Mar 2007 13:19:59 GMT
Author: rdonkin
Date: Sat Mar 10 05:19:53 2007
New Revision: 516704

URL: http://svn.apache.org/viewvc?view=rev&rev=516704
Log:
Moved libraries from deployment module into a first level directory called stage. Not sure
that this is the right name but should be easy enough to change after discussion. As requested,
maven standard layout adopted for this directory. Tried to preserve the current phoenix build
as far as possible.

Added:
    james/server/trunk/default.properties
      - copied, changed from r508743, james/server/trunk/pheonix-deployment/default.properties
    james/server/trunk/include.properties
      - copied, changed from r508743, james/server/trunk/pheonix-deployment/include.properties
    james/server/trunk/stage/   (with props)
    james/server/trunk/stage/activation/
    james/server/trunk/stage/activation/jars/
    james/server/trunk/stage/activation/jars/activation-1.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/activation-1.1.jar
    james/server/trunk/stage/activation/jars/activation.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/activation.LICENSE
    james/server/trunk/stage/avalon-framework/
    james/server/trunk/stage/avalon-framework/jars/
    james/server/trunk/stage/avalon-framework/jars/avalon-framework-api-4.3.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/avalon-framework-api-4.3.jar
    james/server/trunk/stage/avalon-framework/jars/avalon-framework-impl-4.3.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/avalon-framework-impl-4.3.jar
    james/server/trunk/stage/avalon-logkit/
    james/server/trunk/stage/avalon-logkit/jars/
    james/server/trunk/stage/avalon-logkit/jars/avalon-logkit-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/avalon-logkit-2.1.jar
    james/server/trunk/stage/commons-beanutils/
    james/server/trunk/stage/commons-beanutils/jars/
    james/server/trunk/stage/commons-beanutils/jars/commons-beanutils-1.7.0.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-beanutils-1.7.0.jar
    james/server/trunk/stage/commons-collections/
    james/server/trunk/stage/commons-collections/jars/
    james/server/trunk/stage/commons-collections/jars/commons-collections-3.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-collections-3.1.jar
    james/server/trunk/stage/commons-configuration/
    james/server/trunk/stage/commons-configuration/jars/
    james/server/trunk/stage/commons-configuration/jars/commons-configuration-1.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-configuration-1.1.jar
    james/server/trunk/stage/commons-dbcp/
    james/server/trunk/stage/commons-dbcp/jars/
    james/server/trunk/stage/commons-dbcp/jars/commons-dbcp-1.2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-dbcp-1.2.1.jar
    james/server/trunk/stage/commons-digester/
    james/server/trunk/stage/commons-digester/jars/
    james/server/trunk/stage/commons-digester/jars/commons-digester-1.8.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-digester-1.8.jar
    james/server/trunk/stage/commons-lang/
    james/server/trunk/stage/commons-lang/jars/
    james/server/trunk/stage/commons-lang/jars/commons-lang-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-lang-2.1.jar
    james/server/trunk/stage/commons-logging/
    james/server/trunk/stage/commons-logging/jars/
    james/server/trunk/stage/commons-logging/jars/LICENSE.commons-logging
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/LICENSE.commons-logging
    james/server/trunk/stage/commons-logging/jars/commons-logging.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-logging.jar
    james/server/trunk/stage/commons-net/
    james/server/trunk/stage/commons-net/jars/
    james/server/trunk/stage/commons-net/jars/commons-net-1.4.1.jar
      - copied unchanged from r516156, james/server/trunk/pheonix-deployment/tools/lib/commons-net-1.4.1.jar
    james/server/trunk/stage/commons-pool/
    james/server/trunk/stage/commons-pool/jars/
    james/server/trunk/stage/commons-pool/jars/commons-pool-1.2.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/commons-pool-1.2.jar
    james/server/trunk/stage/concurrent/
    james/server/trunk/stage/concurrent/jars/
    james/server/trunk/stage/concurrent/jars/concurrent-1.3.4.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/concurrent-1.3.4.jar
    james/server/trunk/stage/concurrent/jars/concurrent.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/concurrent.LICENSE
    james/server/trunk/stage/cornerstone-connection/
    james/server/trunk/stage/cornerstone-connection/jars/
    james/server/trunk/stage/cornerstone-connection/jars/cornerstone-connection-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-connection-api-2.1.jar
    james/server/trunk/stage/cornerstone-connection/jars/cornerstone-connection-impl-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-connection-impl-2.1.jar
    james/server/trunk/stage/cornerstone-datasources/
    james/server/trunk/stage/cornerstone-datasources/jars/
    james/server/trunk/stage/cornerstone-datasources/jars/cornerstone-datasources-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-datasources-api-2.1.jar
    james/server/trunk/stage/cornerstone-datasources/jars/cornerstone-datasources-impl-2.1-patched.README
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-datasources-impl-2.1-patched.README
    james/server/trunk/stage/cornerstone-datasources/jars/cornerstone-datasources-impl-2.1-patched.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-datasources-impl-2.1-patched.jar
    james/server/trunk/stage/cornerstone-scheduler/
    james/server/trunk/stage/cornerstone-scheduler/jars/
    james/server/trunk/stage/cornerstone-scheduler/jars/cornerstone-scheduler-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-scheduler-api-2.1.jar
    james/server/trunk/stage/cornerstone-scheduler/jars/cornerstone-scheduler-impl-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-scheduler-impl-2.1.jar
    james/server/trunk/stage/cornerstone-sockets/
    james/server/trunk/stage/cornerstone-sockets/jars/
    james/server/trunk/stage/cornerstone-sockets/jars/cornerstone-sockets-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-sockets-api-2.1.jar
    james/server/trunk/stage/cornerstone-sockets/jars/cornerstone-sockets-impl-2.1-patched.README
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-sockets-impl-2.1-patched.README
    james/server/trunk/stage/cornerstone-sockets/jars/cornerstone-sockets-impl-2.1-patched.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-sockets-impl-2.1-patched.jar
    james/server/trunk/stage/cornerstone-store/
    james/server/trunk/stage/cornerstone-store/jars/
    james/server/trunk/stage/cornerstone-store/jars/cornerstone-store-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-store-api-2.1.jar
    james/server/trunk/stage/cornerstone-threads/
    james/server/trunk/stage/cornerstone-threads/jars/
    james/server/trunk/stage/cornerstone-threads/jars/cornerstone-threads-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-threads-api-2.1.jar
    james/server/trunk/stage/cornerstone-threads/jars/cornerstone-threads-impl-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/cornerstone-threads-impl-2.1.jar
    james/server/trunk/stage/dnsjava/
    james/server/trunk/stage/dnsjava/jars/
    james/server/trunk/stage/dnsjava/jars/dnsjava-2.0.3.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/dnsjava-2.0.3.jar
    james/server/trunk/stage/dnsjava/jars/dnsjava.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/dnsjava.LICENSE
    james/server/trunk/stage/excalibur-datasource/
    james/server/trunk/stage/excalibur-datasource/jars/
    james/server/trunk/stage/excalibur-datasource/jars/excalibur-datasource-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/excalibur-datasource-2.1.jar
    james/server/trunk/stage/excalibur-pool/
    james/server/trunk/stage/excalibur-pool/jars/
    james/server/trunk/stage/excalibur-pool/jars/excalibur-pool-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/excalibur-pool-api-2.1.jar
    james/server/trunk/stage/excalibur-pool/jars/excalibur-pool-impl-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/excalibur-pool-impl-2.1.jar
    james/server/trunk/stage/excalibur-thread/
    james/server/trunk/stage/excalibur-thread/jars/
    james/server/trunk/stage/excalibur-thread/jars/excalibur-thread-api-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/excalibur-thread-api-2.1.jar
    james/server/trunk/stage/excalibur-thread/jars/excalibur-thread-impl-2.1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/excalibur-thread-impl-2.1.jar
    james/server/trunk/stage/javax.mail/
    james/server/trunk/stage/javax.mail/jars/
    james/server/trunk/stage/javax.mail/jars/mail-1.4.1ea-SNAPSHOT.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/mail-1.4.1ea-SNAPSHOT.jar
    james/server/trunk/stage/javax.mail/jars/mail.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/mail.LICENSE
    james/server/trunk/stage/jdom/
    james/server/trunk/stage/jdom/jars/
    james/server/trunk/stage/jdom/jars/LICENSE.jdom
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/LICENSE.jdom
    james/server/trunk/stage/jdom/jars/jdom.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/jdom.jar
    james/server/trunk/stage/jmock/
    james/server/trunk/stage/jmock/jars/
    james/server/trunk/stage/jmock/jars/jmock-1.1.0.jar
      - copied unchanged from r516156, james/server/trunk/pheonix-deployment/tools/lib/jmock-1.1.0.jar
    james/server/trunk/stage/junit/
    james/server/trunk/stage/mstor/
    james/server/trunk/stage/mstor/jars/
    james/server/trunk/stage/mstor/jars/mstor.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/mstor.LICENSE
    james/server/trunk/stage/mstor/jars/mstor.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/mstor.jar
    james/server/trunk/stage/mx4j/
    james/server/trunk/stage/mx4j/jars/
    james/server/trunk/stage/mx4j/jars/mx4j-jmx.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/mx4j-jmx.jar
    james/server/trunk/stage/mx4j/jars/mx4j.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/mx4j.LICENSE
    james/server/trunk/stage/org.apache.derby/
    james/server/trunk/stage/org.apache.derby/jars/
    james/server/trunk/stage/org.apache.derby/jars/derby.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/derby.jar
    james/server/trunk/stage/org.apache.james/
    james/server/trunk/stage/org.apache.james/jars/
    james/server/trunk/stage/org.apache.james/jars/jsieve-0.2-SNAPSHOT.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/jsieve-0.2-SNAPSHOT.jar
    james/server/trunk/stage/org.apache.james/jars/jspf-0.9-SNAPSHOT.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/jspf-0.9-SNAPSHOT.jar
    james/server/trunk/stage/org.bouncycastle/
    james/server/trunk/stage/org.bouncycastle/jars/
    james/server/trunk/stage/org.bouncycastle/jars/BouncyCastle.LICENSE
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/BouncyCastle.LICENSE
    james/server/trunk/stage/org.bouncycastle/jars/bcmail-jdk14-129-workaround.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/bcmail-jdk14-129-workaround.jar
    james/server/trunk/stage/org.bouncycastle/jars/bcmail-jdk14-129.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/bcmail-jdk14-129.jar
    james/server/trunk/stage/oro/
    james/server/trunk/stage/oro/jars/
    james/server/trunk/stage/oro/jars/jakarta-oro-2.0.8.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/jakarta-oro-2.0.8.jar
    james/server/trunk/stage/torque/
    james/server/trunk/stage/torque/jars/
    james/server/trunk/stage/torque/jars/torque-3.3-RC1.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/torque-3.3-RC1.jar
    james/server/trunk/stage/village/
    james/server/trunk/stage/village/jars/
    james/server/trunk/stage/village/jars/village-2.0.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/village-2.0.jar
    james/server/trunk/stage/xstream/
    james/server/trunk/stage/xstream/jars/
    james/server/trunk/stage/xstream/jars/LICENSE.xstream
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/LICENSE.xstream
    james/server/trunk/stage/xstream/jars/xstream.jar
      - copied unchanged from r508743, james/server/trunk/pheonix-deployment/lib/xstream.jar
Removed:
    james/server/trunk/pheonix-deployment/default.properties
    james/server/trunk/pheonix-deployment/include.properties
    james/server/trunk/pheonix-deployment/lib/BouncyCastle.LICENSE
    james/server/trunk/pheonix-deployment/lib/LICENSE.commons-logging
    james/server/trunk/pheonix-deployment/lib/LICENSE.jdom
    james/server/trunk/pheonix-deployment/lib/LICENSE.xstream
    james/server/trunk/pheonix-deployment/lib/activation-1.1.jar
    james/server/trunk/pheonix-deployment/lib/activation.LICENSE
    james/server/trunk/pheonix-deployment/lib/avalon-framework-api-4.3.jar
    james/server/trunk/pheonix-deployment/lib/avalon-framework-impl-4.3.jar
    james/server/trunk/pheonix-deployment/lib/avalon-logkit-2.1.jar
    james/server/trunk/pheonix-deployment/lib/bcmail-jdk14-129-workaround.jar
    james/server/trunk/pheonix-deployment/lib/bcmail-jdk14-129.jar
    james/server/trunk/pheonix-deployment/lib/commons-beanutils-1.7.0.jar
    james/server/trunk/pheonix-deployment/lib/commons-collections-3.1.jar
    james/server/trunk/pheonix-deployment/lib/commons-configuration-1.1.jar
    james/server/trunk/pheonix-deployment/lib/commons-dbcp-1.2.1.jar
    james/server/trunk/pheonix-deployment/lib/commons-digester-1.8.jar
    james/server/trunk/pheonix-deployment/lib/commons-lang-2.1.jar
    james/server/trunk/pheonix-deployment/lib/commons-logging.jar
    james/server/trunk/pheonix-deployment/lib/commons-pool-1.2.jar
    james/server/trunk/pheonix-deployment/lib/concurrent-1.3.4.jar
    james/server/trunk/pheonix-deployment/lib/concurrent.LICENSE
    james/server/trunk/pheonix-deployment/lib/cornerstone-connection-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-connection-impl-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-datasources-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-datasources-impl-2.1-patched.README
    james/server/trunk/pheonix-deployment/lib/cornerstone-datasources-impl-2.1-patched.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-scheduler-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-scheduler-impl-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-sockets-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-sockets-impl-2.1-patched.README
    james/server/trunk/pheonix-deployment/lib/cornerstone-sockets-impl-2.1-patched.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-store-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-threads-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/cornerstone-threads-impl-2.1.jar
    james/server/trunk/pheonix-deployment/lib/derby.jar
    james/server/trunk/pheonix-deployment/lib/dnsjava-2.0.3.jar
    james/server/trunk/pheonix-deployment/lib/dnsjava.LICENSE
    james/server/trunk/pheonix-deployment/lib/excalibur-datasource-2.1.jar
    james/server/trunk/pheonix-deployment/lib/excalibur-pool-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/excalibur-pool-impl-2.1.jar
    james/server/trunk/pheonix-deployment/lib/excalibur-thread-api-2.1.jar
    james/server/trunk/pheonix-deployment/lib/excalibur-thread-impl-2.1.jar
    james/server/trunk/pheonix-deployment/lib/jakarta-oro-2.0.8.jar
    james/server/trunk/pheonix-deployment/lib/jdom.jar
    james/server/trunk/pheonix-deployment/lib/jsieve-0.2-SNAPSHOT.jar
    james/server/trunk/pheonix-deployment/lib/jspf-0.9-SNAPSHOT.jar
    james/server/trunk/pheonix-deployment/lib/mail-1.4.1ea-SNAPSHOT.jar
    james/server/trunk/pheonix-deployment/lib/mail.LICENSE
    james/server/trunk/pheonix-deployment/lib/mstor.LICENSE
    james/server/trunk/pheonix-deployment/lib/mstor.jar
    james/server/trunk/pheonix-deployment/lib/mx4j-jmx.jar
    james/server/trunk/pheonix-deployment/lib/mx4j.LICENSE
    james/server/trunk/pheonix-deployment/lib/readme.xml
    james/server/trunk/pheonix-deployment/lib/torque-3.3-RC1.jar
    james/server/trunk/pheonix-deployment/lib/village-2.0.jar
    james/server/trunk/pheonix-deployment/lib/xstream.jar
    james/server/trunk/pheonix-deployment/tools/lib/commons-net-1.4.1.jar
    james/server/trunk/pheonix-deployment/tools/lib/jmock-1.1.0.jar
Modified:
    james/server/trunk/pheonix-deployment/build.xml

Copied: james/server/trunk/default.properties (from r508743, james/server/trunk/pheonix-deployment/default.properties)
URL: http://svn.apache.org/viewvc/james/server/trunk/default.properties?view=diff&rev=516704&p1=james/server/trunk/pheonix-deployment/default.properties&r1=508743&p2=james/server/trunk/default.properties&r2=516704
==============================================================================
--- james/server/trunk/pheonix-deployment/default.properties (original)
+++ james/server/trunk/default.properties Sat Mar 10 05:19:53 2007
@@ -16,6 +16,7 @@
 year=1999-2006
 extension.name=org.apache.james
 vendor=Apache Software Foundation
+vendor.id=org.apache
 
 
 #
@@ -36,7 +37,7 @@
 build.compiler.fulldepend = true
 
 #
-# standard comiler switches
+# standard compiler switches
 #
 
 debug = on
@@ -94,3 +95,33 @@
 #
 #
 
+###################################################################
+#
+# START Defaults for Modular build
+#
+
+
+# Names of important files
+filename.license=LICENSE.txt
+filename.notice=NOTICE.txt
+
+# Follow maven standard layout
+dir.src.java=src/main/java
+dir.src.resources=src/main/resources
+dir.src.conf=src/main/config
+dir.src.test=src/test/java
+dir.src.test-resources=src/test/resources
+dir.build=target
+dir.build.bin=${dir.build}/classes       
+dir.build.test=${dir.build}/test-classes
+dir.build.test-reports=${dir.build}/test-reports
+dir.stage.james=../stage/org.apache.james/jars
+
+vendor.spec=The Apache Software Foundation
+vendor.impl=The Apache Software Foundation
+vendor.impl.id=org.apache
+vendor.impl.title=Apache JAMES Reference Implementation
+
+#
+# END of Defaults for Modular build
+####################################################################

Copied: james/server/trunk/include.properties (from r508743, james/server/trunk/pheonix-deployment/include.properties)
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?view=diff&rev=516704&p1=james/server/trunk/pheonix-deployment/include.properties&r1=508743&p2=james/server/trunk/include.properties&r2=516704
==============================================================================
--- james/server/trunk/pheonix-deployment/include.properties (original)
+++ james/server/trunk/include.properties Sat Mar 10 05:19:53 2007
@@ -14,100 +14,158 @@
 #  third party binary directories
 #
 
-lib.dir = ${james.dir}/lib
+lib.dir = ../stage
 phoenix.dir = phoenix-bin
 
+ 
+#    <dependency>
+#      <path.lib>junit</path.lib>
+#      <artifactId>junit</artifactId>
+#      <version>3.8.1</version>
+#      <scope>test</scope>
+#    </dependency>
+
+
+# --------------------------------------------------
+# Groups
+# --------------------------------------------------
+path.lib.bouncycastle=org.bouncycastle/jars
+path.lib.james=org.apache.james/jars
+path.lib.javamail=javax.mail/jars
+path.lib.avalon=avalon-framework/jars
+path.lib.commonsdbcp=commons-dbcp/jars
+path.lib.commonscollections=commons-collections/jars
+path.lib.cornerstonethreads=cornerstone-threads/jars
+path.lib.cornerstoneconnection=cornerstone-connection/jars
+path.lib.cornerstonesockets=cornerstone-sockets/jars
+path.lib.cornerstonedatasources=cornerstone-datasources/jars
+path.lib.excaliburdatasource=excalibur-datasource/jars
+path.lib.cornerstonescheduler=cornerstone-scheduler/jars
+path.lib.cornerstonestore=cornerstone-store/jars
+path.lib.dns=dnsjava/jars
+path.lib.excaliburthread=excalibur-thread/jars
+path.lib.logkit=avalon-logkit/jars
+path.lib.derby=org.apache.derby/jars
+path.lib.oro=oro/jars
+path.lib.mstor=mstor/jars
+path.lib.xstream=xstream/jars
+path.lib.mx4j=mx4j/jars
+path.lib.torque=torque/jars
+path.lib.excaliburpool=excalibur-pool/jars
+path.lib.concurrent=concurrent/jars
+path.lib.commonslogging=commons-logging/jars
+path.lib.village=village/jars
+path.lib.commonsconfiguration=commons-configuration/jars
+path.lib.commonsbeanutils=commons-beanutils/jars
+path.lib.commonsdigester=commons-digester/jars
+path.lib.jdom=jdom/jars
+path.lib.activation=activation/jars
+path.lib.commonspool=commons-pool/jars
+path.lib.commonslang=commons-lang/jars
+path.lib.commonsnet=commons-net/jars
+path.lib.jmock=jmock/jars
+
 # --------------------------------------------------
 #                REQUIRED LIBRARIES
 # --------------------------------------------------
 
 # ----- Avalon Framework -----
-avalon-framework.jar=avalon-framework-api-4.3.jar
+avalon-framework.jar=${path.lib.avalon}/avalon-framework-api-4.3.jar
 
 # ----- Avalon Framework -----
-avalon-framework-impl.jar=avalon-framework-impl-4.3.jar
+avalon-framework-impl.jar=${path.lib.avalon}/avalon-framework-impl-4.3.jar
 
 # ----- From lib
 
 # ----- Excalibur datasource -----
-excalibur-datasource.jar=excalibur-datasource-2.1.jar
+excalibur-datasource.jar=${path.lib.excaliburdatasource}/excalibur-datasource-2.1.jar
 
 # ----- Javax mail -----
-javax-mail.jar=${javamail.id}.jar
+javax-mail.jar=${path.lib.javamail}/${javamail.id}.jar
 
 # ----- Activation -----
-javax-activation.jar=${activation.id}.jar
+javax-activation.jar=${path.lib.activation}/${activation.id}.jar
 
 # ----- DNS -----
-dns.jar=dnsjava-2.0.3.jar
+dns.jar=${path.lib.dns}/dnsjava-2.0.3.jar
 
 # ----- Commons -----
-commons-dbcp.jar=commons-dbcp-1.2.1.jar
-commons-pool.jar=commons-pool-1.2.jar
-commons-collections.jar=commons-collections-3.1.jar
+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
 
 # ----- Jakarta ORO -----
-jakarta-oro.jar=jakarta-oro-2.0.8.jar
+jakarta-oro.jar=${path.lib.oro}/jakarta-oro-2.0.8.jar
 
 # ----- Cornerstone threads, version 1.0 or later -----
-cornerstone-threads-api.jar=cornerstone-threads-api-2.1.jar
-cornerstone-threads-impl.jar=cornerstone-threads-impl-2.1.jar
+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
 
 # ----- Cornerstone connection, version 1.0 or later -----
-cornerstone-connection-api.jar=cornerstone-connection-api-2.1.jar
-cornerstone-connection-impl.jar=cornerstone-connection-impl-2.1.jar
+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
 
 # ----- Cornerstone masterstore, version 1.0 or later -----
-cornerstone-store-api.jar=cornerstone-store-api-2.1.jar
+cornerstone-store-api.jar=${path.lib.cornerstonestore}/cornerstone-store-api-2.1.jar
 
 # ----- Cornerstone sockets, version 1.0 or later -----
-cornerstone-sockets-api.jar=cornerstone-sockets-api-2.1.jar
-cornerstone-sockets-impl.jar=cornerstone-sockets-impl-2.1-patched.jar
+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
 
 # ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-scheduler-api.jar=cornerstone-scheduler-api-2.1.jar
-cornerstone-scheduler-impl.jar=cornerstone-scheduler-impl-2.1.jar
+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
 
 # ----- Cornerstone scheduler, version 1.0 or later -----
-cornerstone-datasources-api.jar=cornerstone-datasources-api-2.1.jar
-cornerstone-datasources-impl.jar=cornerstone-datasources-impl-2.1-patched.jar
+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
 
 # ----- Excalibur thread, version 1.0 or later -----
-excalibur-thread-api.jar=excalibur-thread-api-2.1.jar
-excalibur-thread-impl.jar=excalibur-thread-impl-2.1.jar
+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
 
 # ----- Excalibur pool -----
-excalibur-pool-api.jar=excalibur-pool-api-2.1.jar
-excalibur-pool-impl.jar=excalibur-pool-impl-2.1.jar
+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=concurrent-1.3.4.jar
+concurrent.jar=${path.lib.concurrent}/concurrent-1.3.4.jar
 
-derby.jar=derby.jar
+derby.jar=${path.lib.derby}/derby.jar
 
-bcmail.jar=bcmail-jdk14-129.jar
-bcmail-workaround.jar=bcmail-jdk14-129-workaround.jar
+bcmail.jar=${path.lib.bouncycastle}/bcmail-jdk14-129.jar
+bcmail-workaround.jar=${path.lib.bouncycastle}/bcmail-jdk14-129-workaround.jar
 
 # ----- jSPF -----
-jspf.jar=jspf-0.9-SNAPSHOT.jar
+jspf.jar=${path.lib.james}/jspf-0.9-SNAPSHOT.jar
 
 # ----- mstor -----
-mstor.jar=mstor.jar
-commons-logging.jar=commons-logging.jar
-jdom.jar=jdom.jar
-xstream.jar=xstream.jar
+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
 
 # ----- torque -----
 
-torque.jar=torque-3.3-RC1.jar
-village.jar=village-2.0.jar
-commons-lang.jar=commons-lang-2.1.jar
-commons-configuration.jar=commons-configuration-1.1.jar
-commons-beanutils.jar=commons-beanutils-1.7.0.jar
+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
 
 # ----- javax.management -----
 
-javax.management=mx4j-jmx.jar
+javax.management=${path.lib.mx4j}/mx4j-jmx.jar
 
 # ----- sieve-----
-jsieve.jar=jsieve-0.2-SNAPSHOT.jar
-commons-digester.jar=commons-digester-1.8.jar
+jsieve.jar=${path.lib.james}/jsieve-0.2-SNAPSHOT.jar
+commons-digester.jar=${path.lib.commonsdigester}/commons-digester-1.8.jar
+
+# ----- Logging
+avalon-logkit.jar=${path.lib.logkit}/avalon-logkit-2.1.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

Modified: james/server/trunk/pheonix-deployment/build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pheonix-deployment/build.xml?view=diff&rev=516704&r1=516703&r2=516704
==============================================================================
--- james/server/trunk/pheonix-deployment/build.xml (original)
+++ james/server/trunk/pheonix-deployment/build.xml Sat Mar 10 05:19:53 2007
@@ -29,10 +29,11 @@
     (and without typing -D each time he compiles it)
     -->
     <property file=".ant.properties"/>
+    <property file="../.ant.properties"/>   
     <property file="${user.home}/.ant.properties"/>
     <property file="check-targets.properties"/>
-    <property file="include.properties"/>
-    <property file="default.properties"/>
+    <property file="../include.properties"/>
+    <property file="../default.properties"/>
 
     <!--
     ===================================================================
@@ -281,7 +282,7 @@
     -->
     <target name="compile" depends="compile-main, compile-proposal"/>
 
-    <target name="compile-main" depends="prepare">
+    <target name="compile-main" depends="prepare"> 
         <echo message="Compiling James Java sources"/>
         <mkdir dir="${build.classes}"/>
         <javac destdir="${build.classes}" debug="${debug}" optimize="${optimize}" deprecation="${deprecation}"
target="${jdk.target}" source="${jdk.source}">
@@ -823,12 +824,22 @@
                                   unit tests
     ===================================================================
     -->
-    <target name="unit-tests-classpath" depends="compile">
+    <target name="unit-tests-classpath" depends="compile">      
         <path id="unittest.class.path">
-            <pathelement location="tools/lib/commons-net-1.4.1.jar"/>
-            <pathelement location="tools/lib/jmock-1.1.0.jar"/>
-            <fileset dir="${lib.dir}">
-                <include name="*.jar"/>
+            <fileset dir="${lib.dir}">    
+                <include name="${commons-net.jar}"/>
+                <include name="${jmock.jar}"/>
+            </fileset>   
+            <fileset dir="${lib.dir}">   
+                <include name="${avalon-logkit.jar}"/>
+                <include name='${excalibur-thread-impl.jar}'/>   
+                <include name='${cornerstone-scheduler-impl.jar}'/> 
+                <include name="${cornerstone-threads-impl.jar}"/>
+                <include name="${cornerstone-sockets-impl.jar}"/>
+                <include name="${cornerstone-datasources-impl.jar}"/> 
+                <include name="${concurrent.jar}"/>
+                <include name='${derby.jar}'/>
+                <include name='${commons-beanutils.jar}'/>   
             </fileset>
         </path>
     </target>

Propchange: james/server/trunk/stage/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Mar 10 05:19:53 2007
@@ -0,0 +1 @@
+



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message