[Smartfrog-checkins] SF.net SVN: smartfrog: [4685] trunk/core/components/junit

[<st...@us...>]

Revision: 4685
          http://svn.sourceforge.net/smartfrog/?rev=4685&view=rev
Author:   steve_l
Date:     2007-07-16 08:02:54 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
SFOS-280: xunit and junit components don't run their published target when core/ant runs published. 
SFOS-101 database and junit/xunit builds dont create source or documentation artifacts
-Moving from mixin based builds to common.xml

Modified Paths:
--------------
    trunk/core/components/junit/build.xml
    trunk/core/components/junit/ivy.xml

Modified: trunk/core/components/junit/build.xml
===================================================================
--- trunk/core/components/junit/build.xml	2007-07-16 14:41:14 UTC (rev 4684)
+++ trunk/core/components/junit/build.xml	2007-07-16 15:02:54 UTC (rev 4685)
@@ -34,35 +34,29 @@
   <property file="build.properties"/>
   <property name="javac.java.version" value="1.5"/>
   <property name="is.component" value="true"/>
+  <property name="ivy.enabled" value="true"/>
   <property name="system.tests" value="true"/>
 
   <property name="root.dir" location="../.."/>
-  <property name="antbuild.dir" location="${root.dir}/antbuild"/>
-  <property name="xml.dir" location="${antbuild.dir}/xml"/>
 
+  <echo message="==================================================================="/>
+  <echo message="= ${ant.project.name}"/>
 
   <!-- Import common stuff -->
-  <import file="${xml.dir}/gui.xml"/>
-  <import file="${xml.dir}/ivy-mixin.xml"/>
-  <import file="${xml.dir}/dist.xml"/>
-  <import file="${xml.dir}/systemtest.xml"/>
-  <import file="${xml.dir}/state.xml"/>
+  <import file="${root.dir}/common.xml"/>
 
-  <!---->
-  <target name="default" depends="published"/>
-
-
-  <target name="init" depends="core.init">
-    <echo message="==================================================================="/>
-    <echo message="= ${ant.project.name}"/>
-  </target>
-
-  <target name="system-tests" depends="ready-to-system-test"
-      if="system.tests.enabled"
-      description="run the system tests if system.tests.enabled is set">
-    <core:system-test>
+  <!-- ========================================================== -->
+  <!-- this is an override point -->
+  <!-- system tests : anything that is tested on a live daemon
+       not to be run on public machines for
+       security reasons, unless security is active-->
+  <!-- ========================================================== -->
+  <target name="system-tests" if="system.tests.enabled"
+      depends="ready-to-test"
+      description="run the system tests">
+    <sf-system-test>
       <test>
-        <core:system-test-junit>
+        <sf-system-test-junit>
           <batchtest todir="${test.data.dir}" unless="testcase">
             <fileset dir="${test.classes.dir}">
               <include name="org/smartfrog/**/test/*Test.class"/>
@@ -71,12 +65,10 @@
               <exclude name="org/smartfrog/**/test/targets/*Test.class"/>
             </fileset>
           </batchtest>
-        </core:system-test-junit>
-        <core:system-test-validate />
+        </sf-system-test-junit>
+        <sf-system-test-validate/>
       </test>
-    </core:system-test>
+    </sf-system-test>
   </target>
 
-
-
 </project>

Modified: trunk/core/components/junit/ivy.xml
===================================================================
--- trunk/core/components/junit/ivy.xml	2007-07-16 14:41:14 UTC (rev 4684)
+++ trunk/core/components/junit/ivy.xml	2007-07-16 15:02:54 UTC (rev 4685)
@@ -59,6 +59,6 @@
     <dependency org="junit"
         name="junit"
         rev="${junit.version}"
-        conf="compile->master;redist->default"/>
+        conf="compile->default;redist->default"/>
   </dependencies>
 </ivy-module>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.