Author: [email protected]
Date: Mon May 21 11:07:26 2012
New Revision: 2365
Log:
[AMDATUOPENSOCIAL-218] Moved opensocial performance tests
Added:
trunk/amdatu-performance-test/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/
- copied from r2359,
/trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.0/
Modified:
trunk/amdatu-performance-test/pom.xml
trunk/amdatu-performance-test/test-analyzer/pom.xml
trunk/amdatu-performance-test/test-bundle/pom.xml
trunk/amdatu-performance-test/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java
trunk/amdatu-performance-test/test-execution/pom.xml
trunk/amdatu-performance-test/test-execution/src/main/assembly/component.xml
trunk/amdatu-performance-test/test-launcher/pom.xml
trunk/amdatu-performance-test/test-releases/auth-0.2.2/pom.xml
trunk/amdatu-performance-test/test-releases/auth-0.3.0/pom.xml
trunk/amdatu-performance-test/test-releases/auth-0.3.0/src/main/assembly/bin-component.xml
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/pom.xml
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/assembly/bin-component.xml
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/assembly/bin-release.xml
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/resources/
trunk/amdatu-performance-test/test-releases/pom.xml
Modified: trunk/amdatu-performance-test/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/pom.xml (original)
+++ trunk/amdatu-performance-test/pom.xml Mon May 21 11:07:26 2012
@@ -18,14 +18,29 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>amdatu</artifactId>
+ <version>6-RC2</version>
</parent>
- <artifactId>org.amdatu.auth.test.performance</artifactId>
+ <artifactId>org.amdatu.test.performance</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Amdatu Auth - Performance Test</name>
- <description>Root pom for Auth performance test</description>
+ <name>Amdatu - Performance Tests</name>
+ <description>Root pom for performance tests</description>
+
+ <repositories>
+ <repository>
+ <id>amdatu.releases</id>
+ <name>Amdatu Release Repository</name>
+ <url>http://repository.amdatu.org/releases</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
<modules>
<module>test-analyzer</module>
Modified: trunk/amdatu-performance-test/test-analyzer/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-analyzer/pom.xml (original)
+++ trunk/amdatu-performance-test/test-analyzer/pom.xml Mon May 21 11:07:26 2012
@@ -18,13 +18,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.auth.test.performance.analyzer</artifactId>
+ <artifactId>org.amdatu.test.performance.analyzer</artifactId>
<packaging>jar</packaging>
- <name>Amdatu Auth - Performance Test Analyzer</name>
+ <name>Amdatu - Performance Test Analyzer</name>
<description>This jar holds the Performance Test Analyzer</description>
<dependencies>
Modified: trunk/amdatu-performance-test/test-bundle/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-bundle/pom.xml (original)
+++ trunk/amdatu-performance-test/test-bundle/pom.xml Mon May 21 11:07:26 2012
@@ -18,19 +18,19 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.auth.test.performance.bundle</artifactId>
+ <artifactId>org.amdatu.test.performance.bundle</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Auth - Performance Test bundle</name>
+ <name>Amdatu - Performance Test Bundle</name>
<properties>
<org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
<org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
-
- <amdatu.web.version>0.2.0</amdatu.web.version>
+ <org.amdatu.web.version>1.0.0-RC1</org.amdatu.web.version>
+ <org.amdatu.osgisupport.version>1.0.0-RC1</org.amdatu.osgisupport.version>
</properties>
<dependencies>
@@ -38,11 +38,13 @@
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.httpcontext</artifactId>
+ <version>${org.amdatu.web.version}</version>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.jaxrs</artifactId>
+ <version>${org.amdatu.web.version}</version>
<type>bundle</type>
</dependency>
@@ -62,6 +64,7 @@
<dependency>
<groupId>org.amdatu.osgisupport</groupId>
<artifactId>org.amdatu.osgisupport</artifactId>
+ <version>${org.amdatu.osgisupport.version}</version>
<type>jar</type>
</dependency>
</dependencies>
Modified:
trunk/amdatu-performance-test/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java
==============================================================================
---
trunk/amdatu-performance-test/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java
(original)
+++
trunk/amdatu-performance-test/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/RESTPerformanceTest.java
Mon May 21 11:07:26 2012
@@ -45,7 +45,7 @@
@Produces({MediaType.TEXT_PLAIN})
@Path("status")
public Response status() {
- return Response.ok("Auth performancetest service
online").cacheControl(CACHE_CONTROL).build();
+ return Response.ok("Performance test service
online").cacheControl(CACHE_CONTROL).build();
}
public URL getResource(final String name) {
Modified: trunk/amdatu-performance-test/test-execution/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-execution/pom.xml (original)
+++ trunk/amdatu-performance-test/test-execution/pom.xml Mon May 21
11:07:26 2012
@@ -18,14 +18,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.auth.test.performance.execution</artifactId>
+ <artifactId>org.amdatu.test.performance.execution</artifactId>
<packaging>jar</packaging>
- <name>Amdatu Auth - Performance Test</name>
- <description>This bundle generates the Performance Test framework for the
Auth project</description>
+ <name>Amdatu - Performance Test Execution</name>
+ <description>This bundle generates the Performance Test
executable</description>
<properties>
<test.version.x>0.2.2</test.version.x>
@@ -34,28 +34,32 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance.launcher</artifactId>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.launcher</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<type>jar</type>
</dependency>
<dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance.analyzer</artifactId>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.analyzer</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
<type>jar</type>
</dependency>
+
+ <!-- We use the cassandra releases here so that we can run all JMeter
plans on the same
+ assembly. If needed, we can fine tune performance test on
auth/opensocial by using
+ these assemblies instead -->
<dependency>
- <groupId>org.amdatu.auth</groupId>
+ <groupId>org.amdatu</groupId>
<artifactId>org.amdatu.auth.test.performance.release-${test.version.x}</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.amdatu.auth</groupId>
+ <groupId>org.amdatu</groupId>
<artifactId>org.amdatu.auth.test.performance.release-${test.version.y}</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
@@ -76,7 +80,7 @@
<goal>single</goal>
</goals>
<configuration>
- <finalName>auth-performancetest</finalName>
+ <finalName>performancetest</finalName>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
</descriptors>
@@ -99,15 +103,15 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>org.amdatu.auth</groupId>
-
<artifactId>org.amdatu.auth.test.performance.launcher</artifactId>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.launcher</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
</artifactItem>
<artifactItem>
- <groupId>org.amdatu.auth</groupId>
-
<artifactId>org.amdatu.auth.test.performance.analyzer</artifactId>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.analyzer</artifactId>
<version>${project.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
Modified:
trunk/amdatu-performance-test/test-execution/src/main/assembly/component.xml
==============================================================================
---
trunk/amdatu-performance-test/test-execution/src/main/assembly/component.xml
(original)
+++
trunk/amdatu-performance-test/test-execution/src/main/assembly/component.xml
Mon May 21 11:07:26 2012
@@ -25,7 +25,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
-
<include>org.amdatu.auth:org.amdatu.auth.test.performance.release-${test.version.x}</include>
+
<include>org.amdatu:org.amdatu.auth.test.performance.release-${test.version.x}</include>
</includes>
</dependencySet>
<dependencySet>
@@ -34,7 +34,7 @@
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
-
<include>org.amdatu.auth:org.amdatu.auth.test.performance.release-${test.version.y}</include>
+
<include>org.amdatu:org.amdatu.auth.test.performance.release-${test.version.y}</include>
</includes>
</dependencySet>
</dependencySets>
Added:
trunk/amdatu-performance-test/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx
==============================================================================
--- (empty file)
+++
trunk/amdatu-performance-test/test-execution/src/main/resources/jmeter-plans/Amdatu
dashboard.jmx Mon May 21 11:07:26 2012
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jmeterTestPlan version="1.2" properties="2.1">
+ <hashTree>
+ <TestPlan guiclass="TestPlanGui" testclass="TestPlan" testname="Amdatu Web
Test Plan" enabled="true">
+ <stringProp name="TestPlan.comments"></stringProp>
+ <boolProp name="TestPlan.functional_mode">false</boolProp>
+ <boolProp name="TestPlan.serialize_threadgroups">false</boolProp>
+ <elementProp name="TestPlan.user_defined_variables"
elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments"
testname="User Defined Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="TestPlan.user_define_classpath"></stringProp>
+ </TestPlan>
+ <hashTree>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup"
testname="Thread Group" enabled="true">
+ <stringProp name="ThreadGroup.on_sample_error">continue</stringProp>
+ <elementProp name="ThreadGroup.main_controller"
elementType="LoopController" guiclass="LoopControlPanel"
testclass="LoopController" testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">false</boolProp>
+ <stringProp name="LoopController.loops">10</stringProp>
+ </elementProp>
+ <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>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <ConfigTestElement guiclass="HttpDefaultsGui"
testclass="ConfigTestElement" testname="HTTP Request Defaults" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain">localhost</stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp name="HTTPSampler.path"></stringProp>
+ </ConfigTestElement>
+ <hashTree/>
+ <CookieManager guiclass="CookiePanel" testclass="CookieManager"
testname="HTTP Cookie Manager" enabled="true">
+ <collectionProp name="CookieManager.cookies"/>
+ <boolProp name="CookieManager.clearEachIteration">false</boolProp>
+ <stringProp name="CookieManager.policy">rfc2109</stringProp>
+ </CookieManager>
+ <hashTree/>
+ <LoopController guiclass="LoopControlPanel" testclass="LoopController"
testname="Loop Controller" enabled="true">
+ <boolProp name="LoopController.continue_forever">true</boolProp>
+ <stringProp name="LoopController.loops">25</stringProp>
+ </LoopController>
+ <hashTree>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Open dashboard" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/dashboard/jsp/dashboard.jsp</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Login" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments">
+ <elementProp name="username" elementType="HTTPArgument">
+ <boolProp name="HTTPArgument.always_encode">false</boolProp>
+ <stringProp name="Argument.value">Administrator</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ <boolProp name="HTTPArgument.use_equals">true</boolProp>
+ <stringProp name="Argument.name">username</stringProp>
+ </elementProp>
+ <elementProp name="password" elementType="HTTPArgument">
+ <boolProp name="HTTPArgument.always_encode">false</boolProp>
+ <stringProp name="Argument.value">Administrator</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ <boolProp name="HTTPArgument.use_equals">true</boolProp>
+ <stringProp name="Argument.name">password</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/rest/authorization/login</stringProp>
+ <stringProp name="HTTPSampler.method">POST</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Refresh dashboard (logged in)" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/dashboard/jsp/dashboard.jsp</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Retrieve all gadgets" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/rest/gadgetstore/gadgets/all</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Retrieve 3rd party gadgets" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/rest/gadgetstore/gadgets/all?category=3rdparty</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Logout" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments">
+ <elementProp name="username" elementType="HTTPArgument">
+ <boolProp name="HTTPArgument.always_encode">false</boolProp>
+ <stringProp name="Argument.value">Administrator</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ <boolProp name="HTTPArgument.use_equals">true</boolProp>
+ <stringProp name="Argument.name">username</stringProp>
+ </elementProp>
+ <elementProp name="password" elementType="HTTPArgument">
+ <boolProp name="HTTPArgument.always_encode">false</boolProp>
+ <stringProp name="Argument.value">Administrator</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ <boolProp name="HTTPArgument.use_equals">true</boolProp>
+ <stringProp name="Argument.name">password</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/rest/authorization/logout</stringProp>
+ <stringProp name="HTTPSampler.method">POST</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler"
testname="Refresh dashboard (logged out)" enabled="true">
+ <elementProp name="HTTPsampler.Arguments" elementType="Arguments"
guiclass="HTTPArgumentsPanel" testclass="Arguments" testname="User Defined
Variables" enabled="true">
+ <collectionProp name="Arguments.arguments"/>
+ </elementProp>
+ <stringProp name="HTTPSampler.domain"></stringProp>
+ <stringProp name="HTTPSampler.port">2204</stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
+ <stringProp name="HTTPSampler.protocol"></stringProp>
+ <stringProp name="HTTPSampler.contentEncoding"></stringProp>
+ <stringProp
name="HTTPSampler.path">/dashboard/jsp/dashboard.jsp</stringProp>
+ <stringProp name="HTTPSampler.method">GET</stringProp>
+ <boolProp name="HTTPSampler.follow_redirects">true</boolProp>
+ <boolProp name="HTTPSampler.auto_redirects">false</boolProp>
+ <boolProp name="HTTPSampler.use_keepalive">true</boolProp>
+ <boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
+ <boolProp name="HTTPSampler.monitor">false</boolProp>
+ <stringProp name="HTTPSampler.embedded_url_re"></stringProp>
+ </HTTPSampler>
+ <hashTree/>
+ </hashTree>
+ <ResultCollector guiclass="SummaryReport" testclass="ResultCollector"
testname="Summary Report" enabled="true">
+ <boolProp name="ResultCollector.error_logging">false</boolProp>
+ <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+
<saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ </hashTree>
+ </hashTree>
+</jmeterTestPlan>
Modified: trunk/amdatu-performance-test/test-launcher/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-launcher/pom.xml (original)
+++ trunk/amdatu-performance-test/test-launcher/pom.xml Mon May 21 11:07:26 2012
@@ -18,13 +18,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.auth.test.performance.launcher</artifactId>
+ <artifactId>org.amdatu.test.performance.launcher</artifactId>
<packaging>jar</packaging>
- <name>Amdatu Auth - Performance Test Launcher</name>
+ <name>Amdatu - Performance Test Launcher</name>
<description>This jar holds the Performance Test Launcher</description>
<dependencies>
Modified: trunk/amdatu-performance-test/test-releases/auth-0.2.2/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/auth-0.2.2/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/auth-0.2.2/pom.xml Mon May
21 11:07:26 2012
@@ -18,9 +18,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance.releases</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.releases</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.auth.test.performance.release-0.2.2</artifactId>
<name>Amdatu Auth - Performance Test release - ${current.version}</name>
Modified: trunk/amdatu-performance-test/test-releases/auth-0.3.0/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/auth-0.3.0/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/auth-0.3.0/pom.xml Mon May
21 11:07:26 2012
@@ -18,9 +18,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance.releases</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.releases</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.auth.test.performance.release-0.3.0</artifactId>
<name>Amdatu Auth - Performance Test release - ${current.version}</name>
@@ -35,15 +35,16 @@
<dependencies>
<dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.release.demo</artifactId>
- <version>${current.version}</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.release.demo</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <classifier>auth-1.0.0-SNAPSHOT</classifier>
<scope>compile</scope>
<type>zip</type>
</dependency>
<dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance.bundle</artifactId>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.bundle</artifactId>
<version>${current.version}</version>
<scope>compile</scope>
<type>bundle</type>
Modified:
trunk/amdatu-performance-test/test-releases/auth-0.3.0/src/main/assembly/bin-component.xml
==============================================================================
---
trunk/amdatu-performance-test/test-releases/auth-0.3.0/src/main/assembly/bin-component.xml
(original)
+++
trunk/amdatu-performance-test/test-releases/auth-0.3.0/src/main/assembly/bin-component.xml
Mon May 21 11:07:26 2012
@@ -20,7 +20,7 @@
<dependencySets>
<dependencySet>
<includes>
- <include>org.amdatu.auth:org.amdatu.auth.release.demo</include>
+ <include>org.amdatu:org.amdatu.release.demo</include>
</includes>
<unpack>true</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
Modified: trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/pom.xml
==============================================================================
---
/trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.0/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/pom.xml
Mon May 21 11:07:26 2012
@@ -18,346 +18,38 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.test.performance.releases</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance.releases</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
-
<artifactId>org.amdatu.opensocial.test.performance.release-${org.amdatu.opensocial.version}</artifactId>
- <name>Amdatu OpenSocial - Performance Test release -
${org.amdatu.opensocial.version}</name>
+ <artifactId>org.amdatu.opensocial.test.performance.release-0.2.0</artifactId>
+ <name>Amdatu OpenSocial - Performance Test release -
${current.version}</name>
<packaging>pom</packaging>
<properties>
- <amdatu.http.hostname>localhost</amdatu.http.hostname>
- <amdatu.http.port>2204</amdatu.http.port>
- <amdatu.https.port>8045</amdatu.https.port>
- <amdatu.log.level>WARNING</amdatu.log.level>
-
- <org.amdatu.opensocial.version>0.2.0</org.amdatu.opensocial.version>
-
- <org.amdatu.web.version>0.2.1</org.amdatu.web.version>
- <org.amdatu.lib.version>0.2.1</org.amdatu.lib.version>
- <org.amdatu.auth.version>0.2.1</org.amdatu.auth.version>
-
- <org.apache.felix.main.version>3.0.2</org.apache.felix.main.version>
-
<org.apache.felix.eventadmin.version>1.2.2</org.apache.felix.eventadmin.version>
-
<org.apache.felix.configadmin.version>1.2.4</org.apache.felix.configadmin.version>
- <org.apache.felix.scr.version>1.6.0</org.apache.felix.scr.version>
- <org.apache.felix.log.version>1.0.0</org.apache.felix.log.version>
-
<org.apache.felix.file.install.version>3.1.10</org.apache.felix.file.install.version>
- <org.apache.felix.http.version>2.2.0</org.apache.felix.http.version>
-
<org.apache.felix.metatype.version>1.0.4</org.apache.felix.metatype.version>
-
<org.apache.felix.webconsole.version>3.1.2</org.apache.felix.webconsole.version>
-
<org.apache.felix.shell.tui.version>1.4.1</org.apache.felix.shell.tui.version>
- <org.apache.felix.shell.version>1.4.2</org.apache.felix.shell.version>
- <org.apache.felix.prefs.version>1.0.4</org.apache.felix.prefs.version>
-
- <pax.useradmin.version>0.0.1-amdatu1</pax.useradmin.version>
+ <!-- Release version is the final release version (i.e 0.3.0), current
+ version is the actual version (i.e. 0.3.0-SNAPSHOT or 0.3.0-RC1) -->
+ <release.version>0.2.1</release.version>
+ <current.version>0.2.1-RC2-SNAPSHOT</current.version>
</properties>
<dependencies>
<dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.config.templates</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.loghandler</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenant</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantstore.inmem</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.tenantuseradmindecorator</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.core</groupId>
- <artifactId>org.amdatu.core.useradminstore.fs</artifactId>
- <version>${org.amdatu.platform.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.httpcontext</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.dispatcher</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.tenantresolver.hostname</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.resource</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.jsp</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.jaxrs</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.web</groupId>
- <artifactId>org.amdatu.web.wink</artifactId>
- <version>${org.amdatu.web.version}</version>
- <scope>runtime</scope>
- <type>bundle</type>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${org.osgi.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${org.osgi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>${org.apache.felix.main.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.eventadmin</artifactId>
- <version>${org.apache.felix.eventadmin.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.configadmin</artifactId>
- <version>${org.apache.felix.configadmin.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- <version>${org.apache.felix.scr.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.log</artifactId>
- <version>${org.apache.felix.log.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.fileinstall</artifactId>
- <version>${org.apache.felix.file.install.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${org.apache.felix.http.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${org.apache.felix.main.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.prefs</artifactId>
- <version>${org.apache.felix.prefs.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager</artifactId>
- <version>${org.apache.felix.dependencymanager.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
- <version>${org.apache.felix.dependencymanager.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.metatype</artifactId>
- <version>${org.apache.felix.metatype.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <version>${org.apache.felix.webconsole.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
- <version>${org.apache.felix.shell.tui.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>${org.apache.felix.shell.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.ops4j.pax.useradmin</groupId>
- <artifactId>pax-useradmin-service</artifactId>
- <version>${pax.useradmin.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Add all the OpenSocial dependencies -->
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.dashboard</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
<groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.gadgetmanagement</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
+ <artifactId>org.amdatu.opensocial.release.demo</artifactId>
+ <version>${current.version}</version>
<scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.profile</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.shindig</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.store.gadget.mem</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.opensocial</groupId>
- <artifactId>org.amdatu.opensocial.config</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- <type>jar</type>
+ <type>zip</type>
</dependency>
<dependency>
<groupId>org.amdatu.opensocial</groupId>
<artifactId>org.amdatu.opensocial.test.performance.bundle</artifactId>
- <version>${org.amdatu.opensocial.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Required Auth dependencies -->
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenprovider</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.tokenstore.mem</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.oauth.api</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.service</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.login.gadget</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.rest</artifactId>
- <version>${org.amdatu.auth.version}</version>
- <scope>compile</scope>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.useradmin.gadget</artifactId>
- <version>${org.amdatu.auth.version}</version>
+ <version>${current.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
</dependencies>
+
<build>
<defaultGoal>package</defaultGoal>
<pluginManagement>
@@ -367,46 +59,33 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<configuration>
- <finalName>opensocial-${org.amdatu.opensocial.version}</finalName>
+ <finalName>opensocial-${release.version}</finalName>
<appendAssemblyId>true</appendAssemblyId>
</configuration>
</plugin>
</plugins>
</pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-release</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
- <profiles>
- <profile>
- <!--
- The release profile by default generates all binary, source,
- javadoc and assemblies
- -->
- <id>release</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>create-release</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/bin-release.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
</project>
Modified:
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/assembly/bin-component.xml
==============================================================================
---
/trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.0/src/main/assembly/bin-component.xml
(original)
+++
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/assembly/bin-component.xml
Mon May 21 11:07:26 2012
@@ -19,72 +19,19 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
<dependencySets>
<dependencySet>
- <outputDirectory>lib</outputDirectory>
<includes>
- <include>org.osgi:org.osgi.compendium</include>
- <include>org.apache.felix:*</include>
- <include>org.ops4j.pax.useradmin:*</include>
+
<include>org.amdatu.opensocial:org.amdatu.opensocial.release.demo</include>
</includes>
- <unpack>false</unpack>
+ <unpack>true</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
-
<dependencySet>
<outputDirectory>deploy</outputDirectory>
<includes>
- <include>org.amdatu.core:*</include>
- <include>org.amdatu.web:*</include>
- <include>org.amdatu.opensocial:*</include>
- <include>org.amdatu.auth:*</include>
+
<include>org.amdatu.opensocial:org.amdatu.opensocial.test.performance.bundle</include>
</includes>
- <excludes>
- <exclude>org.amdatu.opensocial:org.amdatu.opensocial.config</exclude>
- </excludes>
<unpack>false</unpack>
<useTransitiveDependencies>false</useTransitiveDependencies>
</dependencySet>
-
- <!--Unpack the the config files to deploy directory -->
- <dependencySet>
- <outputDirectory>deploy</outputDirectory>
- <includes>
- <include>org.amdatu.opensocial:org.amdatu.opensocial.config</include>
- </includes>
- <unpack>true</unpack>
- <unpackOptions>
- <excludes>
- <exclude>META-INF/**</exclude>
- </excludes>
- <filtered>true</filtered>
- </unpackOptions>
- <outputFileNameMapping></outputFileNameMapping> <!-- MASSEMBLY-533 -->
- <useTransitiveDependencies>false</useTransitiveDependencies>
- </dependencySet>
</dependencySets>
- <fileSets>
- <fileSet>
- <directory></directory>
- <outputDirectory></outputDirectory>
- <filtered>false</filtered>
- <includes>
- <include>LICENSE</include>
- <include>NOTICE</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory></outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>src/main/resources/config</directory>
- <outputDirectory>deploy</outputDirectory>
- <filtered>true</filtered>
- </fileSet>
- </fileSets>
</component>
\ No newline at end of file
Modified:
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/assembly/bin-release.xml
==============================================================================
---
/trunk/amdatu-opensocial/test-performance/test-releases/opensocial-0.2.0/src/main/assembly/bin-release.xml
(original)
+++
trunk/amdatu-performance-test/test-releases/opensocial-0.2.0/src/main/assembly/bin-release.xml
Mon May 21 11:07:26 2012
@@ -20,6 +20,7 @@
<id>bin</id>
<formats>
<format>zip</format>
+ <format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<componentDescriptors>
Modified: trunk/amdatu-performance-test/test-releases/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/pom.xml (original)
+++ trunk/amdatu-performance-test/test-releases/pom.xml Mon May 21 11:07:26 2012
@@ -18,11 +18,11 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.amdatu.auth</groupId>
- <artifactId>org.amdatu.auth.test.performance</artifactId>
- <version>0.3.0-SNAPSHOT</version>
+ <groupId>org.amdatu</groupId>
+ <artifactId>org.amdatu.test.performance</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>org.amdatu.auth.test.performance.releases</artifactId>
+ <artifactId>org.amdatu.test.performance.releases</artifactId>
<packaging>pom</packaging>
<name>Amdatu Auth - Performance Test releases</name>
<description>Root pom for Auth performance test releases</description>
@@ -30,6 +30,7 @@
<modules>
<module>auth-0.2.2</module>
<module>auth-0.3.0</module>
+ <module>opensocial-0.2.0</module>
</modules>
</project>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
