[jboss-cvs] JBossAS SVN: r108957 - trunk/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 27 22:03:01 EDT 2010
Author: smcgowan at redhat.com
Date: 2010-10-27 22:03:01 -0400 (Wed, 27 Oct 2010)
New Revision: 108957
Modified:
trunk/testsuite/build.xml
Log:
JBAS-8551 - minimize tests.classpath so smoke tests will run on Windows
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-10-28 00:35:36 UTC (rev 108956)
+++ trunk/testsuite/build.xml 2010-10-28 02:03:01 UTC (rev 108957)
@@ -210,16 +210,6 @@
<!-- The combined library classpath -->
<path id="library.classpath">
- <!-- apache commons classpath -->
- <fileset refid="commons-collections:commons-collections:jar"/>
- <fileset refid="commons-logging:commons-logging:jar"/>
- <fileset refid="apache-discovery:commons-discovery:jar"/>
- <fileset refid="commons-fileupload:commons-fileupload:jar"/>
- <fileset refid="commons-lang:commons-lang:jar"/>
-
- <fileset refid="commons-httpclient:commons-httpclient:jar"/>
- <fileset refid="commons-codec:commons-codec:jar"/>
- <fileset refid="log4j:log4j:jar"/>
<fileset refid="apache-jaxme:jaxmexs:jar"/>
<fileset refid="org.apache.ws.scout:scout:jar"/>
<fileset refid="xml-resolver:xml-resolver:jar"/>
@@ -240,12 +230,10 @@
-->
<fileset refid="org.jgroups:jgroups:jar"/>
<fileset refid="joesnmp:joesnmp:jar"/>
- <fileset refid="junit:junit:jar"/>
<fileset refid="org.easymock:easymock:jar"/>
<fileset refid="javassist:javassist:jar"/>
<fileset refid="juddi:juddi:jar"/>
<fileset refid="nekohtml:nekohtml:jar"/>
- <fileset refid="objectweb-joramtests:joramtests:jar"/>
<fileset refid="opensaml:opensaml:jar"/>
<fileset refid="oswego-concurrent:concurrent:jar"/>
<fileset refid="sleepycat:je:jar"/>
@@ -302,7 +290,6 @@
<fileset refid="org.jboss.profileservice:jboss-profileservice-persistence:jar"/>
<fileset refid="org.jboss.service.binding:jboss-service-binding-core:jar"/>
<fileset refid="org.jboss.service.binding:jboss-service-binding-mgmt:jar"/>
- <fileset refid="org.jboss.stdio:jboss-stdio:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-hornetq-int:jar"/>
<fileset refid="org.hornetq:hornetq-core-client:jar"/>
<fileset refid="org.hornetq:hornetq-jms-client:jar"/>
@@ -339,10 +326,6 @@
<fileset refid="org.jboss.cl:jboss-classloader:jar"/>
<fileset refid="org.jboss.cl:jboss-classloading:jar"/>
<fileset refid="org.jboss.cl:jboss-classloading-vfs:jar"/>
- <fileset refid="org.jboss.kernel:jboss-aop-mc-int:jar"/>
- <fileset refid="org.jboss.kernel:jboss-dependency:jar"/>
- <fileset refid="org.jboss.kernel:jboss-kernel:jar"/>
- <fileset refid="org.jboss.kernel:jboss-jmx-mc-int:jar"/>
<!-- For classloader leak tests -->
<fileset refid="jboss.profiler.jvmti:jboss-profiler-jvmti:jar"/>
@@ -420,16 +403,6 @@
<fileset refid="org.jboss.jbossas:jboss-as-hibernate-int:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
<path refid="jboss.internal-server.classpath"/>
- <fileset refid="org.jboss.mx:jboss-j2se:jar"/>
- <fileset refid="org.jboss.mx:jboss-jmx:jar"/>
- <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
- <fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
- <fileset refid="org.jboss.mx:jboss-mbeanserver:jar"/>
- <fileset refid="org.jboss:jboss-vfs:jar"/>
- <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca"/>
- <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca-deployer"/>
- <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-local-jdbc"/>
- <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-common-jdbc-wrapper"/>
<fileset refid="org.jboss.jbossas:jboss-as-management:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-management:jar:jsr77"/>
<fileset refid="org.jboss.jbossas:jboss-as-management:jar:jsr77-client"/>
@@ -449,9 +422,9 @@
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-as:jar"/>
<fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar"/>
- <fileset refid="org.jboss.jbossas:jboss-as-system:jar"/>
- <fileset refid="org.jboss.jbossas:jboss-as-system-jmx:jar"/>
- <fileset refid="org.jboss.test:jboss-test:jar"/>
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar"/>
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar"/>
+ <fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar"/>
<path refid="org.jboss.jbossas.tomcat.classpath"/>
<fileset refid="org.jboss.jbossas:jboss-as-varia:jar"/>
<fileset refid="org.jboss.web:jasper-jdt:jar"/>
@@ -483,11 +456,11 @@
<fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="org.jboss.jbossas.tomcat.classpath"/>
- <path refid="thirdparty.classpath"/>
+ <path refid="tests.classpath"/>
</path>
<!-- Classpath to build and run the tests -->
- <path id="tests.classpath">
+ <path id="smoketests.classpath">
<fileset dir="${jboss.dist}/client">
<include name="**/*.jar"/>
<exclude name="jaxws-rt.jar"/>
@@ -499,12 +472,41 @@
<pathelement path="${local.classpath}"/>
<pathelement path="${project.tools}/ant/lib/ant.jar"/>
<pathelement path="${project.tools}/ant/lib/ant-junit.jar"/>
+ <fileset refid="junit:junit:jar"/>
+ <fileset refid="log4j:log4j:jar"/>
+ <fileset refid="org.jboss.stdio:jboss-stdio:jar"/>
+ <fileset refid="commons-collections:commons-collections:jar"/>
+ <fileset refid="commons-logging:commons-logging:jar"/>
+ <fileset refid="apache-discovery:commons-discovery:jar"/>
+ <fileset refid="commons-fileupload:commons-fileupload:jar"/>
+ <fileset refid="commons-lang:commons-lang:jar"/>
+ <fileset refid="commons-codec:commons-codec:jar"/>
+ <fileset refid="commons-httpclient:commons-httpclient:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar"/>
<fileset refid="org.jboss.jbossas:jboss-as-ejb3:jar:client"/>
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-api:jar"/>
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-spi:jar"/>
- <fileset refid="org.jboss.shrinkwrap:shrinkwrap-impl-base:jar"/>
<fileset refid="org.jboss.test:jboss-test:jar"/>
+ <fileset refid="org.jboss.mx:jboss-j2se:jar"/>
+ <fileset refid="org.jboss.mx:jboss-jmx:jar"/>
+ <fileset refid="org.jboss.mx:jboss-jmx-annotations:jar"/>
+ <fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
+ <fileset refid="org.jboss.mx:jboss-mbeanserver:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-system:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-system-jmx:jar"/>
+ <fileset refid="org.jboss:jboss-vfs:jar"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-jca-deployer"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-local-jdbc"/>
+ <fileset refid="org.jboss.jbossas:jboss-as-connector:jar:jboss-common-jdbc-wrapper"/>
+ <fileset refid="objectweb-joramtests:joramtests:jar"/>
+ <fileset refid="org.jboss.kernel:jboss-jmx-mc-int:jar"/>
+ <fileset refid="org.jboss.kernel:jboss-aop-mc-int:jar"/>
+ <fileset refid="org.jboss.kernel:jboss-dependency:jar"/>
+ <fileset refid="org.jboss.kernel:jboss-kernel:jar"/>
+ </path>
+
+<!-- Classpath to build and run the tests -->
+ <path id="tests.classpath">
+ <path refid="smoketests.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -1594,7 +1596,7 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
+ <path refid="smoketests.classpath"/>
</classpath>
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -3750,31 +3752,6 @@
<server:stop name="cluster-tcp-0"/>
<server:stop name="cluster-tcp-1"/>
- <!-- Test the field UDP stack -->
- <antcall target="tests-clustering-field-configure" inheritRefs="true">
- <param name="cluster.includes.refid" value="cluster.field.includes"/>
- <param name="jboss-junit-configuration" value="udp"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-udp-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-udp-1"/>
- </antcall>
-
- <server:start name="cluster-field-udp-0"/>
- <server:start name="cluster-field-udp-1"/>
- <server:stop name="cluster-field-udp-0"/>
- <server:stop name="cluster-field-udp-1"/>
- <!-- Test the field TCP stack -->
- <antcall target="tests-clustering-field-configure" inheritRefs="true">
- <param name="cluster.includes.refid" value="cluster.field.includes"/>
- <param name="jboss-junit-configuration" value="tcp"/>
- <param name="jbosstest.cluster.node0.config" value="cluster-field-tcp-0"/>
- <param name="jbosstest.cluster.node1.config" value="cluster-field-tcp-1"/>
- </antcall>
-
- <server:start name="cluster-field-tcp-0"/>
- <server:start name="cluster-field-tcp-1"/>
- <server:stop name="cluster-field-tcp-0"/>
- <server:stop name="cluster-field-tcp-1"/>
-
<!-- Create the sso enabled tomcat config starting with the all config -->
<create-cluster-sso-node newconf="tomcat-sso-cluster0"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster1"/>
More information about the jboss-cvs-commits
mailing list