Return-Path: 
 <oak-commits-return-1005-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org>
X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org
Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id AAF1B925A
	for <apmail-jackrabbit-oak-commits-archive@minotaur.apache.org>;
 Sun, 17 Jun 2012 22:02:10 +0000 (UTC)
Received: (qmail 95695 invoked by uid 500); 17 Jun 2012 22:02:10 -0000
Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org
Received: (qmail 95662 invoked by uid 500); 17 Jun 2012 22:02:10 -0000
Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:oak-commits-help@jackrabbit.apache.org>
List-Unsubscribe: <mailto:oak-commits-unsubscribe@jackrabbit.apache.org>
List-Post: <mailto:oak-commits@jackrabbit.apache.org>
List-Id: <oak-commits.jackrabbit.apache.org>
Reply-To: oak-commits@jackrabbit.apache.org
Delivered-To: mailing list oak-commits@jackrabbit.apache.org
Received: (qmail 95650 invoked by uid 99); 17 Jun 2012 22:02:10 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2012 22:02:10 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Jun 2012 22:02:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id BFB462388860;
	Sun, 17 Jun 2012 22:01:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1351172 - in /jackrabbit/oak/trunk/oak-bench:
 base/pom.xml
 oak03/pom.xml parent/pom.xml pom.xml
Date: Sun, 17 Jun 2012 22:01:48 -0000
To: oak-commits@jackrabbit.apache.org
From: jukka@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120617220148.BFB462388860@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: jukka
Date: Sun Jun 17 22:01:48 2012
New Revision: 1351172

URL: http://svn.apache.org/viewvc?rev=1351172&view=rev
Log:
OAK-119: Oak performance benchmark

Adjust artifactIds to match folder names.
Make the benchmark inherit the Oak parent pom.

Modified:
    jackrabbit/oak/trunk/oak-bench/base/pom.xml
    jackrabbit/oak/trunk/oak-bench/oak03/pom.xml
    jackrabbit/oak/trunk/oak-bench/parent/pom.xml
    jackrabbit/oak/trunk/oak-bench/pom.xml

Modified: jackrabbit/oak/trunk/oak-bench/base/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/base/pom.xml?rev=1351172&r1=1351171&r2=1351172&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/base/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/base/pom.xml Sun Jun 17 22:01:48 2012
@@ -24,13 +24,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.jackrabbit.oak</groupId>
-    <artifactId>oak-perf-parent</artifactId>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>oak-bench-parent</artifactId>
     <version>0.3-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>oak-perf-base</artifactId>
+  <artifactId>oak-bench-base</artifactId>
   <name>Oak Performance Test Utilities</name>
 
   <dependencies>
@@ -50,12 +50,6 @@
       <version>0.3-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
-    <!--  dependency>
-      <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>1.6.2</version --> <!-- overridden by downstream projects -->
-      <!-- scope>provided</scope>
-    </dependency -->
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

Modified: jackrabbit/oak/trunk/oak-bench/oak03/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/oak03/pom.xml?rev=1351172&r1=1351171&r2=1351172&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/oak03/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/oak03/pom.xml Sun Jun 17 22:01:48 2012
@@ -24,19 +24,19 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.apache.jackrabbit.oak</groupId>
-    <artifactId>oak-perf-parent</artifactId>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>oak-bench-parent</artifactId>
     <version>0.3-SNAPSHOT</version>
     <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>oak-perf-oak03</artifactId>
+  <artifactId>oak-bench-oak03</artifactId>
   <name>Oak 0.3 Performance Test</name>
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.jackrabbit.oak</groupId>
-      <artifactId>oak-perf-base</artifactId>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-bench-base</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
@@ -46,19 +46,12 @@
       <version>2.0</version>
       <scope>test</scope>
     </dependency>
-	<dependency>
-		<groupId>org.apache.jackrabbit</groupId>
-		<artifactId>oak-jcr</artifactId>
-		<version>0.3-SNAPSHOT</version>
-		<scope>provided</scope>
-		</dependency>
-    <!-- dependency>
+    <dependency>
       <groupId>org.apache.jackrabbit</groupId>
-      <artifactId>jackrabbit-core</artifactId>
-      <version>2.4-SNAPSHOT</version>
+      <artifactId>oak-jcr</artifactId>
+      <version>${project.version}</version>
       <scope>test</scope>
-    </dependency  -->
+    </dependency>
   </dependencies>
 
 </project>
-

Modified: jackrabbit/oak/trunk/oak-bench/parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/parent/pom.xml?rev=1351172&r1=1351171&r2=1351172&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/parent/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/parent/pom.xml Sun Jun 17 22:01:48 2012
@@ -28,16 +28,14 @@
   <!-- =================================================================== -->
 
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>10</version>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>oak-parent</artifactId>
+    <version>0.3-SNAPSHOT</version>
     <relativePath />
   </parent>
 
-  <groupId>org.apache.jackrabbit.oak</groupId>
-  <artifactId>oak-perf-parent</artifactId>
+  <artifactId>oak-bench-parent</artifactId>
   <name>Oak Performance Test Parent</name>
-  <version>0.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
@@ -50,23 +48,12 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-        <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <configuration>
-			<argLine>-Xms256m -Xmx512m</argLine>
+            <argLine>-Xms256m -Xmx512m</argLine>
             <enableAssertions>false</enableAssertions>
             <systemProperties>
               <property>
-                <name>derby.stream.error.file</name>
-                <value>target/derby.log</value>
-              </property>
-              <property>
                 <name>repo</name>
                 <value>${repo}</value>
               </property>
@@ -99,7 +86,7 @@
             <plugin>
               <artifactId>maven-surefire-plugin</artifactId>
               <configuration>
-				<argLine>-Xmx512m -XX:MaxPermSize=512m -agentlib:${agentlib}</argLine>
+                <argLine>-Xmx512m -XX:MaxPermSize=512m -agentlib:${agentlib}</argLine>
               </configuration>
             </plugin>
           </plugins>

Modified: jackrabbit/oak/trunk/oak-bench/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-bench/pom.xml?rev=1351172&r1=1351171&r2=1351172&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-bench/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-bench/pom.xml Sun Jun 17 22:01:48 2012
@@ -28,13 +28,13 @@
   <!-- =================================================================== -->
 
   <parent>
-    <groupId>org.apache.jackrabbit.oak</groupId>
-    <artifactId>oak-perf-parent</artifactId>
+    <groupId>org.apache.jackrabbit</groupId>
+    <artifactId>oak-bench-parent</artifactId>
     <version>0.3-SNAPSHOT</version>
     <relativePath>parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>oak-perf</artifactId>
+  <artifactId>oak-bench</artifactId>
   <name>Oak Performance Tests</name>
   <packaging>pom</packaging>