Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 90568 invoked from network); 17 Aug 2006 16:11:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 17 Aug 2006 16:11:18 -0000 Received: (qmail 5325 invoked by uid 500); 17 Aug 2006 16:11:17 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 5293 invoked by uid 500); 17 Aug 2006 16:11:17 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 5284 invoked by uid 99); 17 Aug 2006 16:11:17 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Aug 2006 09:11:17 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Aug 2006 09:11:16 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 7D7041A981A; Thu, 17 Aug 2006 09:10:56 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r432272 - in /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi: ItemImpl.java LazyItemIterator.java NodeImpl.java PropertyImpl.java RepositoryImpl.java WorkspaceImpl.java Date: Thu, 17 Aug 2006 16:10:55 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060817161056.7D7041A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: angela Date: Thu Aug 17 09:10:54 2006 New Revision: 432272 URL: http://svn.apache.org/viewvc?rev=432272&view=rev Log: work in progress - javadoc - remove DIFF comments Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/NodeImpl.java jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java?rev=432272&r1=432271&r2=432272&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/ItemImpl.java Thu Aug 17 09:10:54 2006 @@ -106,7 +106,6 @@ public String getPath() throws RepositoryException { checkStatus(); try { - // DIFF JR: use nsResolver return PathFormat.format(getQPath(), session.getNamespaceResolver()); } catch (NoPrefixDeclaredException npde) { // should never get here... @@ -249,7 +248,7 @@ checkStatus(); if (keepChanges) { - /** todo FIXME should reset Item#status field to STATUS_NORMAL + /** TODO should reset Item#status field to STATUS_NORMAL * of all descendent non-transient instances; maybe also * have to reset stale ItemState instances */ return; @@ -472,7 +471,6 @@ } //------------------------------------------------------< check methods >--- - // DIFF TO JACKRABBIT: consistenly naming of 'checkMethods' /** * Performs a sanity check on this item and the associated session. * @@ -590,7 +588,6 @@ /** - * DIFF JACKRABBIT * Failsafe conversion of internal Path to JCR path for use in * error messages etc. * Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java?rev=432272&r1=432271&r2=432272&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/LazyItemIterator.java Thu Aug 17 09:10:54 2006 @@ -142,8 +142,9 @@ * Always returns -1 */ public long getSize() { - // DIFF JR always return -1, since original list may contains items that - // are not accessible due to access constraints + // Always returns -1, since the original list may contains items that + // are not accessible due to access constraints. -1 seems preferable + // to returning a size that is not correct. return UNDEFINED_SIZE; } 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?rev=432272&r1=432271&r2=432272&view=diff ============================================================================== --- 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 Thu Aug 17 09:10:54 2006 @@ -114,7 +114,6 @@ if (session.getNodeTypeManager().hasNodeType(nodeTypeName)) { primaryTypeName = nodeTypeName; } else { - // DIFF JR: jr defines nt:unstructured as fallback. // should not occur. Since nodetypes are defined by the 'server' // its not possible to determine a fallback nodetype that is // always available. @@ -767,7 +766,6 @@ checkIsVersionable(); checkHasPendingChanges(); checkIsLocked(); - // DIFF JR if (isCheckedOut()) { session.getVersionManager().checkin(getNodeState()); } else { @@ -783,7 +781,6 @@ public void checkout() throws UnsupportedRepositoryOperationException, LockException, RepositoryException { checkIsVersionable(); checkIsLocked(); - // DIFF JR if (!isCheckedOut()) { session.getVersionManager().checkout(getNodeState()); } else { @@ -1166,12 +1163,10 @@ checkSupportedOption(Repository.OPTION_LOCKING_SUPPORTED); checkStatus(); - // DIFF JR: swich check if (isNew() || !isNodeType(QName.MIX_LOCKABLE)) { // a node that is new or not lockable never holds a lock return false; } else { - // DIFF JR: no separate LockManager.holdsLock LockManager lMgr = session.getLockManager(); return (lMgr.isLocked(getNodeState()) && lMgr.getLock(getNodeState()).getNode().isSame(this)); } @@ -1378,7 +1373,6 @@ } } - // DIFF JR: instead of 'getORCreate' only create... /** * Create a new single valued property * @@ -1408,7 +1402,6 @@ return createProperty(qName, targetType, def, new QValue[] {qvs}); } - // DIFF JR: instead of 'getORCreate' only create... /** * Create a new multivalue property * Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java?rev=432272&r1=432271&r2=432272&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/PropertyImpl.java Thu Aug 17 09:10:54 2006 @@ -494,7 +494,6 @@ return getPropertyState().getValues(); } - // DIFF JR: extracted from JR setValue-methods /** * * @param value @@ -523,7 +522,6 @@ setInternalValues(new QValue[]{qValue}, requiredType); } - // DIFF JACKRABBIT: protected void internalSetValue(QValue[] values, int type) /** * * @param qValues @@ -535,7 +533,6 @@ // check for null value if (qValues == null) { // setting a property to null removes it automatically - // DIFF JR: ((NodeImpl)getParent()).removeChildProperty remove(); return; } @@ -548,9 +545,9 @@ } /** - * DIFF JACKRABBIT (not present in JR) + * Private helper to access the PropertyState directly * - * @return + * @return state for this Property */ private PropertyState getPropertyState() { return (PropertyState) getItemState(); Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java?rev=432272&r1=432271&r2=432272&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/RepositoryImpl.java Thu Aug 17 09:10:54 2006 @@ -98,20 +98,4 @@ public Session login() throws LoginException, NoSuchWorkspaceException, RepositoryException { return login(null, null); } - - - //--------------------------------------------< implementation specific >--- - /* - * DIFF JACKRABBIT: - * - * - workspaces are not read from config any more. - * - therefore no workspace Infos - * - NamespaceRegistry/NodeTypeRegistry can only be loaded after login - * since they also have to obey the access-control and transaction - * mechanisms. - * - SharedItemStateManager retrieved by 'getWorkspaceStateManager(String)' - * has not relevance any more (correct?) - * - only the UpdatableItemStateManager 'local' statemanager retrieved from - * the workspace exists. it depends on the SessionInfo. - */ } Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java?rev=432272&r1=432271&r2=432272&view=diff ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/WorkspaceImpl.java Thu Aug 17 09:10:54 2006 @@ -43,7 +43,6 @@ import org.apache.jackrabbit.spi.RepositoryService; import org.apache.jackrabbit.spi.SessionInfo; import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.spi.NodeId; import org.slf4j.LoggerFactory; import org.slf4j.Logger; import org.xml.sax.ContentHandler;