Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 34590 invoked from network); 13 Jul 2009 11:49:37 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Jul 2009 11:49:37 -0000 Received: (qmail 54398 invoked by uid 500); 13 Jul 2009 11:49:46 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 54364 invoked by uid 500); 13 Jul 2009 11:49:46 -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 54340 invoked by uid 99); 13 Jul 2009 11:49:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jul 2009 11:49:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Mon, 13 Jul 2009 11:49:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0DB02388878; Mon, 13 Jul 2009 11:49:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r793559 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee: RepositoryAccessServlet.java RepositoryStartupServlet.java Date: Mon, 13 Jul 2009 11:49:24 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090713114924.A0DB02388878@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Mon Jul 13 11:49:24 2009 New Revision: 793559 URL: http://svn.apache.org/viewvc?rev=793559&view=rev Log: JCR-1736: Expose BootstrapConfig in Servlets Apply the patch from Toby. Modified: jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java 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/RepositoryAccessServlet.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java?rev=793559&r1=793558&r2=793559&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java (original) +++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryAccessServlet.java Mon Jul 13 11:49:24 2009 @@ -103,7 +103,7 @@ * @param ctx the servlet context * @return this servlet */ - private static RepositoryAccessServlet getInstance(ServletContext ctx) { + public static RepositoryAccessServlet getInstance(ServletContext ctx) { final RepositoryAccessServlet instance = (RepositoryAccessServlet) ctx.getAttribute(CTX_PARAM_THIS); if(instance==null) { throw new IllegalStateException( @@ -322,6 +322,14 @@ } /** + * Returns the config that was used to bootstrap this servlet. + * @return the bootstrap config or null. + */ + public BootstrapConfig getBootstrapConfig() { + return config; + } + + /** * optional class for RMI, will only be used, if RMI client is present */ protected static abstract class ClientFactoryDelegater { 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?rev=793559&r1=793558&r2=793559&view=diff ============================================================================== --- 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 Mon Jul 13 11:49:24 2009 @@ -592,6 +592,14 @@ } /** + * Returns the config that was used to bootstrap this servlet. + * @return the bootstrap config or null. + */ + public BootstrapConfig getBootstrapConfig() { + return config; + } + + /** * Return the fully qualified name of the class providing the remote * repository. The class whose name is returned must implement the * {@link RemoteFactoryDelegater} interface.