You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2007/05/15 22:24:08 UTC
svn commit: r538310 -
/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
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 >---