jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mdue...@apache.org
Subject svn commit: r1164026 [1/11] - in /jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ./ config/ hierarchy/ lock/ nodetype/ observation/ operation/ query/ security/ state/ util/ version/ xml/
Date Thu, 01 Sep 2011 11:52:13 GMT
Author: mduerig
Date: Thu Sep  1 11:52:08 2011
New Revision: 1164026

URL: http://svn.apache.org/viewvc?rev=1164026&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
cleanup

Modified:
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemLifeCycleListener.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrLockManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NamespaceRegistryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NamespaceStorage.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/SessionImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/StaleProperty.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/XASessionImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/config/RepositoryConfig.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeAttic.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildNodeEntriesImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntries.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/ChildPropertyEntriesImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/EntryValidation.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEventListener.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntry.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/PropertyEntryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/UniqueIdResolver.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/BitsetENTCacheImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/DefinitionValidator.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeType.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeCache.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeProvider.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProvider.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/ItemDefinitionProviderImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeCache.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeDefinitionProvider.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistry.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeRegistryListener.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/EventJournalImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/FilteredEventIterator.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/InternalEventListener.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/observation/ObservationManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractCopy.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractOperation.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddLabel.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddNode.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AddProperty.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkin.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkout.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Checkpoint.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Clone.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Copy.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateConfiguration.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRefresh.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockRelease.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Merge.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Move.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Operation.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/OperationVisitor.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveActivity.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveLabel.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/RemoveVersion.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ReorderNodes.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/ResolveMergeConflict.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Restore.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetMixin.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPrimaryType.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/SetPropertyValue.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperation.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/TransientOperationVisitor.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Update.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/WorkspaceImport.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/NodeIteratorImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryObjectModelImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/QueryResultImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/RowIteratorImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/query/ScoreNodeIterator.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/security/AccessManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/AbstractItemStateFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ChangeLog.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemState.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateCreationListener.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateLifeCycleListener.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/ItemStateValidator.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/PropertyState.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/Status.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientISFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/TransientItemStateManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/UpdatableItemStateManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/WorkspaceItemStateFactory.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/LogUtil.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/ReferenceChangeTracker.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/util/StateUtility.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionHistoryImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManager.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/version/VersionManagerImpl.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/Importer.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java
    jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemCacheImpl.java Thu Sep  1 11:52:08 2011
