Author: robbie
Date: Wed Apr  4 16:15:04 2012
New Revision: 1309476

URL: http://svn.apache.org/viewvc?rev=1309476&view=rev
Log:
QPID-3929: remove old perftests + integrationtests + junit-toolkit modules and 
associated files

Removed:
    qpid/trunk/qpid/java/bdbstore/etc/
    qpid/trunk/qpid/java/integrationtests/
    qpid/trunk/qpid/java/junit-toolkit/
    qpid/trunk/qpid/java/perftests/
    qpid/trunk/qpid/java/systests/etc/bin/testclients.sh
    
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/exchange/MessagingTestConfigProperties.java
    qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/
    
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/close/CloseBeforeAckTest.java
Modified:
    qpid/trunk/qpid/java/bdbstore/build.xml
    qpid/trunk/qpid/java/build.deps
    qpid/trunk/qpid/java/build.xml
    qpid/trunk/qpid/java/systests/build.xml

Modified: qpid/trunk/qpid/java/bdbstore/build.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/build.xml?rev=1309476&r1=1309475&r2=1309476&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/build.xml Wed Apr  4 16:15:04 2012
@@ -18,7 +18,7 @@
  -->
 <project name="bdbstore" default="build">
     <property name="module.depends" value="common broker" />
-    <property name="module.test.depends" value="test client common/test 
broker/test management/common perftests systests" />
+    <property name="module.test.depends" value="test client common/test 
broker/test management/common systests" />
     <property name="module.genpom" value="true"/>
 
     <import file="../module.xml" />

Modified: qpid/trunk/qpid/java/build.deps
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1309476&r1=1309475&r2=1309476&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Wed Apr  4 16:15:04 2012
@@ -59,8 +59,7 @@ broker.libs=${commons-cli} ${commons-log
 
 broker-plugins.libs=${felix.libs} ${log4j} ${commons-configuration.libs}
 
-junit-toolkit.libs=${log4j} ${junit} ${slf4j-api} ${mockito-all}
-test.libs=${slf4j-log4j} ${junit-toolkit.libs}
+test.libs=${slf4j-log4j} ${log4j} ${junit} ${slf4j-api} ${mockito-all}
 
 ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
 ecl-core-jface=lib/org.eclipse.jface_3.4.1.M20080827-2000.jar

Modified: qpid/trunk/qpid/java/build.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=1309476&r1=1309475&r2=1309476&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Wed Apr  4 16:15:04 2012
@@ -26,9 +26,9 @@
   <findSubProjects name="client-plugins" dir="client-plugins"/>
   <findSubProjects name="management" dir="management" 
excludes="common,example"/>
 
-  <property name="modules.core"       value="junit-toolkit common 
management/common broker client tools"/>
+  <property name="modules.core"       value="common management/common broker 
client tools"/>
   <property name="modules.examples"   value="client/example 
management/example"/>
-  <property name="modules.tests"      value="systests perftests 
integrationtests"/>
+  <property name="modules.tests"      value="systests"/>
   <property name="modules.management" value="${management}"/>
   <property name="modules.plugin"     value="${broker-plugins} 
${client-plugins}"/>
   <property name="modules.opt"        value=""/>

Modified: qpid/trunk/qpid/java/systests/build.xml
URL: 
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/build.xml?rev=1309476&r1=1309475&r2=1309476&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/build.xml (original)
+++ qpid/trunk/qpid/java/systests/build.xml Wed Apr  4 16:15:04 2012
@@ -27,7 +27,7 @@ nn - or more contributor license agreeme
         </and>
     </condition>
 
-    <property name="module.depends" value="client management/common broker 
broker/test common common/test junit-toolkit jca ${systests.optional.depends}"/>
+    <property name="module.depends" value="client management/common broker 
broker/test common common/test jca ${systests.optional.depends}"/>
     <property name="module.test.src" location="src/main/java"/>
     <property name="module.test.excludes"
               value="**/DropInTest.java,**/TestClientControlledTest.java"/>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to