[jboss-cvs] JBossAS SVN: r106967 - 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 23:26:03 EDT 2010
Author: jeff.zhang
Date: 2010-07-20 23:26:02 -0400 (Tue, 20 Jul 2010)
New Revision: 106967
Added:
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/bootstrap.xml
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/profiler.xml
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/jbas/jboss-profiler.properties
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh
Log:
[JBJCA-386] start and stop profiler by ant
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-07-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/build.xml 2010-07-21 03:26:02 UTC (rev 106967)
@@ -107,6 +107,8 @@
<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"/>
+ <property name="version.jboss.serialization" value="1.0.3.GA"/>
+ <property name="version.jboss.remoting" value="2.5.3"/>
<!-- =================================
Bootstrap Ivy
Modified: projects/jboss-jca/branches/performance/ivy.xml
===================================================================
--- projects/jboss-jca/branches/performance/ivy.xml 2010-07-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/ivy.xml 2010-07-21 03:26:02 UTC (rev 106967)
@@ -39,6 +39,8 @@
<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="jboss" name="jboss-serialization" rev="${version.jboss.serialization}" conf="sjc"/>
+ <dependency org="org.jboss.remoting" name="jboss-remoting" rev="${version.jboss.remoting}" 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>
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-07-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-07-21 03:26:02 UTC (rev 106967)
@@ -66,7 +66,7 @@
<!-- =================================
Target: jbossas server config
================================= -->
- <target name="jbas-config" unless="server-config.target.complete">
+ <target name="jbas-config" unless="server-config.target.complete" if="jbas.home">
<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"/>
@@ -108,35 +108,65 @@
Target: profiler-prepare
================================= -->
<target name="profiler-prepare" depends="profiler-prepare-jbjca, profiler-prepare-jbas">
+ <taskdef name="startprofiler" classname="org.jboss.profiler.ant.StartProfilerTask">
+ <classpath refid="profiler.taskdef.classpath"/>
+ </taskdef>
+ <taskdef name="stopprofiler" classname="org.jboss.profiler.ant.StopProfilerTask">
+ <classpath refid="profiler.taskdef.classpath"/>
+ </taskdef>
</target>
<target name="profiler-prepare-jbjca" depends="profiler-get" if="jbjca.home">
- <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbjca.home}/lib/profiler">
+ <property name="deployer.dir" value="${jbjca.home}/deploy"/>
+ <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbjca.home}/bin">
<patternset>
<include name="${jboss.profiler}/jboss-profiler.jar"/>
- <include name="${jboss.profiler}/jboss-profiler-plugins.jar"/>
</patternset>
<mapper type="flatten"/>
</unzip>
+ <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbjca.home}/lib/profiler">
+ <patternset>
+ <include name="${jboss.profiler}/jboss-profiler-ant.jar"/>
+ <include name="${jboss.profiler}/jboss-profiler.sar"/>
+ <include name="${jboss.profiler}/concurrent.jar"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </unzip>
+ <move file="${jbjca.home}/lib/profiler/jboss-profiler.sar" tofile="${jbjca.home}/lib/profiler/jboss-profiler.sar.jar"/>
+
<copy todir="${jbjca.home}/lib/profiler">
<fileset dir="${lib.dir}/sjc" includes="*.jar"/>
</copy>
+ <path id="profiler.taskdef.classpath">
+ <fileset dir="${jbjca.home}/lib/profiler" includes="jboss-profiler-ant.jar"/>
+ <fileset dir="${jbjca.home}/lib/profiler" includes="jboss-remoting.jar"/>
+ <fileset dir="${jbjca.home}/lib" includes="*.jar"/>
+ </path>
<copy todir="${jbjca.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/jbjca" includes="**/*"/>
+ <fileset dir="src/main/resources/jbjca" includes="*.properties"/>
+ <fileset dir="src/main/resources/jbjca" includes="*.sh"/>
+ <fileset dir="src/main/resources/jbjca" includes="*.bat"/>
</copy>
<chmod file="${jbjca.home}/bin/*_profiler.sh" perm="775"/>
+
+ <copy todir="${jbjca.home}/config" overwrite="true">
+ <fileset dir="src/main/resources/jbjca" includes="bootstrap.xml"/>
+ </copy>
+ <copy todir="${jbjca.home}/config/bootstrap" overwrite="true">
+ <fileset dir="src/main/resources/jbjca" includes="profiler.xml"/>
+ </copy>
<delete>
- <fileset dir="${jbjca.home}/deploy" includes="wm*.rar"/>
+ <fileset dir="${deployer.dir}" includes="wm*.rar"/>
</delete>
- <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jbjca.home}/deploy"/>
</target>
<target name="profiler-prepare-jbas" depends="profiler-get" if="jbas.home">
+ <property name="deployer.dir" value="${jbas.home}/server/default/deploy"/>
<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"/>
+ <include name="${jboss.profiler}/jboss-profiler-ant.jar"/>
</patternset>
<mapper type="flatten"/>
</unzip>
@@ -149,15 +179,19 @@
<copy todir="${jbas.home}/bin/profiler">
<fileset dir="${lib.dir}/jbossas" includes="*.jar"/>
</copy>
+ <path id="profiler.taskdef.classpath">
+ <fileset dir="${jbas.home}/bin/profiler" includes="jboss-profiler-ant.jar"/>
+ <fileset dir="${jbas.home}/client" includes="*.jar"/>
+ </path>
<copy todir="${jbas.home}/bin" overwrite="true">
<fileset dir="src/main/resources/jbas" includes="**/*"/>
</copy>
<chmod file="${jbas.home}/bin/*_profiler.sh" perm="775"/>
<delete>
- <fileset dir="${jbas.home}/server/default/deploy" includes="wm*.rar"/>
+ <fileset dir="${deployer.dir}" includes="wm*.rar"/>
</delete>
- <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jbas.home}/server/default/deploy"/>
+
</target>
<!-- =================================
@@ -173,8 +207,16 @@
<exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
<arg line="run_profiler.${ext}"/>
</exec>
+ <sleep seconds="5"/>
+
+ <echo message="Start Profiler"/>
+ <startprofiler/>
+ <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${deployer.dir}"/>
<echo message="Wait for a while"/>
<sleep seconds="10"/>
+ <echo message="Stop Profiler"/>
+ <stopprofiler/>
+
<echo message="Stoping server..."/>
<exec dir="${jbjca.home}/bin" executable="${exec}">
<arg line="shutdown_profiler.${ext}"/>
@@ -184,8 +226,16 @@
<target name="profiler-jbas" depends="jbas-config" if="jbas.home">
<echo message="Starting server..."/>
<server:start name="default"/>
+ <sleep seconds="2"/>
+
+ <echo message="Start Profiler"/>
+ <startprofiler/>
+ <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${deployer.dir}"/>
<echo message="Wait for a while"/>
<sleep seconds="10"/>
+ <echo message="Stop Profiler"/>
+ <stopprofiler/>
+
<echo message="Stoping server..."/>
<server:stop name="default"/>
</target>
Modified: 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 2010-07-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbas/jboss-profiler.properties 2010-07-21 03:26:02 UTC (rev 106967)
@@ -7,18 +7,17 @@
visibility=private
save=yes
savelocation=.
-startup=yes
+startup=no
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
+ejb=no
+servlet=no
+jsf=no
+jmx=no
+rmi=no
+corba=no
+
Added: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/bootstrap.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/bootstrap.xml (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/bootstrap.xml 2010-07-21 03:26:02 UTC (rev 106967)
@@ -0,0 +1,8 @@
+<bootstrap>
+
+ <url>bootstrap/naming.xml</url>
+ <url>bootstrap/stdio.xml</url>
+ <url>bootstrap/transaction.xml</url>
+ <url>bootstrap/jca.xml</url>
+ <url>bootstrap/profiler.xml</url>
+</bootstrap>
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-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties 2010-07-21 03:26:02 UTC (rev 106967)
@@ -7,18 +7,17 @@
visibility=private
save=yes
savelocation=.
-startup=yes
+startup=no
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
+ejb=no
+servlet=no
+jsf=no
+jmx=no
+rmi=no
+corba=no
+
Added: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/profiler.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/profiler.xml (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/profiler.xml 2010-07-21 03:26:02 UTC (rev 106967)
@@ -0,0 +1,11 @@
+<deployment>
+
+ <bean name="Profiler" class="org.jboss.profiler.as.Profiler">
+ </bean>
+
+ <bean name="Communicator" class="org.jboss.profiler.as.Communicator">
+ <property name="Socket">true</property>
+ <property name="SocketPort">5400</property>
+ </bean>
+
+</deployment>
Modified: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat 2010-07-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat 2010-07-21 03:26:02 UTC (rev 106967)
@@ -65,7 +65,7 @@
-Djava.endorsed.dirs="%IRON_JACAMAR_ENDORSED_DIRS%" ^
-Dorg.jboss.logging.Logger.pluginClass=org.jboss.logging.logmanager.LoggerPluginImpl ^
-Dlog4j.defaultInitOverride=true ^
- -javaagent:..\lib\profiler\jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties ^
+ -javaagent:jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties ^
-jar ironjacamar-sjc.jar %*
if ERRORLEVEL 10 goto RESTART
Modified: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh 2010-07-21 03:13:34 UTC (rev 106966)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh 2010-07-21 03:26:02 UTC (rev 106967)
@@ -50,5 +50,5 @@
-Djava.endorsed.dirs="$IRON_JACAMAR_ENDORSED_DIRS" \
-Dorg.jboss.logging.Logger.pluginClass=org.jboss.logging.logmanager.LoggerPluginImpl \
-Dlog4j.defaultInitOverride=true \
- -javaagent:../lib/profiler/jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties \
+ -javaagent:jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties \
-jar ironjacamar-sjc.jar "$@"
More information about the jboss-cvs-commits
mailing list