svn commit: r14261 - branches/work_issue4625_dthompson/src/argouml-app: . src

Author: dthompson
Date: 2008-03-29 16:17:22-0700
New Revision: 14261

Removed:
   branches/work_issue4625_dthompson/src/argouml-app/src/build.xml
Modified:
   branches/work_issue4625_dthompson/src/argouml-app/build.xml

Log:
Updated build.xml files to make junit tests work.

Junit tests now seem to compile and run ok, but there's an error while generating the reports.

Modified: branches/work_issue4625_dthompson/src/argouml-app/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-app/build.xml?view=diff&rev=14261&p1=branches/work_issue4625_dthompson/src/argouml-app/build.xml&p2=branches/work_issue4625_dthompson/src/argouml-app/build.xml&r1=14260&r2=14261
==============================================================================
--- branches/work_issue4625_dthompson/src/argouml-app/build.xml	(original)
+++ branches/work_issue4625_dthompson/src/argouml-app/build.xml	2008-03-29 16:17:22-0700
@@ -72,25 +72,25 @@
       <path refid="src.compile.classpath"/>
       <!-- only one of the following will be used at a time -->
       <!-- we put them together because there's little risk of crosstalk -->
-      <fileset dir="../model-mdr/build/">
+      <fileset dir="../argouml-core-model-mdr/build/">
         <include name="*.jar"/>
       </fileset>
-      <fileset dir="../model-euml/build/">
+      <fileset dir="../argouml-core-model-euml/build/">
         <include name="*.jar"/>
       </fileset>
     </path>
 
     <path id="tests.compile.classpath">
       <pathelement location="${build.classes}"/>
-      <pathelement location="../../tools/junit-3.8.2/junit.jar"/>
-      <pathelement location="../../tools/lib/easymock12.jar"/>
-      <pathelement location="../../tools/jdepend-2.9/lib/jdepend-2.9.jar"/>
+      <pathelement location="../argouml-core-tools/junit-3.8.2/junit.jar"/>
+      <pathelement location="../argouml-core-tools/lib/easymock12.jar"/>
+      <pathelement location="../argouml-core-tools/jdepend-2.9/lib/jdepend-2.9.jar"/>
       <path refid="src.compile.classpath"/>
     </path>
 
     <path id="tests.run.classpath">
       <path refid="tests.compile.classpath"/>
-      <fileset dir="../model-mdr/build/">
+      <fileset dir="../argouml-core-model-mdr/build/">
         <include name="*.jar"/>
       </fileset>
     </path>
@@ -463,8 +463,8 @@
            fork="yes" dir="${basedir}" forkmode="perTest"
            haltonfailure="false"
            maxmemory="48M" printsummary="${junit.printsummary}">
-      <sysproperty key="test.model.uml" 
-            value="../model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml"/>
+      <sysproperty key="test.model.uml"
+            value="../argouml-core-model-mdr/src/org/argouml/model/mdr/mof/01-02-15.xml"/>
       <sysproperty key="argouml.model.implementation" 
             value="${test.model.implementation}"/>
       <sysproperty key="log4j.configuration" value="org/argouml/resource/default.lcf"/>

Removed: branches/work_issue4625_dthompson/src/argouml-app/src/build.xml
Url: http://argouml.tigris.org/source/browse/argouml/branches/work_issue4625_dthompson/src/argouml-app/src/build.xml?view=auto&rev=14260