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 2012/04/06 17:03:06 UTC

svn commit: r1310379 - in /jackrabbit/oak/trunk/oak-it: mk/ mk/pom.xml mk/src/ mk/src/test/ mk/src/test/resources/ mk/src/test/resources/logback-test.xml pom.xml

Author: jukka
Date: Fri Apr  6 15:03:06 2012
New Revision: 1310379

URL: http://svn.apache.org/viewvc?rev=1310379&view=rev
Log:
OAK-12: Implement a test suite for the MicroKernel

Add an oak-it-mk for MicroKernel integration tests

Added:
    jackrabbit/oak/trunk/oak-it/mk/
    jackrabbit/oak/trunk/oak-it/mk/pom.xml
      - copied, changed from r1310234, jackrabbit/oak/trunk/oak-it/pom.xml
    jackrabbit/oak/trunk/oak-it/mk/src/
    jackrabbit/oak/trunk/oak-it/mk/src/test/
    jackrabbit/oak/trunk/oak-it/mk/src/test/resources/
    jackrabbit/oak/trunk/oak-it/mk/src/test/resources/logback-test.xml
      - copied, changed from r1310234, jackrabbit/oak/trunk/oak-it/pom.xml
Modified:
    jackrabbit/oak/trunk/oak-it/pom.xml

Copied: jackrabbit/oak/trunk/oak-it/mk/pom.xml (from r1310234, jackrabbit/oak/trunk/oak-it/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/pom.xml?p2=jackrabbit/oak/trunk/oak-it/mk/pom.xml&p1=jackrabbit/oak/trunk/oak-it/pom.xml&r1=1310234&r2=1310379&rev=1310379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/mk/pom.xml Fri Apr  6 15:03:06 2012
@@ -24,19 +24,36 @@
     <groupId>org.apache.jackrabbit</groupId>
     <artifactId>oak-parent</artifactId>
     <version>0.2-SNAPSHOT</version>
-    <relativePath>../oak-parent/pom.xml</relativePath>
+    <relativePath>../../oak-parent/pom.xml</relativePath>
   </parent>
 
-  <artifactId>oak-it</artifactId>
-  <name>Oak Integration Tests</name>
-  <packaging>pom</packaging>
+  <artifactId>oak-it-mk</artifactId>
+  <name>Oak Integration Tests for MicroKernel implementations</name>
 
   <properties>
     <skip.deployment>true</skip.deployment>
   </properties>
 
-  <modules>
-    <module>jcr</module>
-  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-mk</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>1.0.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 
 </project>

Copied: jackrabbit/oak/trunk/oak-it/mk/src/test/resources/logback-test.xml (from r1310234, jackrabbit/oak/trunk/oak-it/pom.xml)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/resources/logback-test.xml?p2=jackrabbit/oak/trunk/oak-it/mk/src/test/resources/logback-test.xml&p1=jackrabbit/oak/trunk/oak-it/pom.xml&r1=1310234&r2=1310379&rev=1310379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/test/resources/logback-test.xml Fri Apr  6 15:03:06 2012
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
@@ -16,27 +15,17 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
+<configuration>
 
-<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.apache.jackrabbit</groupId>
-    <artifactId>oak-parent</artifactId>
-    <version>0.2-SNAPSHOT</version>
-    <relativePath>../oak-parent/pom.xml</relativePath>
-  </parent>
-
-  <artifactId>oak-it</artifactId>
-  <name>Oak Integration Tests</name>
-  <packaging>pom</packaging>
-
-  <properties>
-    <skip.deployment>true</skip.deployment>
-  </properties>
-
-  <modules>
-    <module>jcr</module>
-  </modules>
+  <appender name="file" class="ch.qos.logback.core.FileAppender">
+    <file>target/test.log</file>
+    <encoder>
+      <pattern>%date{HH:mm:ss.SSS} %-5level %-40([%thread] %F:%L) %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="INFO">
+    <appender-ref ref="file"/>
+  </root>
 
-</project>
+</configuration>

Modified: jackrabbit/oak/trunk/oak-it/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/pom.xml?rev=1310379&r1=1310378&r2=1310379&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/pom.xml Fri Apr  6 15:03:06 2012
@@ -37,6 +37,7 @@
 
   <modules>
     <module>jcr</module>
+    <module>mk</module>
   </modules>
 
 </project>