You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by tr...@apache.org on 2009/07/22 21:22:26 UTC
svn commit: r796845 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core:
./ version/ xml/
Author: tripod
Date: Wed Jul 22 19:22:25 2009
New Revision: 796845
URL: http://svn.apache.org/viewvc?rev=796845&view=rev
Log:
JCR-2221 - Rename "Version Managers" (1. step: renamed VersionManager)
Added:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManager.java (contents, props changed)
- copied, changed from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java (contents, props changed)
- copied, changed from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java (contents, props changed)
- copied, changed from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java (contents, props changed)
- copied, changed from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java
Removed:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManager.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JcrVersionManagerImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalActivityImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalConfigurationImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreezeImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImplBase.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java Wed Jul 22 19:22:25 2009
@@ -59,7 +59,7 @@
import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.core.version.VersionHistoryInfo;
-import org.apache.jackrabbit.core.version.VersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
@@ -1814,7 +1814,7 @@
PropertyState prop = (PropertyState) srcStateMgr.getItemState(propId);
copiedFrom = prop.getValues()[0].getNodeId();
}
- VersionManager manager = session.getVersionManager();
+ InternalVersionManager manager = session.getInternalVersionManager();
history = manager.getVersionHistory(session, newState, copiedFrom);
}
// copy properties
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java Wed Jul 22 19:22:25 2009
@@ -66,7 +66,7 @@
import org.apache.jackrabbit.core.state.StaleItemStateException;
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.core.version.VersionHistoryInfo;
-import org.apache.jackrabbit.core.version.VersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
@@ -731,7 +731,7 @@
if (nt.includesNodeType(NameConstants.MIX_VERSIONABLE)) {
if (!nodeState.hasPropertyName(NameConstants.JCR_VERSIONHISTORY)) {
NodeImpl node = (NodeImpl) itemMgr.getItem(itemState.getId());
- VersionManager vMgr = session.getVersionManager();
+ InternalVersionManager vMgr = session.getInternalVersionManager();
/**
* check if there's already a version history for that
* node; this would e.g. be the case if a versionable
@@ -762,7 +762,7 @@
// we need to check the version manager for an existing
// version history, since simple versioning does not
// expose it's reference in a property
- VersionManager vMgr = session.getVersionManager();
+ InternalVersionManager vMgr = session.getInternalVersionManager();
vMgr.getVersionHistory(session, nodeState, null);
// create isCheckedOutProperty if not already exists
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JcrVersionManagerImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JcrVersionManagerImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JcrVersionManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/JcrVersionManagerImpl.java Wed Jul 22 19:22:25 2009
@@ -475,7 +475,7 @@
* {@inheritDoc}
*/
public Node createActivity(String title) throws RepositoryException {
- NodeId id = session.getVersionManager().createActivity(session, title);
+ NodeId id = vMgr.createActivity(session, title);
return session.getNodeById(id);
}
@@ -488,7 +488,7 @@
throw new UnsupportedRepositoryOperationException("Given node is not an activity.");
}
NodeId actId = actNode.getNodeId();
- session.getVersionManager().removeActivity(session, actId);
+ vMgr.removeActivity(session, actId);
if (actId.equals(currentActivity)) {
currentActivity = null;
}
@@ -502,7 +502,7 @@
if (!actNode.isNodeType(NameConstants.NT_ACTIVITY)) {
throw new UnsupportedRepositoryOperationException("Given node is not an activity.");
}
- InternalActivity activity = session.getVersionManager().getActivity(actNode.getNodeId());
+ InternalActivity activity = vMgr.getActivity(actNode.getNodeId());
if (activity == null) {
throw new UnsupportedRepositoryOperationException("Given activity not found.");
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryCopier.java Wed Jul 22 19:22:25 2009
@@ -32,7 +32,7 @@
import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry;
import org.apache.jackrabbit.core.persistence.PersistenceCopier;
import org.apache.jackrabbit.core.state.ItemStateException;
-import org.apache.jackrabbit.core.version.VersionManagerImpl;
+import org.apache.jackrabbit.core.version.InternalVersionManagerImpl;
import org.apache.jackrabbit.spi.Name;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -176,7 +176,7 @@
}
private void copyVersionStore(
- VersionManagerImpl source, VersionManagerImpl target)
+ InternalVersionManagerImpl source, InternalVersionManagerImpl target)
throws RepositoryException, ItemStateException {
logger.info("Copying version histories");
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java Wed Jul 22 19:22:25 2009
@@ -97,8 +97,8 @@
import org.apache.jackrabbit.core.state.ManagedMLRUItemStateCacheFactory;
import org.apache.jackrabbit.core.state.SharedItemStateManager;
import org.apache.jackrabbit.core.util.RepositoryLockMechanism;
-import org.apache.jackrabbit.core.version.VersionManager;
-import org.apache.jackrabbit.core.version.VersionManagerImpl;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManagerImpl;
import org.apache.jackrabbit.core.xml.ClonedInputSource;
import org.apache.jackrabbit.spi.commons.name.NameConstants;
import org.apache.jackrabbit.spi.commons.namespace.NamespaceResolver;
@@ -169,7 +169,7 @@
private final NamespaceRegistryImpl nsReg;
private final NodeTypeRegistry ntReg;
- private final VersionManagerImpl vMgr;
+ private final InternalVersionManagerImpl vMgr;
private final VirtualNodeTypeStateManager virtNTMgr;
/**
@@ -459,7 +459,7 @@
* @return the newly created version manager
* @throws RepositoryException if an error occurs
*/
- protected VersionManagerImpl createVersionManager(VersioningConfig vConfig,
+ protected InternalVersionManagerImpl createVersionManager(VersioningConfig vConfig,
DelegatingObservationDispatcher delegatingDispatcher)
throws RepositoryException {
@@ -475,7 +475,7 @@
ISMLocking ismLocking = vConfig.getISMLocking();
- return new VersionManagerImpl(pm, fs, ntReg, delegatingDispatcher,
+ return new InternalVersionManagerImpl(pm, fs, ntReg, delegatingDispatcher,
SYSTEM_ROOT_NODE_ID,
VERSION_STORAGE_NODE_ID,
ACTIVITIES_NODE_ID,
@@ -701,7 +701,7 @@
return ntReg;
}
- protected VersionManager getVersionManager() {
+ protected InternalVersionManager getVersionManager() {
return vMgr;
}
@@ -2338,7 +2338,7 @@
}
}
- VersionManagerImpl getVersionManagerImpl() {
+ InternalVersionManagerImpl getVersionManagerImpl() {
return vMgr;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java Wed Jul 22 19:22:25 2009
@@ -89,8 +89,8 @@
import org.apache.jackrabbit.core.state.SharedItemStateManager;
import org.apache.jackrabbit.core.util.Dumpable;
import org.apache.jackrabbit.core.value.ValueFactoryImpl;
-import org.apache.jackrabbit.core.version.VersionManager;
-import org.apache.jackrabbit.core.version.VersionManagerImpl;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManagerImpl;
import org.apache.jackrabbit.core.xml.ImportHandler;
import org.apache.jackrabbit.core.xml.SessionImporter;
import org.apache.jackrabbit.spi.Name;
@@ -198,7 +198,7 @@
/**
* The version manager for this session
*/
- protected final VersionManager versionMgr;
+ protected final InternalVersionManager versionMgr;
/**
* Listeners (weak references)
@@ -338,7 +338,7 @@
* the repository version manager.
* @return version manager
*/
- protected VersionManager createVersionManager(RepositoryImpl rep)
+ protected InternalVersionManager createVersionManager(RepositoryImpl rep)
throws RepositoryException {
return rep.getVersionManager();
@@ -476,11 +476,11 @@
}
/**
- * Returns the <code>VersionManager</code> associated with this session.
+ * Returns the <code>InternalVersionManager</code> associated with this session.
*
- * @return the <code>VersionManager</code> associated with this session
+ * @return the <code>InternalVersionManager</code> associated with this session
*/
- public VersionManager getVersionManager() {
+ public InternalVersionManager getInternalVersionManager() {
return versionMgr;
}
@@ -643,7 +643,7 @@
*/
public GarbageCollector createDataStoreGarbageCollector() throws RepositoryException {
ArrayList<PersistenceManager> pmList = new ArrayList<PersistenceManager>();
- VersionManagerImpl vm = (VersionManagerImpl) rep.getVersionManager();
+ InternalVersionManagerImpl vm = (InternalVersionManagerImpl) rep.getVersionManager();
PersistenceManager pm = vm.getPersistenceManager();
pmList.add(pm);
String[] wspNames = rep.getWorkspaceNames();
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/XASessionImpl.java Wed Jul 22 19:22:25 2009
@@ -24,9 +24,9 @@
import org.apache.jackrabbit.core.security.authentication.AuthContext;
import org.apache.jackrabbit.core.state.SharedItemStateManager;
import org.apache.jackrabbit.core.state.XAItemStateManager;
-import org.apache.jackrabbit.core.version.VersionManager;
-import org.apache.jackrabbit.core.version.VersionManagerImpl;
-import org.apache.jackrabbit.core.version.XAVersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManagerImpl;
+import org.apache.jackrabbit.core.version.InternalXAVersionManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -134,7 +134,7 @@
private void init() throws RepositoryException {
XAItemStateManager stateMgr = (XAItemStateManager) wsp.getItemStateManager();
XALockManager lockMgr = (XALockManager) getLockManager();
- XAVersionManager versionMgr = (XAVersionManager) getVersionManager();
+ InternalXAVersionManager versionMgr = (InternalXAVersionManager) getInternalVersionManager();
/**
* Create array that contains all resources that participate in this
@@ -170,11 +170,11 @@
/**
* {@inheritDoc}
*/
- protected VersionManager createVersionManager(RepositoryImpl rep)
+ protected InternalVersionManager createVersionManager(RepositoryImpl rep)
throws RepositoryException {
- VersionManagerImpl vMgr = (VersionManagerImpl) rep.getVersionManager();
- return new XAVersionManager(vMgr, rep.getNodeTypeRegistry(), this, rep.getItemStateCacheFactory());
+ InternalVersionManagerImpl vMgr = (InternalVersionManagerImpl) rep.getVersionManager();
+ return new InternalXAVersionManager(vMgr, rep.getNodeTypeRegistry(), this, rep.getItemStateCacheFactory());
}
/**
@@ -410,9 +410,9 @@
super.logout();
// dispose the caches
try {
- ((XAVersionManager) versionMgr).close();
+ ((InternalXAVersionManager) versionMgr).close();
} catch (Exception e) {
- log.warn("error while closing XAVersionManager", e);
+ log.warn("error while closing InternalXAVersionManager", e);
}
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalActivityImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalActivityImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalActivityImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalActivityImpl.java Wed Jul 22 19:22:25 2009
@@ -33,7 +33,7 @@
/**
* Implements a internal representation of an activity node.
- * this is only for the {@link XAVersionManager}.
+ * this is only for the {@link InternalXAVersionManager}.
*/
class InternalActivityImpl extends InternalVersionItemImpl implements InternalActivity {
@@ -43,7 +43,7 @@
* @param node version history node state
* @throws RepositoryException if an error occurs
*/
- public InternalActivityImpl(AbstractVersionManager vMgr, NodeStateEx node)
+ public InternalActivityImpl(InternalVersionManagerBase vMgr, NodeStateEx node)
throws RepositoryException {
super(vMgr, node);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalConfigurationImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalConfigurationImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalConfigurationImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalConfigurationImpl.java Wed Jul 22 19:22:25 2009
@@ -35,7 +35,7 @@
* @param node version history node state
* @throws RepositoryException if an error occurs
*/
- public InternalConfigurationImpl(AbstractVersionManager vMgr, NodeStateEx node)
+ public InternalConfigurationImpl(InternalVersionManagerBase vMgr, NodeStateEx node)
throws RepositoryException {
super(vMgr, node);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreezeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreezeImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreezeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreezeImpl.java Wed Jul 22 19:22:25 2009
@@ -33,7 +33,7 @@
* @param vMgr
* @param parent
*/
- protected InternalFreezeImpl(AbstractVersionManager vMgr, NodeStateEx node, InternalVersionItem parent) {
+ protected InternalFreezeImpl(InternalVersionManagerBase vMgr, NodeStateEx node, InternalVersionItem parent) {
super(vMgr, node);
this.parent = parent;
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java Wed Jul 22 19:22:25 2009
@@ -94,7 +94,7 @@
* @param parent parent item
* @throws RepositoryException if an error occurs
*/
- public InternalFrozenNodeImpl(AbstractVersionManager vMgr, NodeStateEx node,
+ public InternalFrozenNodeImpl(InternalVersionManagerBase vMgr, NodeStateEx node,
InternalVersionItem parent)
throws RepositoryException {
super(vMgr, node, parent);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java Wed Jul 22 19:22:25 2009
@@ -34,7 +34,7 @@
*
* @param node
*/
- public InternalFrozenVHImpl(AbstractVersionManager vMgr, NodeStateEx node,
+ public InternalFrozenVHImpl(InternalVersionManagerBase vMgr, NodeStateEx node,
InternalVersionItem parent) {
super(vMgr, node, parent);
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java Wed Jul 22 19:22:25 2009
@@ -109,7 +109,7 @@
* @param node version history node state
* @throws RepositoryException if an error occurs
*/
- public InternalVersionHistoryImpl(AbstractVersionManager vMgr, NodeStateEx node)
+ public InternalVersionHistoryImpl(InternalVersionManagerBase vMgr, NodeStateEx node)
throws RepositoryException {
super(vMgr, node);
init();
@@ -585,7 +585,7 @@
* @throws RepositoryException if an error occurs
*/
static NodeStateEx create(
- AbstractVersionManager vMgr, NodeStateEx parent, Name name,
+ InternalVersionManagerBase vMgr, NodeStateEx parent, Name name,
NodeState nodeState, NodeId copiedFrom) throws RepositoryException {
// create history node
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionItemImpl.java Wed Jul 22 19:22:25 2009
@@ -31,14 +31,14 @@
/**
* the version manager
*/
- protected final AbstractVersionManager vMgr;
+ protected final InternalVersionManagerBase vMgr;
/**
* Creates a new Internal version item impl
*
* @param vMgr
*/
- protected InternalVersionItemImpl(AbstractVersionManager vMgr, NodeStateEx node) {
+ protected InternalVersionItemImpl(InternalVersionManagerBase vMgr, NodeStateEx node) {
this.vMgr = vMgr;
this.node = node;
}
@@ -48,7 +48,7 @@
*
* @return the version manager.
*/
- protected AbstractVersionManager getVersionManager() {
+ protected InternalVersionManagerBase getVersionManager() {
return vMgr;
}
Copied: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManager.java (from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManager.java?p2=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManager.java&p1=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManager.java&r1=796586&r2=796845&rev=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManager.java Wed Jul 22 19:22:25 2009
@@ -30,7 +30,7 @@
* This interface defines the version manager. It gives access to the underlying
* persistence layer of the versioning.
*/
-public interface VersionManager {
+public interface InternalVersionManager {
/**
* returns the virtual item state provider that exposes the internal versions
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java (from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java?p2=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java&p1=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java&r1=796586&r2=796845&rev=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java Wed Jul 22 19:22:25 2009
@@ -42,17 +42,17 @@
import org.slf4j.LoggerFactory;
/**
- * Base implementation of the {@link VersionManager} interface.
+ * Base implementation of the {@link InternalVersionManager} interface.
* <p/>
* All read operations must acquire the read lock before reading, all write
* operations must acquire the write lock.
*/
-abstract class AbstractVersionManager implements VersionManager {
+abstract class InternalVersionManagerBase implements InternalVersionManager {
/**
* Logger instance.
*/
- private static Logger log = LoggerFactory.getLogger(AbstractVersionManager.class);
+ private static Logger log = LoggerFactory.getLogger(InternalVersionManagerBase.class);
/**
* State manager for the version storage.
@@ -84,11 +84,11 @@
*/
private final DefaultISMLocking rwLock = new DefaultISMLocking();
- public AbstractVersionManager(NodeTypeRegistry ntReg) {
+ public InternalVersionManagerBase(NodeTypeRegistry ntReg) {
this.ntReg = ntReg;
}
- //-------------------------------------------------------< VersionManager >
+ //-------------------------------------------------------< InternalVersionManager >
/**
* {@inheritDoc}
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerBase.java
------------------------------------------------------------------------------
svn:keywords = author date id revision url
Copied: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java (from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java?p2=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java&p1=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java&r1=796586&r2=796845&rev=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java Wed Jul 22 19:22:25 2009
@@ -66,13 +66,13 @@
/**
* This Class implements a VersionManager.
*/
-public class VersionManagerImpl extends AbstractVersionManager
+public class InternalVersionManagerImpl extends InternalVersionManagerBase
implements ItemStateListener, UpdateEventListener {
/**
* the default logger
*/
- private static Logger log = LoggerFactory.getLogger(VersionManager.class);
+ private static Logger log = LoggerFactory.getLogger(InternalVersionManager.class);
/**
* The path to the version storage: /jcr:system/jcr:versionStorage
@@ -163,7 +163,7 @@
* @param ismLocking workspace item state locking
* @throws RepositoryException if an error occurs
*/
- public VersionManagerImpl(PersistenceManager pMgr, FileSystem fs,
+ public InternalVersionManagerImpl(PersistenceManager pMgr, FileSystem fs,
NodeTypeRegistry ntReg,
DelegatingObservationDispatcher obsMgr,
NodeId rootParentId,
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java
------------------------------------------------------------------------------
svn =
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java (from r796586, jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java)
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java?p2=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java&p1=jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java&r1=796586&r2=796845&rev=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java Wed Jul 22 19:22:25 2009
@@ -51,11 +51,11 @@
import org.apache.jackrabbit.spi.commons.name.NameConstants;
/**
- * Implementation of a {@link VersionManager} that works in an XA environment.
+ * Implementation of a {@link InternalVersionManager} that works in an XA environment.
* Works as a filter between a version manager client and the global version
* manager.
*/
-public class XAVersionManager extends AbstractVersionManager
+public class InternalXAVersionManager extends InternalVersionManagerBase
implements EventStateCollectionFactory, VirtualItemStateProvider, InternalXAResource {
/**
@@ -71,7 +71,7 @@
/**
* Repository version manager.
*/
- private final VersionManagerImpl vMgr;
+ private final InternalVersionManagerImpl vMgr;
/**
* The session that uses this version manager.
@@ -102,7 +102,7 @@
* @param cacheFactory cache factory
* @throws RepositoryException if a an error occurs
*/
- public XAVersionManager(VersionManagerImpl vMgr, NodeTypeRegistry ntReg,
+ public InternalXAVersionManager(InternalVersionManagerImpl vMgr, NodeTypeRegistry ntReg,
SessionImpl session, ItemStateCacheFactory cacheFactory)
throws RepositoryException {
super(ntReg);
@@ -130,7 +130,7 @@
return vMgr.getEscFactory().createEventStateCollection(session);
}
- //-------------------------------------------------------< VersionManager >
+ //-------------------------------------------------------< InternalVersionManager >
/**
* {@inheritDoc}
@@ -421,7 +421,7 @@
public void removeListener(ItemStateListener listener) {
}
- //-----------------------------------------------< AbstractVersionManager >
+ //-----------------------------------------------< InternalVersionManagerBase >
/**
* {@inheritDoc}
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalXAVersionManager.java
------------------------------------------------------------------------------
svn:keywords = author date id revision url
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImplBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImplBase.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImplBase.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/JcrVersionManagerImplBase.java Wed Jul 22 19:22:25 2009
@@ -77,7 +77,7 @@
/**
* the session version manager.
*/
- protected final VersionManager vMgr;
+ protected final InternalVersionManager vMgr;
/**
* the lock on this version manager
@@ -102,7 +102,7 @@
this.stateMgr = stateMgr;
this.hierMgr = hierMgr;
this.ntReg = session.getNodeTypeManager().getNodeTypeRegistry();
- this.vMgr = session.getVersionManager();
+ this.vMgr = session.getInternalVersionManager();
}
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java Wed Jul 22 19:22:25 2009
@@ -72,7 +72,7 @@
protected InternalVersionHistory getInternalVersionHistory()
throws RepositoryException {
InternalVersionHistory history =
- session.getVersionManager().getVersionHistory((NodeId) id);
+ session.getInternalVersionManager().getVersionHistory((NodeId) id);
if (history == null) {
throw new InvalidItemStateException(id + ": the item does not exist anymore");
}
@@ -163,7 +163,7 @@
try {
// check permissions
checkVersionManagementPermission();
- session.getVersionManager().setVersionLabel(
+ session.getInternalVersionManager().setVersionLabel(
session, getInternalVersionHistory(), session.getQName(versionName),
session.getQName(label), move);
} catch (NameException e) {
@@ -178,7 +178,7 @@
try {
// check permissions
checkVersionManagementPermission();
- InternalVersion existing = session.getVersionManager().setVersionLabel(
+ InternalVersion existing = session.getInternalVersionManager().setVersionLabel(
session, getInternalVersionHistory(), null, session.getQName(label), true);
if (existing == null) {
throw new VersionException("No version with label '" + label + "' exists in this version history.");
@@ -250,7 +250,7 @@
try {
// check permissions
checkVersionManagementPermission();
- session.getVersionManager().removeVersion(session,
+ session.getInternalVersionManager().removeVersion(session,
getInternalVersionHistory(), session.getQName(versionName));
} catch (NameException e) {
throw new RepositoryException(e);
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionImpl.java Wed Jul 22 19:22:25 2009
@@ -61,7 +61,7 @@
*/
protected InternalVersion getInternalVersion() throws RepositoryException {
InternalVersion version =
- session.getVersionManager().getVersion((NodeId) id);
+ session.getInternalVersionManager().getVersion((NodeId) id);
if (version == null) {
throw new InvalidItemStateException(id + ": the item does not exist anymore");
}
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java Wed Jul 22 19:22:25 2009
@@ -87,7 +87,7 @@
Name name, int type,
boolean multiValued)
throws RepositoryException {
- throw new IllegalStateException("VersionManager should never create a VirtualPropertyState");
+ throw new IllegalStateException("InternalVersionManager should never create a VirtualPropertyState");
}
/**
@@ -96,7 +96,7 @@
public VirtualNodeState createNodeState(VirtualNodeState parent, Name name,
NodeId id, Name nodeTypeName)
throws RepositoryException {
- throw new IllegalStateException("VersionManager should never create a VirtualNodeState");
+ throw new IllegalStateException("InternalVersionManager should never create a VirtualNodeState");
}
/**
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java?rev=796845&r1=796844&r2=796845&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java Wed Jul 22 19:22:25 2009
@@ -31,7 +31,7 @@
import org.apache.jackrabbit.core.util.ReferenceChangeTracker;
import org.apache.jackrabbit.core.value.InternalValue;
import org.apache.jackrabbit.core.version.VersionHistoryInfo;
-import org.apache.jackrabbit.core.version.VersionManager;
+import org.apache.jackrabbit.core.version.InternalVersionManager;
import org.apache.jackrabbit.spi.Name;
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.spi.commons.conversion.MalformedPathException;
@@ -63,7 +63,7 @@
private final NodeState importTarget;
private final WorkspaceImpl wsp;
private final SessionImpl session;
- private final VersionManager versionManager;
+ private final InternalVersionManager versionManager;
private final NodeTypeRegistry ntReg;
private final HierarchyManager hierMgr;
private final BatchedItemOperations itemOps;
@@ -107,7 +107,7 @@
VersionException, LockException, RepositoryException {
this.wsp = wsp;
this.session = (SessionImpl) wsp.getSession();
- this.versionManager = session.getVersionManager();
+ this.versionManager = session.getInternalVersionManager();
this.ntReg = ntReg;
this.uuidBehavior = uuidBehavior;