svn commit: r494982 - /jackrabbit/branches/1.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java

[ju...@apache.org]

Author: jukka
Date: Wed Jan 10 13:02:03 2007
New Revision: 494982

URL: http://svn.apache.org/viewvc?view=rev&rev=494982
Log:
1.2: Merged jackrabbit-webapp changes from revisions 489363 and 493043 (JCR-686)

Modified:
    jackrabbit/branches/1.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java

Modified: jackrabbit/branches/1.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?view=diff&rev=494982&r1=494981&r2=494982
==============================================================================
--- jackrabbit/branches/1.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java (original)
+++ jackrabbit/branches/1.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java Wed Jan 10 13:02:03 2007
@@ -23,12 +23,6 @@
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -49,6 +43,13 @@
 import java.util.Enumeration;
 import java.util.Properties;
 
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+
 /**
  * The RepositoryStartupServlet starts a jackrabbit repository and registers it
  * to the JNDI environment and optional to the RMI registry.
@@ -508,7 +509,7 @@
      * {@link RemoteFactoryDelegater} interface.
      */
     protected String getRemoteFactoryDelegaterClass() {
-        return "org.apache.jackrabbit.j2ee.RMIRemoteFactoryDelegater";
+        return "org.apache.jackrabbit.j2ee.RepositoryStartupServlet$RMIRemoteFactoryDelegater";
     }
 
     /**
@@ -560,26 +561,27 @@
         }
     }
 
-}
-
-/**
- * optional class for RMI, will only be used, if RMI server is present
- */
-abstract class RemoteFactoryDelegater {
+    /**
+     * optional class for RMI, will only be used, if RMI server is present
+     */
+    protected static abstract class RemoteFactoryDelegater {
 
-    public abstract Remote createRemoteRepository(Repository repository)
-            throws RemoteException;
-}
-/**
- * optional class for RMI, will only be used, if RMI server is present
- */
-class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater {
+        public abstract Remote createRemoteRepository(Repository repository)
+                throws RemoteException;
+    }
+    /**
+     * optional class for RMI, will only be used, if RMI server is present
+     */
+    protected static class RMIRemoteFactoryDelegater extends RemoteFactoryDelegater {
 
-    // only used to enforce linking upon Class.forName()
-    static String FactoryClassName = ServerAdapterFactory.class.getName();
+        // only used to enforce linking upon Class.forName()
+        static String FactoryClassName = ServerAdapterFactory.class.getName();
 
-    public Remote createRemoteRepository(Repository repository)
-            throws RemoteException {
-        return new ServerAdapterFactory().getRemoteRepository(repository);
+        public Remote createRemoteRepository(Repository repository)
+                throws RemoteException {
+            return new ServerAdapterFactory().getRemoteRepository(repository);
+        }
     }
+
 }
+