[jboss-cvs] JBossAS SVN: r114624 - in branches/JBPAPP_5: testsuite and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Dec 20 05:53:33 EST 2013
Author: wolfc
Date: 2013-12-20 05:53:33 -0500 (Fri, 20 Dec 2013)
New Revision: 114624
Modified:
branches/JBPAPP_5/build/build.xml
branches/JBPAPP_5/testsuite/build.xml
branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
Log:
JBPAPP-10720: reverting 114622 (bad commit)
Modified: branches/JBPAPP_5/build/build.xml
===================================================================
--- branches/JBPAPP_5/build/build.xml 2013-12-20 09:05:04 UTC (rev 114623)
+++ branches/JBPAPP_5/build/build.xml 2013-12-20 10:53:33 UTC (rev 114624)
@@ -15,7 +15,7 @@
<!-- $Id$ -->
<project default="main" name="JBoss/Build">
- <property name="configuration.directory" value= "." />
+
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
Modified: branches/JBPAPP_5/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5/testsuite/build.xml 2013-12-20 09:05:04 UTC (rev 114623)
+++ branches/JBPAPP_5/testsuite/build.xml 2013-12-20 10:53:33 UTC (rev 114624)
@@ -15,8 +15,6 @@
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
-
- <property name="configuration.directory" value="../build" />
<import file="../tools/etc/buildmagic/build-common.xml"/>
<!-- Tests requiring separate server configurations -->
@@ -29,6 +27,7 @@
<format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/>
</tstamp>
<echo message="${TIMENOW}" file="run.tstamp"/>
+
<property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/>
<property name="buildlog.level" value="info" />
<property environment="env"/>
@@ -1799,32 +1798,20 @@
<target name="jboss-all-config-tests"
description="The units tests which are run against the jboss all config" depends="init">
+
<!-- Default configuration to run the tests against -->
<property name="conf" value="all"/>
+
+ <echo message="Replacing hornetq-roles and hornetq-users.properties used for tests"/>
- <echo message="Replacing hornetq-roles and hornetq-users.properties used for tests"/>
-
- <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties"
- tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-roles.properties" overwrite="true"/>
- <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties"
- tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-users.properties" overwrite="true"/>
-
- <echo message="Configuring default security domain for EJBs"/>
- <copy file="${module.output}/resources/test-configs/default_ejb_security_domain/conf/props/wtf-roles.properties"
- tofile="${jboss.dist}/server/${conf}/conf/props/wtf-roles.properties" overwrite="true"/>
- <copy file="${module.output}/resources/test-configs/default_ejb_security_domain/conf/props/wtf-users.properties"
- tofile="${jboss.dist}/server/${conf}/conf/props/wtf-users.properties" overwrite="true"/>
- <copy file="${jboss.dist}/server/${conf}/conf/login-config.xml"
- tofile="${jboss.dist}/server/${conf}/conf/login-config.backup" overwrite="true"/>
- <copy file="${module.output}/resources/test-configs/default_ejb_security_domain/conf/login-config.xml"
- tofile="${jboss.dist}/server/${conf}/conf/login-config.xml" overwrite="true"/>
- <copy file="${jboss.dist}/server/${conf}/deploy/ejb3-interceptors-aop.xml"
- tofile="${jboss.dist}/server/ejb3-interceptors-aop.backup" overwrite="true"/>
- <copy file="${module.output}/resources/test-configs/default_ejb_security_domain/deploy/ejb3-interceptors-aop.xml"
- tofile="${jboss.dist}/server/${conf}/deploy/ejb3-interceptors-aop.xml" overwrite="true"/>
+ <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties"
+ tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-roles.properties" overwrite="true"/>
- <server:start name="${conf}"/>
+ <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties"
+ tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-users.properties" overwrite="true"/>
+
+ <server:start name="${conf}"/>
<antcall target="tests-standard-unit">
<param name="custom.excludes" value="ec2.excludes"/>
</antcall>
@@ -1846,25 +1833,7 @@
<antcall target="tests-webservice" />
<antcall target="tests-ws" />
<antcall target="tests-aspects"/>
- <server:stop name="${conf}"/>
-
- <echo message="Cleaning default security domain for EJBs"/>
- <delete file="${jboss.dist}/server/${conf}/conf/props/wtf-users.properties"/>
- <delete file="${jboss.dist}/server/${conf}/conf/props/wtf-roles.properties"/>
- <copy file="${jboss.dist}/server/ejb3-interceptors-aop.backup"
- tofile="${jboss.dist}/server/${conf}/deploy/ejb3-interceptors-aop.xml" overwrite="true"/>
- <copy file="${jboss.dist}/server/${conf}/conf/login-config.backup"
- tofile="${jboss.dist}/server/${conf}/conf/login-config.xml" overwrite="true"/>
- <delete file="${jboss.dist}/server/ejb3-interceptors-aop.backup"/>
- <delete file="${jboss.dist}/server/${conf}/conf/login-config.backup"/>
-
- <echo message="Replacing hornetq-roles and hornetq-users.properties used for tests"/>
-
- <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties"
- tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-roles.properties" overwrite="true"/>
-
- <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties"
- tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-users.properties" overwrite="true"/>
+ <server:stop name="${conf}"/>
</target>
<target name="security-basic-tests"
Modified: branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml 2013-12-20 09:05:04 UTC (rev 114623)
+++ branches/JBPAPP_5/tools/etc/buildmagic/version-info.xml 2013-12-20 10:53:33 UTC (rev 114624)
@@ -5,7 +5,6 @@
<!-- Include user and project property overrides. -->
<property file="${user.home}/.buildmagic.properties"/>
<property file="${user.home}/.ant.properties"/>
- <property file="${configuration.directory}/build.properties"/>
<!-- Setup the build timestamp & build identifer properties -->
<tstamp>
@@ -15,11 +14,11 @@
<property name="build.id" value="${build.number}"/>
<!-- Version identifiers for the server. -->
- <!-- <property name="version.major" value="5"/>
+ <property name="version.major" value="5"/>
<property name="version.minor" value="3"/>
<property name="version.revision" value="0"/>
<property name="version.tag" value="Branch"/>
- <property name="version.name" value="EAP"/> -->
+ <property name="version.name" value="EAP"/>
<!-- This must be set to the CVS tag for any release -->
<property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
@@ -37,7 +36,6 @@
<target name="print-version-info">
<echo>
- configuration = ${configuration.directory}/build.properties
version.major=${version.major}
version.minor=${version.minor}
version.revision=${version.revision}
More information about the jboss-cvs-commits
mailing list