jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r727422 - in /jackrabbit/branches/1.5: ./ jackrabbit-jcr-servlet/pom.xml jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java jackrabbit-webapp/pom.xml
Date Wed, 17 Dec 2008 16:15:17 GMT
Author: jukka
Date: Wed Dec 17 08:15:16 2008
New Revision: 727422

URL: http://svn.apache.org/viewvc?rev=727422&view=rev
Log:
1.5: Merged revisions 727388-727397 (JCR-1910). Updated relevant component versions to 1.5.1-SNAPSHOT.
Ignored non-bugfix revisions in trunk.

Modified:
    jackrabbit/branches/1.5/   (props changed)
    jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
    jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml

Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 08:15:16 2008
@@ -1,2 +1,2 @@
 /jackrabbit/branches/1.3:631261
-/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784
+/jackrabbit/trunk:703899-704158,704165,704167,704324,704358,704361,704864,704933,704939,705010,705033,705243,705496,705522,705579,705925,705932,705934,705937-705938,705961,706242,706273,706285-706286,706562,706606,706649,706655,706660,706697,706918,707303-707304,707307,707310,707630,708206,708598,708609,708613,708619,708634,708840,708863,708909,708929,708943,709115,709142,709207,709211,710047,711238,711566-711567,711595,711841-711843,712984-712985,713037,713059,713065,713072,713076,713162,713214,713956,713958,713964,713971,713975,714034,718218,718249-718250,718371,718376,718566,718632,718981,719225,719282,719575-719577,719579,719585-719586,719588,719592,720455,720484,720492,720524,720533,720540,720673,720679,720687,720784,720940,720969,721186,721191,721194,721235,721387-721389,721470,721495,722068-722069,722463,722465,722467,722470,722825,723281,723346,723728,723784,724300,724387,725292,727376,727388,727390,727395,727397

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml?rev=727422&r1=727421&r2=727422&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-servlet/pom.xml Wed Dec 17 08:15:16 2008
@@ -34,6 +34,7 @@
   </parent>
   <artifactId>jackrabbit-jcr-servlet</artifactId>
   <name>Jackrabbit JCR Servlets</name>
+  <version>1.5.1-SNAPSHOT</version>
   <description>
     Servlets and related classes for easy use of JCR content repositories
     in web applications.

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java?rev=727422&r1=727421&r2=727422&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
(original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-servlet/src/main/java/org/apache/jackrabbit/servlet/remote/RMIRemoteBindingServlet.java
Wed Dec 17 08:15:16 2008
@@ -75,15 +75,11 @@
             url = "//localhost/javax/jcr/Repository";
         }
         try {
-            Naming.bind(url, getRemoteRepository());
+            Naming.rebind(url, getRemoteRepository());
         } catch (MalformedURLException e) {
-            throw new ServletException("Invalid RMI URL: " + url, e);
-        } catch (AlreadyBoundException e) {
-            throw new ServletException(
-                    "RMI URL is already bound: " + url, e);
+            log("Invalid RMI URL: " + url, e);
         } catch (RemoteException e) {
-            throw new ServletException(
-                    "Failed to bind repository to RMI: " + url, e);
+            log("Failed to bind repository to RMI: " + url, e);
         }
     }
 
@@ -93,10 +89,10 @@
     public void destroy() {
         try {
             Naming.unbind(url);
-        } catch (MalformedURLException e) {
-            log("Invalid RMI URL: " + url, e);
         } catch (NotBoundException e) {
-            log("Repository not bound in RMI: " + url, e);
+            // Ignore, perhaps the reference was already manually removed
+        } catch (MalformedURLException e) {
+            // Ignore, we already logged a warning about this during init()
         } catch (RemoteException e) {
             log("Failed to unbind repository from RMI: " + url, e);
         }

Modified: jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml?rev=727422&r1=727421&r2=727422&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml Wed Dec 17 08:15:16 2008
@@ -83,7 +83,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-servlet</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>



Mime
View raw message