You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2011/05/23 18:10:48 UTC

svn commit: r1126563 - in /commons/proper/scxml/branches/J6: ./ src/main/java/org/apache/commons/scxml/model/ src/test/java/org/apache/commons/scxml/ src/test/java/org/apache/commons/scxml/env/ src/test/java/org/apache/commons/scxml/env/faces/ src/test...

Author: sebb
Date: Mon May 23 16:10:47 2011
New Revision: 1126563

URL: http://svn.apache.org/viewvc?rev=1126563&view=rev
Log:
Drop the aggregate test suites

Removed:
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/AllSCXMLTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/SCXMLTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/EnvTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/faces/EnvFacesTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/javascript/EnvJavaScriptTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jexl/EnvJexlTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/jsp/EnvJspTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/rhino/EnvRhinoTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/servlet/EnvServletTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/env/xpath/EnvXPathTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/invoke/InvokeTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/io/IOTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/issues/IssuesTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/ModelTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/semantics/SemanticsTestSuite.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/test/TestingTestSuite.java
Modified:
    commons/proper/scxml/branches/J6/pom.xml
    commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Send.java
    commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/Hello.java

Modified: commons/proper/scxml/branches/J6/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/pom.xml?rev=1126563&r1=1126562&r2=1126563&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/pom.xml (original)
+++ commons/proper/scxml/branches/J6/pom.xml Mon May 23 16:10:47 2011
@@ -212,6 +212,8 @@
     <commons.rc.version>RC1</commons.rc.version>
     <commons.jira.id>SCXML</commons.jira.id>
     <commons.jira.pid>12310492</commons.jira.pid>
+    <!-- Allow override of the logging level -->
+    <simplelog.defaultlog>fatal</simplelog.defaultlog>
   </properties> 
 
   <build>
@@ -231,28 +233,10 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <includes>
-            <include>org/apache/commons/scxml/SCXMLTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/EnvTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/faces/EnvFacesTestSuite.java</include>
-            <!-- Avoid bug in Surefire 2.4.3 which stops when java is found in a directory name -->
-            <include>org/apache/commons/scxml/env/j*avascript/EnvJavaScriptTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/jexl/EnvJexlTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/jsp/EnvJspTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/rhino/EnvRhinoTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/servlet/EnvServletTestSuite.java</include>
-            <include>org/apache/commons/scxml/env/xpath/EnvXPathTestSuite.java</include>
-            <include>org/apache/commons/scxml/invoke/InvokeTestSuite.java</include>
-            <include>org/apache/commons/scxml/io/IOTestSuite.java</include>
-            <include>org/apache/commons/scxml/issues/IssuesTestSuite.java</include>
-            <include>org/apache/commons/scxml/model/ModelTestSuite.java</include>
-            <include>org/apache/commons/scxml/semantics/SemanticsTestSuite.java</include>
-            <include>org/apache/commons/scxml/test/TestingTestSuite.java</include>
-          </includes>
           <systemPropertyVariables>
             <!-- Suppress most logging output -->
             <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
-            <org.apache.commons.logging.simplelog.defaultlog>fatal</org.apache.commons.logging.simplelog.defaultlog>
+            <org.apache.commons.logging.simplelog.defaultlog>${simplelog.defaultlog}</org.apache.commons.logging.simplelog.defaultlog>
           </systemPropertyVariables>
         </configuration>
       </plugin>

Modified: commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Send.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Send.java?rev=1126563&r1=1126562&r2=1126563&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Send.java (original)
+++ commons/proper/scxml/branches/J6/src/main/java/org/apache/commons/scxml/model/Send.java Mon May 23 16:10:47 2011
@@ -240,7 +240,7 @@ public class Send extends Action impleme
     /**
      * Set the target type for this &lt;send&gt; element.
      *
-     * @param type The type to set.
+     * @param targettype The type to set.
      * @deprecated Use {@link #setType(String)} instead.
      */
     public final void setTargettype(final String targettype) {

Modified: commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/Hello.java
URL: http://svn.apache.org/viewvc/commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/Hello.java?rev=1126563&r1=1126562&r2=1126563&view=diff
==============================================================================
--- commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/Hello.java (original)
+++ commons/proper/scxml/branches/J6/src/test/java/org/apache/commons/scxml/model/Hello.java Mon May 23 16:10:47 2011
@@ -60,9 +60,6 @@ public class Hello extends Action {
         this.name = name;
     }
 
-    /**
-     * @inheritDoc
-     */
     @Override
     public void execute(final EventDispatcher evtDispatcher,
             final ErrorReporter errRep, final SCInstance scInstance,