Return-Path: Delivered-To: apmail-incubator-jackrabbit-commits-archive@www.apache.org Received: (qmail 28677 invoked from network); 25 Apr 2005 10:08:53 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Apr 2005 10:08:53 -0000 Received: (qmail 86572 invoked by uid 500); 25 Apr 2005 10:09:20 -0000 Mailing-List: contact jackrabbit-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jackrabbit-dev@incubator.apache.org Delivered-To: mailing list jackrabbit-commits@incubator.apache.org Received: (qmail 86556 invoked by uid 500); 25 Apr 2005 10:09:19 -0000 Delivered-To: apmail-incubator-jackrabbit-cvs@incubator.apache.org Received: (qmail 86531 invoked by uid 99); 25 Apr 2005 10:09:19 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 25 Apr 2005 03:09:16 -0700 Received: (qmail 28630 invoked by uid 65534); 25 Apr 2005 10:08:46 -0000 Message-ID: <20050425100846.28629.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r164552 - in /incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core: ./ config/ lock/ nodetype/ nodetype/virtual/ observation/ query/ query/lucene/ security/ state/ util/ util/uuid/ version/ Date: Mon, 25 Apr 2005 10:08:38 -0000 To: jackrabbit-cvs@incubator.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jukka Date: Mon Apr 25 03:08:35 2005 New Revision: 164552 URL: http://svn.apache.org/viewcvs?rev=3D164552&view=3Drev Log: JCR-97: Improved Checkstyle conformance in various ways. Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl= .java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl= .java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Path.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Property= Impl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Reposito= ryImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Workspac= eImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/C= onfigurationParser.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/L= oginModuleConfig.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/R= epositoryConfig.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/Loc= kManagerImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /EffectiveNodeType.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /ItemDef.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeDefId.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeDef.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeManagerImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeRegistry.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropDefId.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropDefImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropertyDefinitionImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /ValueConstraint.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /virtual/VirtualNodeTypeStateManager.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /virtual/VirtualNodeTypeStateProvider.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/DelegatingObservationDispatcher.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventConsumer.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventFilter.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventListenerIteratorImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/ObservationManagerImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/NA= ryQueryNode.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/Or= derQueryNode.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/Te= xtFilterService.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/CachingIndexReader.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/CachingMultiReader.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/ChildAxisQuery.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/MatchAllQuery.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/MultiIndex.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/NodeIteratorImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/RowIteratorImpl.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/VolatileIndex.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security= /UserPrincipal.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/It= emState.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/No= deReferencesId.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Se= ssionItemStateManager.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Tr= ansientItemStateManager.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Chi= ldrenCollectorFilter.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ISO= 9075.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Tex= t=2Ejava incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Val= ueHelper.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uui= d/Bytes.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/= VersionItemStateProvider.java incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/= VersionManagerImpl.java Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/It= emImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/ItemImpl.java?rev=3D164552&r1=3D164551&r2=3D164552&v= iew=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl= .java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ItemImpl= .java Mon Apr 25 03:08:35 2005 @@ -162,13 +162,7 @@ session.sanityCheck(); =20 // check status of this item for read operation - switch (status) { - case STATUS_NORMAL: - case STATUS_MODIFIED: - return; - - case STATUS_DESTROYED: - case STATUS_INVALIDATED: + if (status =3D=3D STATUS_DESTROYED || status =3D=3D STATUS_INVALID= ATED) { throw new InvalidItemStateException(id + ": the item does = not exist anymore"); } } @@ -383,14 +377,16 @@ =20 case ItemState.STATUS_STALE_MODIFIED: { - String msg =3D transientState.getId() + ": the= item cannot be saved because it has been modified externally."; + String msg =3D transientState.getId() + + ": the item cannot be saved because it h= as been modified externally."; log.debug(msg); throw new InvalidItemStateException(msg); } =20 case ItemState.STATUS_STALE_DESTROYED: { - String msg =3D transientState.getId() + ": the= item cannot be saved because it has been deleted externally."; + String msg =3D transientState.getId() + + ": the item cannot be saved because it h= as been deleted externally."; log.debug(msg); throw new InvalidItemStateException(msg); } @@ -430,7 +426,8 @@ throw new InvalidItemStateException(msg); } if (transientState.getStatus() =3D=3D ItemState.STATUS_STA= LE_DESTROYED) { - String msg =3D transientState.getId() + ": the item ca= nnot be removed because it has already been deleted externally."; + String msg =3D transientState.getId() + + ": the item cannot be removed because it has alr= eady been deleted externally."; log.debug(msg); throw new InvalidItemStateException(msg); } @@ -708,7 +705,9 @@ try { if (!target.getPrimaryPath().isDescendantO= f(getPrimaryPath())) { String msg =3D itemMgr.safeGetJCRPath(= propState.getId()) - + ": target node of REFERENCE = property is a new node and must therefore either be saved first or be withi= n the scope of the current save operation."; + + ": target node of REFERENCE = property is a new node and must" + + " therefore either be saved = first or be within the scope of" + + " the current save operation= ."; log.warn(msg); throw new ReferentialIntegrityExceptio= n(msg); } @@ -870,7 +869,8 @@ node.internalSetProperty(JCR_VERSIONHISTORY, Inter= nalValue.create(new UUID(hist.getUUID()))); node.internalSetProperty(JCR_BASEVERSION, Internal= Value.create(new UUID(hist.getRootVersion().getUUID()))); node.internalSetProperty(JCR_ISCHECKEDOUT, Interna= lValue.create(true)); - node.internalSetProperty(JCR_PREDECESSORS, new Int= ernalValue[]{InternalValue.create(new UUID(hist.getRootVersion().getUUID())= )}); + node.internalSetProperty(JCR_PREDECESSORS, + new InternalValue[]{InternalValue.create(n= ew UUID(hist.getRootVersion().getUUID()))}); createdTransientState =3D true; } } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/No= deImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/NodeImpl.java?rev=3D164552&r1=3D164551&r2=3D164552&v= iew=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl= .java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/NodeImpl= .java Mon Apr 25 03:08:35 2005 @@ -1,7 +1,7 @@ /* * Copyright 2004-2005 The Apache Software Foundation or its licensors, - * as applicable. - * + * as applicable. + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -311,23 +311,23 @@ genValues =3D new InternalValue[]{InternalValue.create(thi= sState.getUUID())}; } /* - todo consolidate version history creation code (currently in ItemImpl.ini= tVersionHistories) - } else if (nt.getQName().equals(MIX_VERSIONABLE)) { - // mix:versionable node type - VersionHistory hist =3D session.getVersionManager().getOrCreateVersio= nHistory(this); - if (name.equals(JCR_VERSIONHISTORY)) { - // jcr:versionHistory property - genValues =3D new InternalValue[]{InternalValue.create(new UUID(hist.get= UUID()))}; - } else if (name.equals(JCR_BASEVERSION)) { - // jcr:baseVersion property - genValues =3D new InternalValue[]{InternalValue.create(new UUID(hist.get= RootVersion().getUUID()))}; - } else if (name.equals(JCR_ISCHECKEDOUT)) { - // jcr:isCheckedOut property - genValues =3D new InternalValue[]{InternalValue.create(true)}; - } else if (name.equals(JCR_PREDECESSORS)) { - // jcr:predecessors property - genValues =3D new InternalValue[]{InternalValue.create(new UUID(hist.get= RootVersion().getUUID()))}; - } + todo consolidate version history creation code (currently in ItemImpl.= initVersionHistories) + } else if (nt.getQName().equals(MIX_VERSIONABLE)) { + // mix:versionable node type + VersionHistory hist =3D session.getVersionManager().getOrCreateVer= sionHistory(this); + if (name.equals(JCR_VERSIONHISTORY)) { + // jcr:versionHistory property + genValues =3D new InternalValue[]{InternalValue.create(new UUID(hi= st.getUUID()))}; + } else if (name.equals(JCR_BASEVERSION)) { + // jcr:baseVersion property + genValues =3D new InternalValue[]{InternalValue.create(new UUID(hi= st.getRootVersion().getUUID()))}; + } else if (name.equals(JCR_ISCHECKEDOUT)) { + // jcr:isCheckedOut property + genValues =3D new InternalValue[]{InternalValue.create(true)}; + } else if (name.equals(JCR_PREDECESSORS)) { + // jcr:predecessors property + genValues =3D new InternalValue[]{InternalValue.create(new UUID(hi= st.getRootVersion().getUUID()))}; + } */ } else if (nt.getQName().equals(NT_HIERARCHYNODE)) { // nt:hierarchyNode node type @@ -483,7 +483,7 @@ NodeState nodeState; try { if (uuid =3D=3D null) { - uuid =3D UUID.randomUUID().toString(); // version 4 uuid + uuid =3D UUID.randomUUID().toString(); // version 4 uuid } nodeState =3D stateMgr.createTransientNodeState(uuid, nodeType.getQN= ame(), @@ -1118,7 +1118,8 @@ PropertyIterator iter =3D getReferences(); if (iter.hasNext()) { throw new ConstraintViolationException( - mixinName + " can not be removed: the node is bein= g referenced through at least one property of type REFERENCE"); + mixinName + " can not be removed: the node is bein= g referenced" + + " through at least one property of type REFERENC= E"); } } =20 @@ -1225,7 +1226,7 @@ *
  • this node must not be locked by somebody else
    • * * Note that certain checks are performed by the respective - * Property.setValue() methods.=20 + * Property.setValue() methods. * * @throws VersionException if this node is not checked-out * @throws LockException if this node is locked by somebody else @@ -2943,7 +2944,8 @@ * @throws InvalidItemStateException if this nodes session has pending= changes * @throws RepositoryException */ - private void checkSessionHasPending() throws RepositoryException { + private void checkSessionHasPending() + throws InvalidItemStateException, RepositoryException { // check for pending changes if (session.hasPendingChanges()) { String msg =3D "Unable to perform operation. Session has pendi= ng changes."; @@ -3188,7 +3190,7 @@ */ protected boolean internalIsCheckedOut() throws RepositoryException { /** - * try shortcut first:=20 + * try shortcut first: * if current node is 'new' we can safely consider it checked-out * since otherwise it would had been impossible to add it in the f= irst * place @@ -3357,7 +3359,9 @@ * @throws LockException * @throws RepositoryException */ - private void internalMerge(SessionImpl srcSession, List failedIds, boo= lean bestEffort, boolean removeExisting, boolean replaceExisting) + private void internalMerge( + SessionImpl srcSession, List failedIds, + boolean bestEffort, boolean removeExisting, boolean replaceExi= sting) throws LockException, RepositoryException { =20 NodeImpl srcNode =3D doMergeTest(srcSession, failedIds, bestEffort= ); @@ -3619,7 +3623,9 @@ } else { // since we delete the OPV=3DCopy children bef= orehand, all // found nodes must be outside of this tree - throw new ItemExistsException("Unable to resto= re node, item already exists outside of restored tree: " + existing.safeGet= JCRPath()); + throw new ItemExistsException( + "Unable to restore node, item already = exists outside of restored tree: " + + existing.safeGetJCRPath()); } } catch (ItemNotFoundException e) { // ignore, item with uuid does not exist @@ -3644,7 +3650,9 @@ } else { // since we delete the OPV=3DCopy children beforeh= and, all // found nodes must be outside of this tree - throw new ItemExistsException("Unable to restore n= ode, item already exists outside of restored tree: " + n.safeGetJCRPath()); + throw new ItemExistsException( + "Unable to restore node, item already exis= ts outside of restored tree: " + + n.safeGetJCRPath()); } } else { // get desired version from version selector Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Pa= th.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/Path.java?rev=3D164552&r1=3D164551&r2=3D164552&view= =3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Path.jav= a (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Path.jav= a Mon Apr 25 03:08:35 2005 @@ -109,7 +109,12 @@ *
  • group 7 is index excl. brackets * */ - private static final Pattern PATH_ELEMENT_PATTERN =3D Pattern.compile(= "(\\.)|(\\.\\.)|(([^ /:\\[\\]*'\"|](?:[^/:\\[\\]*'\"|]*[^ /:\\[\\]*'\"|])?)= :)?([^ /:\\[\\]*'\"|](?:[^/:\\[\\]*'\"|]*[^ /:\\[\\]*'\"|])?)(\\[([1-9]\\d*= )\\])?"); + private static final Pattern PATH_ELEMENT_PATTERN =3D + Pattern.compile("(\\.)|" + + "(\\.\\.)|" + + "(([^ /:\\[\\]*'\"|](?:[^/:\\[\\]*'\"|]*[^ /:\\[\\]*'\"|= ])?):)?" + + "([^ /:\\[\\]*'\"|](?:[^/:\\[\\]*'\"|]*[^ /:\\[\\]*'\"|]= )?)" + + "(\\[([1-9]\\d*)\\])?"); =20 /** * the elements of this path @@ -285,7 +290,8 @@ * @return the relative path created from name. * @throws IllegalArgumentException if index is negative. */ - public static Path create(QName name, int index) { + public static Path create(QName name, int index) + throws IllegalArgumentException { if (index < 0) { throw new IllegalArgumentException("index must not be negative= : " + index); } @@ -380,7 +386,9 @@ // check if the prefix is a valid XML prefix if (!XMLChar.isValidNCName(prefix)) { // illegal syntax for prefix - throw new MalformedPathException("'" + jcrPath= + "' is not a valid path: '" + elem + "' specifies an illegal namespace pr= efix"); + throw new MalformedPathException( + "'" + jcrPath + "' is not a valid path= : '" + + elem + "' specifies an illegal names= pace prefix"); } } else { // no prefix specified @@ -405,7 +413,9 @@ nsURI =3D resolver.getURI(prefix); } catch (NamespaceException nse) { // unknown prefix - throw new MalformedPathException("'" + jcrPath + "= ' is not a valid path: '" + elem + "' specifies an unmapped namespace prefi= x"); + throw new MalformedPathException( + "'" + jcrPath + "' is not a valid path: '" + + elem + "' specifies an unmapped namespac= e prefix"); } =20 PathElement element; @@ -419,7 +429,9 @@ } } else { // illegal syntax for path element - throw new MalformedPathException("'" + jcrPath + "' is not= a valid path: '" + elem + "' is not a legal path element"); + throw new MalformedPathException( + "'" + jcrPath + "' is not a valid path: '" + + elem + "' is not a legal path element"); } } if (resolver !=3D null) { @@ -639,7 +651,8 @@ * degree * @throws IllegalArgumentException if degree is negative */ - public Path getAncestor(int degree) throws PathNotFoundException { + public Path getAncestor(int degree) + throws IllegalArgumentException, PathNotFoundException { if (degree < 0) { throw new IllegalArgumentException("degree must be >=3D 0"); } else if (degree =3D=3D 0) { @@ -853,7 +866,7 @@ * as a Path. * @see #toString() */ - public static Path valueOf(String s) { + public static Path valueOf(String s) throws IllegalArgumentException { if ("".equals(s) || s =3D=3D null) { throw new IllegalArgumentException("invalid Path literal"); } @@ -1220,7 +1233,7 @@ * @param name qualified name * @throws IllegalArgumentException if the name is null */ - private PathElement(QName name) { + private PathElement(QName name) throws IllegalArgumentException { if (name =3D=3D null) { throw new IllegalArgumentException("name must not be null"= ); } @@ -1235,7 +1248,7 @@ * @param index index * @throws IllegalArgumentException if the name is null */ - private PathElement(QName name, int index) { + private PathElement(QName name, int index) throws IllegalArgumentE= xception { if (name =3D=3D null) { throw new IllegalArgumentException("name must not be null"= ); } @@ -1370,7 +1383,7 @@ * is null or if its * format is invalid */ - public static PathElement fromString(String s) { + public static PathElement fromString(String s) throws IllegalArgum= entException { if (s =3D=3D null) { throw new IllegalArgumentException("null PathElement liter= al"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Pr= opertyImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/PropertyImpl.java?rev=3D164552&r1=3D164551&r2=3D1645= 52&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Property= Impl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Property= Impl.java Mon Apr 25 03:08:35 2005 @@ -166,9 +166,10 @@ case PropertyType.BINARY: BLOBFileValue blob =3D (BLOBFileValue) value.internalValue= (); return blob.getLength(); - } =20 - return -1; + default: + return -1; + } } =20 /** @@ -259,14 +260,10 @@ if (oldValues !=3D null) { for (int i =3D 0; i < oldValues.length; i++) { InternalValue old =3D oldValues[i]; - if (old !=3D null) { - switch (old.getType()) { - case PropertyType.BINARY: - // BINARY value - BLOBFileValue blob =3D (BLOBFileValue) old.int= ernalValue(); - blob.delete(); - break; - } + if (old !=3D null && old.getType() =3D=3D PropertyType.BIN= ARY) { + // BINARY value + BLOBFileValue blob =3D (BLOBFileValue) old.internalVal= ue(); + blob.delete(); } } } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Re= positoryImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/RepositoryImpl.java?rev=3D164552&r1=3D164551&r2=3D16= 4552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Reposito= ryImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Reposito= ryImpl.java Mon Apr 25 03:08:35 2005 @@ -170,18 +170,18 @@ // load uuid of the repository's root node InputStream in =3D uuidFile.getInputStream(); /* - // uuid is stored in binary format (16 bytes) - byte[] bytes =3D new byte[16]; - try { - in.read(bytes); - } finally { - try { - in.close(); - } catch (IOException ioe) { - // ignore - } - } - rootNodeUUID =3D new UUID(bytes).toString(); + // uuid is stored in binary format (16 bytes) + byte[] bytes =3D new byte[16]; + try { + in.read(bytes); + } finally { + try { + in.close(); + } catch (IOException ioe) { + // ignore + } + } + rootNodeUUID =3D new UUID(bytes).toString(); */ // uuid is stored in text format (36 characters) for b= etter readability char[] chars =3D new char[36]; @@ -465,7 +465,7 @@ * @throws NoSuchWorkspaceException If the named workspace does not ex= ist. */ protected WorkspaceInfo getWorkspaceInfo(String workspaceName) - throws NoSuchWorkspaceException { + throws IllegalStateException, NoSuchWorkspaceException { // check sanity of this instance sanityCheck(); =20 @@ -1084,7 +1084,9 @@ if (itemStateMgr =3D=3D null) { // create item state manager try { - itemStateMgr =3D new SharedItemStateManager(getPersist= enceManager(config.getPersistenceManagerConfig()), rootNodeUUID, ntReg); + itemStateMgr =3D new SharedItemStateManager( + getPersistenceManager(config.getPersistenceMan= agerConfig()), + rootNodeUUID, ntReg); try { itemStateMgr.addVirtualItemStateProvider(vMgr.getV= irtualItemStateProvider(itemStateMgr)); itemStateMgr.addVirtualItemStateProvider(virtNTMgr= .getVirtualItemStateProvider()); Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Wo= rkspaceImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/WorkspaceImpl.java?rev=3D164552&r1=3D164551&r2=3D164= 552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Workspac= eImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Workspac= eImpl.java Mon Apr 25 03:08:35 2005 @@ -24,6 +24,7 @@ import org.apache.jackrabbit.core.nodetype.NodeTypeRegistry; import org.apache.jackrabbit.core.nodetype.PropDef; import org.apache.jackrabbit.core.nodetype.PropDefId; +import org.apache.jackrabbit.core.observation.ObservationManagerFactory; import org.apache.jackrabbit.core.observation.ObservationManagerImpl; import org.apache.jackrabbit.core.query.QueryManagerImpl; import org.apache.jackrabbit.core.security.AccessManager; @@ -629,8 +630,8 @@ NodeReferences refs =3D stateMgr.getNodeReferences= (refsId); if (refs.hasReferences()) { throw new ReferentialIntegrityException( - hierMgr.safeGetJCRPath(targetId) + - ": cannot remove node with references"= ); + hierMgr.safeGetJCRPath(targetId) + + ": cannot remove node with reference= s"); } } catch (ItemStateException ise) { String msg =3D "internal error: failed to check re= ferences on " @@ -1099,7 +1100,8 @@ QName propName) throws RepositoryException { =20 - // @todo special handling required for properties with special sem= antics (e.g. those defined by mix:versionable, mix:lockable, et.al.) + // @todo special handling required for properties with special sem= antics + // (e.g. those defined by mix:versionable, mix:lockable, et.al.) PropertyState newState =3D stateMgr.createNew(propName, parentUUID= ); PropDefId defId =3D srcState.getDefinitionId(); newState.setDefinitionId(defId); @@ -1577,7 +1579,9 @@ =20 if (obsMgr =3D=3D null) { try { - obsMgr =3D rep.getObservationManagerFactory(wspConfig.getN= ame()).createObservationManager(session, session.getItemManager()); + ObservationManagerFactory factory =3D + rep.getObservationManagerFactory(wspConfig.getName()); + obsMgr =3D factory.createObservationManager(session, sessi= on.getItemManager()); } catch (NoSuchWorkspaceException nswe) { // should never get here String msg =3D "internal error: failed to instantiate obse= rvation manager"; @@ -1684,9 +1688,13 @@ } if (restored =3D=3D null) { if (numRestored =3D=3D 0) { - throw new VersionException("Unable to restore. At = least one version needs existing versionable node in workspace."); + throw new VersionException( + "Unable to restore. At least one version n= eeds" + + " existing versionable node in workspace= ."); } else { - throw new VersionException("Unable to restore. All= versions with non existing versionable nodes need parent."); + throw new VersionException( + "Unable to restore. All versions with non" + + " existing versionable nodes need parent= ."); } } } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/co= nfig/ConfigurationParser.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/config/ConfigurationParser.java?rev=3D164552&r1=3D16= 4551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/C= onfigurationParser.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/C= onfigurationParser.java Mon Apr 25 03:08:35 2005 @@ -538,7 +538,7 @@ * @param parent parent element * @param name name of the child element * @return named child element - * @throws ConfigurationException=20 + * @throws ConfigurationException * @throws ConfigurationException if the child element is not found */ private Element getElement(Element parent, String name) throws Configu= rationException { Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/co= nfig/LoginModuleConfig.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/config/LoginModuleConfig.java?rev=3D164552&r1=3D1645= 51&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/L= oginModuleConfig.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/L= oginModuleConfig.java Mon Apr 25 03:08:35 2005 @@ -24,7 +24,7 @@ *

    * Login module is an optional configuration that allows to use JackRabbit * in a non-JAAS environment. - *=20 + * * @see RepositoryConfig#getLoginModuleConfig() * @version $Id$ */ @@ -39,7 +39,7 @@ LoginModuleConfig(BeanConfig config) { super(config); } - =20 + public LoginModule getLoginModule() throws ConfigurationException { Object result =3D newInstance(); if (result instanceof LoginModule) { Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/co= nfig/RepositoryConfig.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/config/RepositoryConfig.java?rev=3D164552&r1=3D16455= 1&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/R= epositoryConfig.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/config/R= epositoryConfig.java Mon Apr 25 03:08:35 2005 @@ -372,7 +372,7 @@ =20 /** * Returns the repository login module configuration. - *=20 + * * @return login module configuration, or null if standard * JAAS mechanism should be used. */ Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lo= ck/LockManagerImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/lock/LockManagerImpl.java?rev=3D164552&r1=3D164551&r= 2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/Loc= kManagerImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/lock/Loc= kManagerImpl.java Mon Apr 25 03:08:35 2005 @@ -285,7 +285,7 @@ node.internalSetProperty(Constants.JCR_LOCKOWNER, null); node.internalSetProperty(Constants.JCR_LOCKISDEEP, null); node.save(); - =20 + } catch (RepositoryException e) { log.warn("Unable to unlock session-scoped lock on node '" + info.lockToken + "': " + e.getMessage()); Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/EffectiveNodeType.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/EffectiveNodeType.java?rev=3D164552&r1=3D16= 4551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /EffectiveNodeType.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /EffectiveNodeType.java Mon Apr 25 03:08:35 2005 @@ -126,7 +126,8 @@ ItemDef def =3D (ItemDef) defs.get(j); if (cnda[i].isAutoCreated() || def.isAutoCreated()= ) { // conflict - String msg =3D "There are more than one 'auto-= create' item definitions for '" + name + "' in node type '" + ntName + "'"; + String msg =3D "There are more than one 'auto-= create' item definitions for '" + + name + "' in node type '" + ntName + "'"; log.debug(msg); throw new NodeTypeConflictException(msg); } @@ -157,7 +158,8 @@ ItemDef def =3D (ItemDef) defs.get(j); if (pda[i].isAutoCreated() || def.isAutoCreated())= { // conflict - String msg =3D "There are more than one 'auto-= create' item definitions for '" + name + "' in node type '" + ntName + "'"; + String msg =3D "There are more than one 'auto-= create' item definitions for '" + + name + "' in node type '" + ntName + "'"; log.debug(msg); throw new NodeTypeConflictException(msg); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/ItemDef.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/ItemDef.java?rev=3D164552&r1=3D164551&r2=3D= 164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /ItemDef.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /ItemDef.java Mon Apr 25 03:08:35 2005 @@ -22,7 +22,7 @@ /** * ItemDef is the internal representation of * an item definition. It refers to QNames only - * and is thus isolated from session-specific namespace mappings. =20 + * and is thus isolated from session-specific namespace mappings. * * @see javax.jcr.nodetype.ItemDefinition */ Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/NodeDefId.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/NodeDefId.java?rev=3D164552&r1=3D164551&r2= =3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeDefId.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeDefId.java Mon Apr 25 03:08:35 2005 @@ -93,7 +93,7 @@ * as a NodeDefId. * @see #toString() */ - public static NodeDefId valueOf(String s) { + public static NodeDefId valueOf(String s) throws IllegalArgumentExcept= ion { if (s =3D=3D null) { throw new IllegalArgumentException("invalid NodeDefId literal"= ); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/NodeTypeDef.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/NodeTypeDef.java?rev=3D164552&r1=3D164551&r= 2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeDef.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeDef.java Mon Apr 25 03:08:35 2005 @@ -83,7 +83,7 @@ * value constraints in property definitions). *

    * Note that self-references (e.g. a child node definition that specif= ies - * the declaring node type as the default primary type) are not consid= ered=20 + * the declaring node type as the default primary type) are not consid= ered * dependencies. * * @return a collection of node type QNames Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/NodeTypeManagerImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java?rev=3D164552&r1=3D= 164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeManagerImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeManagerImpl.java Mon Apr 25 03:08:35 2005 @@ -185,7 +185,7 @@ public void nodeTypeReRegistered(QName ntName) { // flush all affected cache entries ntCache.remove(ntName); - synchronized(pdCache) { + synchronized (pdCache) { Iterator iter =3D pdCache.values().iterator(); while (iter.hasNext()) { PropDefImpl pd =3D (PropDefImpl) iter.next(); @@ -194,7 +194,7 @@ } } } - synchronized(ndCache) { + synchronized (ndCache) { Iterator iter =3D ndCache.values().iterator(); while (iter.hasNext()) { NodeDefImpl nd =3D (NodeDefImpl) iter.next(); @@ -211,7 +211,7 @@ public void nodeTypeUnregistered(QName ntName) { // flush all affected cache entries ntCache.remove(ntName); - synchronized(pdCache) { + synchronized (pdCache) { Iterator iter =3D pdCache.values().iterator(); while (iter.hasNext()) { PropDefImpl pd =3D (PropDefImpl) iter.next(); @@ -220,7 +220,7 @@ } } } - synchronized(ndCache) { + synchronized (ndCache) { Iterator iter =3D ndCache.values().iterator(); while (iter.hasNext()) { NodeDefImpl nd =3D (NodeDefImpl) iter.next(); Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/NodeTypeRegistry.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/NodeTypeRegistry.java?rev=3D164552&r1=3D164= 551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeRegistry.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /NodeTypeRegistry.java Mon Apr 25 03:08:35 2005 @@ -166,7 +166,7 @@ try { // load built-in node type definitions loadBuiltInNodeTypeDefs(builtInNTDefs); - =20 + // validate & register built-in node types internalRegister(builtInNTDefs.all()); } catch (InvalidNodeTypeDefException intde) { @@ -489,8 +489,8 @@ // make sure that all primary types except nt:base extend = from nt:base if (!ntd.isMixin() && !NT_BASE.equals(ntd.getName()) && !est.includesNodeType(NT_BASE)) { - String msg =3D "[" + name - + "] all primary node types except nt:base its= elf must be (directly or indirectly) derived from nt:base"; + String msg =3D "[" + name + "] all primary node types = except" + + " nt:base itself must be (directly or indirectly= ) derived from nt:base"; log.debug(msg); throw new InvalidNodeTypeDefException(msg); } @@ -1778,8 +1778,11 @@ // ignore weight Iterator i =3D set.iterator(); while (i.hasNext()) { + h *=3D 37; Object obj =3D i.next(); - h =3D 37 * h + (obj !=3D null ? obj.hashCode() : 0); + if (obj !=3D null) { + h +=3D obj.hashCode(); + } } return h; } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/PropDefId.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/PropDefId.java?rev=3D164552&r1=3D164551&r2= =3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropDefId.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropDefId.java Mon Apr 25 03:08:35 2005 @@ -89,7 +89,7 @@ * as a PropDefId. * @see #toString() */ - public static PropDefId valueOf(String s) { + public static PropDefId valueOf(String s) throws IllegalArgumentExcept= ion { if (s =3D=3D null) { throw new IllegalArgumentException("invalid PropDefId literal"= ); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/PropDefImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/PropDefImpl.java?rev=3D164552&r1=3D164551&r= 2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropDefImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropDefImpl.java Mon Apr 25 03:08:35 2005 @@ -49,7 +49,7 @@ private boolean multiple =3D false; =20 /** - * The identifier of this property definition. The identifier is lazil= y=20 + * The identifier of this property definition. The identifier is lazily * computed based on the characteristics of this property definition a= nd * reset on every attribute change. */ Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/PropertyDefinitionImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java?rev=3D164552&r1= =3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropertyDefinitionImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /PropertyDefinitionImpl.java Mon Apr 25 03:08:35 2005 @@ -52,7 +52,7 @@ =20 /** * Returns the wrapped property definition. - *=20 + * * @return the wrapped property definition. */ public PropDef unwrap() { Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/ValueConstraint.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/ValueConstraint.java?rev=3D164552&r1=3D1645= 51&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /ValueConstraint.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /ValueConstraint.java Mon Apr 25 03:08:35 2005 @@ -273,8 +273,8 @@ s =3D matcher.group(4); upperInclusive =3D s.equals("]"); if (lowerLimit =3D=3D null && upperLimit =3D=3D null) { - String msg =3D "'" + definition - + "' is not a valid value constraint format fo= r numeric types: neither lower- nor upper-limit specified"; + String msg =3D "'" + definition + "' is not a valid va= lue constraint" + + " format for numeric types: neither lower- nor = upper-limit specified"; log.debug(msg); throw new InvalidConstraintException(msg); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/virtual/VirtualNodeTypeStateManager.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateManager.java?re= v=3D164552&r1=3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /virtual/VirtualNodeTypeStateManager.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /virtual/VirtualNodeTypeStateManager.java Mon Apr 25 03:08:35 2005 @@ -87,7 +87,9 @@ * @param rootNodeId * @param parentId */ - public VirtualNodeTypeStateManager(NodeTypeRegistry ntReg, DelegatingO= bservationDispatcher obs, String rootNodeId, String parentId) { + public VirtualNodeTypeStateManager( + NodeTypeRegistry ntReg, DelegatingObservationDispatcher obs, + String rootNodeId, String parentId) { this.ntReg =3D ntReg; this.obsDispatcher =3D obs; this.rootNodeId =3D rootNodeId; Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/no= detype/virtual/VirtualNodeTypeStateProvider.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java?r= ev=3D164552&r1=3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /virtual/VirtualNodeTypeStateProvider.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/nodetype= /virtual/VirtualNodeTypeStateProvider.java Mon Apr 25 03:08:35 2005 @@ -195,7 +195,8 @@ } pState.setPropertyValue(JCR_AUTOCREATED, InternalValue.create(prop= Def.isAutoCreated())); pState.setPropertyValue(JCR_MANDATORY, InternalValue.create(propDe= f=2EisMandatory())); - pState.setPropertyValue(JCR_ONPARENTVERSION, InternalValue.create(= OnParentVersionAction.nameFromValue(propDef.getOnParentVersion()))); + pState.setPropertyValue(JCR_ONPARENTVERSION, + InternalValue.create(OnParentVersionAction.nameFromValue(p= ropDef.getOnParentVersion()))); pState.setPropertyValue(JCR_PROTECTED, InternalValue.create(propDe= f=2EisProtected())); pState.setPropertyValue(JCR_MULTIPLE, InternalValue.create(propDef= .isMultiple())); pState.setPropertyValue(JCR_REQUIREDTYPE, InternalValue.create(Pro= pertyType.nameFromValue(propDef.getRequiredType()))); @@ -229,9 +230,11 @@ } pState.setPropertyValue(JCR_AUTOCREATED, InternalValue.create(cnDe= f=2EisAutoCreated())); pState.setPropertyValue(JCR_MANDATORY, InternalValue.create(cnDef.= isMandatory())); - pState.setPropertyValue(JCR_ONPARENTVERSION, InternalValue.create(= OnParentVersionAction.nameFromValue(cnDef.getOnParentVersion()))); + pState.setPropertyValue(JCR_ONPARENTVERSION, + InternalValue.create(OnParentVersionAction.nameFromValue(c= nDef.getOnParentVersion()))); pState.setPropertyValue(JCR_PROTECTED, InternalValue.create(cnDef.= isProtected())); - pState.setPropertyValues(JCR_REQUIREDPRIMARYTYPES, PropertyType.NA= ME, InternalValue.create(cnDef.getRequiredPrimaryTypes())); + pState.setPropertyValues(JCR_REQUIREDPRIMARYTYPES, + PropertyType.NAME, InternalValue.create(cnDef.getRequiredP= rimaryTypes())); if (cnDef.getDefaultPrimaryType() !=3D null) { pState.setPropertyValue(JCR_DEFAULTPRIMARYTYPE, InternalValue.= create(cnDef.getDefaultPrimaryType())); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ob= servation/DelegatingObservationDispatcher.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java?rev= =3D164552&r1=3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/DelegatingObservationDispatcher.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/DelegatingObservationDispatcher.java Mon Apr 25 03:08:35 2005 @@ -56,7 +56,7 @@ * Dispatchers a list of events to all registered dispatchers. A new * {@link EventStateCollection} is created for every dispatcher, fille= with * the given event list and then dispatched. - *=20 + * * @param eventList * @param session * @throws RepositoryException Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ob= servation/EventConsumer.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/observation/EventConsumer.java?rev=3D164552&r1=3D164= 551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventConsumer.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventConsumer.java Mon Apr 25 03:08:35 2005 @@ -89,7 +89,8 @@ * @throws NullPointerException if session, listene= r * or filter isnull. */ - EventConsumer(SessionImpl session, EventListener listener, EventFilter= filter) { + EventConsumer(SessionImpl session, EventListener listener, EventFilter= filter) + throws NullPointerException { if (session =3D=3D null) { throw new NullPointerException("session"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ob= servation/EventFilter.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/observation/EventFilter.java?rev=3D164552&r1=3D16455= 1&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventFilter.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventFilter.java Mon Apr 25 03:08:35 2005 @@ -184,7 +184,8 @@ if (nodeTypes !=3D null) { boolean match =3D false; for (int i =3D 0; i < nodeTypes.length && !match; i++) { - match |=3D eventState.getNodeType().getQName().equals(node= Types[i].getQName()) || eventState.getNodeType().isDerivedFrom(nodeTypes[i]= .getQName()); + match |=3D eventState.getNodeType().getQName().equals(node= Types[i].getQName()) + || eventState.getNodeType().isDerivedFrom(nodeTypes[i]= .getQName()); } if (!match) { return true; Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ob= servation/EventImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/observation/EventImpl.java?rev=3D164552&r1=3D164551&= r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventImpl.java Mon Apr 25 03:08:35 2005 @@ -83,7 +83,8 @@ try { Path p; if (eventState.getChildRelPath().getIndex() > 0) { - p =3D Path.create(eventState.getParentPath(), eventState.g= etChildRelPath().getName(), eventState.getChildRelPath().getIndex(), false); + p =3D Path.create(eventState.getParentPath(), eventState.g= etChildRelPath().getName(), + eventState.getChildRelPath().getIndex(), false); } else { p =3D Path.create(eventState.getParentPath(), eventState.g= etChildRelPath().getName(), false); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ob= servation/EventListenerIteratorImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/observation/EventListenerIteratorImpl.java?rev=3D164= 552&r1=3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventListenerIteratorImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/EventListenerIteratorImpl.java Mon Apr 25 03:08:35 2005 @@ -59,7 +59,8 @@ * @throws NullPointerException if ticket or consum= er * is null. */ - EventListenerIteratorImpl(Session session, Collection sConsumers, Coll= ection aConsumers) { + EventListenerIteratorImpl(Session session, Collection sConsumers, Coll= ection aConsumers) + throws NullPointerException { if (session =3D=3D null) { throw new NullPointerException("session"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ob= servation/ObservationManagerImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/observation/ObservationManagerImpl.java?rev=3D164552= &r1=3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/ObservationManagerImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/observat= ion/ObservationManagerImpl.java Mon Apr 25 03:08:35 2005 @@ -66,7 +66,7 @@ */ ObservationManagerImpl(ObservationManagerFactory obsMgrFactory, SessionImpl session, - ItemManager itemMgr) { + ItemManager itemMgr) throws NullPointerExceptio= n { if (session =3D=3D null) { throw new NullPointerException("session"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/NAryQueryNode.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/NAryQueryNode.java?rev=3D164552&r1=3D164551&r2= =3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/NA= ryQueryNode.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/NA= ryQueryNode.java Mon Apr 25 03:08:35 2005 @@ -125,7 +125,7 @@ if (operands =3D=3D null) { return EMPTY; } - =20 + List result =3D new ArrayList(operands.size()); for (int i =3D 0; i < operands.size(); i++) { Object r =3D ((QueryNode) operands.get(i)).accept(visitor, dat= a); Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/OrderQueryNode.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/OrderQueryNode.java?rev=3D164552&r1=3D164551&r= 2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/Or= derQueryNode.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/Or= derQueryNode.java Mon Apr 25 03:08:35 2005 @@ -87,7 +87,7 @@ * @throws IndexOutOfBoundsException if there is no property with * index i. */ - public boolean isAscending(int i) { + public boolean isAscending(int i) throws IndexOutOfBoundsException { return ((OrderSpec) specs.get(i)).ascending; } =20 Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/TextFilterService.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/TextFilterService.java?rev=3D164552&r1=3D16455= 1&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/Te= xtFilterService.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/Te= xtFilterService.java Mon Apr 25 03:08:35 2005 @@ -50,6 +50,9 @@ */ public class TextFilterService { =20 + /** Hidden constructor. */ + private TextFilterService() { } + /** * Logger instance for this class. */ Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/CachingIndexReader.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/CachingIndexReader.java?rev=3D164552&r1= =3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/CachingIndexReader.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/CachingIndexReader.java Mon Apr 25 03:08:35 2005 @@ -127,7 +127,7 @@ * @throws IllegalArgumentException if the document with number * n is deleted. */ - public Document document(int n) throws IOException { + public Document document(int n) throws IOException, IllegalArgumentExc= eption { if (isDeleted(n)) { throw new IllegalArgumentException("attempt to access a delete= d document"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/CachingMultiReader.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/CachingMultiReader.java?rev=3D164552&r1= =3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/CachingMultiReader.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/CachingMultiReader.java Mon Apr 25 03:08:35 2005 @@ -55,7 +55,8 @@ * @exception IllegalArgumentException if subReaders does * not comply to the above type requirements. */ - public CachingMultiReader(IndexReader[] subReaders) throws IOException= { + public CachingMultiReader(IndexReader[] subReaders) + throws IOException, IllegalArgumentException { super(subReaders); // check readers, all but last must be a CachingIndexReader for (int i =3D 0; i < subReaders.length - 1; i++) { Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/ChildAxisQuery.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/ChildAxisQuery.java?rev=3D164552&r1=3D1= 64551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/ChildAxisQuery.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/ChildAxisQuery.java Mon Apr 25 03:08:35 2005 @@ -344,7 +344,8 @@ // only select last List childNodes =3D state.getChildNode= Entries(); if (childNodes.size() =3D=3D 0 - || !((NodeState.ChildNodeEntry= ) childNodes.get(childNodes.size() - 1)).getUUID().equals(uuid)) { + || !((NodeState.ChildNodeEntry= ) childNodes.get(childNodes.size() - 1)) + .getUUID().equals(uuid)) { hits.flip(i); } } else { @@ -369,7 +370,8 @@ QName name =3D ((NodeState.ChildNo= deEntry) childNodes.get(0)).getName(); childNodes =3D state.getChildNodeE= ntries(name); if (childNodes.size() =3D=3D 0 - || !((NodeState.ChildNodeE= ntry) childNodes.get(childNodes.size() - 1)).getUUID().equals(uuid)) { + || !((NodeState.ChildNodeE= ntry) childNodes.get(childNodes.size() - 1)) + .getUUID().equals(uuid= )) { hits.flip(i); } } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/MatchAllQuery.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/MatchAllQuery.java?rev=3D164552&r1=3D16= 4551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/MatchAllQuery.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/MatchAllQuery.java Mon Apr 25 03:08:35 2005 @@ -35,7 +35,7 @@ * @param field the field name. * @throws NullPointerException if field is null. */ - MatchAllQuery(String field) { + MatchAllQuery(String field) throws NullPointerException { if (field =3D=3D null) { throw new NullPointerException("field"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/MultiIndex.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/MultiIndex.java?rev=3D164552&r1=3D16455= 1&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/MultiIndex.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/MultiIndex.java Mon Apr 25 03:08:35 2005 @@ -28,7 +28,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.MultiReader; import org.apache.log4j.Logger; =20 import javax.jcr.RepositoryException; Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/NodeIteratorImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/NodeIteratorImpl.java?rev=3D164552&r1= =3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/NodeIteratorImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/NodeIteratorImpl.java Mon Apr 25 03:08:35 2005 @@ -65,30 +65,30 @@ /** * Returns the next Node in the result set. * @return the next Node in the result set. - * @throws java.util.NoSuchElementException if iteration has no more + * @throws NoSuchElementException if iteration has no more * Nodes. */ - public Node nextNode() { + public Node nextNode() throws NoSuchElementException { return nextNodeImpl(); } =20 /** * Returns the next Node in the result set. * @return the next Node in the result set. - * @throws java.util.NoSuchElementException if iteration has no more + * @throws NoSuchElementException if iteration has no more * Nodes. */ - public Object next() { + public Object next() throws NoSuchElementException { return nextNode(); } =20 /** * Skip a number of Nodes in this iterator. * @param skipNum the non-negative number of Nodes to skip - * @throws java.util.NoSuchElementException + * @throws NoSuchElementException * if skipped past the last Node in this iterato= r=2E */ - public void skip(long skipNum) { + public void skip(long skipNum) throws NoSuchElementException { if (skipNum < 0) { throw new IllegalArgumentException("skipNum must not be negati= ve"); } @@ -139,7 +139,7 @@ * @return the score of the node returned by {@link #nextNode()}. * @throws NoSuchElementException if there is no next node. */ - float getScore() { + float getScore() throws NoSuchElementException { if (!hasNext()) { throw new NoSuchElementException(); } @@ -152,7 +152,7 @@ * @throws NoSuchElementException if iteration has no more * Nodes. */ - NodeImpl nextNodeImpl() { + NodeImpl nextNodeImpl() throws NoSuchElementException { if (pos >=3D uuids.length) { throw new NoSuchElementException(); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/RowIteratorImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/RowIteratorImpl.java?rev=3D164552&r1=3D= 164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/RowIteratorImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/RowIteratorImpl.java Mon Apr 25 03:08:35 2005 @@ -35,6 +35,7 @@ import javax.jcr.StringValue; import javax.jcr.Property; import java.util.Arrays; +import java.util.NoSuchElementException; import java.util.Set; import java.util.HashSet; =20 @@ -72,10 +73,10 @@ * Returns the next Row in the iteration. * * @return the next Row in the iteration. - * @throws java.util.NoSuchElementException if iteration has no more - * Rows. + * @throws NoSuchElementException if iteration has no more + * Rows. */ - public Row nextRow() { + public Row nextRow() throws NoSuchElementException { return new RowImpl(nodes.getScore(), nodes.nextNodeImpl()); } =20 @@ -83,10 +84,10 @@ * Skip a number of Rows in this iterator. * * @param skipNum the non-negative number of Rows to skip - * @throws java.util.NoSuchElementException - * if skipped past the last Row in this iterator. + * @throws NoSuchElementException if skipped past the last + * Row in this iterator. */ - public void skip(long skipNum) { + public void skip(long skipNum) throws NoSuchElementException { nodes.skip(skipNum); } =20 @@ -134,10 +135,9 @@ * Returns the next Row in the iteration. * * @return the next Row in the iteration. - * @throws java.util.NoSuchElementException if iteration has no more - * Rows. + * @throws NoSuchElementException if iteration has no more Rows. */ - public Object next() { + public Object next() throws NoSuchElementException { return nextRow(); } =20 Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/qu= ery/lucene/VolatileIndex.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/query/lucene/VolatileIndex.java?rev=3D164552&r1=3D16= 4551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/VolatileIndex.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/query/lu= cene/VolatileIndex.java Mon Apr 25 03:08:35 2005 @@ -36,7 +36,7 @@ /** * Default value for {@link #bufferSize}. */ - private final int DEFAULT_BUFFER_SIZE =3D 10; + private static final int DEFAULT_BUFFER_SIZE =3D 10; =20 /** The redo log */ private final RedoLog redoLog; Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/se= curity/UserPrincipal.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/security/UserPrincipal.java?rev=3D164552&r1=3D164551= &r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security= /UserPrincipal.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/security= /UserPrincipal.java Mon Apr 25 03:08:35 2005 @@ -32,7 +32,7 @@ * @param name the name of this principal * @throws IllegalArgumentException if name is null= . */ - public UserPrincipal(String name) { + public UserPrincipal(String name) throws IllegalArgumentException { if (name =3D=3D null) { throw new IllegalArgumentException("name can not be null"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st= ate/ItemState.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/state/ItemState.java?rev=3D164552&r1=3D164551&r2=3D1= 64552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/It= emState.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/It= emState.java Mon Apr 25 03:08:35 2005 @@ -362,10 +362,11 @@ case STATUS_UNDEFINED: status =3D newStatus; return; + default: + String msg =3D "illegal status: " + newStatus; + log.debug(msg); + throw new IllegalArgumentException(msg); } - String msg =3D "illegal status: " + newStatus; - log.debug(msg); - throw new IllegalArgumentException(msg); } =20 /** Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st= ate/NodeReferencesId.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/state/NodeReferencesId.java?rev=3D164552&r1=3D164551= &r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/No= deReferencesId.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/No= deReferencesId.java Mon Apr 25 03:08:35 2005 @@ -44,7 +44,7 @@ * as a NodeReferencesId. * @see #toString() */ - public static NodeId valueOf(String s) { + public static NodeId valueOf(String s) throws IllegalArgumentException= { if (s =3D=3D null) { throw new IllegalArgumentException("invalid NodeReferencesId l= iteral"); } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st= ate/SessionItemStateManager.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/state/SessionItemStateManager.java?rev=3D164552&r1= =3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Se= ssionItemStateManager.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Se= ssionItemStateManager.java Mon Apr 25 03:08:35 2005 @@ -447,9 +447,8 @@ * appending a random integer in order= to * avoid potential conflicts */ - Path dummy =3D Path.create(p0, - Path.create(new QName(Constant= s=2ENS_DEFAULT_URI, Integer.toString(new Random().nextInt())), 0), - true); + QName dummyName =3D new QName(Constant= s=2ENS_DEFAULT_URI, Integer.toString(new Random().nextInt())); + Path dummy =3D Path.create(p0, Path.cr= eate(dummyName, 0), true); descendants.put(dummy, state); isDescendant =3D true; break; Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/st= ate/TransientItemStateManager.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/state/TransientItemStateManager.java?rev=3D164552&r1= =3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Tr= ansientItemStateManager.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/state/Tr= ansientItemStateManager.java Mon Apr 25 03:08:35 2005 @@ -97,7 +97,7 @@ public boolean hasNodeReferences(NodeReferencesId id) { return false; } - =20 + //------------------< methods for listing & querying state of cache/at= tic > =20 /** Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ut= il/ChildrenCollectorFilter.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/util/ChildrenCollectorFilter.java?rev=3D164552&r1=3D= 164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Chi= ldrenCollectorFilter.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Chi= ldrenCollectorFilter.java Mon Apr 25 03:08:35 2005 @@ -126,7 +126,7 @@ int pLen =3D pattern.length(); int sLen =3D s.length(); =20 - for (; ;) { + while (true) { if (pOff >=3D pLen) { if (sOff >=3D sLen) { return true; @@ -152,7 +152,7 @@ return true; } =20 - for (; ;) { + while (true) { if (internalMatches(s, pattern, sOff, pOff)) { return true; } Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ut= il/ISO9075.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/util/ISO9075.java?rev=3D164552&r1=3D164551&r2=3D1645= 52&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ISO= 9075.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/ISO= 9075.java Mon Apr 25 03:08:35 2005 @@ -34,6 +34,9 @@ */ public class ISO9075 { =20 + /** Hidden constructor. */ + private ISO9075() { } + /** Pattern on an encoded character */ private static final Pattern ENCODE_PATTERN =3D Pattern.compile("_x\\p= {XDigit}{4}_"); =20 @@ -166,7 +169,8 @@ * @param location the location to look at. * @throws ArrayIndexOutOfBoundsException if location > name.length() */ - private static boolean needsEscaping(String name, int location) { + private static boolean needsEscaping(String name, int location) + throws ArrayIndexOutOfBoundsException { if (name.charAt(location) =3D=3D '_' && name.length() >=3D locatio= n + 6) { return name.charAt(location + 1) =3D=3D 'x' && HEX_DIGITS.indexOf(name.charAt(location + 2)) !=3D -1 Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ut= il/Text.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/util/Text.java?rev=3D164552&r1=3D164551&r2=3D164552&= view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Tex= t=2Ejava (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Tex= t=2Ejava Mon Apr 25 03:08:35 2005 @@ -26,6 +26,9 @@ */ public class Text { =20 + /** Hidden constructor. */ + private Text() { } + /** * used for the md5 */ Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ut= il/ValueHelper.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/util/ValueHelper.java?rev=3D164552&r1=3D164551&r2=3D= 164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Val= ueHelper.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/Val= ueHelper.java Mon Apr 25 03:08:35 2005 @@ -506,7 +506,7 @@ */ public static Value deserialize(String value, int type, boolean decodeBlanks) - throws RepositoryException { + throws ValueFormatException, RepositoryException { if (type =3D=3D PropertyType.BINARY) { // base64 encoded binary value; // the encodeBlanks flag can be ignored since base64-encoded Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ut= il/uuid/Bytes.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/util/uuid/Bytes.java?rev=3D164552&r1=3D164551&r2=3D1= 64552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uui= d/Bytes.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/util/uui= d/Bytes.java Mon Apr 25 03:08:35 2005 @@ -141,8 +141,11 @@ if (rhs =3D=3D null) { return +1; } - if (lhs.length !=3D rhs.length) { - return ((lhs.length < rhs.length) ? -1 : +1); + if (lhs.length < rhs.length) { + return -1; + } + if (lhs.length > rhs.length) { + return +1; } for (int i =3D 0; i < lhs.length; i++) { if (lhs[i] < rhs[i]) { Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ve= rsion/VersionItemStateProvider.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/version/VersionItemStateProvider.java?rev=3D164552&r= 1=3D164551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- 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 Mon Apr 25 03:08:35 2005 @@ -89,9 +89,12 @@ this.vMgr =3D vMgr; this.parentId =3D parentId; NDEF_VERSION =3D ntReg.getEffectiveNodeType(NT_VERSIONHISTORY).get= ApplicableChildNodeDef(JCR_ROOTVERSION, NT_VERSION).getId(); - NDEF_VERSION_HISTORY =3D ntReg.getEffectiveNodeType(REP_VERSIONSTO= RAGE).getApplicableChildNodeDef(JCR_ROOTVERSION, NT_VERSIONHISTORY).getId(); - NDEF_VERSION_HISTORY_ROOT =3D ntReg.getEffectiveNodeType(REP_SYSTE= M).getApplicableChildNodeDef(JCR_VERSIONSTORAGE, REP_VERSIONSTORAGE).getId(= ); - NDEF_VERSION_LABELS =3D ntReg.getEffectiveNodeType(NT_VERSIONHISTO= RY).getApplicableChildNodeDef(JCR_VERSIONLABELS, NT_VERSIONLABELS).getId(); + NDEF_VERSION_HISTORY =3D + ntReg.getEffectiveNodeType(REP_VERSIONSTORAGE).getApplicableCh= ildNodeDef(JCR_ROOTVERSION, NT_VERSIONHISTORY).getId(); + NDEF_VERSION_HISTORY_ROOT =3D + ntReg.getEffectiveNodeType(REP_SYSTEM).getApplicableChildNodeD= ef(JCR_VERSIONSTORAGE, REP_VERSIONSTORAGE).getId(); + NDEF_VERSION_LABELS =3D + ntReg.getEffectiveNodeType(NT_VERSIONHISTORY).getApplicableChi= ldNodeDef(JCR_VERSIONLABELS, NT_VERSIONLABELS).getId(); } =20 /** @@ -210,8 +213,7 @@ state =3D createNodeState(parent, JCR_FROZENNODE, id.getUUID(), - mimicFrozen ? fn.getFrozenPrimaryType() : - NT_FROZENNODE); + mimicFrozen ? fn.getFrozenPrimaryType() : NT_FROZE= NNODE); mapFrozenNode(state, fn, mimicFrozen); =20 } else if (vi instanceof InternalFrozenVersionHistory) { Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/ve= rsion/VersionManagerImpl.java URL: http://svn.apache.org/viewcvs/incubator/jackrabbit/trunk/src/java/org/= apache/jackrabbit/core/version/VersionManagerImpl.java?rev=3D164552&r1=3D16= 4551&r2=3D164552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/= VersionManagerImpl.java (original) +++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/version/= VersionManagerImpl.java Mon Apr 25 03:08:35 2005 @@ -269,7 +269,7 @@ * @throws RepositoryException if any other error occurs. */ public void removeVersion(VersionHistory history, QName name) - throws RepositoryException { + throws VersionException, RepositoryException { if (!((VersionHistoryImpl) history).hasNode(name)) { throw new VersionException("Version with name " + name.toStrin= g() + " does not exist in this VersionHistory");