jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r900786 - in /jackrabbit/branches/2.0: ./ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/ jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/
Date Tue, 19 Jan 2010 14:09:18 GMT
Author: jukka
Date: Tue Jan 19 14:09:17 2010
New Revision: 900786

URL: http://svn.apache.org/viewvc?rev=900786&view=rev
Log:
2.0: Merged revisions 899391, 900305 and 900310 (JCR-2467 and JCR-97)

Modified:
    jackrabbit/branches/2.0/   (props changed)
    jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
    jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java

Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 19 14:09:17 2010
@@ -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:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,900314,900702
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,898872,899102,899181,899391,899393-899394,900305,900310,900314,900702

Modified: jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java?rev=900786&r1=900785&r2=900786&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java
Tue Jan 19 14:09:17 2010
@@ -41,9 +41,6 @@
 import org.apache.jackrabbit.core.util.Dumpable;
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.QNodeDefinition;
-import org.apache.jackrabbit.spi.Path;
-import org.apache.jackrabbit.spi.PathFactory;
-import org.apache.jackrabbit.spi.commons.name.PathFactoryImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -582,7 +579,7 @@
         // the nearest common ancestor of all transient states
         // must be either
         // a) a node state with STATUS_EXISTING_MODIFIED, or
-        // b) the parent node of a property state with STATUS_EXISTING_MODIFIED 
+        // b) the parent node of a property state with STATUS_EXISTING_MODIFIED
 
         // collect all candidates based on above criteria
         Collection<NodeId> candidateIds = new LinkedList<NodeId>();

Modified: jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java?rev=900786&r1=900785&r2=900786&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java
(original)
+++ jackrabbit/branches/2.0/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/nodetype/compact/CompactNodeTypeDefWriter.java
Tue Jan 19 14:09:17 2010
@@ -140,8 +140,8 @@
     /**
      * Creates a new nodetype writer
      *
-     * @param out the underlaying writer
-     * @param r the naespace resolver
+     * @param out the underlying writer
+     * @param r the namespace resolver
      * @param npResolver name-path resolver
      * @param includeNS if <code>true</code> all used namespace decl. are also
      *                  written to the writer
@@ -171,7 +171,7 @@
      * @param out output writer
      * @throws IOException if an I/O error occurs
      */
-    public static void write(Collection<QNodeTypeDefinition> defs,
+    public static void write(Collection<? extends QNodeTypeDefinition> defs,
                              NamespaceResolver r,
                              NamePathResolver npResolver,
                              Writer out)
@@ -204,7 +204,7 @@
      * @param defs node type definitions
      * @throws IOException if an I/O error occurs
      */
-    public void write(Collection<QNodeTypeDefinition> defs) throws IOException {
+    public void write(Collection<? extends QNodeTypeDefinition> defs) throws IOException
{
         for (QNodeTypeDefinition def : defs) {
             write(def);
         }



Mime
View raw message