@@ -30,8 +30,7 @@ import org.slf4j.LoggerFactory;
  * <code>ItemCacheImpl</code>...
  */
 public class ItemCacheImpl implements ItemCache {
-
-    private static Logger log = LoggerFactory.getLogger(ItemCacheImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(ItemCacheImpl.class);
 
     private final Map<ItemState, Item> cache;
 
@@ -41,24 +40,23 @@ public class ItemCacheImpl implements It
     }
 
     //----------------------------------------------------------< ItemCache >---
-    /**
-     * @see ItemCache#getItem(ItemState)
-     */
+
+    @Override
     public Item getItem(ItemState state) {
         return cache.get(state);
     }
 
-    /**
-     * @see ItemCache#clear()
-     */
+    @Override
     public void clear() {
         cache.clear();
     }
 
     //----------------------------------------------< ItemLifeCycleListener >---
+
     /**
      * @see ItemLifeCycleListener#itemCreated(Item)
      */
+    @Override
     public void itemCreated(Item item) {
         if (!(item instanceof ItemImpl)) {
             String msg = "Incompatible Item object: " + ItemImpl.class.getName() + " expected.";
@@ -71,6 +69,7 @@ public class ItemCacheImpl implements It
         cacheItem(((ItemImpl)item).getItemState(), item);
     }
 
+    @Override
     public void itemUpdated(Item item, boolean modified) {
         if (!(item instanceof ItemImpl)) {
             String msg = "Incompatible Item object: " + ItemImpl.class.getName() + " expected.";
@@ -92,6 +91,7 @@ public class ItemCacheImpl implements It
     /**
      * @see ItemLifeCycleListener#itemDestroyed(Item)
      */
+    @Override
     public void itemDestroyed(Item item) {
         if (!(item instanceof ItemImpl)) {
             String msg = "Incompatible Item object: " + ItemImpl.class.getName() + " expected.";
@@ -107,6 +107,7 @@ public class ItemCacheImpl implements It
     }
 
     //-------------------------------------------------< item cache methods >---
+
     /**
      * Puts the reference of an item in the cache with
      * the item's path as the key.
@@ -163,7 +164,7 @@ public class ItemCacheImpl implements It
             } catch (RepositoryException e) {
                 path = "-";
             }
-            builder.append(state + "\t" + path + " (" + item + ")\n");
+            builder.append(state).append('\t').append(path).append(" (").append(item).append(")\n");
         }
         return builder.toString();
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java Thu Sep  1 11:52:08 2011
@@ -16,25 +16,6 @@
  */
 package org.apache.jackrabbit.jcr2spi;
 
-import java.util.Collections;
-import java.util.Map;
-
-import javax.jcr.AccessDeniedException;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.Item;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.ItemVisitor;
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.ReferentialIntegrityException;
-import javax.jcr.Repository;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.version.VersionException;
-
 import org.apache.commons.collections.map.ReferenceMap;
 import org.apache.jackrabbit.jcr2spi.config.CacheBehaviour;
 import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry;
@@ -49,15 +30,28 @@ import org.apache.jackrabbit.jcr2spi.sta
 import org.apache.jackrabbit.jcr2spi.util.LogUtil;
 import org.apache.jackrabbit.spi.Name;
 import org.apache.jackrabbit.spi.Path;
+import org.omg.CORBA.DynAnyPackage.Invalid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.Item;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.ItemVisitor;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
+import java.util.Collections;
+import java.util.Map;
+
 /**
  * <code>ItemImpl</code>...
  */
 public abstract class ItemImpl implements Item, ItemStateLifeCycleListener {
-
-    private static Logger log = LoggerFactory.getLogger(ItemImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(ItemImpl.class);
 
     private final ItemState state;
 
@@ -73,14 +67,13 @@ public abstract class ItemImpl implement
     protected final Map<ItemLifeCycleListener, ItemLifeCycleListener> listeners =
         Collections.synchronizedMap(new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.WEAK));
 
-    public ItemImpl(SessionImpl session, ItemState state,
-                    ItemLifeCycleListener[] listeners) {
+    protected ItemImpl(SessionImpl session, ItemState state, ItemLifeCycleListener[] listeners) {
         this.session = session;
         this.state = state;
 
         if (listeners != null) {
-            for (int i = 0; i < listeners.length; i++) {
-                addLifeCycleListener(listeners[i]);
+            for (ItemLifeCycleListener listener : listeners) {
+                addLifeCycleListener(listener);
             }
         }
         notifyCreated();
@@ -90,23 +83,18 @@ public abstract class ItemImpl implement
     }
 
     //-----------------------------------------------------< Item interface >---
-    /**
-     * @see javax.jcr.Item#getPath()
-     */
+
+    @Override
     public String getPath() throws RepositoryException {
         checkStatus();
         return session.getPathResolver().getJCRPath(getQPath());
     }
 
-    /**
-     * @see javax.jcr.Item#getName()
-     */
+    @Override
     public abstract String getName() throws RepositoryException;
 
-    /**
-     * @see javax.jcr.Item#getAncestor(int)
-     */
-    public Item getAncestor(int depth) throws ItemNotFoundException, AccessDeniedException, RepositoryException {
+    @Override
+    public Item getAncestor(int depth) throws RepositoryException {
         checkStatus();
         if (depth == 0) {
             return session.getRootNode();
@@ -131,10 +119,8 @@ public abstract class ItemImpl implement
         }
     }
 
-    /**
-     * @see Item#getParent()
-     */
-    public Node getParent() throws ItemNotFoundException, AccessDeniedException, RepositoryException {
+    @Override
+    public Node getParent() throws RepositoryException {
         checkStatus();
 
         // special treatment for root node
@@ -148,9 +134,7 @@ public abstract class ItemImpl implement
         return (Node) getItemManager().getItem(parentEntry);
     }
 
-    /**
-     * @see javax.jcr.Item#getDepth()
-     */
+    @Override
     public int getDepth() throws RepositoryException {
         checkStatus();
         if (state.isNode() && ((NodeState)state).isRoot()) {
@@ -164,30 +148,24 @@ public abstract class ItemImpl implement
      * Note: as of 2.x this method returns the session irrespective of the item's
      * status.
      * 
-     * @see javax.jcr.Item#getSession()
      * @see <a href="http://issues.apache.org/jira/browse/JCR-2529">Issue JCR-2529</a>
      */
+    @Override
     public Session getSession() throws RepositoryException {
         return session;
     }
 
-    /**
-     * @see javax.jcr.Item#isNew()
-     */
+    @Override
     public boolean isNew() {
         return state.getStatus() == Status.NEW;
     }
 
-    /**
-     * @see javax.jcr.Item#isModified()
-     */
+    @Override
     public boolean isModified() {
         return state.getStatus() == Status.EXISTING_MODIFIED;
     }
 
-    /**
-     * @see javax.jcr.Item#isSame(Item)
-     */
+    @Override
     public boolean isSame(Item otherItem) throws RepositoryException {
         checkStatus();
         if (this == otherItem) {
@@ -198,7 +176,7 @@ public abstract class ItemImpl implement
         }
         if (otherItem instanceof ItemImpl) {
             ItemImpl other = (ItemImpl) otherItem;
-            if (this.state == other.state) {
+            if (state == other.state) {
                 return true;
             }
             // check status of the other item.
@@ -217,43 +195,34 @@ public abstract class ItemImpl implement
                     updateId(other.state);
                     return state.getWorkspaceId().equals(other.state.getWorkspaceId());
                 }
-                /* else:
-                - if both wsp-states are null, the items are both transiently
-                  added and are only the same if they are obtained from the same
-                  session. in this case, their states must be the same object,
-                  which is covered above.
-                - either of the two items does not have a workspace state.
-                  therefore the items cannot be the same, since one has been
-                  transiently added in one but not the other session.
-                */
+                // else:
+                // - if both wsp-states are null, the items are both transiently
+                //   added and are only the same if they are obtained from the same
+                //   session. in this case, their states must be the same object,
+                //   which is covered above.
+                // - either of the two items does not have a workspace state.
+                //   therefore the items cannot be the same, since one has been
+                //   transiently added in one but not the other session.
             }
         }
         return false;
     }
 
-    /**
-     * @see javax.jcr.Item#accept(ItemVisitor)
-     */
+    @Override
     public abstract void accept(ItemVisitor visitor) throws RepositoryException;
 
-    /**
-     * @see javax.jcr.Item#isNode()
-     */
+    @Override
     public abstract boolean isNode();
 
-    /**
-     * @see javax.jcr.Item#save()
-     */
-    public void save() throws AccessDeniedException, ConstraintViolationException, InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException, RepositoryException {
+    @Override
+    public void save() throws RepositoryException {
         // check state of this instance
         checkStatus();
         session.getSessionItemStateManager().save(getItemState());
     }
 
-    /**
-     * @see javax.jcr.Item#refresh(boolean)
-     */
-    public void refresh(boolean keepChanges) throws InvalidItemStateException, RepositoryException {
+    @Override
+    public void refresh(boolean keepChanges) throws RepositoryException {
         // check session status
         session.checkIsAlive();
         int status = state.getStatus();
@@ -262,8 +231,8 @@ public abstract class ItemImpl implement
             throw new InvalidItemStateException("Item '" + this + "' doesn't exist anymore");
         }
 
-        /* If 'keepChanges' is true, items that do not have changes pending have
-           their state refreshed to reflect the current saved state */
+        // If 'keepChanges' is true, items that do not have changes pending have
+        //   their state refreshed to reflect the current saved state
         if (keepChanges) {
             if (status != Status.NEW  &&
                 session.getCacheBehaviour() != CacheBehaviour.OBSERVATION) {
@@ -281,24 +250,20 @@ public abstract class ItemImpl implement
                 throw new RepositoryException(msg);
             }
 
-            /*
-            Reset all transient modifications from this item and its descendants.
-            */
+            // Reset all transient modifications from this item and its descendants.
             session.getSessionItemStateManager().undo(state);
 
-            /* Unless the session is in 'observation' mode, mark all states
-               within this tree 'invalidated' in order to have them refreshed
-               from the server upon the next access.*/
+            // Unless the session is in 'observation' mode, mark all states
+            // within this tree 'invalidated' in order to have them refreshed
+            // from the server upon the next access.
             if (session.getCacheBehaviour() != CacheBehaviour.OBSERVATION) {
                 state.getHierarchyEntry().invalidate(true);
             }
         }
     }
 
-    /**
-     * @see javax.jcr.Item#remove()
-     */
-    public void remove() throws VersionException, LockException, ConstraintViolationException, RepositoryException {
+    @Override
+    public void remove() throws RepositoryException {
         checkSupportedOption(Repository.LEVEL_2_SUPPORTED);
         checkStatus();
 
@@ -308,54 +273,51 @@ public abstract class ItemImpl implement
     }
 
     //-----------------------------------------< ItemStateLifeCycleListener >---
+
     /**
      *
      * @param state
      * @param previousStatus
      */
+    @Override
     public void statusChanged(ItemState state, int previousStatus) {
         if (state != this.state) {
             throw new IllegalArgumentException("Invalid argument: ItemState with changed status must be this.state.");
         }
 
         switch (state.getStatus()) {
-            /**
-             * Nothing to do for
-             * - Status#EXISTING : modifications reverted or saved
-             *   inform listeneres about an update (status was MODIFIED before)
-             *   or a simple refresh without modification (status was INVALIDATED).
-             */
+            // Nothing to do for
+            // - Status#EXISTING : modifications reverted or saved
+            //   inform listeneres about an update (status was MODIFIED before)
+            //   or a simple refresh without modification (status was INVALIDATED).
             case Status.EXISTING:
                 if (previousStatus == Status.INVALIDATED || previousStatus == Status.MODIFIED) {
                     notifyUpdated(previousStatus == Status.MODIFIED);
                 }
                 break;
-            /**
-             * Nothing to do for
-             * - Status#EXISTING_MODIFIED : transient modification
-             * - Status#STALE_MODIFIED : external modifications while transient changes pending
-             * - Status#STALE_DESTROYED : external modifications while transient changes pending
-             * - Status#MODIFIED : externaly modified -> marker for sessionISM states only
-             * - Status#EXISTING_REMOVED : transient removal
-             */
+
+            // Nothing to do for
+            // - Status#EXISTING_MODIFIED : transient modification
+            // - Status#STALE_MODIFIED : external modifications while transient changes pending
+            // - Status#STALE_DESTROYED : external modifications while transient changes pending
+            // - Status#MODIFIED : externaly modified -> marker for sessionISM states only
+            // - Status#EXISTING_REMOVED : transient removal
             case Status.EXISTING_MODIFIED:
             case Status.STALE_MODIFIED:
             case Status.STALE_DESTROYED:
             case Status.MODIFIED:
             case Status.EXISTING_REMOVED:
                 break;
-            /**
-             * Notify listeners that this item is transiently or permanently
-             * destroyed.
-             * - Status#REMOVED : permanent removal. item will never get back to life
-             */
+
+            // Notify listeners that this item is transiently or permanently
+            // destroyed.
+            // - Status#REMOVED : permanent removal. item will never get back to life
             case Status.REMOVED:
                 state.removeListener(this);
                 notifyDestroyed();
                 break;
-            /**
-             * Invalid status. A state can never change its state to 'New'.
-             */
+
+            // Invalid status. A state can never change its state to 'New'.
             case Status.NEW:
                 // should never happen.
                 log.error("invalid state change to STATUS_NEW");
@@ -371,8 +333,8 @@ public abstract class ItemImpl implement
     private void notifyCreated() {
         // copy listeners to array to avoid ConcurrentModificationException
         ItemLifeCycleListener[] la = listeners.values().toArray(new ItemLifeCycleListener[listeners.size()]);
-        for (int i = 0; i < la.length; i++) {
-            la[i].itemCreated(this);
+        for (ItemLifeCycleListener aLa : la) {
+            aLa.itemCreated(this);
         }
     }
 
@@ -382,9 +344,9 @@ public abstract class ItemImpl implement
     private void notifyUpdated(boolean modified) {
         // copy listeners to array to avoid ConcurrentModificationException
         ItemLifeCycleListener[] la = listeners.values().toArray(new ItemLifeCycleListener[listeners.size()]);
-        for (int i = 0; i < la.length; i++) {
-            if (la[i] != null) {
-                la[i].itemUpdated(this, modified);
+        for (ItemLifeCycleListener aLa : la) {
+            if (aLa != null) {
+                aLa.itemUpdated(this, modified);
             }
         }
     }
@@ -395,9 +357,9 @@ public abstract class ItemImpl implement
     private void notifyDestroyed() {
         // copy listeners to array to avoid ConcurrentModificationException
         ItemLifeCycleListener[] la = listeners.values().toArray(new ItemLifeCycleListener[listeners.size()]);
-        for (int i = 0; i < la.length; i++) {
-            if (la[i] != null) {
-                la[i].itemDestroyed(this);
+        for (ItemLifeCycleListener aLa : la) {
+            if (aLa != null) {
+                aLa.itemDestroyed(this);
             }
         }
     }
@@ -423,6 +385,7 @@ public abstract class ItemImpl implement
     }
 
     //------------------------------------------------------< check methods >---
+
     /**
      * Performs a sanity check on this item and the associated session. If
      * the underlying item state is in an invalidated state then it will be
@@ -441,31 +404,12 @@ public abstract class ItemImpl implement
         }
         // now check if valid
         if (!state.isValid()) {
-            throw new InvalidItemStateException("Item '" + this + "' doesn't exist anymore. (Status = " +Status.getName(state.getStatus())+ ")");
+            throw new InvalidItemStateException("Item '" + this + "' doesn't exist anymore. (Status = " +
+                    Status.getName(state.getStatus())+ ')');
         }
     }
 
     /**
-     * Returns true if the repository supports the given option. False otherwise.
-     *
-     * @param option Any of the option constants defined by {@link Repository}
-     * that either returns 'true' or 'false'. I.e.
-     * <ul>
-     * <li>{@link Repository#LEVEL_1_SUPPORTED}</li>
-     * <li>{@link Repository#LEVEL_2_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_TRANSACTIONS_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_VERSIONING_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_OBSERVATION_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_LOCKING_SUPPORTED}</li>
-     * <li>{@link Repository#OPTION_QUERY_SQL_SUPPORTED}</li>
-     * </ul>
-     * @return true if the repository supports the given option. False otherwise.
-     */
-    boolean isSupportedOption(String option) {
-        return session.isSupportedOption(option);
-    }
-
-    /**
      * Check if the given option is supported by the repository.
      *
      * @param option Any of the option constants defined by {@link Repository}
@@ -499,7 +443,7 @@ public abstract class ItemImpl implement
      * @throws UnsupportedRepositoryOperationException
      * @throws RepositoryException
      */
-    void checkSupportedOption(String option) throws UnsupportedRepositoryOperationException, RepositoryException {
+    void checkSupportedOption(String option) throws RepositoryException {
         session.checkSupportedOption(option);
     }
 
@@ -513,7 +457,7 @@ public abstract class ItemImpl implement
      * @throws RepositoryException
      * @see ItemStateValidator
      */
-    protected void checkIsWritable() throws UnsupportedRepositoryOperationException, ConstraintViolationException, RepositoryException {
+    protected void checkIsWritable() throws RepositoryException {
         checkSupportedOption(Repository.LEVEL_2_SUPPORTED);
         checkStatus();
     }
@@ -535,6 +479,7 @@ public abstract class ItemImpl implement
     }
 
     //------------------------------------< Implementation specific methods >---
+
     /**
      * Same as <code>{@link Item#getName()}</code> except that
      * this method returns a <code>Name</code> instead of a

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemLifeCycleListener.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemLifeCycleListener.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemLifeCycleListener.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemLifeCycleListener.java Thu Sep  1 11:52:08 2011
@@ -31,7 +31,7 @@ public interface ItemLifeCycleListener {
      *
      * @param item the instance which has been created
      */
-    public void itemCreated(Item item);
+    void itemCreated(Item item);
 
     /**
      * Called when an <code>Item</code> instance has been refreshed. If

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManager.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManager.java Thu Sep  1 11:52:08 2011
@@ -56,7 +56,7 @@ public interface ItemManager {
     /**
      * Disposes this <code>ItemManager</code> and frees resources.
      */
-    public void dispose();
+    void dispose();
 
     /**
      * Checks if the node with the given path exists.
@@ -64,7 +64,7 @@ public interface ItemManager {
      * @param path path to the node to be checked
      * @return true if the specified item exists
      */
-    public boolean nodeExists(Path path);
+    boolean nodeExists(Path path);
 
     /**
      * Checks if the property with the given path exists.
@@ -72,7 +72,7 @@ public interface ItemManager {
      * @param path path to the property to be checked
      * @return true if the specified item exists
      */
-    public boolean propertyExists(Path path);
+    boolean propertyExists(Path path);
 
     /**
      * Checks if the item for given HierarchyEntry exists.
@@ -80,7 +80,7 @@ public interface ItemManager {
      * @param hierarchyEntry
      * @return true if the specified item exists
      */
-    public boolean itemExists(HierarchyEntry hierarchyEntry);
+    boolean itemExists(HierarchyEntry hierarchyEntry);
 
     /**
      *
@@ -89,7 +89,7 @@ public interface ItemManager {
      * @throws PathNotFoundException
      * @throws RepositoryException
      */
-    public Node getNode(Path path) throws PathNotFoundException, RepositoryException;
+    Node getNode(Path path) throws PathNotFoundException, RepositoryException;
 
     /**
      *
@@ -98,7 +98,7 @@ public interface ItemManager {
      * @throws PathNotFoundException
      * @throws RepositoryException
      */
-    public Property getProperty(Path path) throws PathNotFoundException, RepositoryException;
+    Property getProperty(Path path) throws PathNotFoundException, RepositoryException;
 
     /**
      *
@@ -107,7 +107,7 @@ public interface ItemManager {
      * @throws ItemNotFoundException
      * @throws RepositoryException
      */
-    public Item getItem(HierarchyEntry hierarchyEntry) throws ItemNotFoundException, RepositoryException;
+    Item getItem(HierarchyEntry hierarchyEntry) throws ItemNotFoundException, RepositoryException;
 
     /**
      *
@@ -116,7 +116,7 @@ public interface ItemManager {
      * @throws ItemNotFoundException
      * @throws RepositoryException
      */
-    public boolean hasChildNodes(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
+    boolean hasChildNodes(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
 
     /**
      *
@@ -125,7 +125,7 @@ public interface ItemManager {
      * @throws ItemNotFoundException
      * @throws RepositoryException
      */
-    public NodeIterator getChildNodes(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
+    NodeIterator getChildNodes(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
 
     /**
      *
@@ -134,7 +134,7 @@ public interface ItemManager {
      * @throws ItemNotFoundException
      * @throws RepositoryException
      */
-    public boolean hasChildProperties(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
+    boolean hasChildProperties(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
 
     /**
      *
@@ -143,5 +143,5 @@ public interface ItemManager {
      * @throws ItemNotFoundException
      * @throws RepositoryException
      */
-    public PropertyIterator getChildProperties(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
+    PropertyIterator getChildProperties(NodeEntry parentEntry) throws ItemNotFoundException, RepositoryException;
 }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemManagerImpl.java Thu Sep  1 11:52:08 2011
@@ -49,12 +49,11 @@ import java.util.Iterator;
  * <code>ItemManagerImpl</code> implements the <code>ItemManager</code> interface.
  */
 public class ItemManagerImpl implements ItemManager, ItemStateCreationListener {
-
-    private static Logger log = LoggerFactory.getLogger(ItemManagerImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(ItemManagerImpl.class);
 
     private final SessionImpl session;
 
-    private final HierarchyManager hierMgr;
+    private final HierarchyManager hierarchyManager;
 
     /**
      * A cache for item instances created by this <code>ItemManagerImpl</code>.
@@ -68,12 +67,12 @@ public class ItemManagerImpl implements 
     /**
      * Creates a new per-session instance <code>ItemManagerImpl</code> instance.
      *
-     * @param hierMgr HierarchyManager associated with the new instance
+     * @param hierarchyManager HierarchyManager associated with the new instance
      * @param session the session associated with the new instance
      * @param cache the ItemCache to be used.
      */
-    ItemManagerImpl(HierarchyManager hierMgr, SessionImpl session, ItemCache cache) {
-        this.hierMgr = hierMgr;
+    ItemManagerImpl(HierarchyManager hierarchyManager, SessionImpl session, ItemCache cache) {
+        this.hierarchyManager = hierarchyManager;
         this.session = session;
         itemCache = cache;
 
@@ -86,9 +85,8 @@ public class ItemManagerImpl implements 
     }
 
     //--------------------------------------------------------< ItemManager >---
-    /**
-     * @see ItemManager#dispose()
-     */
+
+    @Override
     public void dispose() {
         // stop listening
         Workspace wsp = session.getWorkspace();
@@ -99,13 +97,11 @@ public class ItemManagerImpl implements 
         itemCache.clear();
     }
 
-    /**
-     * @see ItemManager#nodeExists(Path)
-     */
+    @Override
     public boolean nodeExists(Path path) {
         try {
             // session-sanity & permissions are checked upon itemExists(ItemState)
-            NodeState nodeState = hierMgr.getNodeState(path);
+            NodeState nodeState = hierarchyManager.getNodeState(path);
             return itemExists(nodeState);
         } catch (PathNotFoundException pnfe) {
             return false;
@@ -116,13 +112,11 @@ public class ItemManagerImpl implements 
         }
     }
 
-    /**
-     * @see ItemManager#propertyExists(Path)
-     */
+    @Override
     public boolean propertyExists(Path path) {
         try {
             // session-sanity & permissions are checked upon itemExists(ItemState)
-            PropertyState propState = hierMgr.getPropertyState(path);
+            PropertyState propState = hierarchyManager.getPropertyState(path);
             return itemExists(propState);
         } catch (PathNotFoundException pnfe) {
             return false;
@@ -133,9 +127,7 @@ public class ItemManagerImpl implements 
         }
     }
 
-    /**
-     * @see ItemManager#itemExists(HierarchyEntry)
-     */
+    @Override
     public boolean itemExists(HierarchyEntry hierarchyEntry) {
         try {
             // session-sanity & permissions are checked upon itemExists(ItemState)
@@ -167,11 +159,9 @@ public class ItemManagerImpl implements 
         }
     }
 
-    /**
-     * @see ItemManager#getNode(Path)
-     */
-    public synchronized Node getNode(Path path) throws PathNotFoundException, RepositoryException {
-        NodeEntry nodeEntry = hierMgr.getNodeEntry(path);
+    @Override
+    public synchronized Node getNode(Path path) throws RepositoryException {
+        NodeEntry nodeEntry = hierarchyManager.getNodeEntry(path);
         try {
             return (Node) getItem(nodeEntry);
         } catch (ItemNotFoundException infe) {
@@ -179,11 +169,9 @@ public class ItemManagerImpl implements 
         }
     }
 
-    /**
-     * @see ItemManager#getProperty(Path)
-     */
-    public synchronized Property getProperty(Path path) throws PathNotFoundException, RepositoryException {
-        PropertyEntry propertyEntry = hierMgr.getPropertyEntry(path);
+    @Override
+    public synchronized Property getProperty(Path path) throws RepositoryException {
+        PropertyEntry propertyEntry = hierarchyManager.getPropertyEntry(path);
         try {
             return (Property) getItem(propertyEntry);
         } catch (ItemNotFoundException infe) {
@@ -191,10 +179,8 @@ public class ItemManagerImpl implements 
         }
     }
 
-    /**
-     * @see ItemManager#getItem(HierarchyEntry)
-     */
-    public Item getItem(HierarchyEntry hierarchyEntry) throws ItemNotFoundException, RepositoryException {
+    @Override
+    public Item getItem(HierarchyEntry hierarchyEntry) throws RepositoryException {
         session.checkIsAlive();
         ItemState state = hierarchyEntry.getItemState();
         if (!state.isValid()) {
@@ -215,11 +201,8 @@ public class ItemManagerImpl implements 
         return item;
     }
 
-    /**
-     * @see ItemManager#hasChildNodes(NodeEntry)
-     */
-    public synchronized boolean hasChildNodes(NodeEntry parentEntry)
-            throws ItemNotFoundException, RepositoryException {
+    @Override
+    public synchronized boolean hasChildNodes(NodeEntry parentEntry) throws RepositoryException {
         // check sanity of session
         session.checkIsAlive();
 
@@ -238,11 +221,8 @@ public class ItemManagerImpl implements 
         return false;
     }
 
-    /**
-     * @see ItemManager#getChildNodes(NodeEntry)
-     */
-    public synchronized NodeIterator getChildNodes(NodeEntry parentEntry)
-            throws ItemNotFoundException, RepositoryException {
+    @Override
+    public synchronized NodeIterator getChildNodes(NodeEntry parentEntry) throws RepositoryException {
         // check sanity of session
         session.checkIsAlive();
 
@@ -250,11 +230,8 @@ public class ItemManagerImpl implements 
         return new LazyItemIterator(this, it);
     }
 
-    /**
-     * @see ItemManager#hasChildProperties(NodeEntry)
-     */
-    public synchronized boolean hasChildProperties(NodeEntry parentEntry)
-            throws ItemNotFoundException, RepositoryException {
+    @Override
+    public synchronized boolean hasChildProperties(NodeEntry parentEntry) throws RepositoryException {
         // check sanity of session
         session.checkIsAlive();
 
@@ -273,11 +250,8 @@ public class ItemManagerImpl implements 
         return false;
     }
 
-    /**
-     * @see ItemManager#getChildProperties(NodeEntry)
-     */
-    public synchronized PropertyIterator getChildProperties(NodeEntry parentEntry)
-            throws ItemNotFoundException, RepositoryException {
+    @Override
+    public synchronized PropertyIterator getChildProperties(NodeEntry parentEntry) throws RepositoryException {
         // check sanity of session
         session.checkIsAlive();
 
@@ -292,13 +266,14 @@ public class ItemManagerImpl implements 
      */
     public String toString() {
         StringBuilder builder = new StringBuilder();
-        builder.append("ItemManager (" + super.toString() + ")\n");
+        builder.append("ItemManager (").append(super.toString()).append(")\n");
         builder.append("Items in cache:\n");
         builder.append(itemCache);
         return builder.toString();
     }
 
     //----------------------------------------------------< private methods >---
+    
     /**
      * @param state
      * @return a new <code>Node</code> instance.
@@ -332,15 +307,16 @@ public class ItemManagerImpl implements 
         // in order to maintain item cache consistency
         ItemLifeCycleListener[] listeners = new ItemLifeCycleListener[]{itemCache};
         // create property object
-        PropertyImpl prop = new PropertyImpl(session, state, listeners);
-        return prop;
+        return new PropertyImpl(session, state, listeners);
     }
 
     //------------------------------------------< ItemStateCreationListener >---
+
     /**
      *
      * @param state
      */
+    @Override
     public void created(ItemState state) {
         if (state.isNode()) {
             try {
@@ -354,6 +330,7 @@ public class ItemManagerImpl implements 
         }
     }
 
+    @Override
     public void statusChanged(ItemState state, int previousStatus) {
         // stop listening if an state reached Status.REMOVED.
         if (Status.REMOVED == state.getStatus()) {

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/Jcr2spiRepositoryFactory.java Thu Sep  1 11:52:08 2011
@@ -45,7 +45,7 @@ public class Jcr2spiRepositoryFactory im
     /**
      * This parameter determines the {@link RepositoryServiceFactory} to create the
      * {@link RepositoryService}. This is either an instance of <code>RepositoryServiceFactory
-     * </code> or a fully quallyfied class name of a <code>RepositoryServiceFactory</code>
+     * </code> or a fully qualified class name of a <code>RepositoryServiceFactory</code>
      * having a no argument constructor.
      */
     public static final String PARAM_REPOSITORY_SERVICE_FACTORY = "org.apache.jackrabbit.spi.RepositoryServiceFactory";
@@ -133,9 +133,8 @@ public class Jcr2spiRepositoryFactory im
      * from the configuration is wrapped by a SPI logger. See the
      * {@link org.apache.jackrabbit.spi.commons.logging.SpiLoggerFactory SpiLoggerFactory}
      * for details.
-     *
-     * @see RepositoryFactory#getRepository(java.util.Map)
      */
+    @Override
     public Repository getRepository(@SuppressWarnings("unchecked") Map parameters) throws RepositoryException {
         RepositoryServiceFactory serviceFactory = getServiceFactory(parameters);
         Object configParam = parameters.get(PARAM_REPOSITORY_CONFIG);
@@ -231,26 +230,29 @@ public class Jcr2spiRepositoryFactory im
         public RepositoryConfigImpl(RepositoryServiceFactory serviceFactory, Map<?, ?> parameters)
                 throws RepositoryException {
 
-            super();
             this.serviceFactory = serviceFactory;
-            this.cacheBehaviour = getCacheBehaviour(parameters);
-            this.itemCacheSize = getItemCacheSize(parameters);
-            this.pollTimeOut = getPollTimeout(parameters);
+            cacheBehaviour = getCacheBehaviour(parameters);
+            itemCacheSize = getItemCacheSize(parameters);
+            pollTimeOut = getPollTimeout(parameters);
             this.parameters = parameters;
         }
 
+        @Override
         public CacheBehaviour getCacheBehaviour() {
             return cacheBehaviour;
         }
 
+        @Override
         public int getItemCacheSize() {
             return itemCacheSize;
         }
 
+        @Override
         public int getPollTimeout() {
             return pollTimeOut;
         }
 
+        @Override
         public RepositoryService getRepositoryService() throws RepositoryException {
             if (repositoryService == null) {
                 repositoryService = serviceFactory.createRepositoryService(parameters);
@@ -361,7 +363,6 @@ public class Jcr2spiRepositoryFactory im
         private final RepositoryService service;
 
         private SpiLoggerConfig(RepositoryConfig config, Map<?, ?> parameters) throws RepositoryException {
-            super();
             this.config = config;
 
             Object lwProvider = parameters.get(PARAM_LOG_WRITER_PROVIDER);
@@ -383,18 +384,22 @@ public class Jcr2spiRepositoryFactory im
             }
         }
 
+        @Override
         public CacheBehaviour getCacheBehaviour() {
             return config.getCacheBehaviour();
         }
 
+        @Override
         public int getItemCacheSize() {
             return config.getItemCacheSize();
         }
 
+        @Override
         public int getPollTimeout() {
             return config.getPollTimeout();
         }
 
+        @Override
         public RepositoryService getRepositoryService() throws RepositoryException {
             return service;
         }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrLockManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrLockManager.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrLockManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrLockManager.java Thu Sep  1 11:52:08 2011
@@ -47,42 +47,35 @@ public class JcrLockManager implements L
     }
 
     //--------------------------------------------------------< LockManager >---
-    /**
-     * @see javax.jcr.lock.LockManager#getLock(String)
-     */
-    public javax.jcr.lock.Lock getLock(String absPath) throws LockException, RepositoryException {
+
+    @Override
+    public javax.jcr.lock.Lock getLock(String absPath) throws RepositoryException {
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return n.getLock();
     }
 
-    /**
-     * @see javax.jcr.lock.LockManager#isLocked(String)
-     */
+    @Override
     public boolean isLocked(String absPath) throws RepositoryException {
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return n.isLocked();
     }
 
-    /**
-     * @see javax.jcr.lock.LockManager#holdsLock(String)
-     */
+    @Override
     public boolean holdsLock(String absPath) throws RepositoryException {
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return n.holdsLock();
     }
 
-    /**
-     * @see javax.jcr.lock.LockManager#lock(String, boolean, boolean, long, String)
-     */
-    public javax.jcr.lock.Lock lock(String absPath, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerInfo) throws RepositoryException {
+    @Override
+    public javax.jcr.lock.Lock lock(String absPath, boolean isDeep, boolean isSessionScoped, long timeoutHint,
+            String ownerInfo) throws RepositoryException {
+        
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return ((NodeImpl) n).lock(isDeep, isSessionScoped, timeoutHint, ownerInfo);
     }
 
-    /**
-     * @see javax.jcr.lock.LockManager#unlock(String)
-     */
-    public void unlock(String absPath) throws LockException, RepositoryException {
+    @Override
+    public void unlock(String absPath) throws RepositoryException {
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         n.unlock();
     }
@@ -91,8 +84,8 @@ public class JcrLockManager implements L
      * Returns the lock tokens present on the <code>SessionInfo</code> this
      * manager has been created with.
      *
-     * @see javax.jcr.lock.LockManager#getLockTokens()
      */
+    @Override
     public String[] getLockTokens() throws RepositoryException {
         return lockStateMgr.getLockTokens();
     }
@@ -102,9 +95,9 @@ public class JcrLockManager implements L
      * If this succeeds this method will inform all locks stored in the local
      * map in order to give them the chance to update their lock information.
      *
-     * @see javax.jcr.lock.LockManager#addLockToken(String)
      */
-    public void addLockToken(String lt) throws LockException, RepositoryException {
+    @Override
+    public void addLockToken(String lt) throws RepositoryException {
         lockStateMgr.addLockToken(lt);
     }
 
@@ -116,9 +109,9 @@ public class JcrLockManager implements L
      * All locks stored in the local lock map are notified by the removed
      * token in order have them updated their lock information.
      *
-     * @see javax.jcr.lock.LockManager#removeLockToken(String)
      */
-    public void removeLockToken(String lt) throws LockException, RepositoryException {
+    @Override
+    public void removeLockToken(String lt) throws RepositoryException {
         lockStateMgr.removeLockToken(lt);
     }
 

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/JcrVersionManager.java Thu Sep  1 11:52:08 2011
@@ -76,39 +76,32 @@ public class JcrVersionManager implement
     }
 
     //-----------------------------------------------------< VersionManager >---
-    /**
-     * @see javax.jcr.version.VersionManager#checkin(String)
-     */
-    public Version checkin(String absPath) throws VersionException, UnsupportedRepositoryOperationException, InvalidItemStateException, LockException, RepositoryException {
+
+    @Override
+    public Version checkin(String absPath) throws RepositoryException {
         session.checkIsAlive();
         
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return n.checkin();
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#checkout(String)
-     */
-    public void checkout(String absPath) throws UnsupportedRepositoryOperationException, LockException, RepositoryException {
+    @Override
+    public void checkout(String absPath) throws RepositoryException {
         session.checkIsAlive();
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         n.checkout();
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#checkpoint(String)
-     */
-    public Version checkpoint(String absPath) throws VersionException, UnsupportedRepositoryOperationException, InvalidItemStateException, LockException, RepositoryException {
+    @Override
+    public Version checkpoint(String absPath) throws RepositoryException {
         session.checkIsAlive();
 
         NodeImpl n = (NodeImpl) itemManager.getNode(resolver.getQPath(absPath));
         return n.checkpoint();
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#isCheckedOut(String)
-     */
+    @Override
     public boolean isCheckedOut(String absPath) throws RepositoryException {
         session.checkIsAlive();
 
@@ -116,30 +109,24 @@ public class JcrVersionManager implement
         return n.isCheckedOut();
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#getVersionHistory(String)
-     */
-    public VersionHistory getVersionHistory(String absPath) throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public VersionHistory getVersionHistory(String absPath) throws RepositoryException {
         session.checkIsAlive();
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return n.getVersionHistory();
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#getBaseVersion(String)
-     */
-    public Version getBaseVersion(String absPath) throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public Version getBaseVersion(String absPath) throws RepositoryException {
         session.checkIsAlive();
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         return n.getBaseVersion();
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#restore(Version[], boolean)
-     */
-    public void restore(Version[] versions, boolean removeExisting) throws ItemExistsException, UnsupportedRepositoryOperationException, VersionException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public void restore(Version[] versions, boolean removeExisting) throws RepositoryException {
         session.checkIsAlive();
         session.checkHasPendingChanges();
 
@@ -150,27 +137,21 @@ public class JcrVersionManager implement
         vMgr.restore(versionStates, removeExisting);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#restore(String, String, boolean)
-     */
-    public void restore(String absPath, String versionName, boolean removeExisting) throws VersionException, ItemExistsException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public void restore(String absPath, String versionName, boolean removeExisting) throws RepositoryException {
         session.checkIsAlive();
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         n.restore(versionName, removeExisting);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#restore(Version, boolean)
-     */
-    public void restore(Version version, boolean removeExisting) throws VersionException, ItemExistsException, UnsupportedRepositoryOperationException, LockException, RepositoryException {
+    @Override
+    public void restore(Version version, boolean removeExisting) throws RepositoryException {
         restore(new Version[]{version}, removeExisting);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#restore(String, Version, boolean)
-     */
-    public void restore(String absPath, Version version, boolean removeExisting) throws PathNotFoundException, ItemExistsException, VersionException, ConstraintViolationException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public void restore(String absPath, Version version, boolean removeExisting) throws RepositoryException {
         session.checkIsAlive();
         // get parent
         int idx = absPath.lastIndexOf('/');
@@ -180,27 +161,23 @@ public class JcrVersionManager implement
         n.restore(version, name, removeExisting);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#restoreByLabel(String, String, boolean)
-     */
-    public void restoreByLabel(String absPath, String versionLabel, boolean removeExisting) throws VersionException, ItemExistsException, UnsupportedRepositoryOperationException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public void restoreByLabel(String absPath, String versionLabel, boolean removeExisting) throws RepositoryException {
         session.checkIsAlive();
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         n.restoreByLabel(versionLabel, removeExisting);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#merge(String, String, boolean)
-     */
-    public NodeIterator merge(String absPath, String srcWorkspace, boolean bestEffort) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public NodeIterator merge(String absPath, String srcWorkspace, boolean bestEffort) throws RepositoryException {
         return merge(absPath, srcWorkspace, bestEffort, false);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#merge(String, String, boolean, boolean)
-     */
-    public NodeIterator merge(String absPath, String srcWorkspace, boolean bestEffort, boolean isShallow) throws NoSuchWorkspaceException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public NodeIterator merge(String absPath, String srcWorkspace, boolean bestEffort, boolean isShallow)
+            throws RepositoryException {
+
         session.checkIsAlive();        
 
         NodeImpl n = (NodeImpl) itemManager.getNode(resolver.getQPath(absPath));
@@ -214,34 +191,30 @@ public class JcrVersionManager implement
         // make sure the workspace exists and is accessible for this session.
         session.checkAccessibleWorkspace(srcWorkspace);
         
-        Iterator<NodeId> failedIds = session.getVersionStateManager().merge((NodeState) n.getItemState(), srcWorkspace, bestEffort, isShallow);
+        Iterator<NodeId> failedIds = session.getVersionStateManager().merge((NodeState) n.getItemState(), srcWorkspace,
+                bestEffort, isShallow);
+        
         return new LazyItemIterator(itemManager, session.getHierarchyManager(), failedIds);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#doneMerge(String, Version)
-     */
-    public void doneMerge(String absPath, Version version) throws VersionException, InvalidItemStateException, UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public void doneMerge(String absPath, Version version) throws RepositoryException {
         session.checkIsAlive();
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         n.doneMerge(version);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#cancelMerge(String, Version)
-     */
-    public void cancelMerge(String absPath, Version version) throws VersionException, InvalidItemStateException, UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public void cancelMerge(String absPath, Version version) throws RepositoryException {
         session.checkIsAlive();                                  
 
         Node n = itemManager.getNode(resolver.getQPath(absPath));
         n.cancelMerge(version);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#createConfiguration(String)
-     */
-    public Node createConfiguration(String absPath) throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public Node createConfiguration(String absPath) throws RepositoryException {
         session.checkIsAlive();
 
         NodeImpl n = (NodeImpl) itemManager.getNode(resolver.getQPath(absPath));
@@ -249,10 +222,8 @@ public class JcrVersionManager implement
         return (Node) itemManager.getItem(entry);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#setActivity(Node)
-     */
-    public Node setActivity(Node activity) throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public Node setActivity(Node activity) throws RepositoryException {
         session.checkIsAlive();
         session.checkSupportedOption(Repository.OPTION_ACTIVITIES_SUPPORTED);
 
@@ -267,10 +238,8 @@ public class JcrVersionManager implement
         return oldActivity;
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#getActivity()
-     */
-    public Node getActivity() throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public Node getActivity() throws RepositoryException {
         session.checkIsAlive();
         session.checkSupportedOption(Repository.OPTION_ACTIVITIES_SUPPORTED);
 
@@ -288,20 +257,16 @@ public class JcrVersionManager implement
         }
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#createActivity(String)
-     */
-    public Node createActivity(String title) throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public Node createActivity(String title) throws RepositoryException {
         session.checkIsAlive();
 
         NodeEntry entry = vMgr.createActivity(title);
         return (Node) itemManager.getItem(entry);
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#removeActivity(Node)
-     */
-    public void removeActivity(Node activityNode) throws UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public void removeActivity(Node activityNode) throws RepositoryException {
         session.checkIsAlive();
         NodeImpl activity = getValidActivity(activityNode, "remove");
 
@@ -316,10 +281,8 @@ public class JcrVersionManager implement
         }
     }
 
-    /**
-     * @see javax.jcr.version.VersionManager#merge(Node)
-     */
-    public NodeIterator merge(Node activityNode) throws VersionException, AccessDeniedException, MergeException, LockException, InvalidItemStateException, RepositoryException {
+    @Override
+    public NodeIterator merge(Node activityNode) throws RepositoryException {
         session.checkIsAlive();
         NodeImpl activity = getValidActivity(activityNode, "merge");
         Iterator<NodeId> failedIds = vMgr.mergeActivity((NodeState) activity.getItemState());
@@ -341,14 +304,14 @@ public class JcrVersionManager implement
      * @return
      * @throws RepositoryException
      */
-    private NodeImpl getValidActivity(Node activityNode, String methodName) throws UnsupportedRepositoryOperationException, RepositoryException {
+    private NodeImpl getValidActivity(Node activityNode, String methodName) throws RepositoryException {
         NodeImpl activity;
-        if (session != activityNode.getSession()) {
-            String msg = "Attempt to " +methodName+ " an activity node that has been retrieved by another session.";
+        if (session == activityNode.getSession()) {
+            activity = (NodeImpl) activityNode;
+        } else {
+            String msg = "Attempt to " + methodName + " an activity node that has been retrieved by another session.";
             log.warn(msg);
             activity = (NodeImpl) session.getNodeByIdentifier(activityNode.getIdentifier());
-        } else {
-            activity = (NodeImpl) activityNode;
         }
         if (!activity.isNodeType(NameConstants.NT_ACTIVITY)) {
             throw new UnsupportedRepositoryOperationException("Given node is not an activity.");

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java Thu Sep  1 11:52:08 2011
@@ -22,7 +22,6 @@ import java.util.List;
 import java.util.NoSuchElementException;
 
 import javax.jcr.Item;
-import javax.jcr.ItemNotFoundException;
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.Property;
@@ -53,7 +52,7 @@ import org.slf4j.LoggerFactory;
 public class LazyItemIterator implements NodeIterator, PropertyIterator, VersionIterator {
 
     /** Logger instance for this class */
-    private static Logger log = LoggerFactory.getLogger(LazyItemIterator.class);
+    private static final Logger log = LoggerFactory.getLogger(LazyItemIterator.class);
 
     private static final long UNDEFINED_SIZE = -1;
 
@@ -61,7 +60,7 @@ public class LazyItemIterator implements
     private final ItemManager itemMgr;
 
     /** Iterator over HierarchyEntry elements */
-    private final Iterator<? extends HierarchyEntry> iter;
+    private final Iterator<? extends HierarchyEntry> hierarchyEntries;
 
     /**
      * The number of items.
@@ -70,10 +69,11 @@ public class LazyItemIterator implements
      * hierarchy entry has been invalidated or removed in the mean time.
      */
     private long size;
+
     /** the position of the next item */
     private int pos;
 
-    /** prefetched item to be returned on <code>{@link #next()}</code> */
+    /** pre-fetched item to be returned on <code>{@link #next()}</code> */
     private Item next;
 
     /**
@@ -84,7 +84,7 @@ public class LazyItemIterator implements
      */
     public LazyItemIterator(ItemManager itemMgr, Iterator<? extends HierarchyEntry> hierarchyEntryIterator) {
         this.itemMgr = itemMgr;
-        this.iter = hierarchyEntryIterator;
+        hierarchyEntries = hierarchyEntryIterator;
         if (hierarchyEntryIterator instanceof RangeIterator) {
             size = ((RangeIterator) hierarchyEntryIterator).getSize();
         } else {
@@ -102,9 +102,9 @@ public class LazyItemIterator implements
      * @param hierarchyMgr
      * @param itemIds
      */
-    public LazyItemIterator(ItemManager itemMgr, HierarchyManager hierarchyMgr,
-                            Iterator<? extends ItemId> itemIds)
-        throws ItemNotFoundException, RepositoryException {
+    public LazyItemIterator(ItemManager itemMgr, HierarchyManager hierarchyMgr, Iterator<? extends ItemId> itemIds)
+            throws RepositoryException {
+
         this.itemMgr = itemMgr;
         List<HierarchyEntry> entries = new ArrayList<HierarchyEntry>();
         while (itemIds.hasNext()) {
@@ -117,7 +117,7 @@ public class LazyItemIterator implements
             }
             entries.add(entry);
         }
-        iter = entries.iterator();
+        hierarchyEntries = entries.iterator();
         size = entries.size();
         pos = 0;
         // fetch first item
@@ -125,15 +125,15 @@ public class LazyItemIterator implements
     }
 
     /**
-     * Prefetches next item.
+     * Pre-fetches next item.
      * <p>
      * {@link #next} is set to the next available item in this iterator or to
      * <code>null</code> in case there are no more items.
      */
     private Item prefetchNext() {
         Item nextItem = null;
-        while (nextItem == null && iter.hasNext()) {
-            HierarchyEntry entry = iter.next();
+        while (nextItem == null && hierarchyEntries.hasNext()) {
+            HierarchyEntry entry = hierarchyEntries.next();
             try {
                 nextItem = itemMgr.getItem(entry);
             } catch (RepositoryException e) {
@@ -146,37 +146,29 @@ public class LazyItemIterator implements
     }
 
     //-------------------------------------------------------< NodeIterator >---
-    /**
-     * {@inheritDoc}
-     * @see NodeIterator#nextNode()
-     */
+
+    @Override
     public Node nextNode() {
         return (Node) next();
     }
 
     //---------------------------------------------------< PropertyIterator >---
-    /**
-     * {@inheritDoc}
-     * @see PropertyIterator#nextProperty()
-     */
+
+    @Override
     public Property nextProperty() {
         return (Property) next();
     }
 
     //----------------------------------------------------< VersionIterator >---
-    /**
-     * {@inheritDoc}
-     * @see VersionIterator#nextVersion()
-     */
+
+    @Override
     public Version nextVersion() {
         return (Version) next();
     }
 
     //------------------------------------------------------< RangeIterator >---
-    /**
-     * {@inheritDoc}
-     * @see javax.jcr.RangeIterator#getPosition()
-     */
+
+    @Override
     public long getPosition() {
         return pos;
     }
@@ -195,14 +187,12 @@ public class LazyItemIterator implements
      * @return the number of <code>Item</code>s in this iterator.
      * @see RangeIterator#getSize()
      */
+    @Override
     public long getSize() {
         return size;
     }
 
-    /**
-     * {@inheritDoc}
-     * @see RangeIterator#skip(long)
-     */
+    @Override
     public void skip(long skipNum) {
         if (skipNum < 0) {
             throw new IllegalArgumentException("skipNum must not be negative");
@@ -217,11 +207,11 @@ public class LazyItemIterator implements
         // skip the first (skipNum - 1) items without actually retrieving them
         while (--skipNum > 0) {
             pos++;
-            HierarchyEntry entry = iter.next();
+            HierarchyEntry entry = hierarchyEntries.next();
             // check if item exists but don't build Item instance.
             while (!itemMgr.itemExists(entry)) {
                 log.debug("Ignoring nonexistent item " + entry);
-                entry = iter.next();
+                entry = hierarchyEntries.next();
             }
         }
         // fetch final item (the one to be returned on next())
@@ -230,18 +220,13 @@ public class LazyItemIterator implements
     }
 
     //-----------------------------------------------------------< Iterator >---
-    /**
-     * {@inheritDoc}
-     * @see java.util.Iterator#hasNext()
-     */
+
+    @Override
     public boolean hasNext() {
         return next != null;
     }
 
-    /**
-     * {@inheritDoc}
-     * @see Iterator#next()
-     */
+    @Override
     public Object next() {
         if (next == null) {
             throw new NoSuchElementException();
@@ -252,12 +237,7 @@ public class LazyItemIterator implements
         return item;
     }
 
-    /**
-     * {@inheritDoc}
-     * @see Iterator#remove()
-     *
-     * @throws UnsupportedOperationException always since removal is not implemented.
-     */
+    @Override
     public void remove() {
         throw new UnsupportedOperationException("remove");
     }

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ManagerProvider.java Thu Sep  1 11:52:08 2011
@@ -36,17 +36,17 @@ import javax.jcr.RepositoryException;
  */
 public interface ManagerProvider {
 
-    public org.apache.jackrabbit.spi.commons.conversion.NamePathResolver getNamePathResolver();
+    org.apache.jackrabbit.spi.commons.conversion.NamePathResolver getNamePathResolver();
 
-    public NameResolver getNameResolver();
+    NameResolver getNameResolver();
 
-    public org.apache.jackrabbit.spi.commons.conversion.PathResolver getPathResolver();
+    org.apache.jackrabbit.spi.commons.conversion.PathResolver getPathResolver();
 
-    public NamespaceResolver getNamespaceResolver();
+    NamespaceResolver getNamespaceResolver();
 
-    public HierarchyManager getHierarchyManager();
+    HierarchyManager getHierarchyManager();
 
-    public AccessManager getAccessManager();
+    AccessManager getAccessManager();
 
     /**
      * Returns the <code>LockStateManager</code> associated with this
@@ -55,7 +55,7 @@ public interface ManagerProvider {
      * @return the <code>LockStateManager</code> associated with this
      * <code>ManagerProvider</code>
      */
-    public LockStateManager getLockStateManager();
+    LockStateManager getLockStateManager();
 
     /**
      * Returns the <code>VersionManager</code> associated with this
@@ -64,13 +64,13 @@ public interface ManagerProvider {
      * @return the <code>VersionManager</code> associated with this
      * <code>ManagerProvider</code>
      */
-    public VersionManager getVersionStateManager();
+    VersionManager getVersionStateManager();
 
-    public ItemDefinitionProvider getItemDefinitionProvider();
+    ItemDefinitionProvider getItemDefinitionProvider();
 
-    public NodeTypeDefinitionProvider getNodeTypeDefinitionProvider();
+    NodeTypeDefinitionProvider getNodeTypeDefinitionProvider();
 
-    public EffectiveNodeTypeProvider getEffectiveNodeTypeProvider();
+    EffectiveNodeTypeProvider getEffectiveNodeTypeProvider();
 
     /**
      * Same as {@link Session#getValueFactory()} but omits the check, if this repository
@@ -81,7 +81,7 @@ public interface ManagerProvider {
      * @return
      * @throws RepositoryException
      */
-    public ValueFactory getJcrValueFactory() throws RepositoryException;
+    ValueFactory getJcrValueFactory() throws RepositoryException;
 
-    public QValueFactory getQValueFactory() throws RepositoryException;
+    QValueFactory getQValueFactory() throws RepositoryException;
 }
\ No newline at end of file

Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NamespaceRegistryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NamespaceRegistryImpl.java?rev=1164026&r1=1164025&r2=1164026&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NamespaceRegistryImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NamespaceRegistryImpl.java Thu Sep  1 11:52:08 2011
@@ -31,8 +31,7 @@ import javax.jcr.RepositoryException;
  * NamespaceRegistry.
  */
 public class NamespaceRegistryImpl implements NamespaceRegistry {
-
-    private static Logger log = LoggerFactory.getLogger(NamespaceRegistryImpl.class);
+    private static final Logger log = LoggerFactory.getLogger(NamespaceRegistryImpl.class);
 
     private final NamespaceStorage storage;
 
@@ -47,40 +46,29 @@ public class NamespaceRegistryImpl imple
 
     //--------------------------------------------------< NamespaceRegistry >---
 
-    /**
-     * @see NamespaceRegistry#registerNamespace(String, String)
-     */
-    public void registerNamespace(String prefix, String uri) throws NamespaceException, UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public void registerNamespace(String prefix, String uri) throws RepositoryException {
         storage.registerNamespace(prefix, uri);
     }
 
-    /**
-     * @see NamespaceRegistry#unregisterNamespace(String)
-     */
-    public void unregisterNamespace(String prefix) throws NamespaceException, UnsupportedRepositoryOperationException, RepositoryException {
+    @Override
+    public void unregisterNamespace(String prefix) throws RepositoryException {
         storage.unregisterNamespace(getURI(prefix));
     }
 
-    /**
-     * @see javax.jcr.NamespaceRegistry#getPrefixes()
-     */
+    @Override
     public String[] getPrefixes() throws RepositoryException {
         Collection<String> prefixes = storage.getRegisteredNamespaces().keySet();
         return prefixes.toArray(new String[prefixes.size()]);
     }
 
-    /**
-     * @see javax.jcr.NamespaceRegistry#getURIs()
-     */
+    @Override
     public String[] getURIs() throws RepositoryException {
         Collection<String> uris = storage.getRegisteredNamespaces().values();
         return uris.toArray(new String[uris.size()]);
     }
 
-    /**
-     * @see javax.jcr.NamespaceRegistry#getURI(String)
-     * @see org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver#getURI(String)
-     */
+    @Override
     public String getURI(String prefix) throws NamespaceException {
         // try to load the uri
         try {
@@ -91,10 +79,7 @@ public class NamespaceRegistryImpl imple
         }
     }
 
-    /**
-     * @see javax.jcr.NamespaceRegistry#getPrefix(String)
-     * @see org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver#getPrefix(String)
-     */
+    @Override
     public String getPrefix(String uri) throws NamespaceException {
         // try to load the prefix
         try {



Mime
View raw message