[jboss-svn-commits] JBL Code SVN: r29721 - in labs/jbosstm/workspace/whitingjr/trunk/performance: src/main/resources/properties/transaction-management/jta-managed and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 21 08:53:17 EDT 2009
Author: whitingjr
Date: 2009-10-21 08:53:16 -0400 (Wed, 21 Oct 2009)
New Revision: 29721
Added:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties
Removed:
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties
labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties
Modified:
labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
Log:
Added configuration for loading and customising configuration.
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath 2009-10-21 12:52:21 UTC (rev 29720)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/.classpath 2009-10-21 12:53:16 UTC (rev 29721)
@@ -6,5 +6,13 @@
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/caveatemptor-jpa.jar"/>
+ <classpathentry kind="lib" path="lib/ejb3-persistence.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-annotations.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-entitymanager.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate-tools.jar"/>
+ <classpathentry kind="lib" path="lib/hibernate3.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-ejb3-all.jar"/>
+ <classpathentry kind="lib" path="lib/thirdparty-all.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-10-21 12:52:21 UTC (rev 29720)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml 2009-10-21 12:53:16 UTC (rev 29721)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="JBoss TM performance comparison project" default="profile">
+<project name="JBoss TM performance comparison project" default="profile-ejb3">
<import file="/home/whitingjr/java/hibernate/caveatemptor-jpa-061211/build.xml" />
<!--
set this property for the LogStore location.
@@ -16,32 +16,30 @@
<include name="*.jar" />
</fileset>
- <property name="JIP_HOME" value="/home/whitingjr/java/jip" />
-
<path id="ant.classpath">
<pathelement path="${ant.home}/lib/ant" />
<pathelement path="${ant.home}/lib/optional.jar" />
<pathelement path="${ant.home}/lib/ant.jar" />
<pathelement path="${ant.home}/lib/ant-launcher.jar" />
</path>
-
+
<path id="demo.compile.classpath">
- <path refid="project.classpath" />
- <pathelement path="/home/whitingjr/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar" />
- <pathelement path="lib/profile.jar" />
+ <path refid="project.classpath" />
+ <pathelement path="/home/whitingjr/.m2/repository/log4j/log4j/1.2.15/log4j-1.2.15.jar" />
<pathelement path="lib/client.jar" />
- </path>
-
+ <!--pathelement path="lib/caveatemptor-jpa.jar" /-->
+ <!-- try exploding the jar to classpath -->
+ </path>
+
<path id="demo.run.classpath">
- <path refid="demo.compile.classpath" />
- <pathelement path="build/classes"/>
- <pathelement path="src/main/resources"/>
- </path>
-
+ <path refid="demo.compile.classpath" />
+ <pathelement path="build/classes" />
+ </path>
+
<path id="demo.test.classpath">
- <path refid="demo.run.classpath" />
- <pathelement path="src/test/resources"/>
- </path>
+ <path refid="demo.run.classpath" />
+ <pathelement path="src/test/resources" />
+ </path>
<target name="check-arguments">
@@ -90,8 +88,6 @@
</and>
</condition>
</fail>
-
-
</target>
<target name="check-setup">
@@ -113,7 +109,33 @@
<delete dir="build" />
<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/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" />
+ <copy file="src/main/resources/profile-remote.properties" tofile="build/classes/profile.properties">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <copy file="src/main/resources/META-INF/persistence.xml" todir="build/classes/META-INF">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+ <copy file="src/main/resources/META-INF/caveatemptor-beans.xml" todir="build/classes/META-INF">
+ <filterchain>
+ <expandproperties />
+ </filterchain>
+ </copy>
+
+ <copy file="src/main/resources/log4j.xml" todir="build/classes" />
+
+ <delete dir="${test.output.dir}" />
+ <mkdir dir="${test.output.dir}" />
+
</target>
<target name="compile-demo" depends="prepare">
@@ -121,41 +143,53 @@
<javac srcdir="src/test/java" destdir="${build.classes.dir}" classpathref="demo.run.classpath" />
</target>
- <target name="call-profile-demo" depends="compile-demo" description="depreciated task - do not use">
- <!--java classname="org.apache.tools.ant.launch.Launcher" fork="yes">
- <jvmarg value="-javaagent:${JIP_HOME}/profile/profile.jar" />
- <jvmarg value="-Dprofile.properties=/home/whitingjr/eclipse/v3.5-galileo/workspaces/performance/performance/src/main/resources/profile-ant-demo.properties" />
- <arg value="-Dant.home=${ant.home}" />
- <arg value="-Dant.library.dir=${ant.home}/lib" />
- <arg value="run-demo-test" />
+ <target name="run-demo-test" depends="compile" description="task to call the Demo application with profiling enabled.">
+ <copy file="src/test/resources/testsuite-integration-demo.xml" tofile="build/classes/testsuite-integration-demo.xml"/>
+ <testng outputDir="${test.output.dir}">
+ <jvmarg value="-javaagent:lib/profile.jar" />
+ <jvmarg value="-Dprofile.properties=build/classes/profile.properties" />
<classpath>
- <path refid="ant.classpath"/>
- <path refid="demo.run.classpath"/>
+ <path refid="demo.test.classpath" />
</classpath>
- </java-->
+ <xmlfileset file="build/classes/testsuite-integration-demo.xml" />
+ </testng>
</target>
- <target name="run-demo-test" depends="compile-demo" description="task to call the Demo application with profiling enabled.">
- <delete dir="${test.output.dir}"/>
- <mkdir dir="${test.output.dir}"/>
+ <target name="compile" 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" />
+ </target>
+
+ <target name="profile-ejb3" depends="compile">
+ <copy file="src/test/resources/testsuite-integration-ejb3.xml" tofile="build/classes/testsuite-integration.xml"/>
+ <copy file="src/main/resources/embedded-jboss-beans.xml" todir="build/classes"/>
+ <copy file="src/main/resources/ejb3-interceptors-aop.xml" todir="build/classes"/>
+ <copy file="src/main/resources/jndi.properties" todir="build/classes"/>
+ <copy file="src/main/resources/properties/transaction-management/${transaction.strategy}/default.persistence.properties" todir="build/classes"/>
+ <!--copy todir="build/classes/META-INF">
+ <fileset dir="src/main/resources/META-INF">
+ <include name="*.xml"/>
+ </fileset>
+ </copy-->
+ <copy todir="build/classes" file="src/main/resources/basedata.xml"/>
+ <unzip dest="build/classes" src="lib/caveatemptor-jpa.jar" >
+ <patternset>
+ <include name="**/*.class"/>
+ </patternset>
+ </unzip>
+
<testng outputDir="${test.output.dir}">
<jvmarg value="-javaagent:lib/profile.jar" />
- <jvmarg value="-Dprofile.properties=src/main/resources/profile-ant-demo.properties" />
- <classpath>
+ <jvmarg value="-Dprofile.properties=build/classes/profile.properties" />
+ <classpath>
<path refid="demo.test.classpath" />
</classpath>
- <xmlfileset dir="src/test/resources">
- <include name="testsuite-integration-demo.xml" />
- </xmlfileset>
+ <xmlfileset file="build/classes/testsuite-integration.xml"/>
</testng>
</target>
- <target name="profile" depends="prepare">
- </target>
-
-
<target name="usage">
<echo>Usage: ant ${required-args} ${optional-args} (optional) </echo>
</target>
-</project>
\ No newline at end of file
+</project>
Deleted: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties 2009-10-21 12:52:21 UTC (rev 29720)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties 2009-10-21 12:53:16 UTC (rev 29721)
@@ -1,5 +0,0 @@
-# transaction managed
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-hibernate.cache.provider_class=org.hibernate.cache.NoCacheProvider
-# bean managed transaction
-hibernate.current_session_context_class=org.hibernate.transaction.JTATransactionFactory
\ No newline at end of file
Copied: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties (from rev 29643, labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties)
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/jta-managed/default.persistence.properties 2009-10-21 12:53:16 UTC (rev 29721)
@@ -0,0 +1,5 @@
+# transaction managed
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+hibernate.cache.provider_class=org.hibernate.cache.NoCacheProvider
+# bean managed transaction
+hibernate.current_session_context_class=jta
\ No newline at end of file
Deleted: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties 2009-10-21 12:52:21 UTC (rev 29720)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties 2009-10-21 12:53:16 UTC (rev 29721)
@@ -1,5 +0,0 @@
-# native
-hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
-hibernate.cache.provider_class=org.hibernate.cache.NoCacheProvider
-# jdbc managed transaction
-hibernate.current_session_context_class=org.hibernate.transaction.JDBCTransactionFactory
\ No newline at end of file
Copied: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties (from rev 29643, labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties)
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties (rev 0)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/properties/transaction-management/native/default.persistence.properties 2009-10-21 12:53:16 UTC (rev 29721)
@@ -0,0 +1,5 @@
+# native
+hibernate.transaction.manager_lookup_class=org.hibernate.transaction.JBossTransactionManagerLookup
+hibernate.cache.provider_class=org.hibernate.cache.NoCacheProvider
+# jdbc managed transaction
+hibernate.current_session_context_class=thread
\ No newline at end of file
More information about the jboss-svn-commits
mailing list