Author: [email protected]
Date: Fri May 6 17:04:40 2011
New Revision: 1125
Log:
[PREPARE-RELEASE] Merged changes from 0.2 branch back to the trunk
Added:
trunk/amdatu-cassandra/test-integration/LICENSE
- copied unchanged from r1124,
/branches/amdatu-cassandra-0.2.0/test-integration/LICENSE
trunk/amdatu-cassandra/test-integration/NOTICE
- copied unchanged from r1124,
/branches/amdatu-cassandra-0.2.0/test-integration/NOTICE
trunk/amdatu-cassandra/test-performance/test-bundle/LICENSE
- copied unchanged from r1124,
/branches/amdatu-cassandra-0.2.0/test-performance/test-bundle/LICENSE
trunk/amdatu-cassandra/test-performance/test-bundle/NOTICE
- copied unchanged from r1124,
/branches/amdatu-cassandra-0.2.0/test-performance/test-bundle/NOTICE
trunk/amdatu-cassandra/test-performance/test-execution/LICENSE
- copied unchanged from r1124,
/branches/amdatu-cassandra-0.2.0/test-performance/test-execution/LICENSE
trunk/amdatu-cassandra/test-performance/test-execution/NOTICE
- copied unchanged from r1124,
/branches/amdatu-cassandra-0.2.0/test-performance/test-execution/NOTICE
Modified:
trunk/amdatu-cassandra/ (props changed)
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
trunk/amdatu-cassandra/pom.xml
trunk/amdatu-cassandra/release/src/main/resources/CHANGELOG
trunk/amdatu-cassandra/release/src/main/resources/README
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyHectorTest.java
Fri May 6 17:04:40 2011
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
public class EventualConsistencyHectorTest extends UnitTestBase {
@@ -27,16 +28,16 @@
private static final String TEST_COLUMN_BYTES = "ECHT_ColumnBytes";
private static final String DEFAULT_CHARSET = "UTF-8";
- protected void setup() throws Exception {
- super.setup();
+ @BeforeClass
+ public static void setup() throws Exception {
+ UnitTestBase.setup();
m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_CF, "Standard",
"BytesType", null);
}
@Test
public void testAll() throws Exception {
LOG.info("Starting unit tests");
- setup();
-
+
// The test consists of writing value i into column c and then reading
the value from column c.
// We expect that the value read from c is always the same as the
value written to c just before
// reading it, however, in Cassandra this appears not to be the case.
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/EventualConsistencyThriftTest.java
Fri May 6 17:04:40 2011
@@ -17,6 +17,8 @@
import junit.framework.Assert;
+import org.junit.BeforeClass;
+
public class EventualConsistencyThriftTest extends UnitTestBase {
private static final org.apache.log4j.Logger LOG =
org.apache.log4j.Logger.getLogger(EventualConsistencyHectorTest.class);
@@ -26,8 +28,9 @@
private static final String TEST_COLUMN_BYTES = "ECTT_ColumnBytes";
private static final String DEFAULT_CHARSET = "UTF-8";
- protected void setup() throws Exception {
- super.setup();
+ @BeforeClass
+ public static void setup() throws Exception {
+ UnitTestBase.setup();
m_daemon.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_CF, "Super",
"BytesType", "BytesType");
}
@@ -36,7 +39,6 @@
// @Test
public void testAll() throws Exception {
LOG.info("Starting unit tests");
- setup();
// The test consists of writing value i into column c and then reading
the value from column c.
// We expect that the value read from c is always the same as the
value written to c just before
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/PersistenceManagerTest.java
Fri May 6 17:04:40 2011
@@ -29,6 +29,7 @@
import me.prettyprint.hector.api.beans.SuperRow;
import org.junit.Assert;
+import org.junit.BeforeClass;
import org.junit.Test;
@SuppressWarnings("deprecation")
@@ -40,8 +41,9 @@
private static final String TEST_SUPERCOLUMN = "PMUnitTestSuperColumn";
private static final String TEST_COLUMN = "PMUnitTestColumn";
- protected void setup() throws Exception {
- super.setup();
+ @BeforeClass
+ public static void setup() throws Exception {
+ UnitTestBase.setup();
m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_SUPER_CF, "Super",
"BytesType", "BytesType");
m_daemon.addColumnFamily(TEST_KEYSPACE_THRIFT, TEST_SUPER_CF, "Super",
"BytesType", "BytesType");
m_daemon.addColumnFamily(TEST_KEYSPACE_HECTOR, TEST_STANDARD_CF,
"Standard", "BytesType", null);
@@ -51,7 +53,6 @@
@Test
public void run() throws Exception {
LOG.info("Starting unit tests");
- setup();
// Remove all rows first
deleteAllRows(TEST_SUPER_CF);
@@ -71,10 +72,6 @@
testValueTypes(TEST_SUPER_CF, true);
testValueTypes(TEST_STANDARD_CF, false);
- // Drop the keyspaces we created
- m_daemon.dropKeyspace(TEST_KEYSPACE_HECTOR);
- m_daemon.dropKeyspace(TEST_KEYSPACE_THRIFT);
-
LOG.info("Unit tests finished");
}
Modified:
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
==============================================================================
---
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
(original)
+++
trunk/amdatu-cassandra/cassandra-persistencemanager/src/test/java/org/amdatu/cassandra/persistencemanager/UnitTestBase.java
Fri May 6 17:04:40 2011
@@ -44,7 +44,7 @@
protected static HectorCassandraPersistenceManagerImpl m_hectorPM;
protected static ThriftCassandraPersistenceManagerImpl m_thriftPM;
- protected void setup() throws Exception {
+ public static void setup() throws Exception {
if (!INITIALIZED) {
INITIALIZED = true;
@@ -58,6 +58,14 @@
startThread.start();
startThread.join();
+ // Drop keyspaces and re-create them if they exist
+ if (m_daemon.keyspaceExists(TEST_KEYSPACE_HECTOR)) {
+ m_daemon.dropKeyspace(TEST_KEYSPACE_HECTOR);
+ }
+ if (m_daemon.keyspaceExists(TEST_KEYSPACE_THRIFT)) {
+ m_daemon.dropKeyspace(TEST_KEYSPACE_THRIFT);
+ }
+
m_daemon.addKeyspace(TEST_KEYSPACE_HECTOR);
m_daemon.addKeyspace(TEST_KEYSPACE_THRIFT);
Modified: trunk/amdatu-cassandra/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/pom.xml (original)
+++ trunk/amdatu-cassandra/pom.xml Fri May 6 17:04:40 2011
@@ -244,21 +244,44 @@
<!--
For now this module is disabled, as it depends on amdatu-opensocial for
which
there is no official release yet. So we will first provide official 0.2.0
- releases for Amdatu Cssandra, Amdatu OpenSocial and Amdatu Auth, then we
can
+ releases for Amdatu Cassandra, Amdatu OpenSocial and Amdatu Auth, then
we can
release Amdatu Cassandra 0.2.1 including this artifact.
<module>cassandra-gadgetstore</module>
-->
<module>cassandra-listener</module>
<module>cassandra-persistencemanager</module>
<module>cassandra-tenantstore</module>
+ <module>cassandra-tools</module>
<module>cassandra-useradminstore</module>
+ <module>release</module>
<module>test-integration</module>
+ <module>test-performance</module>
</modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.2</version>
<executions>
@@ -298,6 +321,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
Modified: trunk/amdatu-cassandra/release/src/main/resources/CHANGELOG
==============================================================================
--- trunk/amdatu-cassandra/release/src/main/resources/CHANGELOG (original)
+++ trunk/amdatu-cassandra/release/src/main/resources/CHANGELOG Fri May 6
17:04:40 2011
@@ -3,7 +3,7 @@
Amdatu Cassandra
-Release 0.2.0
+Release 0.2.0-RC1
Last revised May 6, 2011
------------------------
Modified: trunk/amdatu-cassandra/release/src/main/resources/README
==============================================================================
--- trunk/amdatu-cassandra/release/src/main/resources/README (original)
+++ trunk/amdatu-cassandra/release/src/main/resources/README Fri May 6
17:04:40 2011
@@ -4,7 +4,7 @@
Amdatu Cassandra
-Release 0.2.0
+Release 0.2.0-RC1
Last revised May 6, 2011
------------------------
_______________________________________________
Amdatu-commits mailing list
[email protected]
http://lists.amdatu.org/mailman/listinfo/amdatu-commits
