[jboss-cvs] JBossAS SVN: r106899 - in projects/jboss-jca/branches/performance: servers and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 20 06:37:10 EDT 2010
Author: jeff.zhang
Date: 2010-07-20 06:37:10 -0400 (Tue, 20 Jul 2010)
New Revision: 106899
Added:
projects/jboss-jca/branches/performance/servers/src/main/resources/jbas/jboss-profiler.properties
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/ivy.xml
projects/jboss-jca/branches/performance/servers/build.xml
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties
Log:
[JBJCA-386] start and stop jbossas automaticlly
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-07-20 10:33:13 UTC (rev 106898)
+++ projects/jboss-jca/branches/performance/build.xml 2010-07-20 10:37:10 UTC (rev 106899)
@@ -1,6 +1,6 @@
<!--
* JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -102,6 +102,11 @@
================================= -->
<property name="version.jboss.jca.api" value="1.5.0.GA"/>
<property name="version.fungal" value="0.8.0.Beta6"/>
+ <property name="version.jboss.test" value="1.1.9.GA"/>
+ <property name="version.jboss.server.manager" value="1.0.3.GA"/>
+ <property name="version.jboss.logging" value="2.1.0.GA"/>
+ <property name="version.log4j" value="1.2.14"/>
+ <property name="version.jboss.jnp-client" value="5.0.5.Final"/>
<!-- =================================
Bootstrap Ivy
Modified: projects/jboss-jca/branches/performance/ivy.xml
===================================================================
--- projects/jboss-jca/branches/performance/ivy.xml 2010-07-20 10:33:13 UTC (rev 106898)
+++ projects/jboss-jca/branches/performance/ivy.xml 2010-07-20 10:37:10 UTC (rev 106899)
@@ -29,15 +29,18 @@
<repository name="jboss" url="http://repository.jboss.org"/>
</info>
- <configurations defaultconfmapping="common->default;sjc->default">
+ <configurations defaultconfmapping="common->default;sjc->default;jbossas->default">
<conf name="common" transitive="false"/>
<conf name="sjc" transitive="false"/>
+ <conf name="jbossas" transitive="false"/>
</configurations>
<dependencies>
<dependency org="org.jboss.javaee" name="jboss-jca-api" rev="${version.jboss.jca.api}" conf="common"/>
<dependency org="com.github.fungal" name="fungal" rev="${version.fungal}" conf="sjc"/>
<dependency org="com.github.fungal" name="fungal-cli" rev="${version.fungal}" conf="sjc"/>
+ <dependency org="org.jboss.test" name="jboss-test" rev="${version.jboss.test}" conf="jbossas"/>
+ <dependency org="org.jboss.jbossas" name="jboss-server-manager" rev="${version.jboss.server.manager}" conf="jbossas"/>
</dependencies>
</ivy-module>
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-07-20 10:33:13 UTC (rev 106898)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-07-20 10:37:10 UTC (rev 106899)
@@ -1,6 +1,6 @@
<!--
* JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
* as indicated by the @author tags. See the copyright.txt file in the
* distribution for a full listing of individual contributors.
*
@@ -21,7 +21,8 @@
-->
<project name="ironjacamar-performance-servers"
default="profiler"
- xmlns:ivy="antlib:org.apache.ivy.ant">
+ xmlns:ivy="antlib:org.apache.ivy.ant"
+ xmlns:server="http://jboss.org/ns/test/ant/server">
<!-- =================================
Properties
@@ -36,6 +37,8 @@
<condition property="is.windows">
<os family="windows"/>
</condition>
+ <property environment="env"/>
+ <property name="java.exec" value="${env.JAVA_HOME}/bin/java"/>
<target name="os-check" depends="os-check-unix, os-check-windows">
</target>
@@ -48,6 +51,9 @@
<property name="ext" value="bat" />
</target>
+ <!-- =================================
+ Target: profiler check
+ ================================= -->
<target name="profiler-check">
<available file="${build.dir}/${jboss.profiler}.zip" type="file" property="profiler.exist" value="true"/>
</target>
@@ -58,6 +64,47 @@
</target>
<!-- =================================
+ Target: jbossas server config
+ ================================= -->
+ <target name="jbas-config" unless="server-config.target.complete">
+ <path id="server.taskdef.classpath">
+ <fileset dir="${jbas.home}/bin/profiler" includes="jboss-test*.jar"/>
+ <fileset dir="${jbas.home}/bin/profiler" includes="jboss-server-manager*.jar"/>
+ <fileset dir="${jbas.home}/client" includes="*.jar"/>
+ </path>
+
+ <taskdef name="config" classname="org.jboss.ant.taskdefs.server.ConfigManagerTask"
+ uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath"/>
+ </taskdef>
+ <taskdef name="start" classname="org.jboss.ant.taskdefs.server.StartServerTask"
+ uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath"/>
+ </taskdef>
+ <taskdef name="stop" classname="org.jboss.ant.taskdefs.server.StopServerTask"
+ uri="http://jboss.org/ns/test/ant/server" loaderref="server.loader">
+ <classpath refid="server.taskdef.classpath"/>
+ </taskdef>
+
+ <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jbas.home}">
+ <server name="default" host="localhost">
+ <jvmarg value="-javaagent:${jbas.home}/bin/profiler/jboss-profiler.jar"/>
+ <jvmarg value="-Djboss-profiler.properties=${jbas.home}/bin/jboss-profiler.properties" />
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
+
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.endorsed.dirs" value="${jbas.home}/lib/endorsed" />
+ </server>
+ </server:config>
+
+ <property name="server-config.target.complete" value="true"/>
+ </target>
+
+ <!-- =================================
Target: profiler-prepare
================================= -->
<target name="profiler-prepare" depends="profiler-prepare-jbjca, profiler-prepare-jbas">
@@ -85,22 +132,32 @@
<copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jbjca.home}/deploy"/>
</target>
- <target name="profiler-prepare-jbas" depends="profiler-get" if="jboss.as.home">
- <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jboss.as.home}/bin">
+ <target name="profiler-prepare-jbas" depends="profiler-get" if="jbas.home">
+ <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbas.home}/bin/profiler">
<patternset>
<include name="${jboss.profiler}/jboss-profiler.jar"/>
<include name="${jboss.profiler}/jboss-profiler-plugins.jar"/>
</patternset>
<mapper type="flatten"/>
</unzip>
- <copy todir="${jboss.as.home}/bin" overwrite="true">
+ <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbas.home}/server/default/deploy">
+ <patternset>
+ <include name="${jboss.profiler}/jboss-profiler.sar"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <copy todir="${jbas.home}/bin/profiler">
+ <fileset dir="${lib.dir}/jbossas" includes="*.jar"/>
+ </copy>
+
+ <copy todir="${jbas.home}/bin" overwrite="true">
<fileset dir="src/main/resources/jbas" includes="**/*"/>
</copy>
- <chmod file="${jboss.as.home}/bin/*_profiler.sh" perm="775"/>
+ <chmod file="${jbas.home}/bin/*_profiler.sh" perm="775"/>
<delete>
- <fileset dir="${jboss.as.home}/sever/default/deploy" includes="wm*.rar"/>
+ <fileset dir="${jbas.home}/server/default/deploy" includes="wm*.rar"/>
</delete>
- <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jboss.as.home}/sever/default/deploy"/>
+ <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jbas.home}/server/default/deploy"/>
</target>
<!-- =================================
@@ -124,7 +181,13 @@
</exec>
</target>
- <target name="profiler-jbas" if="jbas.home">
+ <target name="profiler-jbas" depends="jbas-config" if="jbas.home">
+ <echo message="Starting server..."/>
+ <server:start name="default"/>
+ <echo message="Wait for a while"/>
+ <sleep seconds="10"/>
+ <echo message="Stoping server..."/>
+ <server:stop name="default"/>
</target>
</project>
Added: projects/jboss-jca/branches/performance/servers/src/main/resources/jbas/jboss-profiler.properties
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbas/jboss-profiler.properties (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbas/jboss-profiler.properties 2010-07-20 10:37:10 UTC (rev 106899)
@@ -0,0 +1,24 @@
+enable=yes
+precompiled=no
+cpu=yes
+memory=yes
+includes=org.jboss.resource.work.*
+excludes=*
+visibility=private
+save=yes
+savelocation=.
+startup=yes
+repository=no
+remote=yes
+store=memory
+location=.
+host=localhost
+port=5400
+ejb=yes
+servlet=yes
+jsf=yes
+jmx=yes
+rmi=yes
+corba=yes
+plugin.1=org.jboss.profiler.plugins.Hibernate
+plugin.2=org.jboss.profiler.plugins.Seam
Modified: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties 2010-07-20 10:33:13 UTC (rev 106898)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties 2010-07-20 10:37:10 UTC (rev 106899)
@@ -2,7 +2,7 @@
precompiled=no
cpu=yes
memory=yes
-includes=org.jboss.jca.core.workmanager.*,org.jboss.resource.work.*
+includes=org.jboss.jca.core.workmanager.*
excludes=*
visibility=private
save=yes
More information about the jboss-cvs-commits
mailing list