[jboss-cvs] JBossAS SVN: r106872 - in projects/jboss-jca/branches/performance: rars and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jul 19 21:46:09 EDT 2010
Author: jeff.zhang
Date: 2010-07-19 21:46:08 -0400 (Mon, 19 Jul 2010)
New Revision: 106872
Added:
projects/jboss-jca/branches/performance/servers/
projects/jboss-jca/branches/performance/servers/build.xml
projects/jboss-jca/branches/performance/servers/src/
projects/jboss-jca/branches/performance/servers/src/main/
projects/jboss-jca/branches/performance/servers/src/main/resources/
projects/jboss-jca/branches/performance/servers/src/main/resources/jbas/
projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/
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
Removed:
projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/jboss-profiler.properties
projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.bat
projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.sh
Modified:
projects/jboss-jca/branches/performance/build.xml
projects/jboss-jca/branches/performance/rars/build.xml
Log:
[JBJCA-386] move some script files into servers directory
Modified: projects/jboss-jca/branches/performance/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/build.xml 2010-07-19 23:02:13 UTC (rev 106871)
+++ projects/jboss-jca/branches/performance/build.xml 2010-07-20 01:46:08 UTC (rev 106872)
@@ -154,8 +154,8 @@
<!-- =================================
Target: profiler
================================= -->
- <target name="profiler" depends="jars">
- <ant dir="rars" inheritRefs="true" target="profiler"/>
+ <target name="profiler">
+ <ant dir="servers" inheritRefs="true" target="profiler"/>
</target>
<!-- =================================
Modified: projects/jboss-jca/branches/performance/rars/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/build.xml 2010-07-19 23:02:13 UTC (rev 106871)
+++ projects/jboss-jca/branches/performance/rars/build.xml 2010-07-20 01:46:08 UTC (rev 106872)
@@ -27,53 +27,8 @@
Properties
================================= -->
<property name="build.rars.dir" value="${build.dir}/rars" />
- <property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
- <property name="jboss.profiler.file" value="${build.dir}/${jboss.profiler}.zip" />
- <target name="profiler-check">
- <available file="${build.dir}/${jboss.profiler}.zip" type="file" property="profiler.exist" value="true"/>
- </target>
-
- <target name="profiler-get" unless="profiler.exist" depends="profiler-check">
- <get src="http://download.jboss.org/jbossprofiler/${jboss.profiler}.zip"
- dest="${build.dir}"/>
- </target>
-
<!-- =================================
- Target: profiler-prepare
- ================================= -->
- <target name="profiler-prepare" depends="profiler-prepare-jbjca, profiler-prepare-jbas">
- </target>
-
- <target name="profiler-prepare-jbjca" depends="profiler-get" if="jbjca.home">
- <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>
- <copy todir="${jbjca.home}/bin" overwrite="true">
- <fileset dir="src/main/resources/profiler" includes="**/*"/>
- </copy>
- <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">
- <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">
- <fileset dir="src/main/resources/profiler" includes="**/*"/>
- </copy>
- <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jboss.as.home}/sever/default/deploy"/>
- </target>
-
- <!-- =================================
Target: compile
================================= -->
<target name="compile">
@@ -152,13 +107,6 @@
</target>
<!-- =================================
- Target: profiler
- ================================= -->
- <target name="profiler" depends="profiler-prepare">
-
- </target>
-
- <!-- =================================
Target: docs
================================= -->
<target name="docs" depends="compile">
Deleted: projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/jboss-profiler.properties
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/jboss-profiler.properties 2010-07-19 23:02:13 UTC (rev 106871)
+++ projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/jboss-profiler.properties 2010-07-20 01:46:08 UTC (rev 106872)
@@ -1,24 +0,0 @@
-enable=yes
-precompiled=no
-cpu=yes
-memory=yes
-includes=org.jboss.jca.core.workmanager.*,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
Deleted: projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.bat
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.bat 2010-07-19 23:02:13 UTC (rev 106871)
+++ projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.bat 2010-07-20 01:46:08 UTC (rev 106872)
@@ -1,76 +0,0 @@
- at echo off
-rem -------------------------------------------------------------------------
-rem IronJacamar Script for Windows
-rem -------------------------------------------------------------------------
-
-rem $Id: $
-
- at if not "%ECHO%" == "" echo %ECHO%
- at if "%OS%" == "Windows_NT" setlocal
-
-if "%OS%" == "Windows_NT" (
- set "DIRNAME=%~dp0%"
-) else (
- set DIRNAME=.\
-)
-
-pushd %DIRNAME%..
-if "x%IRON_JACAMAR_HOME%" == "x" (
- set "IRON_JACAMAR_HOME=%CD%"
-)
-popd
-
-set DIRNAME=
-
-if "%OS%" == "Windows_NT" (
- set "PROGNAME=%~nx0%"
-) else (
- set "PROGNAME=run.bat"
-)
-
-if "x%JAVA_HOME%" == "x" (
- set JAVA=java
- echo JAVA_HOME is not set. Unexpected results may occur.
- echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
-) else (
- set "JAVA=%JAVA_HOME%\bin\java"
-)
-
-rem Setup IronJacamar specific properties
-
-rem Setup the java endorsed dirs
-set IRON_JACAMAR_ENDORSED_DIRS=%IRON_JACAMAR_HOME%\lib\endorsed
-
-if "x%JAVA_OPTS%" == "x" (
- set "JAVA_OPTS=-Xmx512m"
-) else (
- set "JAVA_OPTS=-Xmx512m %JAVA_OPTS%"
-)
-
-echo ===============================================================================
-echo.
-echo IronJacamar
-echo.
-echo IRON_JACAMAR_HOME: %IRON_JACAMAR_HOME%
-echo.
-echo JAVA: %JAVA%
-echo.
-echo JAVA_OPTS: %JAVA_OPTS%
-echo.
-echo ===============================================================================
-echo.
-
-:RESTART
-"%JAVA%" %JAVA_OPTS% ^
- -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 ^
- -jar ironjacamar-sjc.jar %*
-
-if ERRORLEVEL 10 goto RESTART
-
-:END
-if "x%NOPAUSE%" == "x" pause
-
-:END_NO_PAUSE
Deleted: projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.sh
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.sh 2010-07-19 23:02:13 UTC (rev 106871)
+++ projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.sh 2010-07-20 01:46:08 UTC (rev 106872)
@@ -1,54 +0,0 @@
-#!/bin/sh
-### ====================================================================== ###
-## ##
-## IronJacamar Script ##
-## ##
-### ====================================================================== ###
-
-### $Id: $ ###
-
-DIRNAME=`dirname $0`
-
-# Setup IRON_JACAMAR_HOME
-if [ "x$IRON_JACAMAR_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- IRON_JACAMAR_HOME=`cd $DIRNAME/..; pwd`
-fi
-export IRON_JACAMAR_HOME
-
-# Setup the java endorsed dirs
-IRON_JACAMAR_ENDORSED_DIRS="$IRON_JACAMAR_HOME/lib/endorsed"
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-# Setup the JVM options
-JAVA_OPTS="$JAVA_OPTS -Xmx512m"
-
-# Display the environment
-echo "========================================================================="
-echo ""
-echo " IronJacamar"
-echo ""
-echo " IRON_JACAMAR_HOME: $IRON_JACAMAR_HOME"
-echo ""
-echo " JAVA: $JAVA"
-echo ""
-echo " JAVA_OPTS: $JAVA_OPTS"
-echo ""
-echo "========================================================================="
-echo ""
-
-# Start IronJacamar
-"$JAVA" $JAVA_OPTS \
- -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 \
- -jar ironjacamar-sjc.jar "$@"
Added: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml (rev 0)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-07-20 01:46:08 UTC (rev 106872)
@@ -0,0 +1,89 @@
+<!--
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, 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.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+-->
+<project name="ironjacamar-performance-servers"
+ default="profiler"
+ xmlns:ivy="antlib:org.apache.ivy.ant">
+
+ <!-- =================================
+ Properties
+ ================================= -->
+ <property name="build.rars.dir" value="${build.dir}/rars" />
+ <property name="jboss.profiler" value="jboss-profiler-2.0.0.Beta5" />
+ <property name="jboss.profiler.file" value="${build.dir}/${jboss.profiler}.zip" />
+
+ <target name="profiler-check">
+ <available file="${build.dir}/${jboss.profiler}.zip" type="file" property="profiler.exist" value="true"/>
+ </target>
+
+ <target name="profiler-get" unless="profiler.exist" depends="profiler-check">
+ <get src="http://download.jboss.org/jbossprofiler/${jboss.profiler}.zip"
+ dest="${build.dir}"/>
+ </target>
+
+ <!-- =================================
+ Target: profiler-prepare
+ ================================= -->
+ <target name="profiler-prepare" depends="profiler-prepare-jbjca, profiler-prepare-jbas">
+ </target>
+
+ <target name="profiler-prepare-jbjca" depends="profiler-get" if="jbjca.home">
+ <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>
+ <copy todir="${jbjca.home}/bin" overwrite="true">
+ <fileset dir="src/main/resources/jbas" includes="**/*"/>
+ </copy>
+ <delete>
+ <fileset dir="${jbjca.home}/deploy" includes="*.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="jboss.as.home">
+ <unzip src="${build.dir}/${jboss.profiler}.zip" dest="${jboss.as.home}/bin">
+ <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">
+ <fileset dir="src/main/resources/jbjca" includes="**/*"/>
+ </copy>
+ <delete>
+ <fileset dir="${jbjca.home}/deploy" includes="*.rar"/>
+ </delete>
+ <copy file="${target.dir}/wm_JBJCA_NoTransaction_100000.rar" todir="${jboss.as.home}/sever/default/deploy"/>
+ </target>
+
+ <!-- =================================
+ Target: profiler
+ ================================= -->
+ <target name="profiler" depends="profiler-prepare">
+
+ </target>
+
+</project>
Copied: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties (from rev 106871, projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/jboss-profiler.properties)
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/jboss-profiler.properties 2010-07-20 01:46:08 UTC (rev 106872)
@@ -0,0 +1,24 @@
+enable=yes
+precompiled=no
+cpu=yes
+memory=yes
+includes=org.jboss.jca.core.workmanager.*,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
Copied: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat (from rev 106871, projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.bat)
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.bat 2010-07-20 01:46:08 UTC (rev 106872)
@@ -0,0 +1,76 @@
+ at echo off
+rem -------------------------------------------------------------------------
+rem IronJacamar Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id: $
+
+ at if not "%ECHO%" == "" echo %ECHO%
+ at if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set DIRNAME=.\
+)
+
+pushd %DIRNAME%..
+if "x%IRON_JACAMAR_HOME%" == "x" (
+ set "IRON_JACAMAR_HOME=%CD%"
+)
+popd
+
+set DIRNAME=
+
+if "%OS%" == "Windows_NT" (
+ set "PROGNAME=%~nx0%"
+) else (
+ set "PROGNAME=run.bat"
+)
+
+if "x%JAVA_HOME%" == "x" (
+ set JAVA=java
+ echo JAVA_HOME is not set. Unexpected results may occur.
+ echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+ set "JAVA=%JAVA_HOME%\bin\java"
+)
+
+rem Setup IronJacamar specific properties
+
+rem Setup the java endorsed dirs
+set IRON_JACAMAR_ENDORSED_DIRS=%IRON_JACAMAR_HOME%\lib\endorsed
+
+if "x%JAVA_OPTS%" == "x" (
+ set "JAVA_OPTS=-Xmx512m"
+) else (
+ set "JAVA_OPTS=-Xmx512m %JAVA_OPTS%"
+)
+
+echo ===============================================================================
+echo.
+echo IronJacamar
+echo.
+echo IRON_JACAMAR_HOME: %IRON_JACAMAR_HOME%
+echo.
+echo JAVA: %JAVA%
+echo.
+echo JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo ===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% ^
+ -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 ^
+ -jar ironjacamar-sjc.jar %*
+
+if ERRORLEVEL 10 goto RESTART
+
+:END
+if "x%NOPAUSE%" == "x" pause
+
+:END_NO_PAUSE
Copied: projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh (from rev 106871, projects/jboss-jca/branches/performance/rars/src/main/resources/profiler/run_jbjca.sh)
===================================================================
--- projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh (rev 0)
+++ projects/jboss-jca/branches/performance/servers/src/main/resources/jbjca/run_profiler.sh 2010-07-20 01:46:08 UTC (rev 106872)
@@ -0,0 +1,54 @@
+#!/bin/sh
+### ====================================================================== ###
+## ##
+## IronJacamar Script ##
+## ##
+### ====================================================================== ###
+
+### $Id: $ ###
+
+DIRNAME=`dirname $0`
+
+# Setup IRON_JACAMAR_HOME
+if [ "x$IRON_JACAMAR_HOME" = "x" ]; then
+ # get the full path (without any relative bits)
+ IRON_JACAMAR_HOME=`cd $DIRNAME/..; pwd`
+fi
+export IRON_JACAMAR_HOME
+
+# Setup the java endorsed dirs
+IRON_JACAMAR_ENDORSED_DIRS="$IRON_JACAMAR_HOME/lib/endorsed"
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+# Setup the JVM options
+JAVA_OPTS="$JAVA_OPTS -Xmx512m"
+
+# Display the environment
+echo "========================================================================="
+echo ""
+echo " IronJacamar"
+echo ""
+echo " IRON_JACAMAR_HOME: $IRON_JACAMAR_HOME"
+echo ""
+echo " JAVA: $JAVA"
+echo ""
+echo " JAVA_OPTS: $JAVA_OPTS"
+echo ""
+echo "========================================================================="
+echo ""
+
+# Start IronJacamar
+"$JAVA" $JAVA_OPTS \
+ -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 \
+ -jar ironjacamar-sjc.jar "$@"
More information about the jboss-cvs-commits
mailing list