Author: chris.laprun(a)jboss.com
Date: 2010-09-07 05:42:14 -0400 (Tue, 07 Sep 2010)
New Revision: 4063
Modified:
components/wsrp/trunk/UpdateWSRPForGateIn.sh
components/wsrp/trunk/wsrp-producer-war/pom.xml
Log:
- Changed name of environment variable from JBOSS_TEST_HOME to JBOSS_5_1_0_HOME for the
clean AS version to use in tests to align with PC tests, thus making it easier for people.
Thanks, theute! :)
Modified: components/wsrp/trunk/UpdateWSRPForGateIn.sh
===================================================================
--- components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-09-07 09:25:32 UTC (rev 4062)
+++ components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-09-07 09:42:14 UTC (rev 4063)
@@ -33,13 +33,13 @@
fi
echo Using GateIn home at: $GATEIN_EAR_HOME
-if [ -z "$JBOSS_TEST_HOME" -o ! -d "$JBOSS_TEST_HOME" ]
+if [ -z "$JBOSS_5_1_0_HOME" -o ! -d "$JBOSS_5_1_0_HOME" ]
then
- echo \=\=\> Please set JBOSS_TEST_HOME to point the root directory of a clean
install of JBoss AS 5.1.x to be used for tests
+ echo \=\=\> Please set JBOSS_5_1_0_HOME to point the root directory of a clean
install of JBoss AS 5.1.x to be used for tests
exit
fi
echo --------------------------------------------------------------------------
-echo \| Using JBoss AS home at: $JBOSS_TEST_HOME
+echo \| Using JBoss AS home at: $JBOSS_5_1_0_HOME
# Retrieve the current WSRP version as specified in the POM file
export CURRENT_WSRP=`grep -m 1 ".*<version>\(.*\)<\/version>.*"
pom.xml | sed -n -e 's/.*<version>\(.*\)<\/.*/\1/p'`
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-07 09:25:32 UTC (rev 4062)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-09-07 09:42:14 UTC (rev 4063)
@@ -71,7 +71,7 @@
</activation>
<properties>
<jboss.systemPath>${jboss.zip.url}</jboss.systemPath>
-
<JBOSS_TEST_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_TEST_HOME>
+
<JBOSS_5_1_0_HOME>${project.build.directory}/cargo/servers/jboss-5.1.0.GA</JBOSS_5_1_0_HOME>
</properties>
<dependencies>
<dependency>
@@ -446,7 +446,7 @@
<configuration>
<container>
<containerId>jboss51x</containerId>
- <home>${JBOSS_TEST_HOME}</home>
+ <home>${JBOSS_5_1_0_HOME}</home>
<log>${basedir}/target/jboss51x/container.log</log>
<systemProperties>
<!-- Since the tests run on the server, we need to pass system
properties to the
@@ -475,7 +475,7 @@
<configfiles>
<!-- hack to get normal logging instead of incredibly versbose
-->
<configfile>
-
<file>${JBOSS_TEST_HOME}/server/default/conf/jboss-log4j.xml</file>
+
<file>${JBOSS_5_1_0_HOME}/server/default/conf/jboss-log4j.xml</file>
<tofile>/conf/jboss-log4j.xml</tofile>
</configfile>
<configfile>