[jboss-svn-commits] JBL Code SVN: r31401 - in labs/jbosstm/trunk: maven and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 4 09:35:30 EST 2010
Author: jhalliday
Date: 2010-02-04 09:35:29 -0500 (Thu, 04 Feb 2010)
New Revision: 31401
Removed:
labs/jbosstm/trunk/ext/byteman.jar
labs/jbosstm/trunk/ext/classes12.jar
labs/jbosstm/trunk/ext/commons-logging-1.1.jar
labs/jbosstm/trunk/ext/connector-api.jar
labs/jbosstm/trunk/ext/emma_ant.jar
labs/jbosstm/trunk/ext/jmxri.jar
labs/jbosstm/trunk/ext/jndi.jar
labs/jbosstm/trunk/ext/jta-1_1-classes.zip
labs/jbosstm/trunk/ext/junit-4.6.jar
labs/jbosstm/trunk/ext/junit.jar
labs/jbosstm/trunk/ext/log4j-1.2.14.jar
labs/jbosstm/trunk/ext/wrapper.jar
Modified:
labs/jbosstm/trunk/maven/pom-template.xml
labs/jbosstm/trunk/qa/build.xml
labs/jbosstm/trunk/qa/run-tests.xml
labs/jbosstm/trunk/qa/tests/build-jta.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
Log:
Remove use of JBOSS_HOME in qa scripts. Remove 3rd party .jar files since mvn now pulls them in. JBTM-687
Deleted: labs/jbosstm/trunk/ext/byteman.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/classes12.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/commons-logging-1.1.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/connector-api.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/emma_ant.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/jmxri.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/jndi.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/jta-1_1-classes.zip
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/junit-4.6.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/junit.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/log4j-1.2.14.jar
===================================================================
(Binary files differ)
Deleted: labs/jbosstm/trunk/ext/wrapper.jar
===================================================================
(Binary files differ)
Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml 2010-02-04 14:25:42 UTC (rev 31400)
+++ labs/jbosstm/trunk/maven/pom-template.xml 2010-02-04 14:35:29 UTC (rev 31401)
@@ -296,7 +296,22 @@
<artifactId>jbosssx</artifactId>
</dependency>
+ <!-- qa test suite - JBossAS integration code -->
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-server-manager</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.remoting</groupId>
+ <artifactId>jboss-remoting</artifactId>
+ </dependency>
+
<!-- XTS: -->
<dependency>
Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml 2010-02-04 14:25:42 UTC (rev 31400)
+++ labs/jbosstm/trunk/qa/build.xml 2010-02-04 14:35:29 UTC (rev 31401)
@@ -106,20 +106,9 @@
</and>
</condition>
- <fail unless="env.JBOSS_HOME" message="Please set the JBOSS_HOME environment variable" if="integration.build" />
-
<available file="${driver.home}" property="have.dbdrivers" value="true"/>
</target>
- <target name="dist.as" depends="buildtype" if="dist.as">
- <fail unless="env.JBOSS_HOME" message="Please set the JBOSS_HOME environment variable" />
- <echo message="copying ${env.JBOSS_HOME} - this may take a while ..."/>
- <mkdir dir="${org.jboss.jbossts.qa.dist.buildroot}/as"/>
- <copy todir="${org.jboss.jbossts.qa.dist.buildroot}/as">
- <fileset dir="${env.JBOSS_HOME}"/>
- </copy>
- </target>
-
<target name="clean" depends="buildtype">
<delete dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
@@ -128,7 +117,6 @@
<target name="init" depends="buildtype">
<mkdir dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
- <antcall target="dist.as"/>
</target>
<target name="dist" depends="clean, init">
@@ -148,9 +136,6 @@
jbossjta - build tests for the integrated jta transaction engine
jbossjts - build tests for the integrated jts transaction engine
dist - build tests for the last build of the transaction engine
-
- To include a copy of the AS (pointed to by the JBOSS_HOME
- environment variable) in the distribution please set the ant
- property 'as' to true.</echo>
+</echo>
</target>
</project>
Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml 2010-02-04 14:25:42 UTC (rev 31400)
+++ labs/jbosstm/trunk/qa/run-tests.xml 2010-02-04 14:35:29 UTC (rev 31401)
@@ -364,7 +364,7 @@
Hence we need JBossTS in the classpath for the framework, even though it does not get run there.
On the up side, you get better diagnostic messages and code management/navigation in IDEs.
-->
- <pathelement location="../ext/junit-4.6.jar"/>
+ <pathelement location="../build/extlib/junit.jar"/>
<fileset dir="tests/build">
<include name="jbossts-*-qa.jar"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2010-02-04 14:25:42 UTC (rev 31400)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2010-02-04 14:35:29 UTC (rev 31401)
@@ -26,7 +26,6 @@
<!-- set properties for AS testing -->
<property environment="env"/>
- <property name="jbossall-client.location" location="${env.JBOSS_HOME}/client/jbossall-client.jar"/>
<property name="astest.dir" value="org/jboss/jbossts/qa/astests"/>
@@ -45,7 +44,6 @@
<fileset dir="../../build/extlib" includes="junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
- <fileset file="${org.jboss.jbossts.qa.server_manager_location}" />
</path>
<target name="org.jboss.jbossts.qa.init">
@@ -97,7 +95,14 @@
<path refid="jta.classpath"/>
<pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
<!-- additional dependency, which is why we don't just do this in compile task above: -->
- <pathelement location="${jbossall-client.location}"/>
+ <!-- include classes for AS tests -->
+ <fileset dir="../../build/extlib">
+ <include name="jta.jar"/>
+ <include name="jboss-ejb-api.jar"/>
+ <include name="jboss-server-manager.jar"/>
+ <include name="jboss-transaction-spi.jar"/>
+ <include name="jboss-remoting.jar"/>
+ </fileset>
</classpath>
</javac>
</target>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-02-04 14:25:42 UTC (rev 31400)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2010-02-04 14:35:29 UTC (rev 31401)
@@ -25,8 +25,6 @@
<!-- set properties for AS testing -->
<property environment="env"/>
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jbossall-client.location" location="${jboss.home}/client/jbossall-client.jar"/>
<property name="astest.dir" value="org/jboss/jbossts/qa/astests"/>
<!-- TODO cd ArjunaJTS/orbportability; ant -f build-anttasks.xml -->
@@ -54,7 +52,7 @@
<include name="jta.jar"/>
</fileset>
<pathelement location="../../ArjunaJTS/orbportability/config"/>
- <fileset file="${org.jboss.jbossts.qa.server_manager_location}" />
+ <!--<fileset file="${org.jboss.jbossts.qa.server_manager_location}" />-->
<pathelement path="${org.jboss.jbossts.qa.orb.classpath}"/>
<fileset dir="../../build/extlib" includes="junit.jar"/>
<pathelement location="../ext/jboss-profiler-jvmti.jar"/>
@@ -221,10 +219,12 @@
<include name="jta-1_1-classes.zip"/>
</fileset>
<!-- include classes for AS tests -->
- <fileset file="${org.jboss.jbossts.qa.server_manager_location}" />
- <fileset dir="${jboss.home}/client">
- <include name="jbossall-client.jar"/>
- <include name="jboss-javaee.jar"/>
+ <fileset dir="../../build/extlib">
+ <include name="jboss-server-manager.jar"/>
+ <include name="jta.jar"/>
+ <include name="jboss-ejb-api.jar"/>
+ <include name="jboss-transaction-spi.jar"/>
+ <include name="jboss-remoting.jar"/>
</fileset>
</path>
More information about the jboss-svn-commits
mailing list