Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 77808 invoked from network); 15 May 2007 20:24:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 May 2007 20:24:30 -0000 Received: (qmail 39596 invoked by uid 500); 15 May 2007 20:24:36 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 39561 invoked by uid 500); 15 May 2007 20:24:36 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 39552 invoked by uid 99); 15 May 2007 20:24:36 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2007 13:24:36 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 May 2007 13:24:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E03041A9838; Tue, 15 May 2007 13:24:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r538310 - /jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Date: Tue, 15 May 2007 20:24:08 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070515202408.E03041A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Tue May 15 13:24:06 2007 New Revision: 538310 URL: http://svn.apache.org/viewvc?view=rev&rev=538310 Log: JCR-924: Use the Jackrabbit RMI extensions by default in jackrabbit-webapp. Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?view=diff&rev=538310&r1=538309&r2=538310 ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Tue May 15 13:24:06 2007 @@ -19,7 +19,8 @@ import org.apache.jackrabbit.api.JackrabbitRepository; import org.apache.jackrabbit.core.RepositoryImpl; import org.apache.jackrabbit.core.config.RepositoryConfig; -import org.apache.jackrabbit.rmi.server.ServerAdapterFactory; +import org.apache.jackrabbit.rmi.jackrabbit.JackrabbitServerAdapterFactory; +import org.apache.jackrabbit.rmi.server.RemoteAdapterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xml.sax.InputSource; @@ -623,13 +624,14 @@ */ protected static class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater { - // only used to enforce linking upon Class.forName() - static String FactoryClassName = ServerAdapterFactory.class.getName(); + private static final RemoteAdapterFactory FACTORY = + new JackrabbitServerAdapterFactory(); public Remote createRemoteRepository(Repository repository) throws RemoteException { - return new ServerAdapterFactory().getRemoteRepository(repository); + return FACTORY.getRemoteRepository(repository); } + } //-------------------------------------------------< Installer Routines >---