svn commit: r521167 - in /james/server/trunk: build-tools/base-build.xml default.properties include.properties stage/junit/jars/ stage/junit/jars/junit.jar stage/junit/junit.jar

[ba...@apache.org]

Author: bago
Date: Thu Mar 22 02:30:54 2007
New Revision: 521167

URL: http://svn.apache.org/viewvc?view=rev&rev=521167
Log:
Removed trailing spaces from classes property (it didn't compile modules).
Moved junit jar to the correct "jars" folder.
Added junit.jar to the test classpath so that running tests doesn't need junit in ant folder anymore.

Added:
    james/server/trunk/stage/junit/jars/
    james/server/trunk/stage/junit/jars/junit.jar   (contents, props changed)
      - copied, changed from r520934, james/server/trunk/stage/junit/junit.jar
Removed:
    james/server/trunk/stage/junit/junit.jar
Modified:
    james/server/trunk/build-tools/base-build.xml
    james/server/trunk/default.properties
    james/server/trunk/include.properties

Modified: james/server/trunk/build-tools/base-build.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/build-tools/base-build.xml?view=diff&rev=521167&r1=521166&r2=521167
==============================================================================
--- james/server/trunk/build-tools/base-build.xml (original)
+++ james/server/trunk/build-tools/base-build.xml Thu Mar 22 02:30:54 2007
@@ -184,6 +184,7 @@
             <path id='classpath.base.test'>  
                 <path refid='classpath.base'/>
                 <fileset dir="${lib.dir}">    
+                    <include name="${junit.jar}"/>
                     <include name="${commons-net.jar}"/>
                     <include name="${jmock.jar}"/>
                 </fileset>   

Modified: james/server/trunk/default.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/default.properties?view=diff&rev=521167&r1=521166&r2=521167
==============================================================================
--- james/server/trunk/default.properties (original)
+++ james/server/trunk/default.properties Thu Mar 22 02:30:54 2007
@@ -112,7 +112,7 @@
 dir.src.test=src/test/java
 dir.src.test-resources=src/test/resources
 dir.build=target
-dir.build.bin=${dir.build}/classes       
+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

Modified: james/server/trunk/include.properties
URL: http://svn.apache.org/viewvc/james/server/trunk/include.properties?view=diff&rev=521167&r1=521166&r2=521167
==============================================================================
--- james/server/trunk/include.properties (original)
+++ james/server/trunk/include.properties Thu Mar 22 02:30:54 2007
@@ -64,6 +64,7 @@
 path.lib.commonslang=commons-lang/jars
 path.lib.commonsnet=commons-net/jars
 path.lib.jmock=jmock/jars
+path.lib.junit=junit/jars
 
 # --------------------------------------------------
 #                REQUIRED LIBRARIES
@@ -84,11 +85,13 @@
 excalibur-datasource.jar=${path.lib.excaliburdatasource}/${jarname.excalibur-datasource.jar}
 
 # ----- Javax mail -----
-jarname.javax-mail.jar=${javamail.id}.jar
+#jarname.javax-mail.jar=${javamail.id}.jar
+jarname.javax-mail.jar=mail-1.4.1ea-SNAPSHOT.jar
 javax-mail.jar=${path.lib.javamail}/${jarname.javax-mail.jar}
 
 # ----- Activation -----
-jarname.javax-activation.jar=${activation.id}.jar
+#jarname.javax-activation.jar=${activation.id}.jar
+jarname.javax-activation.jar=activation-1.1.jar
 javax-activation.jar=${path.lib.activation}/${jarname.javax-activation.jar}
 
 # ----- DNS -----
@@ -213,3 +216,5 @@
 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}
+jarname.junit.jar=junit.jar
+junit.jar=${path.lib.junit}/${jarname.junit.jar}

Copied: james/server/trunk/stage/junit/jars/junit.jar (from r520934, james/server/trunk/stage/junit/junit.jar)
URL: http://svn.apache.org/viewvc/james/server/trunk/stage/junit/jars/junit.jar?view=diff&rev=521167&p1=james/server/trunk/stage/junit/junit.jar&r1=520934&p2=james/server/trunk/stage/junit/jars/junit.jar&r2=521167
==============================================================================
Binary files - no diff available.

Propchange: james/server/trunk/stage/junit/jars/junit.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



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