[jboss-svn-commits] JBL Code SVN: r29894 - labs/jbosstm/workspace/whitingjr/trunk/performance.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 2 11:03:48 EST 2009
Author: whitingjr
Date: 2009-11-02 11:03:48 -0500 (Mon, 02 Nov 2009)
New Revision: 29894
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
Log:
Changed build file fixing the vendor db library path.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt 2009-11-02 15:53:37 UTC (rev 29893)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/README.txt 2009-11-02 16:03:48 UTC (rev 29894)
@@ -19,6 +19,7 @@
0.0.3 Supports Transaction XA single resource persistence configuration.
Support NoTransaction resource persistence configuration.
Checks command line XA parameter against vendor database driver support for XA.
+ Added integrity constraint relaxing for multiple database vendors.
0.0.4 Added multi XA resource persistence configuration.
Supports filtering and merging of results into categories.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-11-02 15:53:37 UTC (rev 29893)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-11-02 16:03:48 UTC (rev 29894)
@@ -2,13 +2,20 @@
<project name="JBoss TM performance comparison project" default="profile-ejb3" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<import file="/home/whitingjr/java/hibernate/caveatemptor-jpa-061211/build.xml" />
+ <property name="JBOSS_HOME_4_2_3" value="~/java/jboss/jboss-4.2.3.GA" />
<property name="M2_HOME" value="${user.home}/.m2" />
- <property name="MAVEN_ANT_TASK_VERSION" value="2.0.10" />
+ <property name="MAVEN_ANT_TASK_VERSION" value="2.0.10" />
<!-- to download dependencies execute mvn package on this module before calling ant script -->
- <!--path id="maven-ant-tasks.classpath" path="${M2_HOME}/repository/org/apache/maven/maven-ant-tasks/${MAVEN_ANT_TASK_VERSION}/maven-ant-tasks-${MAVEN_ANT_TASK_VERSION}.jar" />
+ <path id="maven-ant-tasks.classpath" path="${M2_HOME}/repository/org/apache/maven/maven-ant-tasks/${MAVEN_ANT_TASK_VERSION}/maven-ant-tasks-${MAVEN_ANT_TASK_VERSION}.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
<artifact:pom id="tsperfpom" file="pom.xml" />
- <artifact:dependencies filesetId="tsperf" pomRefId="tsperfpom"/-->
+ <artifact:dependencies pathId="tsperf">
+ <dependency groupId="org.jboss" artifactId="jbossjta" version="4.8.0_GA-standalone" />
+ <dependency groupId="com.mentorgen.tools.profile" artifactId="jip" version="1.0" />
+ <dependency groupId="com.mentorgen.tools.profile" artifactId="jip-client" version="1.0" />
+ <dependency groupId="org.slf4j" artifactId="slf4j-api" version="1.5.8" />
+ <dependency groupId="org.slf4j" artifactId="slf4j-log4j12" version="1.5.8" />
+ </artifact:dependencies>
<property name="required-args" value="-Dtransaction.strategy=value -Ddb.installation=value -Ddb.vendor=value -Djdbc-datasource=value" />
<property name="optional-args" value="-Dtransaction.log.store=value" />
@@ -16,9 +23,11 @@
<property name="driver.home" value="lib/dbdrivers" />
<property name="properties.home" value="src/main/resources/properties/database" />
- <fileset id="database.driver" dir="${driver.home}/${db.vendor}">
- <include name="*.jar" />
- </fileset>
+ <path id="database.driver">
+ <fileset dir="${driver.home}/${db.vendor}">
+ <include name="*.jar" />
+ </fileset>
+ </path>
<path id="ant.classpath">
<pathelement path="${ant.home}/lib/ant" />
@@ -28,25 +37,30 @@
</path>
<path id="demo.compile.classpath">
- <path refid="project.classpath" />
+ <path refid="tsperf" />
<pathelement path="/home/whitingjr/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar" />
<pathelement path="lib/client.jar" />
<pathelement path="/home/whitingjr/.m2/repository/org/dbunit/dbunit/2.4.6/dbunit-2.4.6.jar" />
- <pathelement path="lib/tomcat-integration.jar"/>
- <!--pathelement path="lib/jboss-jta-4.3.jar"/-->
- <pathelement path="lib/testng-5.10-jdk15.jar"/>
+ <pathelement path="lib/tomcat-integration.jar" />
+ <pathelement path="lib/testng-5.10-jdk15.jar" />
+ <pathelement path="lib/jboss-ejb3-all.jar" />
+ <pathelement path="lib/caveatemptor-jpa.jar" />
+ <pathelement path="lib/ejb3-persistence.jar" />
+ <pathelement path="lib/thirdparty-all.jar" />
+ <pathelement path="lib/hibernate3.jar" />
+ <pathelement path="lib/hibernate-annotations.jar" />
+ <pathelement path="lib/hibernate-entitymanager.jar" />
</path>
<path id="demo.run.classpath">
<path refid="demo.compile.classpath" />
<pathelement path="build/classes" />
- <pathelement path="${M2_HOME}/repository/org/jboss/jbossjta/jbossjta/4.7.0_GA/jbossjta-4.7.0_GA-standalone.jar"/>
- <pathelement path="lib/jboss-ejb3-all.jar"/>
</path>
<path id="demo.test.classpath">
<path refid="demo.run.classpath" />
<pathelement path="src/test/resources" />
+ <path refid="database.driver" />
</path>
<target name="check-arguments">
@@ -86,18 +100,18 @@
</not>
</condition>
</fail>
-
+
<fail message="JDBC configuration must be either [no-tx|xa|local-tx]">
- <condition>
- <not>
- <or>
- <equals arg1="${jdbc-datasource}" arg2="no-tx" />
- <equals arg1="${jdbc-datasource}" arg2="xa" />
- <equals arg1="${jdbc-datasource}" arg2="local-tx" />
- </or>
- </not>
- </condition>
- </fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${jdbc-datasource}" arg2="no-tx" />
+ <equals arg1="${jdbc-datasource}" arg2="xa" />
+ <equals arg1="${jdbc-datasource}" arg2="local-tx" />
+ </or>
+ </not>
+ </condition>
+ </fail>
<fail message="Specify log store configuration when jta-managed. Usage: ant ${required-args} ${optional-args}">
<condition>
@@ -109,7 +123,7 @@
</and>
</condition>
</fail>
-
+
</target>
<target name="check-setup">
@@ -125,13 +139,6 @@
</not>
</condition>
</fail>
-
- <!--fail message="fileset missing">
- <condition>
- <isreference refid="tsperf"/>
- </condition>
- </fail-->
-
</target>
<target name="prepare" depends="check-arguments, check-setup">
@@ -139,12 +146,10 @@
<mkdir dir="build" />
<mkdir dir="build/classes" />
<mkdir dir="build/classes/META-INF" />
-
-
<!-- load properties, specific first then general -->
- <loadproperties srcfile="src/main/resources/properties/log-store/store-data.properties"/>
- <loadproperties srcfile="src/main/resources/properties/jdbc-resource/${jdbc-datasource}/datasource.properties"/>
+ <loadproperties srcfile="src/main/resources/properties/log-store/store-data.properties" />
+ <loadproperties srcfile="src/main/resources/properties/jdbc-resource/${jdbc-datasource}/datasource.properties" />
<loadproperties srcfile="src/main/resources/properties/database/${db.vendor}/database-locations/${db.installation}/db-installation.properties" />
<loadproperties srcfile="src/main/resources/properties/database/${db.vendor}/db-profile.properties" />
<loadproperties srcfile="src/main/resources/properties/database/shared-database.properties" />
@@ -166,17 +171,17 @@
</copy>
<copy file="src/main/resources/log4j.xml" todir="build/classes" />
-
- <copy file="/home/whitingjr/eclipse/v3.5-galileo/workspaces/performance/tomcat-integration/tomcat-integration.jar" todir="lib"/>
+ <copy file="/home/whitingjr/eclipse/v3.5-galileo/workspaces/performance/tomcat-integration/tomcat-integration.jar" todir="lib" />
+
<delete dir="${test.output.dir}" />
<mkdir dir="${test.output.dir}" />
</target>
<target name="compile-demo" depends="prepare">
- <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="demo.compile.classpath" />
- <javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="demo.run.classpath" />
+ <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="demo.compile.classpath" debug="true"/>
+ <javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="demo.run.classpath" debug="true"/>
</target>
<target name="run-demo-test" depends="compile" description="task to call the Demo application with profiling enabled.">
@@ -192,7 +197,7 @@
</target>
<target name="compile" depends="prepare">
- <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="demo.compile.classpath" debug="true"/>
+ <javac srcdir="src/main/java" destdir="${build.classes.dir}" classpathref="demo.compile.classpath" debug="true" />
<javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="demo.run.classpath" />
</target>
@@ -229,3 +234,5 @@
</target>
</project>
+
+
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml 2009-11-02 15:53:37 UTC (rev 29893)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/pom.xml 2009-11-02 16:03:48 UTC (rev 29894)
@@ -39,17 +39,21 @@
<version>2.4.6</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossjta</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jbossjta</artifactId>
- <version>4.7.0_GA</version>
- <classifier>standalone</classifier>
+ <version>4.8.0_GA-standalone</version>
</dependency>
<dependency>
- <groupId>org.jboss.jbossts</groupId>
- <artifactId>jbossts-common</artifactId>
- <version>4.3</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.8</version>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jnp-client</artifactId>
<version>4.2.2.GA</version>
More information about the jboss-svn-commits
mailing list