Author: objectiser Date: 2009-10-18 12:58:00 -0400 (Sun, 18 Oct 2009) New Revision: 184 Added: branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/src/test/resources/deployment.properties Modified: branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/build.xml branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/pom.xml Log: Mechanism for installing a test version of the deployment properties file. The path to this file will be specified using a system property "riftsaw.test.deployment.properties". Modified: branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/build.xml =================================================================== --- branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/build.xml 2009-10-18 16:45:45 UTC (rev 183) +++ branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/build.xml 2009-10-18 16:58:00 UTC (rev 184) @@ -3,9 +3,14 @@ <property environment="env" /> <property name="riftsaw.engine.version" value="2.0-M1" /> + <property file="${riftsaw.test.deployment.properties}" /> + <target name="unpack-distribution"> <mkdir dir="${basedir}/../distribution/target/dist"/> <unzip dest="${basedir}/../distribution/target/dist" src="${basedir}/../distribution/target/riftsaw-${riftsaw.engine.version}.zip"/> + + <copy file="${riftsaw.test.deployment.properties}" + tofile="${basedir}/../distribution/target/dist/riftsaw-${riftsaw.engine.version}/install/deployment.properties" /> </target> <target name="deploy-riftsaw" > @@ -24,13 +29,13 @@ <java classname="org.jboss.Main" fork="true" spawn="true" - dir="${riftsaw.jboss.home}/server/default" > + dir="${org.jboss.esb.server.home}/server/default" > <arg line="-c default"/> <jvmarg value="-Xms128m"/> <jvmarg value="-Xmx512m"/> <jvmarg value="-XX:MaxPermSize=256m"/> <classpath> - <pathelement path="${riftsaw.jboss.home}/bin/run.jar"/> + <pathelement path="${org.jboss.esb.server.home}/bin/run.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> @@ -56,8 +61,8 @@ <java classname="org.jboss.Shutdown" fork="true" failonerror="false" resultproperty="shutdown.rc"> <arg line="-s jnp://localhost:1099 --shutdown"/> <classpath> - <pathelement path="${riftsaw.jboss.home}/bin/shutdown.jar"/> - <pathelement path="${riftsaw.jboss.home}/client/jbossall-client.jar"/> + <pathelement path="${org.jboss.esb.server.home}/bin/shutdown.jar"/> + <pathelement path="${org.jboss.esb.server.home}/client/jbossall-client.jar"/> <pathelement path="${JAVA_HOME}/lib/tools.jar"/> </classpath> </java> Modified: branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/pom.xml =================================================================== --- branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/pom.xml 2009-10-18 16:45:45 UTC (rev 183) +++ branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/pom.xml 2009-10-18 16:58:00 UTC (rev 184) @@ -65,7 +65,6 @@ <property name="test_classpath" refid="maven.test.classpath" /> <property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="project.version" value="${project.version}" /> - <property name="riftsaw.jboss.home" value="${riftsaw.test.dir}/${jboss.version}" /> <property name="dependency.bpel.deployer" value="${maven.dependency.org.jboss.soa.bpel.runtime.deployer.jar.path}" /> <property name="dependency.bpel.engine" @@ -107,7 +106,6 @@ <property name="test_classpath" refid="maven.test.classpath" /> <property name="plugin_classpath" refid="maven.plugin.classpath" /> <property name="project.version" value="${project.version}" /> - <property name="riftsaw.jboss.home" value="${riftsaw.test.dir}/${jboss.version}" /> <property name="dependency.bpel.deployer" value="${maven.dependency.org.jboss.soa.bpel.runtime.deployer.jar.path}" /> <property name="dependency.bpel.engine" Added: branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/src/test/resources/deployment.properties =================================================================== --- branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/src/test/resources/deployment.properties (rev 0) +++ branches/IntegrationTests/RiftSaw-2.0-M1/integration-tests/src/test/resources/deployment.properties 2009-10-18 16:58:00 UTC (rev 184) @@ -0,0 +1,19 @@ +###################################################################### +# JBossAS and JBossESB Configuration +###################################################################### +# The Directory in Which JBoss AS is Installed +# The absolute path to a directory in which a version of JBoss AS with +# EJB3 has been installed. +# This path should not include spaces. +# Use of relative paths or paths with spaces will cause runtime errors +# when deploying and executing the samples. +# (e.g. /var/local/jboss-5.1.0.GA) +org.jboss.esb.server.home=/home/gbrown/NotBackedUp/testing/riftsawIT/jboss-5.1.0.GA + +# The Configuration of JBoss AS to Use +# (e.g. default) +org.jboss.esb.server.config=default + +# The directory for JBossESB home +# (e.g. /var/local/jbossesb-4.6.GA) +org.jboss.esb.home=/home/gbrown/NotBackedUp/testing/riftsawIT/jbossesb-4.6.GA