Author: [email protected]
Date: Mon May 21 12:03:52 2012
New Revision: 2374
Log:
[AMDATUCASSANDRA-187] Moved performance tests
Added:
trunk/amdatu-performance-test/test-bundle-cassandra/
- copied from r2370, /trunk/amdatu-cassandra/test-performance/test-bundle/
Modified:
trunk/amdatu-performance-test/pom.xml
trunk/amdatu-performance-test/test-analyzer/pom.xml
trunk/amdatu-performance-test/test-bundle-cassandra/pom.xml
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/cassandra/test/performance/osgi/Activator.java
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/cassandra/test/performance/service/CassandraTest.java
trunk/amdatu-performance-test/test-bundle/pom.xml
trunk/amdatu-performance-test/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/CassandraTest.java
trunk/amdatu-performance-test/test-bundle/src/main/java/org/amdatu/auth/test/performance/service/TestColumnFamilyProvider.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/cassandra-0.2.3/pom.xml
trunk/amdatu-performance-test/test-releases/cassandra-0.3.0/pom.xml
trunk/amdatu-performance-test/test-releases/opensocial-0.2.1/pom.xml
trunk/amdatu-performance-test/test-releases/opensocial-0.3.0/pom.xml
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 12:03:52 2012
@@ -45,6 +45,7 @@
<modules>
<module>test-analyzer</module>
<module>test-bundle</module>
+ <module>test-bundle-cassandra</module>
<module>test-execution</module>
<module>test-launcher</module>
<module>test-releases</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 12:03:52 2012
@@ -24,7 +24,7 @@
</parent>
<artifactId>org.amdatu.test.performance.analyzer</artifactId>
<packaging>jar</packaging>
- <name>Amdatu - 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-cassandra/pom.xml
==============================================================================
--- /trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-bundle-cassandra/pom.xml Mon May 21
12:03:52 2012
@@ -18,33 +18,33 @@
<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.cassandra</groupId>
- <artifactId>org.amdatu.cassandra.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.cassandra.test.performance.bundle</artifactId>
+ <artifactId>org.amdatu.test.performance.bundle.cassandra</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu Cassandra - Performance Test bundle</name>
+ <name>Amdatu Performance Test - Bundle Cassandra</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.cassandra.version>0.3.0-SNAPSHOT</org.amdatu.cassandra.version>
</properties>
<dependencies>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.httpcontext</artifactId>
- <version>${amdatu.web.version}</version>
+ <version>${org.amdatu.web.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.web</groupId>
<artifactId>org.amdatu.web.jaxrs</artifactId>
- <version>${amdatu.web.version}</version>
+ <version>${org.amdatu.web.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
@@ -69,36 +69,42 @@
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.application</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.hector</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.client</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.persistencemanager.hector</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
<dependency>
<groupId>org.amdatu.cassandra</groupId>
<artifactId>org.amdatu.cassandra.listener</artifactId>
+ <version>${org.amdatu.cassandra.version}</version>
<scope>provided</scope>
<type>bundle</type>
</dependency>
Modified:
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/cassandra/test/performance/osgi/Activator.java
==============================================================================
---
/trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/cassandra/test/performance/osgi/Activator.java
(original)
+++
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/cassandra/test/performance/osgi/Activator.java
Mon May 21 12:03:52 2012
@@ -16,9 +16,9 @@
package org.amdatu.cassandra.test.performance.osgi;
import org.amdatu.cassandra.client.CassandraClientService;
+import org.amdatu.cassandra.client.TenantKeyspaceMapper;
import org.amdatu.cassandra.listener.ColumnFamilyAvailable;
import org.amdatu.cassandra.listener.ColumnFamilyProvider;
-import org.amdatu.cassandra.persistencemanager.CassandraPersistenceManager;
import
org.amdatu.cassandra.persistencemanager.hector.HectorCassandraPersistenceManager;
import org.amdatu.cassandra.test.performance.service.RESTPerformanceTest;
import org.amdatu.cassandra.test.performance.service.TestColumnFamilyProvider;
@@ -51,7 +51,7 @@
// Create the users resource service and register it as REST service
String keyspaceFilter =
- "(" + CassandraPersistenceManager.KEYSPACE_AWARE_KEY + "=" +
TestColumnFamilyProvider.KEYSPACE + ")";
+ "(" + TenantKeyspaceMapper.KEYSPACE_AWARE_KEY + "=" +
TestColumnFamilyProvider.KEYSPACE + ")";
String cfFilter1 = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
TestColumnFamilyProvider.SUPER_CF + ")";
String cfFilter2 = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
TestColumnFamilyProvider.STANDARD_CF + ")";
String cfFilter3 = "(" + ColumnFamilyAvailable.FILTER_NAME + "=" +
TestColumnFamilyProvider.ROWKEY_CF + ")";
Modified:
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/cassandra/test/performance/service/CassandraTest.java
==============================================================================
---
/trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/cassandra/test/performance/service/CassandraTest.java
(original)
+++
trunk/amdatu-performance-test/test-bundle-cassandra/src/main/java/org/amdatu/cassandra/test/performance/service/CassandraTest.java
Mon May 21 12:03:52 2012
@@ -140,7 +140,7 @@
public String testGetSuperRows(final String cfName) {
long start = System.currentTimeMillis();
- m_pm.getSuperRows(cfName, String.class);
+ m_pm.getSuperRows(cfName, String.class);
long diff = System.currentTimeMillis() - start;
return "Test completed in " + diff + " milliseconds";
}
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 12:03:52 2012
@@ -24,7 +24,7 @@
</parent>
<artifactId>org.amdatu.test.performance.bundle</artifactId>
<packaging>bundle</packaging>
- <name>Amdatu - Performance Test Bundle</name>
+ <name>Amdatu Performance Test - Bundle Generic</name>
<properties>
<org.apache.wink.version>1.1.1-incubating</org.apache.wink.version>
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
12:03:52 2012
@@ -24,11 +24,11 @@
</parent>
<artifactId>org.amdatu.test.performance.execution</artifactId>
<packaging>jar</packaging>
- <name>Amdatu - Performance Test Execution</name>
+ <name>Amdatu Performance Test - Executable</name>
<description>This bundle generates the Performance Test
executable</description>
<properties>
- <test.version.x>0.2.2</test.version.x>
+ <test.version.x>0.2.3</test.version.x>
<test.version.y>0.3.0</test.version.y>
</properties>
@@ -53,14 +53,14 @@
these assemblies instead -->
<dependency>
<groupId>org.amdatu</groupId>
-
<artifactId>org.amdatu.auth.test.performance.release-${test.version.x}</artifactId>
+
<artifactId>org.amdatu.cassandra.test.performance.release-${test.version.x}</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.amdatu</groupId>
-
<artifactId>org.amdatu.auth.test.performance.release-${test.version.y}</artifactId>
+
<artifactId>org.amdatu.cassandra.test.performance.release-${test.version.y}</artifactId>
<version>${project.version}</version>
<scope>compile</scope>
<type>zip</type>
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 12:03:52 2012
@@ -20,21 +20,21 @@
<dependencySets>
<dependencySet>
- <outputFileNameMapping>auth-${test.version.x}.zip</outputFileNameMapping>
+
<outputFileNameMapping>cassandra-${test.version.x}.zip</outputFileNameMapping>
<outputDirectory>amdatu-versions</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
-
<include>org.amdatu:org.amdatu.auth.test.performance.release-${test.version.x}</include>
+
<include>org.amdatu:org.amdatu.cassandra.test.performance.release-${test.version.x}</include>
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>auth-${test.version.y}.zip</outputFileNameMapping>
+
<outputFileNameMapping>cassandra-${test.version.y}.zip</outputFileNameMapping>
<outputDirectory>amdatu-versions</outputDirectory>
<unpack>false</unpack>
<scope>runtime</scope>
<includes>
-
<include>org.amdatu:org.amdatu.auth.test.performance.release-${test.version.y}</include>
+
<include>org.amdatu:org.amdatu.cassandra.test.performance.release-${test.version.y}</include>
</includes>
</dependencySet>
</dependencySets>
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 12:03:52 2012
@@ -24,7 +24,7 @@
</parent>
<artifactId>org.amdatu.test.performance.launcher</artifactId>
<packaging>jar</packaging>
- <name>Amdatu - 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 12:03:52 2012
@@ -23,7 +23,7 @@
<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>
+ <name>Amdatu Performance Test - Test Release Auth ${current.version}</name>
<packaging>pom</packaging>
<properties>
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 12:03:52 2012
@@ -23,14 +23,14 @@
<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>
+ <name>Amdatu Performance Test - Test Release Auth - ${current.version}</name>
<packaging>pom</packaging>
<properties>
<!-- Release version is the next release version (i.e 0.3.0), current
version is the actual version (i.e. 0.3.0-SNAPSHOT) -->
<release.version>0.3.0</release.version>
- <current.version>${project.version}</current.version>
+ <current.version>0.3.0-SNAPSHOT</current.version>
</properties>
<dependencies>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.amdatu</groupId>
<artifactId>org.amdatu.test.performance.bundle</artifactId>
- <version>${current.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/cassandra-0.2.3/pom.xml Mon May
21 12:03:52 2012
@@ -23,6 +23,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.cassandra.test.performance.release-0.2.3</artifactId>
+ <name>Amdatu Performance Test - Test Release Cassandra -
${current.version}</name>
<packaging>jar</packaging>
<properties>
Modified: trunk/amdatu-performance-test/test-releases/cassandra-0.3.0/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/cassandra-0.3.0/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/cassandra-0.3.0/pom.xml Mon May
21 12:03:52 2012
@@ -23,14 +23,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.cassandra.test.performance.release-0.3.0</artifactId>
- <name>Amdatu Cassandra - Performance Test release - ${current.version}</name>
+ <name>Amdatu Performance Test - Test Release Cassandra -
${current.version}</name>
<packaging>pom</packaging>
<properties>
<!-- Release version is the next release version (i.e 0.3.0), current
version is the actual version (i.e. 0.3.0-SNAPSHOT) -->
<release.version>0.3.0</release.version>
- <current.version>${project.version}</current.version>
+ <current.version>0.3.0-SNAPSHOT</current.version>
</properties>
<dependencies>
@@ -44,8 +44,8 @@
</dependency>
<dependency>
<groupId>org.amdatu</groupId>
- <artifactId>org.amdatu.test.performance.bundle</artifactId>
- <version>${current.version}</version>
+ <artifactId>org.amdatu.test.performance.bundle.cassandra</artifactId>
+ <version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
Modified: trunk/amdatu-performance-test/test-releases/opensocial-0.2.1/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/opensocial-0.2.1/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/opensocial-0.2.1/pom.xml
Mon May 21 12:03:52 2012
@@ -23,7 +23,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.opensocial.test.performance.release-0.2.0</artifactId>
- <name>Amdatu OpenSocial - Performance Test release -
${current.version}</name>
+ <name>Amdatu Performance Test - Test Release OpenSocial -
${current.version}</name>
<packaging>pom</packaging>
<properties>
Modified: trunk/amdatu-performance-test/test-releases/opensocial-0.3.0/pom.xml
==============================================================================
--- trunk/amdatu-performance-test/test-releases/opensocial-0.3.0/pom.xml
(original)
+++ trunk/amdatu-performance-test/test-releases/opensocial-0.3.0/pom.xml
Mon May 21 12:03:52 2012
@@ -23,14 +23,14 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>org.amdatu.opensocial.test.performance.release-0.3.0</artifactId>
- <name>Amdatu OpenSocial - Performance Test release -
${current.version}</name>
+ <name>Amdatu Performance Test - Test Release OpenSocial -
${current.version}</name>
<packaging>pom</packaging>
<properties>
<!-- Release version is the next release version (i.e 0.3.0), current
version is the actual version (i.e. 0.3.0-SNAPSHOT) -->
<release.version>0.3.0</release.version>
- <current.version>${project.version}</current.version>
+ <current.version>0.3.0-SNAPSHOT</current.version>
</properties>
<dependencies>
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.amdatu</groupId>
<artifactId>org.amdatu.test.performance.bundle</artifactId>
- <version>${current.version}</version>
+ <version>${project.version}</version>
<scope>compile</scope>
<type>bundle</type>
</dependency>
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 12:03:52 2012
@@ -24,8 +24,8 @@
</parent>
<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>
+ <name>Amdatu Performance Test - Releases</name>
+ <description>Root pom for performance test releases</description>
<modules>
<module>auth-0.2.2</module>
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
