You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ju...@apache.org on 2013/02/20 08:19:26 UTC
svn commit: r1448016 - in /jackrabbit/oak/trunk: oak-core/pom.xml
oak-jcr/pom.xml oak-mk/pom.xml oak-mongomk/pom.xml oak-parent/pom.xml
oak-run/pom.xml
oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
Author: jukka
Date: Wed Feb 20 07:19:25 2013
New Revision: 1448016
URL: http://svn.apache.org/r1448016
Log:
OAK-641: Improved benchmark tooling
MongoMK takes over the MongoConnection, so use a separate one for the cleanup.
Unify MongoDB java driver versions.
Use dependency management also for Guava.
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-mk/pom.xml
jackrabbit/oak/trunk/oak-mongomk/pom.xml
jackrabbit/oak/trunk/oak-parent/pom.xml
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Wed Feb 20 07:19:25 2013
@@ -158,14 +158,12 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<!-- Optional dependencies for different persistence backends -->
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.7.1</version>
<optional>true</optional>
</dependency>
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Wed Feb 20 07:19:25 2013
@@ -301,7 +301,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Wed Feb 20 07:19:25 2013
@@ -102,7 +102,6 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<!-- default persistence backend -->
Modified: jackrabbit/oak/trunk/oak-mongomk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/pom.xml?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mongomk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mongomk/pom.xml Wed Feb 20 07:19:25 2013
@@ -84,7 +84,6 @@
<dependency>
<groupId>org.mongodb</groupId>
<artifactId>mongo-java-driver</artifactId>
- <version>2.9.1</version>
</dependency>
<!-- Logging -->
Modified: jackrabbit/oak/trunk/oak-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-parent/pom.xml?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-parent/pom.xml Wed Feb 20 07:19:25 2013
@@ -41,7 +41,6 @@
${project.build.sourceEncoding}
</project.reporting.outputEncoding>
<jackrabbit.version>2.7-SNAPSHOT</jackrabbit.version>
- <guava.version>13.0.1</guava.version>
<mongo.host>127.0.0.1</mongo.host>
<mongo.port>27017</mongo.port>
<mongo.db>MongoMKDB</mongo.db>
@@ -224,6 +223,16 @@
<artifactId>junit</artifactId>
<version>4.10</version>
</dependency>
+ <dependency>
+ <groupId>org.mongodb</groupId>
+ <artifactId>mongo-java-driver</artifactId>
+ <version>2.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>13.0.1</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Wed Feb 20 07:19:25 2013
@@ -130,11 +130,6 @@
<version>1.3.158</version>
</dependency>
<dependency>
- <groupId>org.mongodb</groupId>
- <artifactId>mongo-java-driver</artifactId>
- <version>2.7.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-server</artifactId>
<version>${jackrabbit.version}</version>
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1448016&r1=1448015&r2=1448016&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java Wed Feb 20 07:19:25 2013
@@ -75,14 +75,13 @@ public abstract class OakRepositoryFixtu
public static RepositoryFixture getMongo() {
return new OakRepositoryFixture() {
- private MongoConnection mongo;
private MongoMicroKernel[] kernels;
@Override
public void setUpCluster(Repository[] cluster) throws Exception {
- mongo = new MongoConnection(
- "127.0.0.1", 27017, "oak-benchmark-mongo");
kernels = new MongoMicroKernel[cluster.length];
for (int i = 0; i < cluster.length; i++) {
+ MongoConnection mongo = new MongoConnection(
+ "127.0.0.1", 27017, "oak-benchmark-mongo");
kernels[i] = new MongoMicroKernel(
mongo,
new MongoNodeStore(mongo.getDB()),
@@ -95,8 +94,14 @@ public abstract class OakRepositoryFixtu
for (MongoMicroKernel kernel : kernels) {
kernel.dispose();
}
- mongo.getDB().dropDatabase();
- mongo.close();
+ try {
+ MongoConnection mongo = new MongoConnection(
+ "127.0.0.1", 27017, "oak-benchmark-mongo");
+ mongo.getDB().dropDatabase();
+ mongo.close();
+ } catch (Exception e) {
+ throw new IllegalStateException(e);
+ }
}
};
}