jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r1055497 - in /jackrabbit/branches/2.2: ./ RELEASE-NOTES.txt jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
Date Wed, 05 Jan 2011 15:59:21 GMT
Author: jukka
Date: Wed Jan  5 15:59:21 2011
New Revision: 1055497

URL: http://svn.apache.org/viewvc?rev=1055497&view=rev
Log:
2.2: Merged revision 1050551 (JCR-2850)

Modified:
    jackrabbit/branches/2.2/   (props changed)
    jackrabbit/branches/2.2/RELEASE-NOTES.txt
    jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java

Propchange: jackrabbit/branches/2.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  5 15:59:21 2011
@@ -2,4 +2,4 @@
 /jackrabbit/sandbox/JCR-1456:774917-886178
 /jackrabbit/sandbox/JCR-2170:812417-816332
 /jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1044312,1049473,1049491,1049520,1050346,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164
+/jackrabbit/trunk:1038201,1038203,1038205,1038657,1039064,1039347,1039408,1039422-1039423,1039888,1039946,1040033,1040090,1040459,1040601,1040606,1040661,1040958,1041379,1041439,1041761,1042643,1042647,1042978-1042982,1043084-1043086,1043088,1043343,1043357-1043358,1043430,1043554,1043616,1043618,1043637,1043656,1044312,1049473,1049491,1049520,1050346,1050551,1055068,1055070-1055071,1055116-1055117,1055127,1055134,1055164

Modified: jackrabbit/branches/2.2/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/RELEASE-NOTES.txt?rev=1055497&r1=1055496&r2=1055497&view=diff
==============================================================================
--- jackrabbit/branches/2.2/RELEASE-NOTES.txt (original)
+++ jackrabbit/branches/2.2/RELEASE-NOTES.txt Wed Jan  5 15:59:21 2011
@@ -1,4 +1,4 @@
-Release Notes -- Apache Jackrabbit -- Version 2.2.0
+Release Notes -- Apache Jackrabbit -- Version 2.2.1
 
 Introduction
 ------------

Modified: jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java?rev=1055497&r1=1055496&r2=1055497&view=diff
==============================================================================
--- jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
(original)
+++ jackrabbit/branches/2.2/jackrabbit-webapp/src/main/java/org/apache/jackrabbit/j2ee/RepositoryStartupServlet.java
Wed Jan  5 15:59:21 2011
@@ -483,7 +483,7 @@ public class RepositoryStartupServlet ex
      * the repository with an RMI registry.
      * @throws ServletException if an error occurs.
      */
-    private void registerRMI() throws ServletException {
+    private void registerRMI() {
         RMIConfig rc = config.getRmiConfig();
         if (!rc.isValid() || !rc.enabled()) {
             return;
@@ -492,16 +492,16 @@ public class RepositoryStartupServlet ex
         // try to create remote repository
         Remote remote;
         try {
-            Class clazz = Class.forName(getRemoteFactoryDelegaterClass());
+            Class<?> clazz = Class.forName(getRemoteFactoryDelegaterClass());
             RemoteFactoryDelegater rmf = (RemoteFactoryDelegater) clazz.newInstance();
             remote = rmf.createRemoteRepository(repository);
         } catch (RemoteException e) {
-            log.error("Unable to create RMI repository.", e);
-            throw new ServletExceptionWithCause("Unable to create remote repository.", e);
+            log.warn("Unable to create RMI repository.", e);
+            return;
         } catch (Throwable t) {
-            log.error("Unable to create RMI repository.", t);
-            throw new ServletExceptionWithCause(
-                    "Unable to create RMI repository. jcr-rmi.jar might be missing.", t);
+            log.warn("Unable to create RMI repository."
+                    + " The jcr-rmi jar might be missing.", t);
+            return;
         }
 
         try {
@@ -551,7 +551,7 @@ public class RepositoryStartupServlet ex
                 try {
                     reg = LocateRegistry.getRegistry(rc.getRmiHost(), rc.rmiPort());
                 } catch (RemoteException re) {
-                    log.error("Cannot create the reference to the registry at "
+                    log.warn("Cannot create the reference to the registry at "
                             + rc.getRmiHost() + ":" + rc.getRmiPort(), re);
                 }
             }
@@ -569,13 +569,10 @@ public class RepositoryStartupServlet ex
             } else {
                 log.info("RMI registry missing, cannot bind repository via RMI");
             }
-
         } catch (RemoteException e) {
-            throw new ServletExceptionWithCause(
-                    "Unable to bind repository via RMI: " + rc.getRmiUri(), e);
+            log.warn("Unable to bind repository via RMI: " + rc.getRmiUri(), e);
         } catch (AlreadyBoundException e) {
-            throw new ServletExceptionWithCause(
-                    "Unable to bind repository via RMI: " + rc.getRmiUri(), e);
+            log.warn("Unable to bind repository via RMI: " + rc.getRmiUri(), e);
         }
     }
 



Mime
View raw message