jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
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 GMT
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 <code>null</code>.
+     */
+    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 <code>null</code>.
+     */
+    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.



Mime
View raw message