Return-Path: 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 A1CB3DB01 for ; Tue, 2 Oct 2012 12:34:46 +0000 (UTC) Received: (qmail 48675 invoked by uid 500); 2 Oct 2012 12:34:46 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 48616 invoked by uid 500); 2 Oct 2012 12:34:45 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 48601 invoked by uid 99); 2 Oct 2012 12:34:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Oct 2012 12:34:45 +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; Tue, 02 Oct 2012 12:34:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 60BE123889E1; Tue, 2 Oct 2012 12:34:01 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1392888 - /jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Date: Tue, 02 Oct 2012 12:34:01 -0000 To: oak-commits@jackrabbit.apache.org From: alexparvulescu@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121002123401.60BE123889E1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: alexparvulescu Date: Tue Oct 2 12:34:00 2012 New Revision: 1392888 URL: http://svn.apache.org/viewvc?rev=1392888&view=rev Log: OAK-352: Oak builder for simplified repository construction - added UniqueIndexHook, LuceneReindexHook to repository init Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java?rev=1392888&r1=1392887&r2=1392888&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/Main.java Tue Oct 2 12:34:00 2012 @@ -16,6 +16,8 @@ */ package org.apache.jackrabbit.oak.run; +import static org.apache.jackrabbit.oak.spi.query.IndexUtils.DEFAULT_INDEX_HOME; + import java.io.InputStream; import java.util.Properties; import java.util.concurrent.Executors; @@ -26,15 +28,16 @@ import org.apache.jackrabbit.mk.api.Micr import org.apache.jackrabbit.mk.core.MicroKernelImpl; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.api.ContentRepository; -import org.apache.jackrabbit.oak.core.ContentRepositoryImpl; import org.apache.jackrabbit.oak.http.OakServlet; import org.apache.jackrabbit.oak.jcr.RepositoryImpl; import org.apache.jackrabbit.oak.plugins.lucene.LuceneHook; +import org.apache.jackrabbit.oak.plugins.lucene.LuceneReindexHook; import org.apache.jackrabbit.oak.plugins.name.NameValidatorProvider; import org.apache.jackrabbit.oak.plugins.name.NamespaceValidatorProvider; import org.apache.jackrabbit.oak.plugins.type.DefaultTypeEditor; import org.apache.jackrabbit.oak.plugins.type.TypeValidatorProvider; import org.apache.jackrabbit.oak.plugins.commit.ConflictValidatorProvider; +import org.apache.jackrabbit.oak.plugins.unique.UniqueIndexHook; import org.apache.jackrabbit.oak.security.authorization.AccessControlValidatorProvider; import org.apache.jackrabbit.oak.security.authorization.PermissionValidatorProvider; import org.apache.jackrabbit.oak.security.privilege.PrivilegeValidatorProvider; @@ -202,7 +205,9 @@ public class Main { return new CompositeHook( new DefaultTypeEditor(), new ValidatingHook(createDefaultValidatorProvider()), - new LuceneHook()); + new UniqueIndexHook(), + new LuceneReindexHook(DEFAULT_INDEX_HOME), + new LuceneHook(DEFAULT_INDEX_HOME)); } private static ValidatorProvider createDefaultValidatorProvider() {