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 2005/02/11 15:54:42 UTC
svn commit: r153406 - in
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version:
VersionItemStateProvider.java persistence/NativeItemStateManager.java
persistence/NativePVM.java
Author: tripod
Date: Fri Feb 11 06:54:40 2005
New Revision: 153406
URL: http://svn.apache.org/viewcvs?view=rev&rev=153406
Log:
- fixing JCR-41 (warn messages during checkin/checkout)
Removed:
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativeItemStateManager.java
Modified:
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java?view=diff&r1=153405&r2=153406
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java Fri Feb 11 06:54:40 2005
@@ -228,7 +228,7 @@
// add state to cache
nodes.put(id, state);
- log.info("item added to cache. size=" + nodes.size());
+ log.debug("item added to cache. size=" + nodes.size());
}
return state;
}
Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java
URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java?view=diff&r1=153405&r2=153406
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java (original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/persistence/NativePVM.java Fri Feb 11 06:54:40 2005
@@ -120,7 +120,12 @@
/**
* the state manager for the version storage
*/
- private NativeItemStateManager stateMgr;
+ private LocalItemStateManager stateMgr;
+
+ /**
+ * the persistence manager
+ */
+ private PersistenceManager pMgr;
/**
* mapping from virtual uuids to persistent ids of the persistent nodes
@@ -154,7 +159,10 @@
public NativePVM(PersistenceManager pMgr, NodeTypeRegistry ntReg) throws RepositoryException {
try {
long t1 = System.currentTimeMillis();
- this.stateMgr = new NativeItemStateManager(pMgr, PERSISTENT_ROOT_ID.getUUID(), ntReg);
+ //this.stateMgr = new NativeItemStateManager(pMgr, PERSISTENT_ROOT_ID.getUUID(), ntReg);
+ this.pMgr = pMgr;
+ SharedItemStateManager sharedStateMgr = new SharedItemStateManager(pMgr, PERSISTENT_ROOT_ID.getUUID(), ntReg);
+ stateMgr = new LocalItemStateManager(sharedStateMgr);
NodeState nodeState = (NodeState) stateMgr.getItemState(PERSISTENT_ROOT_ID);
historyRoot = new PersistentNode(stateMgr, nodeState);
initVirtualIds(historyRoot.getState());
@@ -173,7 +181,7 @@
*/
public void close() throws Exception {
// @todo check proper shutdown sequence
- this.stateMgr.persistMgr.close();
+ this.pMgr.close();
this.stateMgr = null;
}
@@ -211,7 +219,7 @@
}
if (id.type == PersistentId.TYPE_HISTORY) {
// need to retrieve the versioned uuid in order to avoid collisions
- PropertyState ps = stateMgr.getPropertyState(new PropertyId(state.getUUID(), PROPNAME_VERSIONABLE_ID));
+ PropertyState ps = (PropertyState) stateMgr.getItemState(new PropertyId(state.getUUID(), PROPNAME_VERSIONABLE_ID));
String vid = (String) ps.getValues()[0].internalValue();
versionedUUIDs.put(vid, id.externalId);
}