jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r727414 - in /jackrabbit/branches/1.5: ./ jackrabbit-jcr-server/pom.xml jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java jackrabbit-standalone/pom.xml jackrabbit-webapp/pom.xml
Date Wed, 17 Dec 2008 15:26:57 GMT
Author: jukka
Date: Wed Dec 17 07:26:57 2008
New Revision: 727414

URL: http://svn.apache.org/viewvc?rev=727414&view=rev
Log:
1.5: Merged revision 723784 (JCR-1902). Updated relevant component versions to 1.5.1-SNAPSHOT.
Ignored non-bugfix releases in trunk.

Modified:
    jackrabbit/branches/1.5/   (props changed)
    jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml
    jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
    jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml
    jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml

Propchange: jackrabbit/branches/1.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 17 07:26:57 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
+/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

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml?rev=727414&r1=727413&r2=727414&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-server/pom.xml Wed Dec 17 07:26:57 2008
@@ -34,6 +34,7 @@
   </parent>
   <artifactId>jackrabbit-jcr-server</artifactId>
   <name>Jackrabbit JCR Server</name>
+  <version>1.5.1-SNAPSHOT</version>
   <description>WebDAV server implementations for JCR</description>
 
   <scm>

Modified: jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java?rev=727414&r1=727413&r2=727414&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
(original)
+++ jackrabbit/branches/1.5/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/webdav/simple/DavResourceImpl.java
Wed Dec 17 07:26:57 2008
@@ -936,25 +936,27 @@
      */
     public Set getParentElements() {
         try {
-            //TODO remove this check once jcr2 is out
-            if (!(this.node instanceof org.apache.jackrabbit.api.jsr283.Node)) {
-                DavResourceLocator loc = this.locator.getFactory().createResourceLocator(
-                        this.locator.getPrefix(), this.locator.getWorkspacePath(), this.node.getParent().getPath(),
false);
-                return Collections.singleton(new ParentElement(loc.getHref(true), this.node.getName()));
-            }
-            Set ps = new HashSet();
-            NodeIterator sharedSetIterator = ((org.apache.jackrabbit.api.jsr283.Node) this.node).getSharedSet();
-            while (sharedSetIterator.hasNext()) {
-                Node sharednode = sharedSetIterator.nextNode();
-                DavResourceLocator loc = this.locator.getFactory().createResourceLocator(
-                        this.locator.getPrefix(), this.locator.getWorkspacePath(), sharednode.getParent().getPath(),
false);
-                ps.add(new ParentElement(loc.getHref(true), sharednode.getName()));
+            if (this.node.getDepth() > 0) {
+                //TODO remove this check once jcr2 is out
+                if (!(this.node instanceof org.apache.jackrabbit.api.jsr283.Node)) {
+                    DavResourceLocator loc = this.locator.getFactory().createResourceLocator(
+                            this.locator.getPrefix(), this.locator.getWorkspacePath(), this.node.getParent().getPath(),
false);
+                    return Collections.singleton(new ParentElement(loc.getHref(true), this.node.getName()));
+                }
+                Set ps = new HashSet();
+                NodeIterator sharedSetIterator = ((org.apache.jackrabbit.api.jsr283.Node)
this.node).getSharedSet();
+                while (sharedSetIterator.hasNext()) {
+                    Node sharednode = sharedSetIterator.nextNode();
+                    DavResourceLocator loc = this.locator.getFactory().createResourceLocator(
+                            this.locator.getPrefix(), this.locator.getWorkspacePath(), sharednode.getParent().getPath(),
false);
+                    ps.add(new ParentElement(loc.getHref(true), sharednode.getName()));
+                }
+                return ps;
             }
-            return ps;
         } catch (RepositoryException e) {
             log.warn("unable to calculate parent set", e);
-            return Collections.EMPTY_SET; 
         }
+        return Collections.EMPTY_SET;
     }
 
     /**

Modified: jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml?rev=727414&r1=727413&r2=727414&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-standalone/pom.xml Wed Dec 17 07:26:57 2008
@@ -34,6 +34,7 @@
   </parent>
   <artifactId>jackrabbit-standalone</artifactId>
   <name>Jackrabbit Standalone</name>
+  <version>1.5.1-SNAPSHOT</version>
   <description>Runnable jar packaging of Apache Jackrabbit</description>
 
   <build>
@@ -83,7 +84,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-webapp</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1-SNAPSHOT</version>
       <type>war</type>
     </dependency>
     <dependency>

Modified: jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml?rev=727414&r1=727413&r2=727414&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/1.5/jackrabbit-webapp/pom.xml Wed Dec 17 07:26:57 2008
@@ -35,6 +35,7 @@
   <artifactId>jackrabbit-webapp</artifactId>
   <packaging>war</packaging>
   <name>Jackrabbit Web Application</name>
+  <version>1.5.1-SNAPSHOT</version>
   <description>Web application that hosts and serves a Jackrabbit content repository</description>
 
   <scm>
@@ -66,7 +67,7 @@
     <dependency>
       <groupId>org.apache.jackrabbit</groupId>
       <artifactId>jackrabbit-jcr-server</artifactId>
-      <version>1.5.0</version>
+      <version>1.5.1-SNAPSHOT</version>
       <exclusions>
         <!-- JCR-683: The commons-httpclient dependency from            -->
         <!-- jackrabbit-webapp depends on commons-logging. Since this   -->



Mime
View raw message