Author: gmazza
Date: Fri Oct 3 13:11:21 2008
New Revision: 701519
URL: http://svn.apache.org/viewvc?rev=701519&view=rev
Log:
Minor cleanups done.
Modified:
cxf/trunk/benchmark/performance/README.txt
cxf/trunk/benchmark/performance/basic_type/build.xml
cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
cxf/trunk/benchmark/performance/complex_type/build.xml
cxf/trunk/benchmark/performance/etc/common_build.xml
cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_java_client
cxf/trunk/benchmark/performance/soap_http_doc_lit/build.xml
Modified: cxf/trunk/benchmark/performance/README.txt
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/README.txt?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/README.txt (original)
+++ cxf/trunk/benchmark/performance/README.txt Fri Oct 3 13:11:21 2008
@@ -6,31 +6,32 @@
under the root drive. This creates the sub-directory build,
which includes all of the product directories.
-1. setup the build Enviroment
+1. Setup the build environment
To build and run the performance test case , you must install
-the J2SE Development Kit (JDK) 5.0
+the J2SE Development Kit (JDK) 5.0 or later.
-If you want to use ant to build and run the performance test case,
-you must install the Apache ant 1.6 build utility.
+The performance test cases in the /bin folder under each test require
+Apache Ant, V1.6 or later.
-The CXF_HOME system variable need to be set to the cxf binary install
+The CXF_HOME system variable needs to be set to the cxf binary install
directory.
- 2. Build the performance test case
+2. Build the performance test case
There are two types of test case in the performance test case
directory. The base directory provide a simple testcase base class for
-the client to calculate the server reponse time and throughput. There
-for you should build the base directory first, and then build the
- othere directory files.
+the client to calculate the server response time and throughput. There
+you should build the base directory first, and then build the
+other directory files.
cd base
ant
- cd ../soap_http_doc_lit
+ cd ../soap_http_doc_lit (the best one, but /basic_type, /complex_type also
available)
ant
- 3. to run the performance test
+3. To run the performance tests
+
You can cd to soap_http_doc_lit/bin to run the test
run_server and run_server.bat just startup the server
run_client and run_client.bat can take these argument:
@@ -38,10 +39,13 @@
-BasedOn Time setup the invoking count with time
-Amount define the invoke times , if based on time it means second
-PacketSize define the packet size which client send to server
- -Threads define the thread number to run the perform test
- Can be a range or comma separated list to run multiple time
- with different thread counts. For example:
- -Threads 1-4,6,8,10
+ -Threads define the number of threads to run the perform test
+ For soap_http_doc_lit, can be a range or comma separated
+ list to run multiple time with different thread counts. For
example:
+ -Threads 1-4,6,8,10
-WSDL wsdl location (defaults to the perf.wsdl)
-BuildFile location of alternative build.xml file (mostly for running
clients/servers)
+You can alternatively run them directly using the build.xml file in each
+test subdirectory (view the contents of the run_xxx(.bat) files
+for the format of those calls--they call the Ant build file directly.)
Modified: cxf/trunk/benchmark/performance/basic_type/build.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/basic_type/build.xml?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/basic_type/build.xml (original)
+++ cxf/trunk/benchmark/performance/basic_type/build.xml Fri Oct 3 13:11:21
2008
@@ -17,42 +17,43 @@
specific language governing permissions and limitations
under the License.
-->
+
+<!-- See README file in parent directory for information on running
performance tests -->
<project name="test.basic_type" default="build" basedir=".">
- <import file="../etc/common_build.xml"/>
- <property name="wsdl.dir" location="${basedir}/wsdl"/>
- <property name="wsdl.file" value="basic_type.wsdl"/>
-
- <target name="client" description="run basic_type client" depends="build">
- <property name="param" value=""/>
- <property name="pipe" value=""/>
- <cxf.client.run
classname="org.apache.cxf.performance.basic_type.client.Client" argline=
- "-WSDL
http://${cxf.host.name}:${cxf.port.name}/performance/basic_type/SoapPort?wsdl
+ <import file="../etc/common_build.xml" />
+ <property name="wsdl.dir" location="${basedir}/wsdl" />
+ <property name="wsdl.file" value="basic_type.wsdl" />
+
+ <target name="generate.code">
+ <echo level="info" message="Generating code using wsdl2java..."
/>
+ <wsdl2java file="basic_type.wsdl" />
+ </target>
+
+ <property name="cxf.war.file.name" value="basic_type" />
+ <target name="war" depends="build">
+ <cxfwar wsdl="basic_type.wsdl"
filename="${cxf.war.file.name}.war" />
+ </target>
+
+ <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
+ <property name="param" value="" />
+ <cxf.client.run
classname="org.apache.cxf.performance.basic_type.client.Client" argline="-WSDL
${base.url}/basic_type/services/basic_type?wsdl " />
+ </target>
+
+ <!-- client and server tasks below easier to run from script files in
bin/ subdirectory
+ Alternatively provide -Dxxxx=yyy options at command line for
params listed below. -->
+ <target name="client" description="run basic_type client"
depends="build">
+ <property name="param" value="" />
+ <property name="pipe" value="" />
+ <cxf.client.run
classname="org.apache.cxf.performance.basic_type.client.Client" argline="-WSDL
http://${cxf.host.name}:${cxf.port.name}/performance/basic_type/SoapPort?wsdl
-Amount ${cxf.running.time}
-BasedOn ${cxf.basedon}
-Operation ${cxf.operation}
-PacketSize ${cxf.packet.size}
- -Threads ${cxf.threads} ${pipe}"/>
- </target>
-
- <target name="server" description="run basic_type server" depends="build">
- <cxf.server.run
classname="org.apache.cxf.performance.basic_type.server.Server" argline="-WSDL
${basedir}/wsdl/${wsdl.file}"/>
- </target>
-
- <target name="generate.code">
- <echo level="info" message="Generating code using wsdl2java..."/>
- <wsdl2java file="basic_type.wsdl"/>
- </target>
-
- <property name="cxf.war.file.name" value="basic_type"/>
- <target name="war" depends="build">
- <cxfwar wsdl="basic_type.wsdl" filename="${cxf.war.file.name}.war"/>
- </target>
-
- <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
- <property name="param" value=""/>
- <cxf.client.run
classname="org.apache.cxf.performance.basic_type.client.Client" argline=
- "-WSDL ${base.url}/basic_type/services/basic_type?wsdl " />
- </target>
+ -Threads ${cxf.threads} ${pipe}" />
+ </target>
+ <target name="server" description="run basic_type server"
depends="build">
+ <cxf.server.run
classname="org.apache.cxf.performance.basic_type.server.Server" argline="-WSDL
${basedir}/wsdl/${wsdl.file}" />
+ </target>
</project>
Modified:
cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
---
cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
(original)
+++
cxf/trunk/benchmark/performance/basic_type/src/org/apache/cxf/performance/basic_type/server/Server.java
Fri Oct 3 13:11:21 2008
@@ -42,7 +42,7 @@
public void run() {
System.out.println("running server");
- System.out.println(" READY ");
+ System.out.println("READY");
}
Modified: cxf/trunk/benchmark/performance/complex_type/build.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/complex_type/build.xml?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/complex_type/build.xml (original)
+++ cxf/trunk/benchmark/performance/complex_type/build.xml Fri Oct 3 13:11:21
2008
@@ -17,43 +17,44 @@
specific language governing permissions and limitations
under the License.
-->
+<!-- See README file in parent directory for information on running
performance tests -->
<project name="test.complex_type" default="build" basedir=".">
- <import file="../etc/common_build.xml"/>
+ <import file="../etc/common_build.xml" />
- <property name="wsdl.dir" location="${basedir}/wsdl"/>
- <property name="wsdl.file" value="complex_type.wsdl"/>
+ <property name="wsdl.dir" location="${basedir}/wsdl" />
+ <property name="wsdl.file" value="complex_type.wsdl" />
- <target name="client" description="run complex_type client" depends="build">
- <property name="param" value=""/>
- <property name="pipe" value=""/>
+ <target name="generate.code">
+ <echo level="info" message="Generating code using wsdl2java..."
/>
+ <wsdl2java file="complex_type.wsdl" />
+ </target>
+
+ <property name="cxf.war.file.name" value="complex_type" />
+ <target name="war" depends="build">
+ <cxfwar wsdl="complex_type.wsdl"
filename="${cxf.war.file.name}.war" />
+ </target>
+
+ <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
+ <property name="param" value="" />
+ <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client"
argline="-WSDL ${base.url}/complex_type/services/complex_type?wsdl " />
+ </target>
+
+ <!-- client and server tasks below easier to run from script files in
bin/ subdirectory
+ alternatively provide -Dxxxx=yyy options at command line for
params listed below. -->
+ <target name="client" description="run complex_type client"
depends="build">
+ <property name="param" value="" />
+ <property name="pipe" value="" />
- <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client"
argline="-WSDL
http://${cxf.host.name}:${cxf.port.name}/performance/complex_type/SoapPort?wsdl
-Amount ${cxf.running.time}
+ <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client"
argline="-WSDL
http://${cxf.host.name}:${cxf.port.name}/performance/complex_type/SoapPort?wsdl
-Amount ${cxf.running.time}
-BasedOn ${cxf.basedon}
-Operation ${cxf.operation}
-PacketSize ${cxf.packet.size}
-
-Threads ${cxf.threads} ${pipe}"/>
- </target>
-
- <target name="server" description="run complex_type server" depends="build">
- <cxf.server.run
classname="org.apache.cxf.performance.complex_type.server.Server"
argline="-WSDL ${basedir}/wsdl/${wsdl.file}"/>
- </target>
-
- <target name="generate.code">
- <echo level="info" message="Generating code using wsdl2java..."/>
- <wsdl2java file="complex_type.wsdl"/>
- </target>
-
- <property name="cxf.war.file.name" value="complex_type"/>
- <target name="war" depends="build">
- <cxfwar wsdl="complex_type.wsdl" filename="${cxf.war.file.name}.war"/>
- </target>
-
- <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
- <property name="param" value=""/>
- <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client" argline=
- "-WSDL ${base.url}/complex_type/services/complex_type?wsdl " />
- </target>
+
-Threads ${cxf.threads} ${pipe}" />
+ </target>
+ <target name="server" description="run complex_type server"
depends="build">
+ <cxf.server.run
classname="org.apache.cxf.performance.complex_type.server.Server"
argline="-WSDL ${basedir}/wsdl/${wsdl.file}" />
+ </target>
</project>
Modified: cxf/trunk/benchmark/performance/etc/common_build.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/etc/common_build.xml?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/etc/common_build.xml (original)
+++ cxf/trunk/benchmark/performance/etc/common_build.xml Fri Oct 3 13:11:21
2008
@@ -52,15 +52,6 @@
<pathelement location="${tools.jar}"/>
</path>
- <condition property="is.java.version.15">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
-
- <fail message="CXF requires Java version 1.5 or higher. You are currently
using Java version ${ant.java.version}."
- unless="is.java.version.15"/>
-
-
-
<!-- Determine cxf.home, either from the environment variable CXF_HOME
- or using ../..
-->
Modified: cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_java_client
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_java_client?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_java_client
(original)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/bin/run_java_client Fri
Oct 3 13:11:21 2008
@@ -17,13 +17,13 @@
# specific language governing permissions and limitations
# under the License.
-OPERARTION=echoComplexTypeDoc
-#OPERARTION=echoStringDoc
-#OPERARTION=echoBase64Doc
+OPERATION=echoComplexTypeDoc
+#OPERATION=echoStringDoc
+#OPERATION=echoBase64Doc
BASEDON=Time
AMOUNT=30
PACKETSIZE=1
-THREADS=0
+THREADS=1
BUILD_XML=build.xml
WSDL=
Modified: cxf/trunk/benchmark/performance/soap_http_doc_lit/build.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/benchmark/performance/soap_http_doc_lit/build.xml?rev=701519&r1=701518&r2=701519&view=diff
==============================================================================
--- cxf/trunk/benchmark/performance/soap_http_doc_lit/build.xml (original)
+++ cxf/trunk/benchmark/performance/soap_http_doc_lit/build.xml Fri Oct 3
13:11:21 2008
@@ -17,6 +17,7 @@
specific language governing permissions and limitations
under the License.
-->
+<!-- See README file in parent directory for information on running
performance tests -->
<project name="test.complex_type" default="build" basedir=".">
<property name="thirdparty.classpath" location
="${basedir}/../base/build/classes"/>
@@ -54,7 +55,24 @@
</sequential>
</macrodef>
+ <target name="generate.code">
+ <echo level="info" message="Generating code using wsdl2java..."/>
+ <wsdl2java file="perf.wsdl"/>
+ </target>
+
+ <property name="cxf.war.file.name" value="complex_type"/>
+ <target name="war" depends="build">
+ <cxfwar wsdl="perf.wsdl" filename="${cxf.war.file.name}.war"/>
+ </target>
+
+ <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
+ <property name="param" value=""/>
+ <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client" argline=
+ "-WSDL
http://localhost:8080/complex_type/services/complex_type?wsdl"; />
+ </target>
+ <!-- client and server tasks below easier to run from script files in
bin/ subdirectory
+ Alternatively provide -Dxxxx=yyy options at command line for
params listed below. -->
<target name="client" description="run complex_type client">
<property name="param" value=""/>
<property name="pipe" value=""/>
@@ -80,21 +98,4 @@
jvmargs="-server -XX:CompileThreshold=1000 -Xmx1500M -Xms1500M
-Xmn1000M -XX:+UseParallelGC -XX:+UseParallelOldGC"/>
</target>
- <target name="generate.code">
- <echo level="info" message="Generating code using wsdl2java..."/>
- <wsdl2java file="perf.wsdl"/>
- </target>
-
- <property name="cxf.war.file.name" value="complex_type"/>
- <target name="war" depends="build">
- <cxfwar wsdl="perf.wsdl" filename="${cxf.war.file.name}.war"/>
- </target>
-
- <target name="client-servlet" description="run demo client hitting
servlet" depends="build">
- <property name="param" value=""/>
- <cxf.client.run
classname="org.apache.cxf.performance.complex_type.client.Client" argline=
- "-WSDL
http://localhost:8080/complex_type/services/complex_type?wsdl"; />
- </target>
-
-
</project>
