[jboss-cvs] JBossAS SVN: r106876 - in projects/jboss-jca/branches/performance: rars/src/main/resources and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 19 23:58:03 EDT 2010
Author: jeff.zhang
Date: 2010-07-19 23:58:02 -0400 (Mon, 19 Jul 2010)
New Revision: 106876
Added:
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh
Removed:
projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/ivy.settings.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/run_profiler.bat
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh
Log:
[JBJCA-386] start and stop sjc server controled by ant
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-07-20 03:47:07 UTC (rev 106875)
+++ projects/jboss-jca/branches/performance/build.xml 2010-07-20 03:58:02 UTC (rev 106876)
@@ -101,6 +101,7 @@
Versions
================================= -->
<property name="version.jboss.jca.api" value="1.5.0.GA"/>
+ <property name="version.fungal" value="0.8.0.Beta6"/>
<!-- =================================
Bootstrap Ivy
@@ -154,7 +155,7 @@
<!-- =================================
Target: profiler
================================= -->
- <target name="profiler">
+ <target name="profiler" depends="resolve">
<ant dir="servers" inheritRefs="true" target="profiler"/>
</target>
Modified: projects/jboss-jca/branches/performance/ivy.settings.xml
===================================================================
--- projects/jboss-jca/branches/performance/ivy.settings.xml 2010-07-20 03:47:07 UTC (rev 106875)
+++ projects/jboss-jca/branches/performance/ivy.settings.xml 2010-07-20 03:58:02 UTC (rev 106876)
@@ -35,11 +35,14 @@
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
<ibiblio name="central" m2compatible="true" usepoms="false" root="${central.repo}"
pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
+ <ibiblio name="fungal" m2compatible="true" usepoms="false" root="${fungal.repo}"
+ pattern="[organisation]/[module]/[revision]/[artifact]-[revision](-[classifier]).[ext]"/>
<chain name="default" returnFirst="true">
<resolver ref="local"/>
<resolver ref="jboss"/>
<resolver ref="snapshots"/>
<resolver ref="central"/>
+ <resolver ref="fungal"/>
</chain>
</resolvers>
</ivysettings>
Modified: projects/jboss-jca/branches/performance/ivy.xml
===================================================================
--- projects/jboss-jca/branches/performance/ivy.xml 2010-07-20 03:47:07 UTC (rev 106875)
+++ projects/jboss-jca/branches/performance/ivy.xml 2010-07-20 03:58:02 UTC (rev 106876)
@@ -29,12 +29,15 @@
<repository name="jboss" url="http://repository.jboss.org"/>
</info>
- <configurations defaultconfmapping="common->default">
+ <configurations defaultconfmapping="common->default;sjc->default">
<conf name="common" transitive="false"/>
+ <conf name="sjc" 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"/>
</dependencies>
</ivy-module>
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-07-20 03:47:07 UTC (rev 106875)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-07-20 03:58:02 UTC (rev 106876)
@@ -30,6 +30,24 @@
<property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
<property name="jboss.profiler.file" value="${build.dir}/${jboss.profiler}.zip" />
+ <condition property="is.unix">
+ <os family="unix"/>
+ </condition>
+ <condition property="is.windows">
+ <os family="windows"/>
+ </condition>
+
+ <target name="os-check" depends="os-check-unix, os-check-windows">
+ </target>
+ <target name="os-check-unix" if="is.unix">
+ <property name="exec" value="bash" />
+ <property name="ext" value="sh" />
+ </target>
+ <target name="os-check-windows" if="is.windows">
+ <property name="exec" value="cmd.exe" />
+ <property name="ext" value="bat" />
+ </target>
+
<target name="profiler-check">
<available file="${build.dir}/${jboss.profiler}.zip" type="file" property="profiler.exist" value="true"/>
</target>
@@ -46,18 +64,23 @@
</target>
<target name="profiler-prepare-jbjca" depends="profiler-get" if="jbjca.home">
- <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbjca.home}/bin">
+ <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jbjca.home}/lib/profiler">
<patternset>
<include name="${jboss.profiler}/jboss-profiler.jar"/>
<include name="${jboss.profiler}/jboss-profiler-plugins.jar"/>
</patternset>
<mapper type="flatten"/>
</unzip>
+ <copy todir="${jbjca.home}/lib/profiler">
+ <fileset dir="${lib.dir}/sjc" includes="*.jar"/>
+ </copy>
+
<copy todir="${jbjca.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/jbas" includes="**/*"/>
+ <fileset dir="src/main/resources/jbjca" includes="**/*"/>
</copy>
+ <chmod file="${jbjca.home}/bin/*_profiler.sh" perm="775"/>
<delete>
- <fileset dir="${jbjca.home}/deploy" includes="*.rar"/>
+ <fileset dir="${jbjca.home}/deploy" includes="wm*.rar"/>
</delete>
<copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jbjca.home}/deploy"/>
</target>
@@ -71,10 +94,11 @@
<mapper type="flatten"/>
</unzip>
<copy todir="${jboss.as.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/jbjca" includes="**/*"/>
+ <fileset dir="src/main/resources/jbas" includes="**/*"/>
</copy>
+ <chmod file="${jboss.as.home}/bin/*_profiler.sh" perm="775"/>
<delete>
- <fileset dir="${jbjca.home}/deploy" includes="*.rar"/>
+ <fileset dir="${jboss.as.home}/sever/default/deploy" includes="wm*.rar"/>
</delete>
<copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jboss.as.home}/sever/default/deploy"/>
</target>
@@ -82,8 +106,25 @@
<!-- =================================
Target: profiler
================================= -->
- <target name="profiler" depends="profiler-prepare">
+ <target name="profiler" depends="os-check, profiler-prepare">
+ <antcall target="profiler-jbjca"/>
+ <antcall target="profiler-jbas"/>
+ </target>
+ <target name="profiler-jbjca" if="jbjca.home">
+ <echo message="Starting server..."/>
+ <exec dir="${jbjca.home}/bin" executable="${exec}" spawn="true">
+ <arg line="run_profiler.${ext}"/>
+ </exec>
+ <echo message="Wait for a while"/>
+ <sleep seconds="10"/>
+ <echo message="Stoping server..."/>
+ <exec dir="${jbjca.home}/bin" executable="${exec}">
+ <arg line="shutdown_profiler.${ext}"/>
+ </exec>
</target>
+ <target name="profiler-jbas" if="jbas.home">
+ </target>
+
</project>
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-20 03:47:07 UTC (rev 106875)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat 2010-07-20 03:58:02 UTC (rev 106876)
@@ -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:jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties ^
+ -javaagent:..\lib\profiler\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-20 03:47:07 UTC (rev 106875)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh 2010-07-20 03:58:02 UTC (rev 106876)
@@ -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:jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties \
+ -javaagent:../lib/profiler/jboss-profiler.jar -Djboss-profiler.properties=jboss-profiler.properties \
-jar ironjacamar-sjc.jar "$@"
Added: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.bat 2010-07-20 03:58:02 UTC (rev 106876)
@@ -0,0 +1,9 @@
+ at echo off
+rem -------------------------------------------------------------------------
+rem IronJacamar Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id: $
+
+java -jar ..\lib\profiler\fungal-cli.jar shutdown
+
Added: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh 2010-07-20 03:58:02 UTC (rev 106876)
@@ -0,0 +1,10 @@
+#!/bin/sh
+### ====================================================================== ###
+## ##
+## IronJacamar Script ##
+## ##
+### ====================================================================== ###
+
+### $Id: $ ###
+
+java -jar ../lib/profiler/fungal-cli.jar shutdown
Property changes on: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/shutdown_profiler.sh
___________________________________________________________________
Name: svn:executable
+ *
More information about the jboss-cvs-commits
mailing list