You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2011/09/03 00:42:32 UTC
svn commit: r1164752 - in
/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi:
./ hierarchy/ lock/ nodetype/ operation/ state/ xml/
Author: mduerig
Date: Fri Sep 2 22:42:31 2011
New Revision: 1164752
URL: http://svn.apache.org/viewvc?rev=1164752&view=rev
Log:
Microkernel based Jackrabbit prototype (WIP)
clean up
Modified:
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/ItemManager.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/NodeImpl.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/hierarchy/HierarchyEntry.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/lock/LockStateManager.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/NodeTypeImpl.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/CreateActivity.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/Remove.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/SessionItemStateManager.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/SysViewImportHandler.java
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=1164752&r1=1164751&r2=1164752&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 Fri Sep 2 22:42:31 2011
@@ -58,7 +58,7 @@ public abstract class ItemImpl implement
/**
* The session that created this item.
*/
- protected SessionImpl session;
+ protected final SessionImpl session;
/**
* Listeners (weak references)
@@ -288,7 +288,7 @@ public abstract class ItemImpl implement
switch (state.getStatus()) {
// Nothing to do for
// - Status#EXISTING : modifications reverted or saved
- // inform listeneres about an update (status was MODIFIED before)
+ // inform listeners 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) {
@@ -300,7 +300,7 @@ public abstract class ItemImpl implement
// - 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#MODIFIED : externally modified -> marker for sessionISM states only
// - Status#EXISTING_REMOVED : transient removal
case Status.EXISTING_MODIFIED:
case Status.STALE_MODIFIED:
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=1164752&r1=1164751&r2=1164752&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 Fri Sep 2 22:42:31 2011
@@ -34,7 +34,7 @@ import javax.jcr.Property;
* instance. It is the factory for <code>Node</code> and <code>Property</code>
* instances.
* <p/>
- * The <code>ItemManager</code>'s responsabilities are:
+ * The <code>ItemManager</code>'s responsibilities are:
* <ul>
* <li>providing access to <code>Item</code> instances by <code>ItemState</code>
* whereas <code>Node</code> and <code>Item</code> are only providing relative access.
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=1164752&r1=1164751&r2=1164752&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 Fri Sep 2 22:42:31 2011
@@ -135,7 +135,7 @@ public class Jcr2spiRepositoryFactory im
* for details.
*/
@Override
- public Repository getRepository(@SuppressWarnings("unchecked") Map parameters) throws RepositoryException {
+ public Repository getRepository(Map parameters) throws RepositoryException {
RepositoryServiceFactory serviceFactory = getServiceFactory(parameters);
Object configParam = parameters.get(PARAM_REPOSITORY_CONFIG);
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=1164752&r1=1164751&r2=1164752&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 Fri Sep 2 22:42:31 2011
@@ -30,12 +30,6 @@ import javax.jcr.Node;
* <code>JcrLockManager</code>...
*/
public class JcrLockManager implements LockManager {
-
- /**
- * logger instance
- */
- private static final Logger log = LoggerFactory.getLogger(JcrLockManager.class);
-
private final LockStateManager lockStateMgr;
private final ItemManager itemManager;
private final PathResolver resolver;
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=1164752&r1=1164751&r2=1164752&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 Fri Sep 2 22:42:31 2011
@@ -297,7 +297,7 @@ public class JcrVersionManager implement
* after successful completion of the operation must reside within scope
* defined by this session.
* <br>
- * In addition this method varifies that the passed node is of type nt:activity.
+ * In addition this method verifies that the passed node is of type nt:activity.
*
* @param activityNode
* @param methodName
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Fri Sep 2 22:42:31 2011
@@ -905,15 +905,6 @@ public class NodeImpl extends ItemImpl i
return session.getWorkspace().getVersionManager().merge(getPath(), srcWorkspace, bestEffort);
}
-
- /**
- * TODO: Issue 728 of the pfd... this method is a leftover and will be removed in the final version.
- * -> change to package protected then
- */
- public NodeIterator merge(String srcWorkspace, boolean bestEffort, boolean isShallow) throws RepositoryException {
- return session.getWorkspace().getVersionManager().merge(getPath(), srcWorkspace, bestEffort, isShallow);
- }
-
@Override
public String getCorrespondingNodePath(String workspaceName) throws RepositoryException {
checkStatus();
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java Fri Sep 2 22:42:31 2011
@@ -439,15 +439,15 @@ public class WorkspaceImpl implements Wo
// NOTE: wspManager has already been disposed upon SessionItemStateManager.dispose()
}
- NameFactory getNameFactory() throws RepositoryException {
+ NameFactory getNameFactory() {
return wspManager.getNameFactory();
}
- PathFactory getPathFactory() throws RepositoryException {
+ PathFactory getPathFactory() {
return wspManager.getPathFactory();
}
- IdFactory getIdFactory() throws RepositoryException {
+ IdFactory getIdFactory() {
return wspManager.getIdFactory();
}
@@ -528,9 +528,7 @@ public class WorkspaceImpl implements Wo
* @return a new <code>ObservationManager</code> instance
* @throws RepositoryException If an error occurs.
*/
- protected ObservationManager createObservationManager(NamePathResolver resolver, NodeTypeRegistry ntRegistry)
- throws RepositoryException {
-
+ protected ObservationManager createObservationManager(NamePathResolver resolver, NodeTypeRegistry ntRegistry) {
return new ObservationManagerImpl(wspManager, resolver, ntRegistry);
}
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/HierarchyEntry.java Fri Sep 2 22:42:31 2011
@@ -176,7 +176,7 @@ public interface HierarchyEntry {
/**
* The required generation of this <code>HierarchyEntry</code> . This is used by the
- * {@link ItemInfoCache} to determine wheter an item info in the cache is up to date or not.
+ * {@link ItemInfoCache} to determine whether an item info in the cache is up to date or not.
* That is whether the generation of the item info in the cache is the same or more recent
* as the required generation of this entry.
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/hierarchy/NodeEntry.java Fri Sep 2 22:42:31 2011
@@ -70,7 +70,7 @@ public interface NodeEntry extends Hiera
void setUniqueID(String uniqueID);
/**
- * @return the index of this child node entry to suppport same-name siblings.
+ * @return the index of this child node entry to support same-name siblings.
* If the index of this entry cannot be determined
* {@link org.apache.jackrabbit.spi.Path#INDEX_UNDEFINED} is returned.
* @throws InvalidItemStateException
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/lock/LockStateManager.java Fri Sep 2 22:42:31 2011
@@ -114,7 +114,7 @@ public interface LockStateManager {
* @return The lock tokens associated with the <code>Session</code> this
* lock manager has been created for.
*/
- public String[] getLockTokens() throws RepositoryException;
+ String[] getLockTokens() throws RepositoryException;
/**
* Invoked by a session to inform that a lock token has been added.
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/EffectiveNodeTypeImpl.java Fri Sep 2 22:42:31 2011
@@ -401,14 +401,6 @@ public class EffectiveNodeTypeImpl imple
return defs.toArray(new QItemDefinition[defs.size()]);
}
- private QItemDefinition[] getNamedItemDefs(Name name) {
- List<QItemDefinition> list = namedItemDefs.get(name);
- if (list == null || list.isEmpty()) {
- return QNodeDefinition.EMPTY_ARRAY;
- }
- return list.toArray(new QItemDefinition[list.size()]);
- }
-
private QItemDefinition[] getUnnamedItemDefs() {
if (unnamedItemDefs.isEmpty()) {
return QItemDefinition.EMPTY_ARRAY;
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java Fri Sep 2 22:42:31 2011
@@ -110,7 +110,7 @@ public class NodeTypeImpl extends Abstra
* type conversions are attempted if the type of the given values does not
* match the required type as specified in the given definition.
*
- * @param def The definiton of the property
+ * @param def The definition of the property
* @param values An array of <code>QValue</code> objects.
* @throws ConstraintViolationException If a constraint is violated.
* @throws RepositoryException If another error occurs.
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/AbstractRemove.java Fri Sep 2 22:42:31 2011
@@ -33,8 +33,8 @@ import javax.jcr.version.VersionExceptio
* operations executed on the workspace such as removing versions or activities.
*/
public abstract class AbstractRemove extends AbstractOperation {
- protected ItemState removeState;
- protected NodeState parent;
+ protected final ItemState removeState;
+ protected final NodeState parent;
protected AbstractRemove(ItemState removeState, NodeState parent) {
this.removeState = removeState;
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/CreateActivity.java Fri Sep 2 22:42:31 2011
@@ -69,7 +69,7 @@ public class CreateActivity extends Abst
*
* @return
*/
- public String getTitle() throws RepositoryException {
+ public String getTitle() {
return title;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/LockOperation.java Fri Sep 2 22:42:31 2011
@@ -117,16 +117,6 @@ public class LockOperation extends Abstr
}
//------------------------------------------------------------< Factory >---
- /**
- *
- * @param nodeState
- * @param isDeep
- * @return
- */
- public static LockOperation create(NodeState nodeState, boolean isDeep, boolean isSessionScoped) {
- return create(nodeState, isDeep, isSessionScoped, Long.MAX_VALUE, null);
- }
-
public static LockOperation create(NodeState nodeState, boolean isDeep, boolean isSessionScoped, long timeoutHint, String ownerHint) {
return new LockOperation(nodeState, isDeep, isSessionScoped, timeoutHint, ownerHint);
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/operation/Remove.java Fri Sep 2 22:42:31 2011
@@ -87,7 +87,7 @@ public class Remove extends TransientOpe
//----------------------------------------< Access Operation Parameters >---
- public ItemId getRemoveId() throws RepositoryException {
+ public ItemId getRemoveId() {
return removeId;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/NodeState.java Fri Sep 2 22:42:31 2011
@@ -283,7 +283,7 @@ public class NodeState extends ItemState
*
* @return true if definition has already been calculated.
*/
- public boolean hasDefinition() throws RepositoryException {
+ public boolean hasDefinition() {
return definition != null;
}
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/state/SessionItemStateManager.java Fri Sep 2 22:42:31 2011
@@ -420,7 +420,7 @@ public class SessionItemStateManager ext
validator.checkAddProperty(parent, propertyName, pDef, options);
// create property state
- return transientStateMgr.createNewPropertyState(propertyName, parent, pDef, values, propertyType);
+ return TransientItemStateManager.createNewPropertyState(propertyName, parent, pDef, values, propertyType);
}
private List<ItemState> addNodeState(NodeState parent, Name nodeName, Name nodeTypeName, String uuid,
@@ -448,7 +448,7 @@ public class SessionItemStateManager ext
// create new nodeState. NOTE, that the uniqueID is not added to the
// state for consistency between 'addNode' and importXML
- NodeState nodeState = transientStateMgr.createNewNodeState(nodeName, null, nodeTypeName, definition, parent);
+ NodeState nodeState = TransientItemStateManager.createNewNodeState(nodeName, null, nodeTypeName, definition, parent);
addedStates.add(nodeState);
if (uuid != null) {
QValue[] value = getQValues(uuid, qValueFactory);
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java Fri Sep 2 22:42:31 2011
@@ -72,7 +72,7 @@ public class ImportHandler extends Defau
/**
* this flag is used to determine whether a namespace context needs to be
* started in the startElement event or if the namespace context has already
- * been started in a preceeding startPrefixMapping event;
+ * been started in a preceding startPrefixMapping event;
* the flag is set per element in the first startPrefixMapping event and is
* cleared again in the following startElement event;
*/
Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java?rev=1164752&r1=1164751&r2=1164752&view=diff
==============================================================================
--- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java (original)
+++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java Fri Sep 2 22:42:31 2011
@@ -322,7 +322,7 @@ class SysViewImportHandler extends Targe
/**
* list of PropInfo instances representing properties of current node
*/
- List<Importer.PropInfo> props = new ArrayList<Importer.PropInfo>();
+ final List<Importer.PropInfo> props = new ArrayList<Importer.PropInfo>();
/**
* flag indicating whether startNode() has been called for current node