jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r615649 [2/14] - in /jackrabbit/trunk: jackrabbit-classloader/src/main/java/org/apache/jackrabbit/classloader/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/config/ jackra...
Date Sun, 27 Jan 2008 21:08:36 GMT
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/GarbageCollector.java Sun Jan 27 13:08:08 2008
@@ -70,7 +70,7 @@
     private ScanEventListener callback;
 
     private int sleepBetweenNodes;
-    
+
     private int testDelay;
 
     private final DataStore store;
@@ -80,16 +80,16 @@
     private final ArrayList listeners = new ArrayList();
 
     private final IterablePersistenceManager[] pmList;
-    
+
     private final Session[] sessionList;
 
     // TODO It should be possible to stop and restart a garbage collection scan.
 
     /**
-     * Create a new garbage collector. 
+     * Create a new garbage collector.
      * This method is usually not called by the application, it is called
      * by SessionImpl.createDataStoreGarbageCollector().
-     * 
+     *
      * @param list the persistence managers
      */
     public GarbageCollector(SessionImpl session, IterablePersistenceManager[] list, Session[] sessionList) {
@@ -103,27 +103,27 @@
      * Set the delay between scanning items.
      * The main scan loop sleeps this many milliseconds after
      * scanning a node. The default is 0, meaning the scan should run at full speed.
-     * 
-     * @param sleepBetweenNodes the number of milliseconds to sleep 
+     *
+     * @param sleepBetweenNodes the number of milliseconds to sleep
      */
     public void setSleepBetweenNodes(int millis) {
         this.sleepBetweenNodes = millis;
     }
-    
+
     /**
      * When testing the garbage collection, a delay is used instead of simulating concurrent access.
-     *  
+     *
      * @param testDelay the delay in milliseconds
      */
     public void setTestDelay(int testDelay) {
         this.testDelay = testDelay;
     }
-    
+
     /**
-     * Set the event listener. If set, the event listener will be called 
+     * Set the event listener. If set, the event listener will be called
      * for each item that is scanned. This mechanism can be used
      * to display the progress.
-     * 
+     *
      * @param callback if set, this is called while scanning
      */
     public void setScanEventListener(ScanEventListener callback) {
@@ -131,15 +131,15 @@
     }
 
     /**
-     * Scan the repository. The garbage collector will iterate over all nodes in the repository 
-     * and update the last modified date. If all persistence managers implement the 
-     * IterablePersistenceManager interface, this mechanism will be used; if not, the garbage 
+     * Scan the repository. The garbage collector will iterate over all nodes in the repository
+     * and update the last modified date. If all persistence managers implement the
+     * IterablePersistenceManager interface, this mechanism will be used; if not, the garbage
      * collector will scan the repository using the JCR API starting from the root node.
-     * 
+     *
      * @throws RepositoryException
      * @throws IllegalStateException
      * @throws IOException
-     * @throws ItemStateException 
+     * @throws ItemStateException
      */
     public void scan() throws RepositoryException,
             IllegalStateException, IOException, ItemStateException {
@@ -148,7 +148,7 @@
             startScanTimestamp = now;
             store.updateModifiedDateOnAccess(startScanTimestamp);
         }
-        
+
         if (pmList == null) {
             for (int i = 0; i < sessionList.length; i++) {
                 scanNodes(sessionList[i]);
@@ -157,7 +157,7 @@
             scanPersistenceManagers();
         }
     }
-    
+
     private void scanNodes(Session session) throws UnsupportedRepositoryOperationException, RepositoryException, IllegalStateException, IOException {
 
         // add a listener to get 'new' nodes
@@ -168,7 +168,7 @@
         // reading usually doesn't, but when scanning, it does
         recurse(session.getRootNode(), sleepBetweenNodes);
     }
-    
+
     private void scanPersistenceManagers() throws ItemStateException, RepositoryException {
         for (int i = 0; i < pmList.length; i++) {
             IterablePersistenceManager pm = pmList[i];
@@ -269,30 +269,30 @@
         /*
          * To delete files early in the garbage collection scan, we could do
          * this:
-         * 
+         *
          * A) If garbage collection was run before, see if there a file with the
          * list of UUIDs ('uuids.txt').
-         * 
+         *
          * B) If yes, and if the checksum is ok, read all those nodes first (if
          * not so many). This updates the modified date of all old files that
          * are still in use. Afterwards, delete all files with an older modified
          * date than the last scan! Newer files, and files that are read have a
          * newer modification date.
-         * 
+         *
          * C) Delete the 'uuids.txt' file (in any case).
-         * 
+         *
          * D) Iterate (recurse) through all nodes and properties like now. If a
          * node has a binary property, store the UUID of the node in the file
          * ('uuids.txt'). Also store the time when the scan started.
-         * 
+         *
          * E) Checksum and close the file.
-         * 
+         *
          * F) Like now, delete files with an older modification date than this
          * scan.
-         * 
+         *
          * We can't use node path for this, UUIDs are required as nodes could be
          * moved around.
-         * 
+         *
          */
     }
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/ScanEventListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/ScanEventListener.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/ScanEventListener.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/ScanEventListener.java Sun Jan 27 13:08:08 2008
@@ -25,7 +25,7 @@
  * The listener interface for receiving garbage collection scan events.
  */
 public interface ScanEventListener extends EventListener {
-    
+
     /**
      * This method is called before a node is scanned.
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataRecord.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataRecord.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataRecord.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataRecord.java Sun Jan 27 13:08:08 2008
@@ -26,7 +26,7 @@
  * Data record that is stored in a database
  */
 public class DbDataRecord extends AbstractDataRecord {
-    
+
     protected final DbDataStore store;
     protected final long length;
     protected long lastModified;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/DbDataStore.java Sun Jan 27 13:08:08 2008
@@ -48,7 +48,7 @@
 
 /**
  * A data store implementation that stores the records in a database using JDBC.
- * 
+ *
  * Configuration:
  * <pre>
  * &lt;DataStore class="org.apache.jackrabbit.core.data.db.DbDataStore">
@@ -63,7 +63,7 @@
  * &lt/DataStore>
  * </pre>
  * <p>
- * Only URL, user name and password usually need to be set. 
+ * Only URL, user name and password usually need to be set.
  * The remaining settings are generated using the database URL sub-protocol from the
  * database type resource file.
  * <p>
@@ -88,159 +88,159 @@
  * blobs at the same time.
  */
 public class DbDataStore implements DataStore {
-    
+
     /**
      * The digest algorithm used to uniquely identify records.
      */
     protected static final String DIGEST = "SHA-1";
-    
+
     /**
      * Logger instance
      */
-    private static Logger log = LoggerFactory.getLogger(DbDataStore.class);    
-    
+    private static Logger log = LoggerFactory.getLogger(DbDataStore.class);
+
     /**
      * The default value for the minimum object size.
      */
     public static final int DEFAULT_MIN_RECORD_LENGTH = 100;
-    
+
     /**
      * The default value for the maximum connections.
      */
     public static final int DEFAULT_MAX_CONNECTIONS = 3;
-    
+
     /**
-     * The minimum modified date. If a file is accessed (read or write) with a modified date 
+     * The minimum modified date. If a file is accessed (read or write) with a modified date
      * older than this value, the modified date is updated to the current time.
      */
     protected long minModifiedDate;
-    
+
     /**
      * The database URL used.
      */
     protected String url;
-    
+
     /**
      * The database driver.
      */
     protected String driver;
-    
+
     /**
      * The user name.
      */
     protected String user;
-    
+
     /**
      * The password
      */
     protected String password;
-    
+
     /**
      * The database type used.
      */
     protected String databaseType;
-    
+
     /**
      * The minimum size of an object that should be stored in this data store.
      */
     protected int minRecordLength = DEFAULT_MIN_RECORD_LENGTH;
-    
+
     /**
      * The maximum number of open connections.
      */
     protected int maxConnections = DEFAULT_MAX_CONNECTIONS;
-    
+
     /**
      * A list of connections
      */
     protected Pool connectionPool;
-    
+
     /**
      * The prefix used for temporary objects.
      */
     protected static final String TEMP_PREFIX = "TEMP_";
-    
+
     /**
      * The prefix for the datastore table, empty by default.
      */
     protected String tablePrefix = "";
-    
+
     /**
      * This is the property 'table'
      * in the [databaseType].properties file, initialized with the default value.
      */
     protected String tableSQL = "DATASTORE";
-    
+
     /**
      * This is the property 'createTable'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String createTableSQL = 
+    protected String createTableSQL =
         "CREATE TABLE ${tablePrefix}${table}(ID VARCHAR(255) PRIMARY KEY, LENGTH BIGINT, LAST_MODIFIED BIGINT, DATA BLOB)";
 
     /**
      * This is the property 'insertTemp'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String insertTempSQL = 
+    protected String insertTempSQL =
         "INSERT INTO ${tablePrefix}${table} VALUES(?, 0, ?, NULL)";
 
     /**
      * This is the property 'updateData'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String updateDataSQL = 
+    protected String updateDataSQL =
         "UPDATE ${tablePrefix}${table} SET DATA=? WHERE ID=?";
-    
+
     /**
      * This is the property 'updateLastModified'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String updateLastModifiedSQL = 
+    protected String updateLastModifiedSQL =
         "UPDATE ${tablePrefix}${table} SET LAST_MODIFIED=? WHERE ID=? AND LAST_MODIFIED<?";
 
     /**
      * This is the property 'update'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String updateSQL = 
+    protected String updateSQL =
         "UPDATE ${tablePrefix}${table} SET ID=?, LENGTH=?, LAST_MODIFIED=? WHERE ID=? AND NOT EXISTS(SELECT ID FROM ${tablePrefix}${table} WHERE ID=?)";
 
     /**
      * This is the property 'delete'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String deleteSQL = 
+    protected String deleteSQL =
         "DELETE FROM ${tablePrefix}${table} WHERE ID=?";
-    
+
     /**
      * This is the property 'deleteOlder'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String deleteOlderSQL = 
+    protected String deleteOlderSQL =
         "DELETE FROM ${tablePrefix}${table} WHERE LAST_MODIFIED<?";
-    
+
     /**
      * This is the property 'selectMeta'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String selectMetaSQL = 
+    protected String selectMetaSQL =
         "SELECT LENGTH, LAST_MODIFIED FROM ${tablePrefix}${table} WHERE ID=?";
-    
+
     /**
      * This is the property 'selectAll'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String selectAllSQL = 
+    protected String selectAllSQL =
         "SELECT ID FROM ${tablePrefix}${table}";
 
     /**
      * This is the property 'selectData'
      * in the [databaseType].properties file, initialized with the default value.
      */
-    protected String selectDataSQL = 
+    protected String selectDataSQL =
         "SELECT ID, DATA FROM ${tablePrefix}${table} WHERE ID=?";
-    
+
     /**
      * The stream storing mechanism used.
      */
@@ -251,27 +251,27 @@
      * This is the default setting.
      */
     public static final String STORE_TEMP_FILE = "tempFile";
-    
+
     /**
      * Call PreparedStatement.setBinaryStream(..., -1)
      */
     public static final String STORE_SIZE_MINUS_ONE = "-1";
-    
+
     /**
      * Call PreparedStatement.setBinaryStream(..., Integer.MAX_VALUE)
      */
     public static final String STORE_SIZE_MAX = "max";
-    
+
     /**
-     * Copy the stream to a temp file before returning it. 
+     * Copy the stream to a temp file before returning it.
      * Enabled by default to support concurrent reads.
      */
     private boolean copyWhenReading = true;
-    
+
     /**
      * All data identifiers that are currently in use are in this set until they are garbage collected.
      */
-    protected WeakHashMap inUse = new WeakHashMap();    
+    protected WeakHashMap inUse = new WeakHashMap();
 
     /**
      * {@inheritDoc}
@@ -282,8 +282,8 @@
         ConnectionRecoveryManager conn = getConnection();
         try {
             conn.setAutoReconnect(false);
-            String id = null, tempId = null;            
-            long now;            
+            String id = null, tempId = null;
+            long now;
             for (int i = 0; i < ConnectionRecoveryManager.TRIALS; i++) {
                 try {
                     now = System.currentTimeMillis();
@@ -328,11 +328,11 @@
             DataIdentifier identifier = new DataIdentifier(digest.digest());
             usesIdentifier(identifier);
             id = identifier.toString();
-            // UPDATE DATASTORE SET ID=?, LENGTH=?, LAST_MODIFIED=? 
-            // WHERE ID=? 
+            // UPDATE DATASTORE SET ID=?, LENGTH=?, LAST_MODIFIED=?
+            // WHERE ID=?
             // AND NOT EXISTS(SELECT ID FROM DATASTORE WHERE ID=?)
             PreparedStatement prep = conn.executeStmt(updateSQL, new Object[]{
-                    id, new Long(length), new Long(now), 
+                    id, new Long(length), new Long(now),
                     tempId, id});
             int count = prep.getUpdateCount();
             if (count == 0) {
@@ -371,11 +371,11 @@
             }
         }
     }
-    
+
     /**
      * Creates a temp file and copies the data there.
      * The input stream is closed afterwards.
-     * 
+     *
      * @param in the input stream
      * @return the file
      * @throws IOException
@@ -433,7 +433,7 @@
         } finally {
             conn.closeSilently(rs);
             putBack(conn);
-        }        
+        }
     }
 
     /**
@@ -445,7 +445,7 @@
 
     /**
      * Set the minimum object length.
-     * 
+     *
      * @param minRecordLength the length
      */
     public void setMinRecordLength(int minRecordLength) {
@@ -501,7 +501,7 @@
             throw convert("Can not init data store, driver=" + driver + " url=" + url + " user=" + user, e);
         }
     }
-    
+
     protected void initDatabaseType() throws DataStoreException {
         boolean failIfNotFound;
         if (databaseType == null) {
@@ -550,7 +550,7 @@
         storeStream = getProperty(prop, "storeStream", storeStream);
         if (STORE_SIZE_MINUS_ONE.equals(storeStream)) {
         } else if (STORE_TEMP_FILE.equals(storeStream)) {
-        } else if (STORE_SIZE_MAX.equals(storeStream)) {            
+        } else if (STORE_SIZE_MAX.equals(storeStream)) {
         } else {
             String msg = "Unsupported Stream store mechanism: " + storeStream
                     + " supported are: " + STORE_SIZE_MINUS_ONE + ", "
@@ -559,12 +559,12 @@
             throw new DataStoreException(msg);
         }
     }
-    
+
     /**
      * Get the expanded property value. The following placeholders are supported:
      * ${table}: the table name (the default is DATASTORE) and
      * ${tablePrefix}: the prefix as set in the configuration (empty by default).
-     * 
+     *
      * @param prop the properties object
      * @param key the key
      * @param defaultValue the default value
@@ -579,7 +579,7 @@
 
     /**
      * Convert an exception to a data store exception.
-     * 
+     *
      * @param cause the message
      * @param e the root cause
      * @return the data store exception
@@ -603,7 +603,7 @@
 
     /**
      * Update the modified date of an entry if required.
-     * 
+     *
      * @param identifier the entry identifier
      * @param lastModified the current last modified date
      * @return the new modified date
@@ -631,7 +631,7 @@
 
     /**
      * {@inheritDoc}
-     */    
+     */
     public InputStream getInputStream(DataIdentifier identifier) throws DataStoreException {
         ConnectionRecoveryManager conn = getConnection();
         try {
@@ -663,10 +663,10 @@
         return databaseType;
     }
 
-    /** 
+    /**
      * Set the database type. By default the sub-protocol of the JDBC database URL is used if it is not set.
      * It must match the resource file [databaseType].properties. Example: mysql.
-     * 
+     *
      * @param databaseType
      */
     public void setDatabaseType(String databaseType) {
@@ -675,7 +675,7 @@
 
     /**
      * Get the database driver
-     * 
+     *
      * @return the driver
      */
     public String getDriver() {
@@ -684,9 +684,9 @@
 
     /**
      * Set the database driver class name.
-     * If not set, the default driver class name for the database type is used, 
+     * If not set, the default driver class name for the database type is used,
      * as set in the [databaseType].properties resource; key 'driver'.
-     * 
+     *
      * @param driver
      */
     public void setDriver(String driver) {
@@ -695,7 +695,7 @@
 
     /**
      * Get the password.
-     * 
+     *
      * @return the password
      */
     public String getPassword() {
@@ -704,7 +704,7 @@
 
     /**
      * Set the password.
-     * 
+     *
      * @param password
      */
     public void setPassword(String password) {
@@ -713,7 +713,7 @@
 
     /**
      * Get the database URL.
-     * 
+     *
      * @return the URL
      */
     public String getUrl() {
@@ -723,7 +723,7 @@
     /**
      * Set the database URL.
      * Example: jdbc:postgresql:test
-     * 
+     *
      * @param url
      */
     public void setUrl(String url) {
@@ -732,7 +732,7 @@
 
     /**
      * Get the user name.
-     * 
+     *
      * @return the user name
      */
     public String getUser() {
@@ -741,13 +741,13 @@
 
     /**
      * Set the user name.
-     * 
+     *
      * @param user
      */
     public void setUser(String user) {
         this.user = user;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -759,18 +759,18 @@
         }
         list.clear();
     }
-    
+
     protected void usesIdentifier(DataIdentifier identifier) {
         inUse.put(identifier, new WeakReference(identifier));
     }
-    
+
     /**
      * {@inheritDoc}
      */
     public void clearInUse() {
         inUse.clear();
-    }    
-    
+    }
+
     protected synchronized MessageDigest getDigest() throws DataStoreException {
         try {
             return MessageDigest.getInstance(DIGEST);
@@ -778,7 +778,7 @@
             throw convert("No such algorithm: " + DIGEST, e);
         }
     }
-    
+
     protected ConnectionRecoveryManager getConnection() throws DataStoreException {
         try {
             ConnectionRecoveryManager conn = (ConnectionRecoveryManager) connectionPool.get();
@@ -790,7 +790,7 @@
             throw new DataStoreException("Can not open a new connection", e);
         }
     }
-    
+
     protected void putBack(ConnectionRecoveryManager conn) throws DataStoreException {
         try {
             connectionPool.add(conn);
@@ -801,7 +801,7 @@
 
     /**
      * Get the maximum number of concurrent connections.
-     * 
+     *
      * @return the maximum number of connections.
      */
     public int getMaxConnections() {
@@ -810,7 +810,7 @@
 
     /**
      * Set the maximum number of concurrent connections.
-     * 
+     *
      * @param maxConnections the new value
      */
     public void setMaxConnections(int maxConnections) {
@@ -819,7 +819,7 @@
 
     /**
      * Create a new connection.
-     * 
+     *
      * @return the new connection
      */
     public ConnectionRecoveryManager createNewConnection() throws RepositoryException {
@@ -829,7 +829,7 @@
 
     /**
      * Is a stream copied to a temporary file before returning?
-     * 
+     *
      * @return the setting
      */
     public boolean getCopyWhenReading() {
@@ -839,7 +839,7 @@
     /**
      * The the copy setting. If enabled,
      * a stream is always copied to a temporary file when reading a stream.
-     * 
+     *
      * @param copyWhenReading the new setting
      */
     public void setCopyWhenReading(boolean copyWhenReading) {
@@ -848,7 +848,7 @@
 
     /**
      * Get the table prefix. The default is empty.
-     * 
+     *
      * @return the table prefix.
      */
     public String getTablePrefix() {
@@ -857,7 +857,7 @@
 
     /**
      * Set the new table prefix.
-     * 
+     *
      * @param tablePrefix the new value
      */
     public void setTablePrefix(String tablePrefix) {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/Pool.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/Pool.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/Pool.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/Pool.java Sun Jan 27 13:08:08 2008
@@ -32,10 +32,10 @@
     protected final ArrayList all = new ArrayList();
     protected final DbDataStore factory;
     protected final LinkedQueue pool = new LinkedQueue();
-    
+
     /**
      * Create a new pool using the given factory and maximum pool size.
-     * 
+     *
      * @param factory the db data store
      * @param maxSize the maximum number of objects in the pool.
      */
@@ -43,12 +43,12 @@
         this.factory = factory;
         this.maxSize = Math.max(1, maxSize);
     }
-    
+
     /**
      * Get a connection from the pool. This method may open a new connection if
      * required, or if the maximum number of connections are opened, it will
      * wait for one to be returned.
-     * 
+     *
      * @return the connection
      */
     protected Object get() throws InterruptedException, RepositoryException {
@@ -66,19 +66,19 @@
         }
         return o;
     }
-    
+
     /**
      * But a connection back into the pool.
-     * 
+     *
      * @param o the connection
      */
     protected void add(Object o) throws InterruptedException {
         pool.put(o);
     }
-    
+
     /**
      * Get all connections (even if they are currently being used).
-     * 
+     *
      * @return all connections
      */
     protected ArrayList getAll() {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/data/db/TempFileInputStream.java Sun Jan 27 13:08:08 2008
@@ -29,14 +29,14 @@
  * An input stream from a temp file that self-destructs when fully read or closed.
  */
 public class TempFileInputStream extends InputStream {
-    
+
     private final File file;
     private final InputStream in;
     private boolean closed;
-    
+
     /**
      * Copy the data to a file and close the input stream afterwards.
-     * 
+     *
      * @param in the input stream
      * @param file the target file
      * @return the size of the file
@@ -55,26 +55,26 @@
         in.close();
         return file.length();
     }
-    
+
     /**
      * Construct a new temporary file input stream.
      * The file is deleted if the input stream is closed or fully read.
      * Deleting is only attempted once.
-     * 
+     *
      * @param file the temporary file
      */
     TempFileInputStream(File file) throws FileNotFoundException {
         this.file = file;
         in = new BufferedInputStream(new FileInputStream(file));
     }
-    
+
     private int closeIfEOF(int read) throws IOException {
         if (read < 0) {
             close();
         }
         return read;
     }
-    
+
     public void close() throws IOException {
         if (!closed) {
             in.close();
@@ -82,27 +82,27 @@
             closed = true;
         }
     }
-    
+
     public int available() throws IOException {
         return in.available();
     }
-    
+
     public void mark(int readlimit) {
         in.mark(readlimit);
     }
-    
+
     public boolean markSupported() {
         return in.markSupported();
     }
-    
+
     public long skip(long n) throws IOException {
         return in.skip(n);
     }
-    
+
     public void reset() throws IOException {
         in.reset();
     }
-    
+
     public int read(byte[] b, int off, int len) throws IOException {
         return closeIfEOF(in.read(b, off, len));
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/JNDIDatabaseFileSystem.java Sun Jan 27 13:08:08 2008
@@ -24,9 +24,9 @@
 
 /**
  * @deprecated
- * This class should not be used because it is not database vendor specific. 
+ * This class should not be used because it is not database vendor specific.
  * Each DatabaseFileSystem now supports getting the connection via JNDI
- * by setting the driver to javax.naming.InitialContext 
+ * by setting the driver to javax.naming.InitialContext
  * and the URL to the JNDI name.
  * <p>
  * Database file system that uses JNDI to acquire the database connection.

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/JNDIDatabaseJournal.java Sun Jan 27 13:08:08 2008
@@ -25,9 +25,9 @@
 
 /**
  * @deprecated
- * This class should not be used because it is not database vendor specific. 
+ * This class should not be used because it is not database vendor specific.
  * Each DatabaseJournal now supports getting the connection via JNDI
- * by setting the driver to javax.naming.InitialContext 
+ * by setting the driver to javax.naming.InitialContext
  * and the URL to the JNDI name.
  * <p>
  * Database journal that uses JNDI to acquire the database connection.

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java Sun Jan 27 13:08:08 2008
@@ -87,7 +87,7 @@
      * given node; otherwise returns <code>false</code>.
      * <p/>
      * Note that <code>isLockHolder(session, node)==true</code> implies
-     * <code>holdsLock(node)==true</code>.   
+     * <code>holdsLock(node)==true</code>.
      * @param session session
      * @param node node
      * @return if the specified session holds a lock on the given node;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -325,7 +325,7 @@
         if (eventChannel != null) {
             operation = eventChannel.create(node.getNodeId());
         }
-        
+
         acquire();
 
         try {
@@ -509,7 +509,7 @@
     /**
      * {@inheritDoc}
      */
-    public boolean isLockHolder(Session session, NodeImpl node) 
+    public boolean isLockHolder(Session session, NodeImpl node)
             throws RepositoryException {
         acquire();
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XAEnvironment.java Sun Jan 27 13:08:08 2008
@@ -237,7 +237,7 @@
             }
         }
 
-        // add 'uncommitted' lock infos 
+        // add 'uncommitted' lock infos
         result.addAll(lockedNodesMap.values());
 
         return (AbstractLockInfo[]) result.toArray(new AbstractLockInfo[result.size()]);

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java Sun Jan 27 13:08:08 2008
@@ -43,7 +43,7 @@
 
     private boolean mixin;
     private boolean orderableChildNodes;
-    
+
     private boolean abstractStatus;
     private Name primaryItemName;
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefDiff.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefDiff.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefDiff.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefDiff.java Sun Jan 27 13:08:08 2008
@@ -119,7 +119,7 @@
             type = TRIVIAL;
 
             // check supertypes
-            int tmpType = supertypesDiff(); 
+            int tmpType = supertypesDiff();
             if (tmpType > type) {
                 type = tmpType;
             }
@@ -334,11 +334,11 @@
 
         return maxType;
     }
-    
+
     public String toString() {
         String result = getClass().getName() + "[\n\tnodeTypeName="
                 + oldDef.getName();
-        
+
         result += ",\n\tmixinFlagDiff=" + modificationTypeToString(mixinFlagDiff());
         result += ",\n\tsupertypesDiff=" + modificationTypeToString(supertypesDiff());
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java Sun Jan 27 13:08:08 2008
@@ -51,7 +51,7 @@
     private final NodeTypeManagerImpl ntMgr;
     // resolver used to translate qualified names to JCR names
     private final NamePathResolver resolver;
-    private final DataStore store;    
+    private final DataStore store;
 
     /**
      * Package private constructor

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java Sun Jan 27 13:08:08 2008
@@ -117,7 +117,7 @@
      * <code>NodeTypeManager</code>
      */
     private final Map ndCache;
-    
+
     private final DataStore store;
 
     /**
@@ -775,7 +775,7 @@
      * Internal helper method for converting a <code>NodeTypeDefinition</code>
      * (using prefixed JCR names) to a <code>NodeTypeDef</code> (using
      * namespace-qualified names).
-     *  
+     *
      * @param definition
      * @return a <code>NodeTypeDef</code>
      * @throws InvalidNodeTypeDefinitionException

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java Sun Jan 27 13:08:08 2008
@@ -429,7 +429,7 @@
             notifyReRegistered(name);
             return entNew;
         }
-        
+
        	String message = "The following nodetype change contains non-trivial changes."
                 + "Up until now only trivial changes are supported."
                 + " (see javadoc for "
@@ -1780,7 +1780,7 @@
         // copy listeners to array to avoid ConcurrentModificationException
         NodeTypeRegistryListener[] la =
                 (NodeTypeRegistryListener[]) listeners.values().toArray(
-                        new NodeTypeRegistryListener[listeners.size()]); 
+                        new NodeTypeRegistryListener[listeners.size()]);
         for (int i = 0; i < la.length; i++) {
             if (la[i] != null) {
                 la[i].nodeTypeRegistered(ntName);

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventState.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventState.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventState.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventState.java Sun Jan 27 13:08:08 2008
@@ -105,11 +105,11 @@
      * Cached hashCode value for this <code>Event</code>.
      */
     private int hashCode;
-    
+
     /**
      * Flag indicating whether this is an external event, e.g. originating from
      * another node in a clustered environment.
-     */ 
+     */
     private final boolean external;
 
     /**
@@ -178,7 +178,7 @@
                                             Name nodeType,
                                             Set mixins,
                                             Session session) {
-        
+
         return childNodeAdded(parentId, parentPath, childId,
                 childPath, nodeType, mixins, session, false);
     }
@@ -211,7 +211,7 @@
         return new EventState(Event.NODE_ADDED, parentId, parentPath,
                 childId, childPath, nodeType, mixins, session, external);
     }
-    
+
     /**
      * Creates a new {@link javax.jcr.observation.Event} of type
      * {@link javax.jcr.observation.Event#NODE_REMOVED}.
@@ -267,7 +267,7 @@
         return new EventState(Event.NODE_REMOVED, parentId, parentPath,
                 childId, childPath, nodeType, mixins, session, external);
     }
-    
+
     /**
      * Creates a new {@link javax.jcr.observation.Event} of type
      * {@link javax.jcr.observation.Event#PROPERTY_ADDED}.
@@ -288,8 +288,8 @@
                                            Name nodeType,
                                            Set mixins,
                                            Session session) {
-        
-        return propertyAdded(parentId, parentPath, childPath, 
+
+        return propertyAdded(parentId, parentPath, childPath,
                 nodeType, mixins, session, false);
     }
 
@@ -315,7 +315,7 @@
                                            Set mixins,
                                            Session session,
                                            boolean external) {
-        
+
         return new EventState(Event.PROPERTY_ADDED, parentId, parentPath,
                 null, childPath, nodeType, mixins, session, external);
     }
@@ -340,7 +340,7 @@
                                              Name nodeType,
                                              Set mixins,
                                              Session session) {
-        
+
         return propertyRemoved(parentId, parentPath, childPath,
                 nodeType, mixins, session, false);
     }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/IterablePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/IterablePersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/IterablePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/IterablePersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -28,14 +28,14 @@
  * and data store garbage collection.
  */
 public interface IterablePersistenceManager extends PersistenceManager {
-    
+
     /**
-     * Get all node ids. 
+     * Get all node ids.
      * A typical application will call this method multiple times, where 'after'
-     * is the last row read. The maxCount parameter defines the maximum number of 
-     * node ids returned, 0 meaning no limit. The order of the node ids is specific for the 
+     * is the last row read. The maxCount parameter defines the maximum number of
+     * node ids returned, 0 meaning no limit. The order of the node ids is specific for the
      * given persistent manager. Items that are added concurrently may not be included.
-     * 
+     *
      * @param after the lower limit, or null for no limit.
      * @param maxCount the maximum number of node ids to return, or 0 for no limit.
      * @return an iterator of all bundles.

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/PMContext.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/PMContext.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/PMContext.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/PMContext.java Sun Jan 27 13:08:08 2008
@@ -76,7 +76,7 @@
                      FileSystem fs,
                      NodeId rootNodeId,
                      NamespaceRegistry nsReg,
-                     NodeTypeRegistry ntReg, 
+                     NodeTypeRegistry ntReg,
                      DataStore dataStore) {
         this.physicalHomeDir = homeDir;
         this.fs = fs;
@@ -128,7 +128,7 @@
     public NodeTypeRegistry getNodeTypeRegistry() {
         return ntReg;
     }
-    
+
     /**
      * Returns the data store
      *

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -81,7 +81,7 @@
  * <li>&lt;param name="{@link #setBundleCacheSize(String) bundleCacheSize}" value="8"/>
  * </ul>
  */
-public abstract class AbstractBundlePersistenceManager implements 
+public abstract class AbstractBundlePersistenceManager implements
     PersistenceManager, CachingPersistenceManager, IterablePersistenceManager {
 
     /** the cvs/svn id */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleDbPersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -198,11 +198,11 @@
 
     /**
      * Sets the JDBC connection URL.
-     * The connection can be created using a JNDI Data Source as well. 
-     * To do that, the driver class name must reference a javax.naming.Context class 
-     * (for example javax.naming.InitialContext), and the URL must be the JNDI URL 
+     * The connection can be created using a JNDI Data Source as well.
+     * To do that, the driver class name must reference a javax.naming.Context class
+     * (for example javax.naming.InitialContext), and the URL must be the JNDI URL
      * (for example java:comp/env/jdbc/Test).
-     * 
+     *
      * @param url the url to set.
      */
     public void setUrl(String url) {
@@ -951,7 +951,7 @@
                     }
                 }
                 result.add(current);
-            }        
+            }
             ListNodeIdIterator it = new ListNodeIdIterator(result);
             return it;
         } catch (SQLException e) {
@@ -962,7 +962,7 @@
             closeResultSet(rs);
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -1271,7 +1271,7 @@
             nodeReferenceUpdateSQL = "update " + schemaObjectPrefix + "REFS set REFS_DATA = ? where NODE_ID = ?";
             nodeReferenceSelectSQL = "select REFS_DATA from " + schemaObjectPrefix + "REFS where NODE_ID = ?";
             nodeReferenceDeleteSQL = "delete from " + schemaObjectPrefix + "REFS where NODE_ID = ?";
-            
+
             bundleSelectAllIdsSQL = "select NODE_ID from " + schemaObjectPrefix + "BUNDLE";
             bundleSelectAllIdsFromSQL = "select NODE_ID from " + schemaObjectPrefix + "BUNDLE WHERE NODE_ID > ? ORDER BY NODE_ID";
         } else {
@@ -1284,13 +1284,13 @@
             nodeReferenceUpdateSQL = "update " + schemaObjectPrefix + "REFS set REFS_DATA = ? where NODE_ID_HI = ? and NODE_ID_LO = ?";
             nodeReferenceSelectSQL = "select REFS_DATA from " + schemaObjectPrefix + "REFS where NODE_ID_HI = ? and NODE_ID_LO = ?";
             nodeReferenceDeleteSQL = "delete from " + schemaObjectPrefix + "REFS where NODE_ID_HI = ? and NODE_ID_LO = ?";
-            
+
             bundleSelectAllIdsSQL = "select NODE_ID_HI, NODE_ID_LO from " + schemaObjectPrefix + "BUNDLE";
             // need to use HI and LO parameters
             // this is not the exact statement, but not all databases support WHERE (NODE_ID_HI, NODE_ID_LOW) >= (?, ?)
             bundleSelectAllIdsFromSQL = "select NODE_ID_HI, NODE_ID_LO from " + schemaObjectPrefix + "BUNDLE WHERE (NODE_ID_HI >= ?) AND (? IS NOT NULL) ORDER BY NODE_ID_HI, NODE_ID_LO";
         }
-        
+
     }
 
     /**
@@ -1423,20 +1423,20 @@
     }
 
     private class ListNodeIdIterator implements NodeIdIterator {
-        
+
         private final ArrayList list;
         private int pos;
-        
+
         ListNodeIdIterator(ArrayList list) {
             this.list = list;
         }
-        
+
         public NodeId nextNodeId() throws NoSuchElementException {
             if (!hasNext()) {
                 throw new NoSuchElementException();
             }
             return new NodeId((UUID) list.get(pos++));
-        }        
+        }
 
         public boolean hasNext() {
             return pos < list.size();
@@ -1449,7 +1449,7 @@
         public void remove() {
             throw new UnsupportedOperationException();
         }
-        
+
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/BundleFsPersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -274,7 +274,7 @@
             throw new ItemStateException(msg, e);
         }
     }
-    
+
     /**
      * Creates the file path for the given node id that is
      * suitable for storing node states in a filesystem.
@@ -291,8 +291,8 @@
         buf.append('.');
         buf.append(NODEFILENAME);
         return buf;
-    }    
-    
+    }
+
     /**
      * Creates the file path for the given references id that is
      * suitable for storing reference states in a filesystem.
@@ -310,7 +310,7 @@
         buf.append('.');
         buf.append(NODEREFSFILENAME);
         return buf;
-    }    
+    }
 
     /**
      * {@inheritDoc}
@@ -532,10 +532,10 @@
             throw new ItemStateException(msg, e);
         }
     }
-    
+
     /**
      * {@inheritDoc}
-     */    
+     */
     protected UUID getUUIDFromFileName(String fileName) {
         StringBuffer buff = new StringBuffer(35);
         if (!fileName.endsWith("." + NODEFILENAME)) {
@@ -556,8 +556,8 @@
         }
         String u = buff.toString();
         return new UUID(u);
-    }    
-    
+    }
+
     private void getListRecursive(ArrayList list, String path, UUID bigger,
             int maxCount) throws FileSystemException {
         if (maxCount > 0 && list.size() >= maxCount) {
@@ -587,7 +587,7 @@
                     bigger, maxCount);
         }
     }
-    
+
     private static class FileNodeIdIterator implements NodeIdIterator {
 
         private final ArrayList list;
@@ -615,7 +615,7 @@
         public void remove() {
             throw new UnsupportedOperationException();
         }
-        
+
     }
 
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/MSSqlPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/MSSqlPersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/MSSqlPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/MSSqlPersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -56,7 +56,7 @@
 
     /**
      * Returns the configured MS SQL table space.
-     * 
+     *
      * @return the configured MS SQL table space.
      */
     public String getTableSpace() {
@@ -65,7 +65,7 @@
 
     /**
      * Sets the MS SQL table space.
-     * 
+     *
      * @param tableSpace the MS SQL table space.
      */
     public void setTableSpace(String tableSpace) {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java Sun Jan 27 13:08:08 2008
@@ -569,7 +569,7 @@
                             String msg = "Error while storing blob. id="
                                 + state.getId() + " idx=" + i + " size=" + val.getBLOBFileValue().getLength();
                             log.error(msg, e);
-                            throw new IOException(msg);                            
+                            throw new IOException(msg);
                         }
                         out.writeUTF(val.toString());
                         break;

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java Sun Jan 27 13:08:08 2008
@@ -31,18 +31,18 @@
  * JNDI resources.
  */
 public class ConnectionFactory {
-    
+
     /**
      * Open a connection using the specified properties.
      * The connection can be created using a JNDI Data Source as well. To do that,
-     * the driver class name must reference a javax.naming.Context class 
-     * (for example javax.naming.InitialContext), and the URL must be the JNDI URL 
+     * the driver class name must reference a javax.naming.Context class
+     * (for example javax.naming.InitialContext), and the URL must be the JNDI URL
      * (for example java:comp/env/jdbc/Test).
-     * 
+     *
      * @param driver the JDBC driver or the Context class
      * @param url the database URL
      * @param user the user name
-     * @param password the password 
+     * @param password the password
      * @return the connection
      * @throws RepositoryException if the driver could not be loaded
      * @throws SQLException if the connection could not be established
@@ -65,7 +65,7 @@
                 } else {
                     try {
                         // Workaround for Apache Derby:
-                        // The JDBC specification recommends the Class.forName method without the .newInstance() method call, 
+                        // The JDBC specification recommends the Class.forName method without the .newInstance() method call,
                         // but it is required after a Derby 'shutdown'.
                         d.newInstance();
                     } catch (Throwable e) {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionRecoveryManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionRecoveryManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionRecoveryManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionRecoveryManager.java Sun Jan 27 13:08:08 2008
@@ -235,7 +235,7 @@
      */
     public PreparedStatement executeStmt(String sql, Object[] params) throws SQLException, RepositoryException {
         return executeStmt(sql, params, false, 0);
-    }    
+    }
 
     /**
      * Executes the given SQL statement with the specified parameters.
@@ -371,7 +371,7 @@
      * Re-establishes the database connection.
      *
      * @throws SQLException if reconnecting failed
-     * @throws RepositoryException 
+     * @throws RepositoryException
      */
     private void reestablishConnection() throws SQLException, RepositoryException {
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/DbNameIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/DbNameIndex.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/DbNameIndex.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/DbNameIndex.java Sun Jan 27 13:08:08 2008
@@ -49,7 +49,7 @@
     protected String nameSelectSQL;
     protected String indexSelectSQL;
     protected String nameInsertSQL;
-    
+
     // caches
     private final HashMap string2Index = new HashMap();
     private final HashMap index2String = new HashMap();

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/DatabasePersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -303,7 +303,7 @@
                         }
                     }
                 } else {
-                    // a non-SQLException has been thrown, 
+                    // a non-SQLException has been thrown,
                     // proceed with error processing
                     break;
                 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/db/SimpleDbPersistenceManager.java Sun Jan 27 13:08:08 2008
@@ -163,7 +163,7 @@
 
     /**
      * Returns a JDBC connection acquired using the JDBC {@link DriverManager}.
-     * @throws SQLException 
+     * @throws SQLException
      *
      * @throws RepositoryException if the driver could not be loaded
      * @throws SQLException if the connection could not be established

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/DerefQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/DerefQueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/DerefQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/DerefQueryNode.java Sun Jan 27 13:08:08 2008
@@ -85,7 +85,7 @@
         }
         return false;
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NAryQueryNode.java Sun Jan 27 13:08:08 2008
@@ -147,7 +147,7 @@
         }
         return false;
     }
-    
+
     /**
      * {@inheritDoc}
      */
@@ -162,5 +162,5 @@
         }
         return false;
     }
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/OrderQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/OrderQueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/OrderQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/OrderQueryNode.java Sun Jan 27 13:08:08 2008
@@ -188,7 +188,7 @@
             return false;
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java Sun Jan 27 13:08:08 2008
@@ -131,13 +131,13 @@
         }
         return false;
     }
-    
-    
+
+
     /**
      * {@inheritDoc}
      */
     public boolean needsSystemTree() {
-        
+
         LocationStepQueryNode[] pathSteps = getPathSteps();
         if (pathSteps == null || pathSteps.length == 0) {
             return true;
@@ -161,7 +161,7 @@
             // the system tree ("*")
             return true;
         }
-        
+
         // Calculate the first workspace relative location step
         LocationStepQueryNode firstWorkspaceRelativeStep = pathSteps[0];
         if (firstPathStepName.equals(NameConstants.ROOT)) {
@@ -170,19 +170,19 @@
                 firstWorkspaceRelativeStep = pathSteps[1];
             }
         }
-        
+
         // First path step starts with "//"
         if (firstWorkspaceRelativeStep.getIncludeDescendants())
             return true;
 
-        // If the first workspace relative location step is jcr:system we need 
+        // If the first workspace relative location step is jcr:system we need
         // to include the system tree
         Name firstWorkspaceRelativeName = firstWorkspaceRelativeStep.getNameTest();
         if (firstWorkspaceRelativeName == null
                 || firstWorkspaceRelativeName.equals(NameConstants.JCR_SYSTEM)) {
             return true;
         }
-        
+
         return super.needsSystemTree();
     }
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyFunctionQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyFunctionQueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyFunctionQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyFunctionQueryNode.java Sun Jan 27 13:08:08 2008
@@ -112,7 +112,7 @@
     public String getFunctionName() {
         return functionName;
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryHandler.java Sun Jan 27 13:08:08 2008
@@ -108,7 +108,7 @@
                              ItemManager itemMgr,
                              String statement,
                              String language) throws InvalidQueryException;
-    
+
     /**
      * Creates a new query by specifying the query object model. If the query
      * object model is considered invalid for the implementing class, an

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java Sun Jan 27 13:08:08 2008
@@ -149,7 +149,7 @@
         query = handler.createExecutableQuery(session, itemMgr, statement, language);
         setInitialized();
     }
-    
+
     /**
      * @inheritDoc
      * <p/>
@@ -244,10 +244,10 @@
             throw new RepositoryException(e.getMessage(), e);
         }
     }
-    
+
     /**
      * Sets the maximum size of the result set.
-     * 
+     *
      * @param limit new maximum size of the result set
      */
     public void setLimit(long limit) {
@@ -256,7 +256,7 @@
 
     /**
      * Sets the start offset of the result set.
-     * 
+     *
      * @param offset new start offset of the result set
      */
     public void setOffset(long offset) {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryNode.java Sun Jan 27 13:08:08 2008
@@ -125,11 +125,11 @@
      *   <code>this</code>; <code>false</code> otherwise.
      */
     public abstract boolean equals(Object obj);
-    
+
     /**
      * Returns <code>true</code> if this query node needs items under
      * /jcr:system to be queried.
-     * 
+     *
      * @return <code>true</code> if this query node needs content under
      *         /jcr:system to be queried; <code>false</code> otherwise.
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryRootNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryRootNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryRootNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryRootNode.java Sun Jan 27 13:08:08 2008
@@ -133,7 +133,7 @@
         }
         return false;
     }
-    
+
     /**
      * {@inheritDoc}
      */

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java Sun Jan 27 13:08:08 2008
@@ -53,7 +53,7 @@
 
     /**
      * Returns the set of query languages supported by this builder.
-     * 
+     *
      * @return String array containing the names of the supported languages.
      */
     String[] getSupportedLanguages();

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilderRegistry.java Sun Jan 27 13:08:08 2008
@@ -43,7 +43,7 @@
      * List of <code>QueryTreeBuilder</code> instances known to the classloader.
      */
     private static final List BUILDERS = new ArrayList();
-    
+
     /**
      * Set of languages known to the registered builders.
      */
@@ -83,11 +83,11 @@
         }
         throw new InvalidQueryException("Unsupported language: " + language);
     }
-    
+
     /**
      * Returns the set of query languages supported by all registered
      * {@link QueryTreeBuilder} implementations.
-     * 
+     *
      * @return String array containing the names of the supported languages.
      */
     public static String[] getSupportedLanguages() {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java Sun Jan 27 13:08:08 2008
@@ -199,7 +199,7 @@
         builder.addLast(element);
         try {
             relPath = builder.getPath();
-        } 
+        }
         catch (MalformedPathException e) {
             // path is always valid
         }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingMultiIndexReader.java Sun Jan 27 13:08:08 2008
@@ -171,7 +171,7 @@
 
     /**
      * {@inheritDoc}
-     */ 
+     */
     public IndexReader[] getIndexReaders() {
         IndexReader readers[] = new IndexReader[subReaders.length];
         System.arraycopy(subReaders, 0, readers, 0, subReaders.length);
@@ -211,7 +211,7 @@
         }
         return -1;
     }
-    
+
     /**
      * Returns the reader index for document <code>n</code>.
      * Implementation copied from lucene MultiReader class.

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java Sun Jan 27 13:08:08 2008
@@ -269,7 +269,7 @@
             do {
                 nextDoc = hits.next();
             } while (nextDoc > -1 && !indexIsValid(nextDoc));
-            
+
             return nextDoc > -1;
         }
 
@@ -295,7 +295,7 @@
             nextDoc = hits.skipTo(target);
             while (nextDoc > -1 && !indexIsValid(nextDoc))
                 next();
-            return nextDoc > -1;            
+            return nextDoc > -1;
         }
 
         /**
@@ -310,7 +310,7 @@
 
         private void calculateChildren() throws IOException {
             if (hits == null) {
-                
+
                 // collect all context nodes
                 List uuids = new ArrayList();
                 final Hits contextHits = new AdaptingHits();
@@ -327,7 +327,7 @@
                     uuids.add(uuid);
                     i = contextHits.next();
                 }
-                
+
                 // collect all children of the context nodes
                 Hits childrenHits = new AdaptingHits();
 
@@ -342,7 +342,7 @@
                 } finally {
                     docs.close();
                 }
-                
+
                 if (nameTestScorer != null) {
                     hits = new HitsIntersection(childrenHits, new ScorerHits(nameTestScorer));
                 } else {

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocId.java Sun Jan 27 13:08:08 2008
@@ -194,7 +194,7 @@
          * The previously calculated foreign segment document id.
          */
         private ForeignSegmentDocId doc;
-        
+
         /**
          * Creates a <code>DocId</code> based on a Node uuid.
          *

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java Sun Jan 27 13:08:08 2008
@@ -25,7 +25,7 @@
 
 /**
  * <code>ExcerptProvider</code> defines an interface to create an excerpt for
- * a matching node. The format of the excerpt is implementation specific. 
+ * a matching node. The format of the excerpt is implementation specific.
  */
 public interface ExcerptProvider {
 

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldNames.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldNames.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldNames.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FieldNames.java Sun Jan 27 13:08:08 2008
@@ -71,10 +71,10 @@
     public static final String PROPERTIES = "_:PROPERTIES".intern();
 
     /**
-     * Name of the field that contains the names of all properties that are set 
-     * on an indexed node. 
+     * Name of the field that contains the names of all properties that are set
+     * on an indexed node.
      */
-    public static final String PROPERTIES_SET = "_:PROPERTIES_SET".intern(); 
+    public static final String PROPERTIES_SET = "_:PROPERTIES_SET".intern();
 
     /**
      * Name of the field that contains the UUIDs of the aggregated nodes. The

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexFormatVersion.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexFormatVersion.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexFormatVersion.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexFormatVersion.java Sun Jan 27 13:08:08 2008
@@ -41,16 +41,16 @@
      * V2 is the index format for Jackrabbit releases >= 1.4
      */
     public static final IndexFormatVersion V2 = new IndexFormatVersion(2);
-    
+
     /**
      * The used version of the index format
      */
     private final int version;
-    
+
     /**
      * Creates a index format version.
      *
-     * @param version       The version of the index. 
+     * @param version       The version of the index.
      */
     private IndexFormatVersion(int version) {
         this.version = version;
@@ -70,7 +70,7 @@
     public String toString() {
         return String.valueOf(getVersion());
     }
-    
+
     /**
      * @return the index format version of the index used by the given
      * index reader.

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java Sun Jan 27 13:08:08 2008
@@ -94,19 +94,19 @@
      * @return the boost for the node scope fulltext index field.
      */
     float getNodeBoost(NodeState state);
-    
+
     /**
-     * Returns the analyzer configured for the property with this fieldName 
+     * Returns the analyzer configured for the property with this fieldName
      * (the string representation ,JCR-style name, of the given <code>Name</code>
-     * prefixed with <code>FieldNames.FULLTEXT_PREFIX</code>), 
+     * prefixed with <code>FieldNames.FULLTEXT_PREFIX</code>),
      * and <code>null</code> if none is configured, or the configured analyzer
      * cannot be found. If <code>null</code> is returned, the default Analyzer
      * is used.
-     * 
+     *
      * @param fieldName the string representation ,JCR-style name, of the given <code>Name</code>,
      * prefixed with <code>FieldNames.FULLTEXT_PREFIX</code>)
-     * @return the <code>analyzer</code> to use for indexing this property 
+     * @return the <code>analyzer</code> to use for indexing this property
      */
     Analyzer getPropertyAnalyzer(String fieldName);
-    
+
 }

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java Sun Jan 27 13:08:08 2008
@@ -70,7 +70,7 @@
      * The logger instance for this class
      */
     private static final Logger log = LoggerFactory.getLogger(IndexingConfigurationImpl.class);
-    
+
     /**
      * A namespace resolver for parsing QNames in the configuration.
      */
@@ -100,7 +100,7 @@
      * The configured analyzers for indexing properties.
      */
     private Map analyzers = new HashMap();
-    
+
     /**
      * {@inheritDoc}
      */
@@ -111,7 +111,7 @@
         PathResolver pathResolver = new ParsingPathResolver(PathFactoryImpl.getInstance(),
                 nameResolver);
         hmgr = new HierarchyManagerImpl(context.getRootId(), ism, pathResolver);
-        
+
         NamespaceResolver nsResolver = new AdditionalNamespaceResolver(getNamespaces(config));
         resolver = new ParsingNameResolver(NameFactoryImpl.getInstance(), nsResolver);
 
@@ -171,7 +171,7 @@
                                     }
                                 }
                             } else {
-                                log.warn("org.apache.lucene.analysis.Analyzer is not a superclass of " 
+                                log.warn("org.apache.lucene.analysis.Analyzer is not a superclass of "
                                         + analyzerClassName +". Ignoring this configure analyzer" );
                             }
                         } catch (ClassNotFoundException e) {
@@ -180,7 +180,7 @@
                     }
                 }
             }
-            
+
         }
         aggregateRules = (AggregateRule[]) idxAggregates.toArray(
                 new AggregateRule[idxAggregates.size()]);
@@ -265,18 +265,18 @@
         return true;
     }
 
-    
+
     /**
-     * Returns the analyzer configured for the property with this fieldName 
+     * Returns the analyzer configured for the property with this fieldName
      * (the string representation ,JCR-style name, of the given <code>Name</code>
-     * prefixed with <code>FieldNames.FULLTEXT_PREFIX</code>)), 
+     * prefixed with <code>FieldNames.FULLTEXT_PREFIX</code>)),
      * and <code>null</code> if none is configured, or the configured analyzer
      * cannot be found. If <code>null</code> is returned, the default Analyzer
      * is used.
-     * 
+     *
      * @param fieldName the string representation ,JCR-style name, of the given <code>Name</code>
      * prefixed with <code>FieldNames.FULLTEXT_PREFIX</code>))
-     * @return the <code>analyzer</code> to use for indexing this property 
+     * @return the <code>analyzer</code> to use for indexing this property
      */
     public Analyzer getPropertyAnalyzer(String fieldName) {
         if(analyzers.containsKey(fieldName)){

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java Sun Jan 27 13:08:08 2008
@@ -139,10 +139,10 @@
      * The synonym provider or <code>null</code> if none is configured.
      */
     private final SynonymProvider synonymProvider;
-    
+
     /**
      * Maps variable names to values.
-     */ 
+     */
     private final Map bindVariableValues;
 
     /**

Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java?rev=615649&r1=615648&r2=615649&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JackrabbitAnalyzer.java Sun Jan 27 13:08:08 2008
@@ -23,28 +23,28 @@
 import java.io.Reader;
 
 /**
- * This is the global jackrabbit lucene analyzer. By default, all 
- * properties are indexed with the <code>StandardAnalyzer(new String[]{})</code>, 
+ * This is the global jackrabbit lucene analyzer. By default, all
+ * properties are indexed with the <code>StandardAnalyzer(new String[]{})</code>,
  * unless in the <SearchIndex> configuration a global analyzer is defined.
  *
- * In the indexing configuration, properties can be configured to be 
- * indexed with a specific analyzer. If configured, this analyzer is used to 
- * index the text of the property and to parse searchtext for this property. 
+ * In the indexing configuration, properties can be configured to be
+ * indexed with a specific analyzer. If configured, this analyzer is used to
+ * index the text of the property and to parse searchtext for this property.
  */
 
 public class JackrabbitAnalyzer  extends Analyzer {
-    
+
     /**
      * The default Jackrabbit analyzer if none is configured in <code><SearchIndex></code>
-     * configuration.  
+     * configuration.
      */
     private Analyzer defaultAnalyzer =  new StandardAnalyzer(new String[]{});
-    
+
     /**
      * The indexing configuration.
      */
-    private IndexingConfiguration indexingConfig; 
-  
+    private IndexingConfiguration indexingConfig;
+
     /**
      * A param indexingConfig the indexing configuration.
      */
@@ -53,20 +53,20 @@
     }
 
     /**
-     * @param analyzer the default jackrabbit analyzer 
+     * @param analyzer the default jackrabbit analyzer
      */
     protected void setDefaultAnalyzer(Analyzer analyzer){
         defaultAnalyzer = analyzer;
     }
-    
-    /** 
-     * Creates a TokenStream which tokenizes all the text in the provided 
+
+    /**
+     * Creates a TokenStream which tokenizes all the text in the provided
      * Reader. If the fieldName (property) is configured to have a different
      * analyzer than the default, this analyzer is used for tokenization
      */
     public TokenStream tokenStream(String fieldName, Reader reader) {
         if(indexingConfig!=null){
-            Analyzer propertyAnalyzer = indexingConfig.getPropertyAnalyzer(fieldName); 
+            Analyzer propertyAnalyzer = indexingConfig.getPropertyAnalyzer(fieldName);
             if(propertyAnalyzer!=null){
                 return propertyAnalyzer.tokenStream(fieldName, reader);
             }



Mime
View raw message