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

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

Revision: 3494
          http://svn.sourceforge.net/smartfrog/?rev=3494&view=rev
Author:   steve_l
Date:     2006-10-17 14:46:38 -0700 (Tue, 17 Oct 2006)

Log Message:
-----------
finishing the moving around of listeners

Modified Paths:
--------------
    trunk/core/components/junit/build.xml
    trunk/core/components/junit/src/org/smartfrog/services/junit/AbstractTestSuite.java
    trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/components.sf
    trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/html/components.sf
    trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/xml/components.sf

Modified: trunk/core/components/junit/build.xml
===================================================================
--- trunk/core/components/junit/build.xml	2006-10-17 21:40:38 UTC (rev 3493)
+++ trunk/core/components/junit/build.xml	2006-10-17 21:46:38 UTC (rev 3494)
@@ -28,6 +28,8 @@
   </description>
   <!--we are a component -->
   <property name="is.component" value="true"/>
+  <!--java 1.5-->
+  <property name="javac.java.version" value="1.5" />
 
   <!-- override point -->
   <property file="build.properties"/>

Modified: trunk/core/components/junit/src/org/smartfrog/services/junit/AbstractTestSuite.java
===================================================================
--- trunk/core/components/junit/src/org/smartfrog/services/junit/AbstractTestSuite.java	2006-10-17 21:40:38 UTC (rev 3493)
+++ trunk/core/components/junit/src/org/smartfrog/services/junit/AbstractTestSuite.java	2006-10-17 21:46:38 UTC (rev 3494)
@@ -19,8 +19,6 @@
  */
 package org.smartfrog.services.junit;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.smartfrog.sfcore.common.SmartFrogException;
 import org.smartfrog.sfcore.prim.Prim;
 import org.smartfrog.sfcore.prim.PrimImpl;
@@ -36,7 +34,6 @@
 
 public abstract class AbstractTestSuite extends PrimImpl implements TestSuite {
 
-    private static final Log log= LogFactory.getLog(AbstractTestSuite.class);
 
     private static final ThreadLocal<RunnerConfiguration> configurationContext =new ThreadLocal<RunnerConfiguration>();
 
@@ -73,7 +70,7 @@
         if (overwriting) {
             //warn that something got overwritten. It is probably harmless, but can
             //cause interesting behaviour
-            log.info("Overwriting an existing thread-local configuration context.\n"
+            sfLog().info("Overwriting an existing thread-local configuration context.\n"
                 +"Multiple thread runners may be active in the same thread\n"
                 +"or the tests are themselves deploying tests.");
         }

Modified: trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/components.sf
===================================================================
--- trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/components.sf	2006-10-17 21:40:38 UTC (rev 3493)
+++ trunk/core/components/junit/src/org/smartfrog/services/junit/junit3/components.sf	2006-10-17 21:46:38 UTC (rev 3494)
@@ -30,7 +30,7 @@
    * package tree with the matching pattern, and/or the named class
    */
   JUnit3TestSuite extends PackagedTestSuite {
-      sfClass "org.smartfrog.services.junit.junit3.JUnitTestSuiteImpl";
+      sfClass "org.smartfrog.services.junit.junit3.JUnit3TestSuiteImpl";
   }
   
   

Modified: trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/html/components.sf
===================================================================
--- trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/html/components.sf	2006-10-17 21:40:38 UTC (rev 3493)
+++ trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/html/components.sf	2006-10-17 21:46:38 UTC (rev 3494)
@@ -68,7 +68,7 @@
  * to a location
  */
 HtmlTestListener extends XmlListener {
-    sfClass "org.smartfrog.services.junit.listeners.HtmlTestListenerComponent";
+    sfClass "org.smartfrog.services.junit.listeners.html.HtmlTestListenerComponent";
     xmlListenerSchema extends XmlListenerSchema;
     htmlTestListenerSchema extends HtmlTestListenerSchema;
     name "HtmlTestListener";
@@ -76,7 +76,7 @@
     indexFile "index.html";
     publishFrequency 30;
     title "Test Statistics";
-    cssResource "/org/smartfrog/services/junit/listeners/report.css";
+    cssResource "/org/smartfrog/services/junit/listeners/html/report.css";
 }
 
 
@@ -84,12 +84,12 @@
 }
 
 HtmlTestIndex extends XmlTestIndex {
-    sfClass "org.smartfrog.services.junit.listeners.HtmlTestIndexImpl";
+    sfClass "org.smartfrog.services.junit.listeners.html.HtmlTestIndexImpl";
     htmlTestIndexSchema extends HtmlTestIndexSchema ;
     indexFile "index.html";
     publishFrequency 30;
     title "Test Statistics";
-    cssResource "/org/smartfrog/services/junit/listeners/report.css";
+    cssResource HtmlTestListener:cssResource;
 }
 
 

Modified: trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/xml/components.sf
===================================================================
--- trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/xml/components.sf	2006-10-17 21:40:38 UTC (rev 3493)
+++ trunk/core/components/junit/src/org/smartfrog/services/junit/listeners/xml/components.sf	2006-10-17 21:46:38 UTC (rev 3494)
@@ -57,7 +57,7 @@
 
 XmlListener extends TestListener {
     xmlListenerSchema extends XmlListenerSchema;
-    sfClass "org.smartfrog.services.junit.listeners.XmlListenerComponent";
+    sfClass "org.smartfrog.services.junit.listeners.xml.XmlListenerComponent";
     useHostname true;
     useProcessname false;
     suffix ".xml";


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