Author: ivol37 at gmail.com
Date: Mon Dec 27 10:22:37 2010
New Revision: 547
Log:
[AMDATU-127] Upgraded to cassandra 0.7.0 rc3
Added:
trunk/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.0-rc3.jar
(contents, props changed)
trunk/amdatu-cassandra/cassandra-application/src/main/resources/cassandra/apache-cassandra-0.7.0-rc3.jar
(contents, props changed)
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/avro-1.4.0-fixes.jar
(contents, props changed)
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/concurrentlinkedhashmap-lru-1.1.jar
(contents, props changed)
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/jline-0.9.94.jar
(contents, props changed)
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.semanticweb.sesame.cfg
Removed:
trunk/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.0-beta3.jar
trunk/amdatu-cassandra/cassandra-application/src/main/resources/cassandra/apache-cassandra-0.7.0-beta3.jar
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/avro-1.4.0-rc4.jar
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/clhm-production.jar
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/google-collections-1.0.jar
Modified:
trunk/amdatu-buildsupport/pom.xml
trunk/amdatu-cassandra/cassandra-application/pom.xml
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/UserAdminRESTTest.java
trunk/pom.xml
Modified: trunk/amdatu-buildsupport/pom.xml
==============================================================================
--- trunk/amdatu-buildsupport/pom.xml (original)
+++ trunk/amdatu-buildsupport/pom.xml Mon Dec 27 10:22:37 2010
@@ -83,7 +83,7 @@
<goal>install-file</goal>
</goals>
<configuration>
-
<file>src/main/resources/lib/apache-cassandra-0.7.0-beta3.jar</file>
+
<file>src/main/resources/lib/apache-cassandra-0.7.0-rc3.jar</file>
<groupId>org.apache.cassandra</groupId>
<artifactId>cassandra</artifactId>
<version>${cassandra.version}</version>
Added:
trunk/amdatu-buildsupport/src/main/resources/lib/apache-cassandra-0.7.0-rc3.jar
==============================================================================
Binary file. No diff available.
Modified: trunk/amdatu-cassandra/cassandra-application/pom.xml
==============================================================================
--- trunk/amdatu-cassandra/cassandra-application/pom.xml (original)
+++ trunk/amdatu-cassandra/cassandra-application/pom.xml Mon Dec 27
10:22:37 2010
@@ -73,19 +73,19 @@
<Bundle-ClassPath>
.,
lib/antlr-3.1.3.jar,
- lib/avro-1.4.0-rc4.jar,
- lib/clhm-production.jar,
+ lib/avro-1.4.0-fixes.jar,
lib/commons-cli-1.1.jar,
lib/commons-codec-1.2.jar,
lib/commons-collections-3.2.1.jar,
lib/commons-lang-2.4.jar,
- lib/google-collections-1.0.jar,
+ lib/concurrentlinkedhashmap-lru-1.1.jar,
lib/guava-r05.jar,
lib/high-scale-lib.jar,
lib/jackson-core-asl-1.4.0.jar,
lib/jackson-mapper-asl-1.4.0.jar,
lib/jetty-6.1.21.jar,
lib/jetty-util-6.1.21.jar,
+ lib/jline-0.9.94.jar,
lib/json-simple-1.1.jar,
lib/jug-2.0.0.jar,
lib/libthrift-0.5.jar,
Added:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/cassandra/apache-cassandra-0.7.0-rc3.jar
==============================================================================
Binary file. No diff available.
Added:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/avro-1.4.0-fixes.jar
==============================================================================
Binary file. No diff available.
Added:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/concurrentlinkedhashmap-lru-1.1.jar
==============================================================================
Binary file. No diff available.
Added:
trunk/amdatu-cassandra/cassandra-application/src/main/resources/lib/jline-0.9.94.jar
==============================================================================
Binary file. No diff available.
Added:
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.semanticweb.sesame.cfg
==============================================================================
--- (empty file)
+++
trunk/amdatu-core/config-filebased/src/main/resources/conf/org.amdatu.semanticweb.sesame.cfg
Mon Dec 27 10:22:37 2010
@@ -0,0 +1,2 @@
+# RDF store directory
+datadir=work/sesame
\ No newline at end of file
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/base/IntegrationTestBase.java
Mon Dec 27 10:22:37 2010
@@ -109,12 +109,12 @@
// And finally deploy ourselves
bundle(integrationTestJarFile().toURI().toString())
));
-
+
Option[] addOptions = getProvisionedBundles();
if (addOptions == null || addOptions.length == 0) {
return baseOptions;
}
-
+
Option[] options = new Option[baseOptions.length + addOptions.length];
for (int i = 0; i < baseOptions.length; i++) {
options[i] = baseOptions[i];
@@ -124,7 +124,7 @@
}
return options;
}
-
+
protected Option[] getProvisionedBundles() {
return new Option[]{provisionBundles()};
}
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/CassandraDaemonIntegrationTest.java
Mon Dec 27 10:22:37 2010
@@ -145,23 +145,23 @@
// -2- Test adding/updating ColumnFamily's to the keyspace
m_daemonService.addColumnFamily(KEYSPACE, COLUMNFAMILY,
ColumnType.STANDARD.value,
- CompareType.BYTESTYPE.value, CompareType.BYTESTYPE.value);
+ CompareType.BYTESTYPE.value, null);
Assert.assertTrue("ColumnFamily '" + COLUMNFAMILY + "' does not exist
after creation", m_daemonService
.columnFamilyExists(KEYSPACE, COLUMNFAMILY));
try {
// Try to create ColumnFamily with the same name twice, should
throw a InvalidRequestException
m_daemonService.addColumnFamily(KEYSPACE, COLUMNFAMILY,
ColumnType.STANDARD.value,
- CompareType.BYTESTYPE.value, CompareType.BYTESTYPE.value);
+ CompareType.BYTESTYPE.value, null);
Assert.fail("InvalidRequestException expected but not thrown");
}
catch (InvalidRequestException e) {}
// Case sensitivity check
m_daemonService.addColumnFamily(KEYSPACE, COLUMNFAMILY.toLowerCase(),
ColumnType.STANDARD.value,
- CompareType.BYTESTYPE.value, CompareType.BYTESTYPE.value);
+ CompareType.BYTESTYPE.value, null);
m_daemonService.addColumnFamily(KEYSPACE, COLUMNFAMILY.toUpperCase(),
ColumnType.STANDARD.value,
- CompareType.BYTESTYPE.value, CompareType.BYTESTYPE.value);
+ CompareType.BYTESTYPE.value, null);
// Sleep a second, this increases the probability that write requests
have been handled
Thread.sleep(1000);
Modified:
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/UserAdminRESTTest.java
==============================================================================
---
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/UserAdminRESTTest.java
(original)
+++
trunk/integration-tests/src/test/java/org/amdatu/test/integration/tests/UserAdminRESTTest.java
Mon Dec 27 10:22:37 2010
@@ -37,9 +37,7 @@
protected Option provisionBundles() {
return provision(
- amdatuUserAdminREST(),
- amdatuTokenProvider(),
- amdatuMemTokenStore());
+ amdatuUserAdminREST());
}
public Component[] getDependencies(DependencyManager manager) {
Modified: trunk/pom.xml
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Mon Dec 27 10:22:37 2010
@@ -77,7 +77,7 @@
Version numbers of platform bundles
-->
<shindig.version>2.0.0</shindig.version>
- <cassandra.version>0.7.0-beta3</cassandra.version>
+ <cassandra.version>0.7.0-rc3</cassandra.version>
<openrdf.version>2.3.2</openrdf.version>
</properties>
