You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by an...@apache.org on 2006/10/02 17:33:47 UTC
svn commit: r452074 -
/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
Author: angela
Date: Mon Oct 2 08:33:47 2006
New Revision: 452074
URL: http://svn.apache.org/viewvc?view=rev&rev=452074
Log:
work in progress
- remove DIFF comment
Modified:
jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java?view=diff&rev=452074&r1=452073&r2=452074
==============================================================================
--- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java (original)
+++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java Mon Oct 2 08:33:47 2006
@@ -917,7 +917,6 @@
try {
// create session on other workspace for current subject
// (may throw NoSuchWorkspaceException and AccessDeniedException)
- // DIFF JR: srcSession = rep.createSession(session.getSubject(), workspaceName);
srcSession = session.switchWorkspace(workspaceName);
// search nearest ancestor that is referenceable
@@ -1324,7 +1323,6 @@
throws ItemExistsException, NoSuchNodeTypeException, VersionException,
ConstraintViolationException, LockException, RepositoryException {
- // DIFF JR: remove check that assert existing nt. this should be done within following statement
QNodeDefinition definition = session.getValidator().getApplicableNodeDefinition(nodeName, nodeTypeName, getNodeState());
if (nodeTypeName == null) {
// use default node type
@@ -1485,7 +1483,6 @@
return false;
}
NodeTypeImpl primaryType = ntMgr.getNodeType(primaryTypeName);
- // DIFF JR: replaced 'isDerivedFrom' by 'isNodeType'
if (primaryType.isNodeType(mixinName)) {
log.error(mixin.getName() + ": already contained in primary node type");
return false;