Author: [email protected] Date: Thu Apr 28 14:47:16 2011 New Revision: 1062 Log: [AMDATUCASSANDRA-7] Performance test refactoring
Added: trunk/amdatu-cassandra/test-performance/pom.xml Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/CassandraTest.java trunk/amdatu-cassandra/test-performance/test-execution/pom.xml trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml Added: trunk/amdatu-cassandra/test-performance/pom.xml ============================================================================== --- (empty file) +++ trunk/amdatu-cassandra/test-performance/pom.xml Thu Apr 28 14:47:16 2011 @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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</artifactId> + <version>0.2.0-SNAPSHOT</version> + </parent> + <artifactId>org.amdatu.cassandra.test.performance</artifactId> + <packaging>pom</packaging> + <name>Amdatu Cassandra - Performance Test</name> + <description>Root pom for Cassandra performance test</description> + + <modules> + <module>test-execution</module> + <module>test-bundle</module> + </modules> +</project> Modified: trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml (original) +++ trunk/amdatu-cassandra/test-performance/test-bundle/pom.xml Thu Apr 28 14:47:16 2011 @@ -8,7 +8,7 @@ </parent> <artifactId>org.amdatu.cassandra.test.performance.bundle</artifactId> <packaging>bundle</packaging> - <name>Amdatu Cassandra - Performance test bundle</name> + <name>Amdatu Cassandra - Performance Test bundle</name> <properties> <org.apache.wink.version>1.1.1-incubating</org.apache.wink.version> @@ -21,14 +21,14 @@ <dependencies> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.webhttpcontext</artifactId> + <artifactId>org.amdatu.web.httpcontext</artifactId> <version>${amdatu.web.version}</version> <scope>provided</scope> <type>bundle</type> </dependency> <dependency> <groupId>org.amdatu.web</groupId> - <artifactId>org.amdatu.web.rest.jaxrs</artifactId> + <artifactId>org.amdatu.web.jaxrs</artifactId> <version>${amdatu.web.version}</version> <scope>provided</scope> <type>bundle</type> Modified: trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/CassandraTest.java ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/CassandraTest.java (original) +++ trunk/amdatu-cassandra/test-performance/test-bundle/src/main/java/org/amdatu/test/performance/service/CassandraTest.java Thu Apr 28 14:47:16 2011 @@ -54,8 +54,8 @@ InvalidRequestException, TException { long start = System.currentTimeMillis(); if (!m_daemon.columnFamilyExists(KEYSPACE, name)) { - m_daemon.addColumnFamily(KEYSPACE, name, ColumnType.SUPER.value, CompareType.BYTESTYPE.value, - CompareType.BYTESTYPE.value); + m_daemon.addColumnFamily(KEYSPACE, name, ColumnType.SUPER.getValue(), CompareType.BYTESTYPE.getValue(), + CompareType.BYTESTYPE.getValue()); } long diff = System.currentTimeMillis() - start; return "Test completed in " + diff + " milliseconds"; Modified: trunk/amdatu-cassandra/test-performance/test-execution/pom.xml ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/pom.xml (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/pom.xml Thu Apr 28 14:47:16 2011 @@ -6,9 +6,9 @@ <artifactId>org.amdatu.cassandra</artifactId> <version>0.2.0-SNAPSHOT</version> </parent> - <artifactId>org.amdatu.cassandra.test.performance</artifactId> + <artifactId>org.amdatu.cassandra.test.performance.execution</artifactId> <packaging>jar</packaging> - <name>Amdatu Open Social - Performance Test</name> + <name>Amdatu Cassandra - Performance Test execution</name> <description>This bundle generates the Performance Test framework for the Cassandra project</description> <properties> @@ -23,6 +23,13 @@ <scope>runtime</scope> <type>jar</type> </dependency> + <dependency> + <groupId>org.amdatu.cassandra</groupId> + <artifactId>org.amdatu.cassandra.test.performance.bundle</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + <type>bundle</type> + </dependency> </dependencies> <build> Modified: trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml ============================================================================== --- trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml (original) +++ trunk/amdatu-cassandra/test-performance/test-execution/src/main/assembly/component.xml Thu Apr 28 14:47:16 2011 @@ -2,6 +2,17 @@ <component xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.0 view-source:http://maven.apache.org/xsd/component-1.1.0.xsd";> + <dependencySets> + <dependencySet> + <outputDirectory>amdatu-versions</outputDirectory> + <includes> + <include>org.amdatu.cassandra:org.amdatu.cassandra.test.performance.bundle</include> + </includes> + <unpack>false</unpack> + <useTransitiveDependencies>false</useTransitiveDependencies> + </dependencySet> + </dependencySets> + <fileSets> <fileSet> <directory>src/main/resources/amdatu-versions</directory> _______________________________________________ Amdatu-commits mailing list [email protected] http://lists.amdatu.org/mailman/listinfo/amdatu-commits
