[jboss-cvs] JBossAS SVN: r62498 - in branches/JBoss_3_2_6_CP: tools/etc/buildmagic and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 23 18:49:32 EDT 2007
Author: jaroslaw.kijanowski
Date: 2007-04-23 18:49:32 -0400 (Mon, 23 Apr 2007)
New Revision: 62498
Modified:
branches/JBoss_3_2_6_CP/testsuite/build.xml
branches/JBoss_3_2_6_CP/tools/etc/buildmagic/buildmagic.ent
branches/JBoss_3_2_6_CP/tools/etc/buildmagic/version-info.xml
Log:
JBQA-748, port start-jboss and stop-jboss tasks, change version string
Modified: branches/JBoss_3_2_6_CP/testsuite/build.xml
===================================================================
--- branches/JBoss_3_2_6_CP/testsuite/build.xml 2007-04-23 20:44:41 UTC (rev 62497)
+++ branches/JBoss_3_2_6_CP/testsuite/build.xml 2007-04-23 22:49:32 UTC (rev 62498)
@@ -18,6 +18,8 @@
<!-- $Id$ -->
<project default="main" name="JBoss/Testsuite">
+ <import file="../tools/etc/buildmagic/build-common.xml"/>
+ <import file="imports/server-config.xml"/>
<!-- ======================================================== -->
<!-- Setup -->
@@ -53,6 +55,50 @@
<property name="results_web" value="http://jboss.sourceforge.net//junit-results/32"/>
+ <!-- port jboss-start and jboss-sop targets -->
+
+ <target name="start-as">
+ <start-jboss conf="all" jvmargs="-XX:MaxPermSize=70m -Xmx128m"/>
+ <wait-on-host />
+ </target>
+
+ <target name="stop-as">
+ <stop-jboss />
+ <wait-on-shutdown conf="all" />
+ </target>
+
+ <macrodef name="wait-on-host">
+ <attribute name="seconds" default="60"/>
+ <attribute name="host" default="localhost"/>
+ <sequential>
+ <echo message="Waiting for @{host} to start..."/>
+ <waitfor maxwait="@{seconds}" maxwaitunit="second"
+ checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
+ <http url="http://@{host}:8080/"/>
+ </waitfor>
+ <fail message="Timeout waiting for nodes to start" if="startup.timeout"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="wait-on-shutdown">
+ <attribute name="seconds" default="60"/>
+ <attribute name="conf"/>
+ <sequential>
+ <echo message="Waiting for '@{conf}' server to stop..."/>
+ <waitfor maxwait="@{seconds}" maxwaitunit="second"
+ checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
+ <available file="server.log">
+ <filepath>
+ <fileset dir="${jboss.dist}/server/@{conf}/log/" includes="server.log">
+ <contains text="[org.jboss.system.server.Server] Shutdown complete"/>
+ </fileset>
+ </filepath>
+ </available>
+ </waitfor>
+ <fail message="Timeout waiting for '@{conf}' server to shutdown." if="shutdown.timeout"/>
+ </sequential>
+ </macrodef>
+
<!-- ======================================================== -->
<!-- Configuration -->
<!-- ======================================================== -->
@@ -4929,6 +4975,7 @@
<target name="tests" description="Execute all tests."
depends="init,
+ start-as,
tests-standard-unit,
tests-client-unit,
tests-security-basic-unit,
@@ -4942,6 +4989,7 @@
tests-jbossmx-implementation,
tests-jbossmx-performance,
tests-iiop-stress,
+ stop-as,
tests-report">
</target>
Modified: branches/JBoss_3_2_6_CP/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/JBoss_3_2_6_CP/tools/etc/buildmagic/buildmagic.ent 2007-04-23 20:44:41 UTC (rev 62497)
+++ branches/JBoss_3_2_6_CP/tools/etc/buildmagic/buildmagic.ent 2007-04-23 22:49:32 UTC (rev 62498)
@@ -102,14 +102,14 @@
<property name="version.major" value="3"/>
<property name="version.minor" value="2"/>
<property name="version.revision" value="6"/>
- <property name="version.tag" value=""/>
+ <property name="version.tag" value=".GA_CP01"/>
<property name="version.name" value="WonderLand"/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="JBoss_3_2_6"/>
+ <property name="version.cvstag" value="https://svn.jboss.org/repos/jbossas/tags/JBoss_3_2_6_GA_CP01"/>
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
<property name="specification.vendor" value="JBoss (http://www.jboss.org/)"/>
<property name="implementation.title" value="JBoss [${version.name}]"/>
Modified: branches/JBoss_3_2_6_CP/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBoss_3_2_6_CP/tools/etc/buildmagic/version-info.xml 2007-04-23 20:44:41 UTC (rev 62497)
+++ branches/JBoss_3_2_6_CP/tools/etc/buildmagic/version-info.xml 2007-04-23 22:49:32 UTC (rev 62498)
@@ -17,14 +17,14 @@
<property name="version.major" value="3"/>
<property name="version.minor" value="2"/>
<property name="version.revision" value="6"/>
- <property name="version.tag" value=""/>
+ <property name="version.tag" value=".GA_CP01"/>
<property name="version.name" value="WonderLand"/>
<!-- This must be set to the CVS tag for any release -->
- <property name="version.cvstag" value="JBoss_3_2_6"/>
+ <property name="version.cvstag" value="https://svn.jboss.org/repos/jbossas/tags/JBoss_3_2_6_GA_CP01"/>
<!-- Manifest version info -->
<property name="specification.title" value="JBoss"/>
- <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}${version.tag}"/>
<property name="specification.vendor" value="JBoss (http://www.jboss.org/)"/>
<property name="implementation.title" value="JBoss [${version.name}]"/>
More information about the jboss-cvs-commits
mailing list