jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tri...@apache.org
Subject svn commit: r531798 - in /jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee: RMIConfig.java RepositoryStartupServlet.java
Date Tue, 24 Apr 2007 07:23:07 GMT
Author: tripod
Date: Tue Apr 24 00:23:06 2007
New Revision: 531798

URL: http://svn.apache.org/viewvc?view=rev&rev=531798
Log:
Fixing issues with RMI access.

Modified:
    jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.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/RMIConfig.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java?view=diff&rev=531798&r1=531797&r2=531798
==============================================================================
--- jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java
(original)
+++ jackrabbit/trunk/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RMIConfig.java
Tue Apr 24 00:23:06 2007
@@ -68,8 +68,8 @@
 
     public void init(ServletConfig ctx) throws ServletException {
         super.init(ctx);
-        // enable rmi if port was set
-        rmiEnabled = rmiPort >= 0;
+        // enable RMI if either port or url was defined
+        rmiEnabled = rmiPort >=0 || rmiUri != null;
     }
 
     public String getRmiName() {

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=531798&r1=531797&r2=531798
==============================================================================
--- 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 Apr 24 00:23:06 2007
@@ -468,11 +468,13 @@
             RemoteFactoryDelegater rmf = (RemoteFactoryDelegater) clazz.newInstance();
             remote = rmf.createRemoteRepository(repository);
         } catch (RemoteException e) {
+            log.error("Unable to create RMI repository.", e);
             throw new ServletException("Unable to create remote repository.", e);
         } catch (NoClassDefFoundError e) {
             throw new ServletException("Unable to create RMI repository. jcr-rmi.jar might
be missing.", e);
         } catch (Exception e) {
-            throw new ServletException("Unable to create RMI repository. jcr-rmi.jar might
be missing.", e);
+            log.error("Unable to create RMI repository.", e);
+            throw new ServletException("Unable to create RMI repository. jcr-rmi.jar might
be missing.");
         }
 
         try {



Mime
View raw message