svn commit: r1311221 - in /ofbiz/trunk: ./ framework/base/config/ framework/base/lib/ framework/base/src/org/ofbiz/base/container/

[jacopoc]

Author: jacopoc
Date: Mon Apr  9 13:37:18 2012
New Revision: 1311221

URL: http://svn.apache.org/viewvc?rev=1311221&view=rev
Log:
Upgrade to the latest version of JUnit (4.10).

Added:
    ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar   (with props)
Removed:
    ofbiz/trunk/framework/base/lib/junit.jar
    ofbiz/trunk/framework/base/lib/junitperf.jar
    ofbiz/trunk/framework/base/src/org/ofbiz/base/container/JunitContainer.java
Modified:
    ofbiz/trunk/.classpath
    ofbiz/trunk/LICENSE
    ofbiz/trunk/framework/base/config/test-containers.xml

Modified: ofbiz/trunk/.classpath
URL: http://svn.apache.org/viewvc/ofbiz/trunk/.classpath?rev=1311221&r1=1311220&r2=1311221&view=diff
==============================================================================
--- ofbiz/trunk/.classpath (original)
+++ ofbiz/trunk/.classpath Mon Apr  9 13:37:18 2012
@@ -43,8 +43,7 @@
     <classpathentry kind="lib" path="framework/base/lib/jdom-1.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/jpim-0.1.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/juel-2.2.1.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/junit.jar"/>
-    <classpathentry kind="lib" path="framework/base/lib/junitperf.jar"/>
+    <classpathentry kind="lib" path="framework/base/lib/junit-dep-4.10.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/log4j-1.2.16.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/mail.jar"/>
     <classpathentry kind="lib" path="framework/base/lib/mx4j-3.0.1.jar"/>

Modified: ofbiz/trunk/LICENSE
URL: http://svn.apache.org/viewvc/ofbiz/trunk/LICENSE?rev=1311221&r1=1311220&r2=1311221&view=diff
==============================================================================
--- ofbiz/trunk/LICENSE (original)
+++ ofbiz/trunk/LICENSE Mon Apr  9 13:37:18 2012
@@ -461,7 +461,6 @@ ofbiz/trunk/framework/base/lib/httpunit.
 ofbiz/trunk/framework/base/lib/ical4j-1.0-rc2.jar
 ofbiz/trunk/lib/build/javacc/javacc.jar (5.0)
 ofbiz/trunk/framework/base/lib/javolution-5.4.3.jar
-ofbiz/trunk/framework/base/lib/junitperf.jar
 ofbiz/trunk/framework/base/lib/xpp3_min-1.1.4c.jar
 ofbiz/trunk/framework/base/lib/xstream-1.3.1.jar
 ofbiz/trunk/framework/base/lib/owasp-esapi-full-java-1.4.jar
@@ -1010,7 +1009,7 @@ Common Public License:
 ofbiz/trunk/specialpurpose/pos/lib/jcl.jar
 ofbiz/trunk/specialpurpose/pos/lib/jpos18-controls.jar
 ofbiz/trunk/framework/service/lib/wsdl4j.jar
-ofbiz/trunk/framework/base/lib/junit.jar
+ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar
 =========================================================================
 Common Public License Version 1.0
 

Modified: ofbiz/trunk/framework/base/config/test-containers.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/config/test-containers.xml?rev=1311221&r1=1311220&r2=1311221&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/config/test-containers.xml (original)
+++ ofbiz/trunk/framework/base/config/test-containers.xml Mon Apr  9 13:37:18 2012
@@ -226,12 +226,5 @@ under the License.
         </property>
     </container>
 
-    <!-- load JUnit test container -->
-    <!-- this is now run through the new testtools stuff
-    <container name="junit-container" class="org.ofbiz.base.container.JunitContainer">
-        <property name="base-test" value="org.ofbiz.base.test.BaseUnitTests"/>
-    </container>
-    -->
-
     <container name="testtools-container" class="org.ofbiz.testtools.TestRunContainer"/>
 </ofbiz-containers>

Added: ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar?rev=1311221&view=auto
==============================================================================
Binary file - no diff available.

Propchange: ofbiz/trunk/framework/base/lib/junit-dep-4.10.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream