Author: [email protected]
Date: Wed Apr 18 15:42:08 2012
New Revision: 2271
Log:
[AMDATUOPENSOCIAL-215] Updated performance test dependency
Added:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyze.bat
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyze.sh
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyzer.properties
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/launcher.properties
Modified:
trunk/amdatu-opensocial/test-performance/test-execution/pom.xml
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/configuration.properties
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.bat
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.sh
trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.1/pom.xml
Modified: trunk/amdatu-opensocial/test-performance/test-execution/pom.xml
==============================================================================
--- trunk/amdatu-opensocial/test-performance/test-execution/pom.xml
(original)
+++ trunk/amdatu-opensocial/test-performance/test-execution/pom.xml Wed Apr
18 15:42:08 2012
@@ -28,15 +28,22 @@
<description>This bundle generates the Performance Test framework for the
OpenSocial project</description>
<properties>
- <test.performance.version>0.2.1</test.performance.version>
+ <test.performance.version>0.2.3-SNAPSHOT</test.performance.version>
<test.version.x>0.2.0</test.version.x>
<test.version.y>0.2.1</test.version.y>
</properties>
<dependencies>
<dependency>
- <groupId>org.amdatu.test</groupId>
- <artifactId>org.amdatu.test.performance</artifactId>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.test.performance.launcher</artifactId>
+ <version>${test.performance.version}</version>
+ <scope>runtime</scope>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.amdatu.auth</groupId>
+ <artifactId>org.amdatu.auth.test.performance.analyzer</artifactId>
<version>${test.performance.version}</version>
<scope>runtime</scope>
<type>jar</type>
@@ -92,13 +99,20 @@
</goals>
<configuration>
<artifactItems>
- <artifactItem>
- <groupId>org.amdatu.test</groupId>
- <artifactId>org.amdatu.test.performance</artifactId>
- <version>${test.performance.version}</version>
- <type>jar</type>
- <overWrite>false</overWrite>
- </artifactItem>
+ <artifactItem>
+ <groupId>org.amdatu.auth</groupId>
+
<artifactId>org.amdatu.auth.test.performance.launcher</artifactId>
+ <version>${test.performance.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.amdatu.auth</groupId>
+
<artifactId>org.amdatu.auth.test.performance.analyzer</artifactId>
+ <version>${test.performance.version}</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ </artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/assembly</outputDirectory>
</configuration>
Modified:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx
==============================================================================
---
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx (original)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx Wed Apr 18 15:42:08 2012
@@ -1,20 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2010, 2011 The Amdatu Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.verning permissions and limitations
- under the License.
--->
<jmeterTestPlan version="1.2" properties="2.1">
<hashTree>
<TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Amdatu Web
Test Plan" enabled="true">
@@ -33,7 +17,7 @@
<boolProp name="LoopController.continue_forever">false</boolProp>
<stringProp name="LoopController.loops">10</stringProp>
</elementProp>
- <stringProp name="ThreadGroup.num_threads">20</stringProp>
+ <stringProp name="ThreadGroup.num_threads">10</stringProp>
<stringProp name="ThreadGroup.ramp_time">1</stringProp>
<longProp name="ThreadGroup.start_time">1297352927000</longProp>
<longProp name="ThreadGroup.end_time">1297352927000</longProp>
@@ -47,7 +31,7 @@
<collectionProp name="Arguments.arguments"/>
</elementProp>
<stringProp name="HTTPSampler.domain">localhost</stringProp>
- <stringProp name="HTTPSampler.port">3737</stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -71,7 +55,7 @@
<collectionProp name="Arguments.arguments"/>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -106,7 +90,7 @@
</collectionProp>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -126,7 +110,7 @@
<collectionProp name="Arguments.arguments"/>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -146,7 +130,7 @@
<collectionProp name="Arguments.arguments"/>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -166,7 +150,7 @@
<collectionProp name="Arguments.arguments"/>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -201,7 +185,7 @@
</collectionProp>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
@@ -221,7 +205,7 @@
<collectionProp name="Arguments.arguments"/>
</elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
- <stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
<stringProp name="HTTPSampler.connect_timeout"></stringProp>
<stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol"></stringProp>
Added:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyze.bat
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyze.bat
Wed Apr 18 15:42:08 2012
@@ -0,0 +1,16 @@
+@REM Copyright (c) 2010, 2011 The Amdatu Foundation
+@REM
+@REM Licensed under the Apache License, Version 2.0 (the "License");
+@REM you may not use this file except in compliance with the License.
+@REM You may obtain a copy of the License at
+@REM
+@REM http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing, software
+@REM distributed under the License is distributed on an "AS IS" BASIS,
+@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@REM See the License for the specific language governing permissions and
+@REM limitations under the License.verning permissions and limitations
+@REM under the License.
+
+java -Xmx1024m -jar
org.amdatu.auth.test.performance.analyzer-${test.performance.version}.jar
-config analyzer.properties
\ No newline at end of file
Added:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyze.sh
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyze.sh
Wed Apr 18 15:42:08 2012
@@ -0,0 +1,16 @@
+# Copyright (c) 2010, 2011 The Amdatu Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.verning permissions and limitations
+# under the License.
+
+java -Xmx1024m -jar
org.amdatu.auth.test.performance.analyzer-${test.performance.version}.jar
-config analyzer.properties
\ No newline at end of file
Added:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyzer.properties
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/analyzer.properties
Wed Apr 18 15:42:08 2012
@@ -0,0 +1,28 @@
+# Copyright (c) 2010, 2011 The Amdatu Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.verning permissions and limitations
+# under the License.
+
+# Java properties file for performance test execution.
+
+# Verbose will print all input arguments to the command line
+verbose=false
+
+# Write the analyze results to the directory:
+resultsdir=results
+
+# The amount of test loops to execute
+testloops=50
+
+# The amount of samples to define Z for; each sample Z is the mean of m
samples X-Y
+m=50
Added:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/launcher.properties
==============================================================================
--- (empty file)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/launcher.properties
Wed Apr 18 15:42:08 2012
@@ -0,0 +1,52 @@
+# Copyright (c) 2010, 2011 The Amdatu Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.verning permissions and limitations
+# under the License.
+
+# Java properties file for performance test execution.
+
+# Verbose will print all input arguments to the command line
+verbose=false
+
+# Run a verification, meaning that also a performance test is excuted of
+# version X against version X. This should obviously result in an outcome
+# stating that there is no significant difference in performance
+verify=true
+
+# Executes the test for all Amdatu versions available in this directory
+# NB: Copy the versions to this directory before running this test
+versiondir=amdatu-versions
+
+# The temporary directoy in which all test execution takes place
+tmpdir=tmp
+
+# Removes the work directory just before starting Amdatu. Can be:
+# 0 - Do not remove work directory
+# 1 - Remove work directory, except for the bundle cache
+# 2 - Remove work directory completely
+clean=1
+
+# Execute the JMeter plans from the directory:
+jmeterplansdir=jmeter-plans
+
+# Write the analyze results to the directory:
+resultsdir=results
+
+# The amount of test loops to execute
+testloops=50
+
+# Omit the first [amount] results of each test run, with the purpose of
reducing correlation between the results
+omit=50
+
+# Run the HTTP service on port 2204
+port=2204
Modified:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.bat
==============================================================================
---
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.bat
(original)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.bat
Wed Apr 18 15:42:08 2012
@@ -13,4 +13,4 @@
@REM limitations under the License.verning permissions and limitations
@REM under the License.
-java -Xmx1024m -jar
org.amdatu.test.performance-${test.performance.version}.jar -config
configuration.properties
\ No newline at end of file
+java -Xmx1024m -jar
org.amdatu.auth.test.performance.launcher-${test.performance.version}.jar
-config launcher.properties
\ No newline at end of file
Modified:
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.sh
==============================================================================
---
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.sh
(original)
+++
trunk/amdatu-opensocial/test-performance/test-execution/src/main/resources/shell/run.sh
Wed Apr 18 15:42:08 2012
@@ -13,4 +13,4 @@
# limitations under the License.verning permissions and limitations
# under the License.
-java -Xmx1024m -jar
org.amdatu.test.performance-${test.performance.version}.jar -config
configuration.properties
\ No newline at end of file
+java -Xmx1024m -jar
org.amdatu.auth.test.performance.launcher-${test.performance.version}.jar
-config launcher.properties
\ No newline at end of file
Modified:
trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.1/pom.xml
==============================================================================
---
trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.1/pom.xml
(original)
+++
trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.1/pom.xml
Wed Apr 18 15:42:08 2012
@@ -54,6 +54,8 @@
<org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
<pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
+
+ <shindig.secretkey>[randomkey]</shindig.secretkey>
</properties>
<dependencies>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
