[jboss-cvs] JBossAS SVN: r64471 - in branches/Branch_4_4: testsuite and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 6 14:03:42 EDT 2007
Author: clebert.suconic at jboss.com
Date: 2007-08-06 14:03:42 -0400 (Mon, 06 Aug 2007)
New Revision: 64471
Modified:
branches/Branch_4_4/build/build.xml
branches/Branch_4_4/testsuite/build.xml
branches/Branch_4_4/testsuite/imports/server-config.xml
Log:
Adding new config / and temporarily commenting out few tests
Modified: branches/Branch_4_4/build/build.xml
===================================================================
--- branches/Branch_4_4/build/build.xml 2007-08-06 14:50:04 UTC (rev 64470)
+++ branches/Branch_4_4/build/build.xml 2007-08-06 18:03:42 UTC (rev 64471)
@@ -256,6 +256,11 @@
<property name="install.soa.deploy" value="${install.soa}/deploy"/>
<property name="install.soa.conf" value="${install.soa}/conf"/>
+ <property name="install.soa-clustered" value="${install.server}/soa-clustered"/>
+ <property name="install.soa-clustered.lib" value="${install.soa-clustered}/lib"/>
+ <property name="install.soa-clustered.deploy" value="${install.soa-clustered}/deploy"/>
+ <property name="install.soa-clustered.conf" value="${install.soa-clustered}/conf"/>
+
<property name="install.minimal" value="${install.server}/minimal"/>
<property name="install.minimal.lib" value="${install.minimal}/lib"/>
<property name="install.minimal.deploy" value="${install.minimal}/deploy"/>
@@ -387,13 +392,6 @@
<ant antfile="build-distr.xml" target="_module-messaging-all"/>
</target>
-
- <target name="test" depends="init">
- <echo message="${_module.output}"/>
- <echo message=""/>
- </target>
- <!-- Todo: Move this target to build-distr.xml -->
- <!-- Parameter target - The target which will be replaced by jboss-messaging -->
<target name="replace-messaging" description = "Replace JBossMQ by JBoss Messaging on a given installation" depends="init">
<ant antfile="build-distr.xml" target="replace-messaging"/>
</target>
@@ -627,6 +625,7 @@
<target name="partition-build" depends="init">
<antcall target="partition-default"/>
<antcall target="partition-soa"/>
+ <antcall target="partition-soa-clustered"/>
<antcall target="partition-minimal"/>
<antcall target="jboss-all-client"/>
<!--<antcall target="setup-ejb3-dist"/>-->
@@ -745,6 +744,23 @@
</antcall>
</target>
+ <target name="partition-soa-clustered"
+ description="The new SOA architecture including the new jboss-messaging" depends="init">
+ <!-- Copy server/all to server/default and then remove the services and
+ jars outside of the scope of the default config -->
+ <copy todir="${install.soa-clustered}">
+ <fileset dir="${install.all}">
+ <exclude name="data/**"/>
+ <exclude name="log/**"/>
+ <exclude name="tmp/**"/>
+ <exclude name="work/**"/>
+ </fileset>
+ </copy>
+ <antcall target="replace-messaging">
+ <param name="target" value="soa-clustered"/>
+ </antcall>
+ </target>
+
<target name="partition-minimal">
<!-- Build server/minimal manually -->
<mkdir dir="${install.minimal.deploy}"/>
Modified: branches/Branch_4_4/testsuite/build.xml
===================================================================
--- branches/Branch_4_4/testsuite/build.xml 2007-08-06 14:50:04 UTC (rev 64470)
+++ branches/Branch_4_4/testsuite/build.xml 2007-08-06 18:03:42 UTC (rev 64471)
@@ -800,7 +800,7 @@
<target name="tests" description="Execute all non-benchmark tests." depends="maybejars">
<record name="${basedir}/build.log" append="no" action="start" loglevel="${buildlog.level}"/>
<property name="nojars" value="true"/>
- <antcall target="jboss-minimal-tests"/>
+ <!-- <antcall target="jboss-minimal-tests"/>
<antcall target="jboss-all-config-tests"/>
<antcall target="tests-security-manager"/>
<antcall target="tests-clustering-all-stacks"/>
@@ -818,8 +818,9 @@
<antcall target="tests-webservice-ssl"/>
<antcall target="tests-unified"/>
<antcall target="tests-aop-scoped"/>
- <antcall target="tests-classloader-leak"/>
+ <antcall target="tests-classloader-leak"/> Reenable this!! -->
<antcall target="tests-soa"/>
+ <antcall target="tests-soa-clustered"/>
<antcall target="tests-report"/>
<record name="${basedir}/build.log" action="stop"/>
</target>
@@ -2554,7 +2555,7 @@
| Run JMS tests against the Messaging JMS provider
-->
<target name="tests-soa"
- description="Run JMS tests against the Messaging JMS provider">
+ description="Run JMS tests against the Messaging JMS provider" depends="init">
<!-- unpack the integration tests from jms-integration-tests, packed as thirdparty libraries -->
<!-- <unzip src="${jboss.jms.integration.tests.lib}/jms-integration-tests.jar" dest="${build.classes}"/>
@@ -2614,6 +2615,70 @@
</target>
+ <!--
+ | Run JMS tests against the Messaging JMS provider
+ -->
+ <target name="tests-soa-clustered"
+ description="Run JMS tests against the Messaging JMS provider" depends="init">
+
+ <!-- unpack the integration tests from jms-integration-tests, packed as thirdparty libraries -->
+ <!-- <unzip src="${jboss.jms.integration.tests.lib}/jms-integration-tests.jar" dest="${build.classes}"/>
+ <copy todir="${build.lib}">
+ <fileset dir="${jboss.jms.integration.tests.lib}"/>
+ </copy> -->
+
+ <server:start name="soa-clustered"/>
+
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.useJBM" value="true"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <pathelement location="${build.resources}/jbossmessaging"/>
+ <pathelement location="${build.lib}/jbossmessagingtest.jar"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+ <sysproperty key="jboss-junit-configuration" value="tests-soa-clustered"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
+ extension="-tests-soa-clustered.xml"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+ <fileset dir="${build.classes}">
+ <patternset refid="jbossmessaging.includes"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <server:stop name="soa-clustered"/>
+
+ </target>
+
<!--
| Run all database related tests
-->
Modified: branches/Branch_4_4/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_4/testsuite/imports/server-config.xml 2007-08-06 14:50:04 UTC (rev 64470)
+++ branches/Branch_4_4/testsuite/imports/server-config.xml 2007-08-06 18:03:42 UTC (rev 64471)
@@ -90,6 +90,13 @@
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
</server>
+ <server name="soa-clustered" host="${node0}">
+ <jvmarg value="${jpda.cmdline}" />
+ <jvmarg value="-Xmx128m" />
+ <jvmarg value="-XX:MaxPermSize=128m" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ <sysproperty key="jgroups.udp.ip_ttl" value="${jbosstest.udp.ip_ttl}" />
+ </server>
<server name="securitymgr" config="default" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xmx64m" />
More information about the jboss-cvs-commits
mailing list