[jboss-svn-commits] JBL Code SVN: r26533 - in labs/jbosstm/trunk/qa: tests and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu May 14 08:35:30 EDT 2009
Author: jhalliday
Date: 2009-05-14 08:35:30 -0400 (Thu, 14 May 2009)
New Revision: 26533
Modified:
labs/jbosstm/trunk/qa/config/JBossTS_JTA_QA.xml
labs/jbosstm/trunk/qa/tests/build-jta.xml
labs/jbosstm/trunk/qa/tests/build-jts.xml
labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java
Log:
Improved qa build handling now that jdbc drivers are no longer a compile time dependency. JBTM-390
Modified: labs/jbosstm/trunk/qa/config/JBossTS_JTA_QA.xml
===================================================================
--- labs/jbosstm/trunk/qa/config/JBossTS_JTA_QA.xml 2009-05-14 10:50:35 UTC (rev 26532)
+++ labs/jbosstm/trunk/qa/config/JBossTS_JTA_QA.xml 2009-05-14 12:35:30 UTC (rev 26533)
@@ -35,6 +35,8 @@
<jar name="$(DTF_HOME)/lib/ext/fscontext.jar"/>
<jar name="$(DTF_HOME)/lib/ext/providerutil.jar"/>
+ <jar name="$(PRODUCT.DIR)/qa/lib/selected_dbdriver/*.jar"/>
+
<!--
<jar name="$(PRODUCT.DIR)/lib/arjunajta.jar"/>
<jar name="$(PRODUCT.DIR)/qa/lib/*.zip"/>
@@ -53,7 +55,7 @@
<properties>
<property name="Context.INITIAL_CONTEXT_FACTORY" value="com.sun.jndi.fscontext.RefFSContextFactory"/>
<property name="jdbcprofilestore.dir" value="$(PRODUCT.DIR)/qa/jdbc_profiles"/>
- <property name="Context.PROVIDER_URL" value="file://$(PRODUCT.DIR)"/>
+ <property name="Context.PROVIDER_URL" value="file:$(PRODUCT.DIR)"/>
<property name="qa.debug" value="true"/>
<property name="performanceprofilestore.dir" value="$(PRODUCT.DIR)/qa/perf_profiles/"/>
<property name="com.arjuna.common.util.propertyservice.verbosePropertyManager" value="OFF"/>
Modified: labs/jbosstm/trunk/qa/tests/build-jta.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jta.xml 2009-05-14 10:50:35 UTC (rev 26532)
+++ labs/jbosstm/trunk/qa/tests/build-jta.xml 2009-05-14 12:35:30 UTC (rev 26533)
@@ -92,7 +92,6 @@
<include name="**/org/jboss/jbossts/qa/astests/**/*.java"/>
<exclude name="**/astests/**"/>
- <exclude name="**/JNDIManager.java"/>
<classpath>
<path refid="jta.classpath"/>
@@ -102,21 +101,6 @@
</javac>
</target>
- <target name="jdbc-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="have.dbdrivers">
- <javac srcdir="${org.jboss.jbossts.qa.src}"
- destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" includes="**/JNDIManager.java">
-
- <classpath>
- <path refid="jta.classpath"/>
- <pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
- <pathelement location="${org.jboss.jbossts.qa.testingframework_location}"/>
- <!-- additional dependency, which is why we don't just do this in compile task above: -->
- <path refid="database.drivers.path"/>
- </classpath>
- </javac>
- </target>
-
<target name="astests-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="integration.build">
<javac srcdir="${org.jboss.jbossts.qa.src}"
destdir="${org.jboss.jbossts.qa.build.classes}"
@@ -149,7 +133,7 @@
</copy>
</target>
- <target name="org.jboss.jbossts.qa.jar" depends="org.jboss.jbossts.qa.compile, jdbc-compile, as-ejbjar">
+ <target name="org.jboss.jbossts.qa.jar" depends="org.jboss.jbossts.qa.compile, as-ejbjar">
<jar jarfile="${org.jboss.jbossts.qa.buildroot}/jbossts-jta-qa.jar"
basedir="${org.jboss.jbossts.qa.build.classes}"/>
</target>
Modified: labs/jbosstm/trunk/qa/tests/build-jts.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-05-14 10:50:35 UTC (rev 26532)
+++ labs/jbosstm/trunk/qa/tests/build-jts.xml 2009-05-14 12:35:30 UTC (rev 26533)
@@ -224,7 +224,6 @@
<exclude name="org/jboss/jbossts/qa/ArjunaCore/Common/ClassPathParserTest.java" />
<exclude name="**/${astest.dir}/**/*.java" />
- <exclude name="**/JNDIManager.java"/>
<classpath>
<path refid="jts.classpath"/>
@@ -234,22 +233,6 @@
</javac>
</target>
- <target name="jdbc-compile" depends="org.jboss.jbossts.qa.clean, org.jboss.jbossts.qa.init" if="have.dbdrivers">
- <javac srcdir="${org.jboss.jbossts.qa.src}"
- destdir="${org.jboss.jbossts.qa.build.classes}"
- debug="on" deprecation="on" includes="**/JNDIManager.java">
-
- <classpath>
- <path refid="jts.classpath"/>
- <pathelement location="${org.jboss.jbossts.qa.build.classes}"/>
- <pathelement location="${org.jboss.jbossts.qa.testingframework_location}"/>
-
- <path refid="database.drivers.path"/>
- </classpath>
- </javac>
- </target>
-
-
<path id="as.classpath">
<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
<include name="jbossjts.jar"/>
@@ -294,7 +277,7 @@
</copy>
</target>
- <target name="org.jboss.jbossts.qa.jar" depends="org.jboss.jbossts.qa.compile, jdbc-compile, as-ejbjar">
+ <target name="org.jboss.jbossts.qa.jar" depends="org.jboss.jbossts.qa.compile, as-ejbjar">
<jar jarfile="${org.jboss.jbossts.qa.buildroot}/jbossts-jts-qa.jar"
basedir="${org.jboss.jbossts.qa.build.classes}"/>
</target>
Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java 2009-05-14 10:50:35 UTC (rev 26532)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/Utils/JNDIManager.java 2009-05-14 12:35:30 UTC (rev 26533)
@@ -39,6 +39,10 @@
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
+/**
+ * Uses reflection to configure the datasources to avoid the need for
+ * compile time linking against specific drivers jars
+ */
public class JNDIManager
{
public static void main(String[] args)
More information about the jboss-svn-commits
mailing list