Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@jackrabbit.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1232476 - in /jackrabbit/branches/2.4: ./
 jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java
 jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java
Date: Tue, 17 Jan 2012 16:57:09 -0000
To: commits@jackrabbit.apache.org
From: jukka@apache.org
Message-Id: <20120117165709.5179E23888FE@eris.apache.org>

Author: jukka
Date: Tue Jan 17 16:57:08 2012
New Revision: 1232476

URL: http://svn.apache.org/viewvc?rev=1232476&view=rev
Log:
2.4: Merged javadoc fixes from trunk

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java
    jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jan 17 16:57:08 2012
@@ -1,3 +1,3 @@
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227240,1232100
+/jackrabbit/trunk:1221447,1221579,1221593,1221789,1221818,1225179,1225191,1225196,1225207,1225525,1225528,1226452,1226472,1226515,1226750,1226863,1227240,1227590,1227593,1227615,1232100

Modified: jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java?rev=1232476&r1=1232475&r2=1232476&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-api/src/main/java/org/apache/jackrabbit/api/management/DataStoreGarbageCollector.java Tue Jan 17 16:57:08 2012
@@ -19,17 +19,19 @@ package org.apache.jackrabbit.api.manage
 import javax.jcr.RepositoryException;
 
 /**
- * Garbage collector for DataStore. This implementation is iterates through all
+ * Garbage collector for DataStore. This implementation iterates through all
  * nodes and reads the binary properties. To detect nodes that are moved while
  * the scan runs, event listeners are started. Like the well known garbage
  * collection in Java, the items that are still in use are marked. Currently
- * this achieved by updating the modified date of the entries. Newly added
+ * this is achieved by updating the modified date of the entries. Newly added
  * entries are detected because the modified date is changed when they are
  * added.
  * <p>
  * Example code to run the data store garbage collection:
  * <pre>
- * DataStoreGarbageCollector gc = ((JackrabbitSession)session).createDataStoreGarbageCollector();
+ * JackrabbitRepositoryFactory jf = (JackrabbitRepositoryFactory) factory;
+ * RepositoryManager m = jf.getRepositoryManager((JackrabbitRepository) repository);
+ * GarbageCollector gc = m.createDataStoreGarbageCollector();
  * gc.mark();
  * gc.sweep();
  * </pre>

Modified: jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java?rev=1232476&r1=1232475&r2=1232476&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java (original)
+++ jackrabbit/branches/2.4/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java Tue Jan 17 16:57:08 2012
@@ -52,18 +52,18 @@ import javax.jcr.observation.EventIterat
 import javax.jcr.observation.ObservationManager;
 
 /**
- * Garbage collector for DataStore. This implementation is iterates through all
+ * Garbage collector for DataStore. This implementation iterates through all
  * nodes and reads the binary properties. To detect nodes that are moved while
  * the scan runs, event listeners are started. Like the well known garbage
  * collection in Java, the items that are still in use are marked. Currently
- * this achieved by updating the modified date of the entries. Newly added
+ * this is achieved by updating the modified date of the entries. Newly added
  * entries are detected because the modified date is changed when they are
  * added.
  * <p>
  * Example code to run the data store garbage collection:
  * <pre>
  * JackrabbitRepositoryFactory jf = (JackrabbitRepositoryFactory) factory;
- * RepositoryManager m = factory.getRepositoryManager((JackrabbitRepository) rep);
+ * RepositoryManager m = jf.getRepositoryManager((JackrabbitRepository) repository);
  * GarbageCollector gc = m.createDataStoreGarbageCollector();
  * try {
  *     gc.mark();