From commits-return-4785-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Oct 30 10:04:50 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 83368 invoked from network); 30 Oct 2007 10:04:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Oct 2007 10:04:50 -0000 Received: (qmail 99497 invoked by uid 500); 30 Oct 2007 10:04:07 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 99470 invoked by uid 500); 30 Oct 2007 10:04:07 -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 99461 invoked by uid 99); 30 Oct 2007 10:04:07 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 03:04:07 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 10:04:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7C9F01A9832; Tue, 30 Oct 2007 03:03:42 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590014 [1/11] - in /jackrabbit/trunk: jackrabbit-core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ jackrabbit-core/src/main/java/org/apache/jackrabbit/core/jou... Date: Tue, 30 Oct 2007 10:02:57 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071030100342.7C9F01A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Oct 30 03:02:41 2007 New Revision: 590014 URL: http://svn.apache.org/viewvc?rev=590014&view=rev Log: JCR-1169 Distribution of commons classes (adjust jackrabbit-core) Added: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamePathResolverImpl.java (with props) Modified: jackrabbit/trunk/jackrabbit-core/pom.xml jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemValidator.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NodeImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyId.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/PropertyImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/RepositoryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SearchManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/SessionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/WorkspaceImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ZombieHierarchyManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterContext.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/cluster/ClusterNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractJournal.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AbstractRecord.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/AppendRecord.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseJournal.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/DatabaseRecordIterator.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileJournal.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordIterator.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRecordLog.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/FileRevision.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Journal.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/LockableFileRevision.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/ReadRecord.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/journal/Record.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/LockManagerImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/lock/XALockManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/BitsetENTCacheImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeType.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCache.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/EffectiveNodeTypeCacheImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDef.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/ItemDefinitionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDef.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefId.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeDefinitionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDef.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeDefStore.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeManagerImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistry.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/NodeTypeRegistryListener.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/PropDef.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/PropDefImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/PropertyDefinitionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/ValueConstraint.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefReader.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefWriter.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/virtual/VirtualNodeTypeStateProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/AdditionalNamespaceResolver.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeReader.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/nodetype/xml/NodeTypeWriter.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ChangeLogBasedHierarchyMgr.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/DelegatingObservationDispatcher.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventFilter.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventState.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/EventStateCollection.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/observation/ObservationManagerImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/AbstractBundlePersistenceManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/BundleBinding.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ItemStateBinding.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/NodePropBundle.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/mem/InMemPersistenceManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/util/Serializer.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/xml/XMLPersistenceManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/DefaultQueryNodeFactory.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/DerefQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/ExactQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/ExecutablePreparedQuery.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/LocationStepQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/NodeTypeQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/OrderQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PathQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PreparedQueryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/PropertyTypeRegistry.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryNodeFactory.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryParser.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryRootNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/QueryTreeDump.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/RelationQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/TextsearchQueryNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/AggregateRuleImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ChildAxisQuery.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/DocOrderNodeIteratorImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ExcerptProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/FileBasedNamespaceMappings.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfiguration.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/IndexingConfigurationImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/JQOM2LuceneQueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/LuceneQueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NSRegistryBasedNamespaceMappings.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NamespaceMappings.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/NodeIndexer.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/PreparedQueryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/QueryResultImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/RowIteratorImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SimpleExcerptProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/WorkspaceTraversalResult.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AbstractQOMNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/AndImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/BindVariableValueImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ChildNodeJoinConditionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ColumnImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ComparisonImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/ConstraintImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DescendantNodeJoinConditionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/DynamicOperandImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/EquiJoinConditionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/FullTextSearchScoreImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinConditionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/JoinImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LengthImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LiteralImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/LowerCaseImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeLocalNameImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NodeNameImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/NotImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/OrderingImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyExistenceImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/PropertyValueImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelFactoryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/QueryObjectModelTree.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SameNodeJoinConditionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SelectorImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/SourceImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/StaticOperandImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/qom/UpperCaseImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTContainsExpression.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTIdentifier.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/ASTPredicate.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/JCRSQLQueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/sql/QueryFormat.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/QueryFormat.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/xpath/XPathQueryBuilder.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/security/AMContext.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/LocalItemStateManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeState.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeStateListener.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/NodeStateMerger.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/PropertyState.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SessionItemStateManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/StateChangeDispatcher.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/state/UpdatableItemStateManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/value/InternalValue.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/AbstractVersionManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFreeze.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNode.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenNodeImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalFrozenVHImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersion.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistory.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionHistoryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/InternalVersionImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/NodeStateEx.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionItemStateProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/VersionManagerImpl.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/version/XAVersionManager.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/AbstractVISProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualItemStateProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualNodeState.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/virtual/VirtualValueProvider.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/AbstractSAXEventGenerator.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/BufferedStringValue.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewImportHandler.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/DocViewSAXEventGenerator.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/ImportHandler.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/NamespaceContext.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/NodeInfo.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/PropInfo.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SessionImporter.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/StringValue.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewImportHandler.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/SysViewSAXEventGenerator.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TargetImportHandler.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/TextValue.java jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/xml/WorkspaceImporter.java jackrabbit/trunk/jackrabbit-core/src/main/javacc/sql/JCRSQL.jjt jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/JackrabbitRepositoryStub.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/NamespaceRegistryImplTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/NodeTypeTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/CyclicNodeTypeRegistrationTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/compact/CompactNodeTypeDefTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/SimpleNamespaceRegistry.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/nodetype/xml/TestAll.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/query/PathQueryNodeTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/state/ChangeLogTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/util/RepositoryLockTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/version/VersionIteratorImplTest.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/ExportDocViewTestData.java jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/init/NodeTestData.java jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RepositorySetup.java Modified: jackrabbit/trunk/jackrabbit-core/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/pom.xml (original) +++ jackrabbit/trunk/jackrabbit-core/pom.xml Tue Oct 30 03:02:41 2007 @@ -268,6 +268,14 @@ org.apache.jackrabbit + jackrabbit-spi-commons + + + org.apache.jackrabbit + jackrabbit-spi + + + org.apache.jackrabbit jackrabbit-text-extractors Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/BatchedItemOperations.java Tue Oct 30 03:02:41 2007 @@ -35,10 +35,11 @@ import org.apache.jackrabbit.core.util.ReferenceChangeTracker; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.version.VersionManager; -import org.apache.jackrabbit.name.MalformedPathException; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; +import org.apache.jackrabbit.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -272,7 +273,7 @@ NodeState srcState = getNodeState(srcStateMgr, srcHierMgr, srcPath); - Path.PathElement destName = destPath.getNameElement(); + Path.Element destName = destPath.getNameElement(); Path destParentPath = destPath.getAncestor(1); NodeState destParentState = getNodeState(destParentPath); int ind = destName.getIndex(); @@ -395,12 +396,12 @@ throw new RepositoryException(msg, mpe); } - Path.PathElement srcName = srcPath.getNameElement(); + Path.Element srcName = srcPath.getNameElement(); Path srcParentPath = srcPath.getAncestor(1); NodeState target = getNodeState(srcPath); NodeState srcParent = getNodeState(srcParentPath); - Path.PathElement destName = destPath.getNameElement(); + Path.Element destName = destPath.getNameElement(); Path destParentPath = destPath.getAncestor(1); NodeState destParent = getNodeState(destParentPath); @@ -529,8 +530,8 @@ * @throws ItemExistsException * @throws RepositoryException */ - public void checkAddNode(NodeState parentState, QName nodeName, - QName nodeTypeName, int options) + public void checkAddNode(NodeState parentState, Name nodeName, + Name nodeTypeName, int options) throws ConstraintViolationException, AccessDeniedException, VersionException, LockException, ItemNotFoundException, ItemExistsException, RepositoryException { @@ -755,7 +756,7 @@ if ((options & CHECK_REFERENCES) == CHECK_REFERENCES) { EffectiveNodeType ent = getEffectiveNodeType(targetState); - if (ent.includesNodeType(QName.MIX_REFERENCEABLE)) { + if (ent.includesNodeType(NameConstants.MIX_REFERENCEABLE)) { NodeReferencesId refsId = new NodeReferencesId(targetState.getNodeId()); if (stateMgr.hasNodeReferences(refsId)) { try { @@ -870,8 +871,8 @@ * could be found * @throws RepositoryException if another error occurs */ - public NodeDef findApplicableNodeDefinition(QName name, - QName nodeTypeName, + public NodeDef findApplicableNodeDefinition(Name name, + Name nodeTypeName, NodeState parentState) throws RepositoryException, ConstraintViolationException { EffectiveNodeType entParent = getEffectiveNodeType(parentState); @@ -898,7 +899,7 @@ * could be found * @throws RepositoryException if another error occurs */ - public PropDef findApplicablePropertyDefinition(QName name, + public PropDef findApplicablePropertyDefinition(Name name, int type, boolean multiValued, NodeState parentState) @@ -910,7 +911,7 @@ /** * Helper method that finds the applicable definition for a property with * the given name, type in the parent node's node type and mixin types. - * Other than {@link #findApplicablePropertyDefinition(QName, int, boolean, NodeState)} + * Other than {@link #findApplicablePropertyDefinition(Name, int, boolean, NodeState)} * this method does not take the multiValued flag into account in the * selection algorithm. If there more than one applicable definitions then * the following rules are applied: @@ -929,7 +930,7 @@ * could be found * @throws RepositoryException if another error occurs */ - public PropDef findApplicablePropertyDefinition(QName name, + public PropDef findApplicablePropertyDefinition(Name name, int type, NodeState parentState) throws RepositoryException, ConstraintViolationException { @@ -957,9 +958,9 @@ * @throws IllegalStateException if the state mananger is not in edit mode */ public NodeState createNodeState(NodeState parent, - QName nodeName, - QName nodeTypeName, - QName[] mixinNames, + Name nodeName, + Name nodeTypeName, + Name[] mixinNames, NodeId id) throws ItemExistsException, ConstraintViolationException, RepositoryException, IllegalStateException { @@ -993,9 +994,9 @@ * @throws IllegalStateException */ public NodeState createNodeState(NodeState parent, - QName nodeName, - QName nodeTypeName, - QName[] mixinNames, + Name nodeName, + Name nodeTypeName, + Name[] mixinNames, NodeId id, NodeDef def) throws ItemExistsException, ConstraintViolationException, @@ -1040,7 +1041,7 @@ if (!node.getMixinTypeNames().isEmpty()) { // create jcr:mixinTypes property - PropDef pd = ent.getApplicablePropertyDef(QName.JCR_MIXINTYPES, + PropDef pd = ent.getApplicablePropertyDef(NameConstants.JCR_MIXINTYPES, PropertyType.NAME, true); createPropertyState(node, pd.getName(), pd.getRequiredType(), pd); } @@ -1086,7 +1087,7 @@ * @throws IllegalStateException if the state mananger is not in edit mode */ public PropertyState createPropertyState(NodeState parent, - QName propName, + Name propName, int type, int numValues) throws ItemExistsException, ConstraintViolationException, @@ -1135,7 +1136,7 @@ * @throws RepositoryException */ public PropertyState createPropertyState(NodeState parent, - QName propName, + Name propName, int type, PropDef def) throws ItemExistsException, RepositoryException { @@ -1296,7 +1297,7 @@ * this would have a negative impact on performance though... */ NodeState nodeState = getNodeState(nodePath); - while (!nodeState.hasPropertyName(QName.JCR_ISCHECKEDOUT)) { + while (!nodeState.hasPropertyName(NameConstants.JCR_ISCHECKEDOUT)) { if (nodePath.denotesRoot()) { return; } @@ -1304,7 +1305,7 @@ nodeState = getNodeState(nodePath); } PropertyId propId = - new PropertyId(nodeState.getNodeId(), QName.JCR_ISCHECKEDOUT); + new PropertyId(nodeState.getNodeId(), NameConstants.JCR_ISCHECKEDOUT); PropertyState propState; try { propState = (PropertyState) stateMgr.getItemState(propId); @@ -1428,45 +1429,45 @@ */ // compute system generated values - QName declaringNT = def.getDeclaringNodeType(); - QName name = def.getName(); - if (QName.MIX_REFERENCEABLE.equals(declaringNT)) { + Name declaringNT = def.getDeclaringNodeType(); + Name name = def.getName(); + if (NameConstants.MIX_REFERENCEABLE.equals(declaringNT)) { // mix:referenceable node type - if (QName.JCR_UUID.equals(name)) { + if (NameConstants.JCR_UUID.equals(name)) { // jcr:uuid property genValues = new InternalValue[]{InternalValue.create( parent.getNodeId().getUUID().toString())}; } - } else if (QName.NT_BASE.equals(declaringNT)) { + } else if (NameConstants.NT_BASE.equals(declaringNT)) { // nt:base node type - if (QName.JCR_PRIMARYTYPE.equals(name)) { + if (NameConstants.JCR_PRIMARYTYPE.equals(name)) { // jcr:primaryType property genValues = new InternalValue[]{InternalValue.create(parent.getNodeTypeName())}; - } else if (QName.JCR_MIXINTYPES.equals(name)) { + } else if (NameConstants.JCR_MIXINTYPES.equals(name)) { // jcr:mixinTypes property Set mixins = parent.getMixinTypeNames(); ArrayList values = new ArrayList(mixins.size()); Iterator iter = mixins.iterator(); while (iter.hasNext()) { - values.add(InternalValue.create((QName) iter.next())); + values.add(InternalValue.create((Name) iter.next())); } genValues = (InternalValue[]) values.toArray(new InternalValue[values.size()]); } - } else if (QName.NT_HIERARCHYNODE.equals(declaringNT)) { + } else if (NameConstants.NT_HIERARCHYNODE.equals(declaringNT)) { // nt:hierarchyNode node type - if (QName.JCR_CREATED.equals(name)) { + if (NameConstants.JCR_CREATED.equals(name)) { // jcr:created property genValues = new InternalValue[]{InternalValue.create(Calendar.getInstance())}; } - } else if (QName.NT_RESOURCE.equals(declaringNT)) { + } else if (NameConstants.NT_RESOURCE.equals(declaringNT)) { // nt:resource node type - if (QName.JCR_LASTMODIFIED.equals(name)) { + if (NameConstants.JCR_LASTMODIFIED.equals(name)) { // jcr:lastModified property genValues = new InternalValue[]{InternalValue.create(Calendar.getInstance())}; } - } else if (QName.NT_VERSION.equals(declaringNT)) { + } else if (NameConstants.NT_VERSION.equals(declaringNT)) { // nt:version node type - if (QName.JCR_CREATED.equals(name)) { + if (NameConstants.JCR_CREATED.equals(name)) { // jcr:created property genValues = new InternalValue[]{InternalValue.create(Calendar.getInstance())}; } @@ -1528,7 +1529,7 @@ // use temp set to avoid ConcurrentModificationException HashSet tmp = new HashSet(targetState.getPropertyNames()); for (Iterator iter = tmp.iterator(); iter.hasNext();) { - QName propName = (QName) iter.next(); + Name propName = (Name) iter.next(); PropertyId propId = new PropertyId(targetState.getNodeId(), propName); try { @@ -1583,8 +1584,8 @@ try { NodeId id; EffectiveNodeType ent = getEffectiveNodeType(srcState); - boolean referenceable = ent.includesNodeType(QName.MIX_REFERENCEABLE); - boolean versionable = ent.includesNodeType(QName.MIX_VERSIONABLE); + boolean referenceable = ent.includesNodeType(NameConstants.MIX_REFERENCEABLE); + boolean versionable = ent.includesNodeType(NameConstants.MIX_VERSIONABLE); switch (flag) { case COPY: // always create new uuid @@ -1673,7 +1674,7 @@ // copy properties iter = srcState.getPropertyNames().iterator(); while (iter.hasNext()) { - QName propName = (QName) iter.next(); + Name propName = (Name) iter.next(); PropertyId propId = new PropertyId(srcState.getNodeId(), propName); if (!srcAccessMgr.isGranted(propId, AccessManager.READ)) { continue; @@ -1690,7 +1691,7 @@ */ PropDefId defId = srcChildState.getDefinitionId(); PropDef def = ntReg.getPropDef(defId); - if (def.getDeclaringNodeType().equals(QName.MIX_LOCKABLE)) { + if (def.getDeclaringNodeType().equals(NameConstants.MIX_LOCKABLE)) { // skip properties defined by mix:lockable continue; } @@ -1704,19 +1705,19 @@ * copied properties declared by mix:versionable need to be * adjusted accordingly. */ - if (propName.equals(QName.JCR_VERSIONHISTORY)) { + if (propName.equals(NameConstants.JCR_VERSIONHISTORY)) { // jcr:versionHistory VersionHistory vh = getOrCreateVersionHistory(newState); newChildState.setValues(new InternalValue[]{InternalValue.create(new UUID(vh.getUUID()))}); - } else if (propName.equals(QName.JCR_BASEVERSION)) { + } else if (propName.equals(NameConstants.JCR_BASEVERSION)) { // jcr:baseVersion VersionHistory vh = getOrCreateVersionHistory(newState); newChildState.setValues(new InternalValue[]{InternalValue.create(new UUID(vh.getRootVersion().getUUID()))}); - } else if (propName.equals(QName.JCR_PREDECESSORS)) { + } else if (propName.equals(NameConstants.JCR_PREDECESSORS)) { // jcr:predecessors VersionHistory vh = getOrCreateVersionHistory(newState); newChildState.setValues(new InternalValue[]{InternalValue.create(new UUID(vh.getRootVersion().getUUID()))}); - } else if (propName.equals(QName.JCR_ISCHECKEDOUT)) { + } else if (propName.equals(NameConstants.JCR_ISCHECKEDOUT)) { // jcr:isCheckedOut newChildState.setValues(new InternalValue[]{InternalValue.create(true)}); } @@ -1749,7 +1750,7 @@ */ private PropertyState copyPropertyState(PropertyState srcState, NodeId parentId, - QName propName) + Name propName) throws RepositoryException { PropDefId defId = srcState.getDefinitionId(); @@ -1769,8 +1770,8 @@ * * todo FIXME delegate to 'node type instance handler' */ - if (def.getDeclaringNodeType().equals(QName.MIX_REFERENCEABLE) - && propName.equals(QName.JCR_UUID)) { + if (def.getDeclaringNodeType().equals(NameConstants.MIX_REFERENCEABLE) + && propName.equals(NameConstants.JCR_UUID)) { // set correct value of jcr:uuid property newState.setValues(new InternalValue[]{InternalValue.create(parentId.getUUID().toString())}); } else { Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/CachingHierarchyManager.java Tue Oct 30 03:02:41 2007 @@ -23,11 +23,13 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.NodeStateListener; import org.apache.jackrabbit.core.util.Dumpable; -import org.apache.jackrabbit.name.MalformedPathException; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.PathResolver; -import org.apache.jackrabbit.name.QName; -import org.apache.jackrabbit.util.PathMap; +import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.name.PathMap; +import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.name.PathFactoryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,8 +120,8 @@ if (state.isNode() && !isCached(state.getId())) { try { - Path.PathBuilder builder = new Path.PathBuilder(); - Path.PathElement[] elements = path.getElements(); + PathBuilder builder = new PathBuilder(); + Path.Element[] elements = path.getElements(); for (int i = 0; i < next; i++) { builder.addLast(elements[i]); } @@ -140,14 +142,14 @@ * being used. If no mapping is found, the item is cached instead after * the base implementation has been invoked. */ - protected void buildPath(Path.PathBuilder builder, ItemState state) + protected void buildPath(PathBuilder builder, ItemState state) throws ItemStateException, RepositoryException { if (state.isNode()) { PathMap.Element element = get(state.getId()); if (element != null) { try { - Path.PathElement[] elements = element.getPath().getElements(); + Path.Element[] elements = element.getPath().getElements(); for (int i = elements.length - 1; i >= 0; i--) { builder.addFirst(elements[i]); } @@ -227,7 +229,7 @@ /** * {@inheritDoc} */ - public QName getName(ItemId id) + public Name getName(ItemId id) throws ItemNotFoundException, RepositoryException { if (id.denotesNode()) { @@ -351,12 +353,12 @@ /** * {@inheritDoc} */ - public void nodeAdded(NodeState state, QName name, int index, NodeId id) { + public void nodeAdded(NodeState state, Name name, int index, NodeId id) { // Optimization: ignore notifications for nodes that are not in the cache synchronized (cacheMonitor) { if (idCache.containsKey(state.getNodeId())) { try { - Path path = Path.create(getPath(state.getNodeId()), name, index, true); + Path path = PathFactoryImpl.getInstance().create(getPath(state.getNodeId()), name, index, true); insert(path, id); } catch (PathNotFoundException e) { log.warn("Unable to get path of node " + state.getNodeId() @@ -415,7 +417,7 @@ * whether their position changed or not - as we might need * to reorder them later on. */ - Path.PathElement newNameIndex = Path.PathElement.create( + Path.Element newNameIndex = PathFactoryImpl.getInstance().createElement( cne.getName(), cne.getIndex()); newChildrenOrder.put(newNameIndex, child); @@ -435,12 +437,12 @@ /** * {@inheritDoc} */ - public void nodeRemoved(NodeState state, QName name, int index, NodeId id) { + public void nodeRemoved(NodeState state, Name name, int index, NodeId id) { // Optimization: ignore notifications for nodes that are not in the cache synchronized (cacheMonitor) { if (idCache.containsKey(state.getNodeId())) { try { - Path path = Path.create(getPath(state.getNodeId()), name, index, true); + Path path = PathFactoryImpl.getInstance().create(getPath(state.getNodeId()), name, index, true); remove(path, id); } catch (PathNotFoundException e) { log.warn("Unable to get path of node " + state.getNodeId() Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManager.java Tue Oct 30 03:02:41 2007 @@ -16,8 +16,8 @@ */ package org.apache.jackrabbit.core; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.Name; import javax.jcr.ItemNotFoundException; import javax.jcr.RepositoryException; @@ -57,7 +57,7 @@ * @throws ItemNotFoundException * @throws RepositoryException */ - QName getName(ItemId id) throws ItemNotFoundException, RepositoryException; + Name getName(ItemId id) throws ItemNotFoundException, RepositoryException; /** * Returns the depth of the specified item which is equivalent to Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/HierarchyManagerImpl.java Tue Oct 30 03:02:41 2007 @@ -22,10 +22,13 @@ import org.apache.jackrabbit.core.state.NoSuchItemStateException; import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; -import org.apache.jackrabbit.name.MalformedPathException; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.PathResolver; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.conversion.MalformedPathException; +import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.name.PathBuilder; +import org.apache.jackrabbit.name.PathFactoryImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,9 +45,9 @@ /** * The parent name returned for orphaned or root nodes. - * TODO: Is it proper to use an invalid QName for this. + * TODO: Is it proper to use an invalid Name for this. */ - private static final QName EMPTY_NAME = new QName("", ""); + private static final Name EMPTY_NAME = NameFactoryImpl.getInstance().create("", ""); protected final NodeId rootNodeId; protected final ItemStateManager provider; @@ -177,10 +180,10 @@ * @return the ChildNodeEntry of parent with * the specified name and index or * null if there's no such entry. - * @see ZombieHierarchyManager#getChildNodeEntry(NodeState, QName, int) + * @see ZombieHierarchyManager#getChildNodeEntry(NodeState, Name, int) */ protected NodeState.ChildNodeEntry getChildNodeEntry(NodeState parent, - QName name, + Name name, int index) { return parent.getChildNodeEntry(name, index); } @@ -225,13 +228,13 @@ protected ItemId resolvePath(Path path, ItemState state, int next) throws ItemStateException { - Path.PathElement[] elements = path.getElements(); + Path.Element[] elements = path.getElements(); if (elements.length == next) { return state.getId(); } - Path.PathElement elem = elements[next]; + Path.Element elem = elements[next]; - QName name = elem.getName(); + Name name = elem.getName(); int index = elem.getIndex(); if (index == 0) { index = 1; @@ -275,7 +278,7 @@ * @param builder builder currently being used * @param state item to find path of */ - protected void buildPath(Path.PathBuilder builder, ItemState state) + protected void buildPath(PathBuilder builder, ItemState state) throws ItemStateException, RepositoryException { // shortcut @@ -315,7 +318,7 @@ } } else { PropertyState propState = (PropertyState) state; - QName name = propState.getName(); + Name name = propState.getName(); // add to path builder.addLast(name); } @@ -347,10 +350,10 @@ throws ItemNotFoundException, RepositoryException { // shortcut if (id.equals(rootNodeId)) { - return Path.ROOT; + return PathFactoryImpl.getInstance().getRootPath(); } - Path.PathBuilder builder = new Path.PathBuilder(); + PathBuilder builder = new PathBuilder(); try { buildPath(builder, getItemState(id)); @@ -373,7 +376,7 @@ /** * {@inheritDoc} */ - public QName getName(ItemId itemId) + public Name getName(ItemId itemId) throws ItemNotFoundException, RepositoryException { if (itemId.denotesNode()) { NodeId nodeId = (NodeId) itemId; Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemImpl.java Tue Oct 30 03:02:41 2007 @@ -34,10 +34,11 @@ import org.apache.jackrabbit.core.state.StaleItemStateException; import org.apache.jackrabbit.core.value.InternalValue; import org.apache.jackrabbit.core.version.VersionManager; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.uuid.UUID; import org.apache.jackrabbit.util.Text; +import org.apache.jackrabbit.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -524,7 +525,7 @@ PropDef[] pda = ent.getMandatoryPropDefs(); for (int i = 0; i < pda.length; i++) { PropDef pd = pda[i]; - if (pd.getDeclaringNodeType().equals(QName.MIX_VERSIONABLE)) { + if (pd.getDeclaringNodeType().equals(NameConstants.MIX_VERSIONABLE)) { /** * todo FIXME workaround for mix:versionable: * the mandatory properties are initialized at a @@ -767,8 +768,8 @@ if (itemState.isNode()) { NodeState nodeState = (NodeState) itemState; EffectiveNodeType nt = validator.getEffectiveNodeType(nodeState); - if (nt.includesNodeType(QName.MIX_VERSIONABLE)) { - if (!nodeState.hasPropertyName(QName.JCR_VERSIONHISTORY)) { + if (nt.includesNodeType(NameConstants.MIX_VERSIONABLE)) { + if (!nodeState.hasPropertyName(NameConstants.JCR_VERSIONHISTORY)) { NodeImpl node = (NodeImpl) itemMgr.getItem(itemState.getId()); VersionManager vMgr = session.getVersionManager(); /** @@ -783,10 +784,10 @@ if (vh == null) { vh = vMgr.createVersionHistory(session, nodeState); } - node.internalSetProperty(QName.JCR_VERSIONHISTORY, InternalValue.create(new UUID(vh.getUUID()))); - node.internalSetProperty(QName.JCR_BASEVERSION, InternalValue.create(new UUID(vh.getRootVersion().getUUID()))); - node.internalSetProperty(QName.JCR_ISCHECKEDOUT, InternalValue.create(true)); - node.internalSetProperty(QName.JCR_PREDECESSORS, + node.internalSetProperty(NameConstants.JCR_VERSIONHISTORY, InternalValue.create(new UUID(vh.getUUID()))); + node.internalSetProperty(NameConstants.JCR_BASEVERSION, InternalValue.create(new UUID(vh.getRootVersion().getUUID()))); + node.internalSetProperty(NameConstants.JCR_ISCHECKEDOUT, InternalValue.create(true)); + node.internalSetProperty(NameConstants.JCR_PREDECESSORS, new InternalValue[]{InternalValue.create(new UUID(vh.getRootVersion().getUUID()))}); createdTransientState = true; } @@ -822,7 +823,7 @@ // check state of this instance sanityCheck(); - Path.PathElement thisName = getPrimaryPath().getNameElement(); + Path.Element thisName = getPrimaryPath().getNameElement(); // check if protected if (isNode()) { @@ -883,13 +884,13 @@ /** * Same as {@link Item#getName()} except that - * this method returns a QName instead of a + * this method returns a Name instead of a * String. * - * @return the name of this item as QName + * @return the name of this item as Name * @throws RepositoryException if an error occurs. */ - public abstract QName getQName() throws RepositoryException; + public abstract Name getQName() throws RepositoryException; //----------------------------------------------------< ItemStateListener > /** Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemManager.java Tue Oct 30 03:02:41 2007 @@ -33,8 +33,9 @@ import org.apache.jackrabbit.core.util.Dumpable; import org.apache.jackrabbit.core.version.VersionHistoryImpl; import org.apache.jackrabbit.core.version.VersionImpl; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.name.NameConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -440,7 +441,7 @@ Iterator iter = nodeState.getPropertyNames().iterator(); while (iter.hasNext()) { - QName propName = (QName) iter.next(); + Name propName = (Name) iter.next(); // check read access if (session.getAccessManager().isGranted(new PropertyId(parentId, propName), AccessManager.READ)) { return true; @@ -473,7 +474,7 @@ Iterator iter = nodeState.getPropertyNames().iterator(); while (iter.hasNext()) { - QName propName = (QName) iter.next(); + Name propName = (Name) iter.next(); PropertyId id = new PropertyId(parentId, propName); // check read access if (session.getAccessManager().isGranted(id, AccessManager.READ)) { @@ -519,10 +520,10 @@ ItemLifeCycleListener[] listeners = new ItemLifeCycleListener[]{this}; // check special nodes - if (state.getNodeTypeName().equals(QName.NT_VERSION)) { + if (state.getNodeTypeName().equals(NameConstants.NT_VERSION)) { return createVersionInstance(id, state, def, listeners); - } else if (state.getNodeTypeName().equals(QName.NT_VERSIONHISTORY)) { + } else if (state.getNodeTypeName().equals(NameConstants.NT_VERSIONHISTORY)) { return createVersionHistoryInstance(id, state, def, listeners); } else { Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemValidator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemValidator.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemValidator.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/ItemValidator.java Tue Oct 30 03:02:41 2007 @@ -24,9 +24,9 @@ import org.apache.jackrabbit.core.state.NodeState; import org.apache.jackrabbit.core.state.PropertyState; import org.apache.jackrabbit.core.value.InternalValue; -import org.apache.jackrabbit.name.Path; -import org.apache.jackrabbit.name.PathResolver; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.Name; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -107,7 +107,7 @@ NodeDef def = ntReg.getNodeDef(nodeState.getDefinitionId()); // check if primary type satisfies the 'required node types' constraint - QName[] requiredPrimaryTypes = def.getRequiredPrimaryTypes(); + Name[] requiredPrimaryTypes = def.getRequiredPrimaryTypes(); for (int i = 0; i < requiredPrimaryTypes.length; i++) { if (!entPrimary.includesNodeType(requiredPrimaryTypes[i])) { String msg = safeGetJCRPath(nodeState.getNodeId()) @@ -193,7 +193,7 @@ throws RepositoryException { // mixin types Set set = nodeState.getMixinTypeNames(); - QName[] types = new QName[set.size() + 1]; + Name[] types = new Name[set.size() + 1]; set.toArray(types); // primary type types[types.length - 1] = nodeState.getNodeTypeName(); Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/LocalNamespaceMappings.java Tue Oct 30 03:02:41 2007 @@ -16,16 +16,10 @@ */ package org.apache.jackrabbit.core; -import org.apache.jackrabbit.name.AbstractNamespaceResolver; -import org.apache.jackrabbit.name.NameException; -import org.apache.jackrabbit.name.NameResolver; -import org.apache.jackrabbit.name.NamespaceListener; -import org.apache.jackrabbit.name.NamespaceResolver; -import org.apache.jackrabbit.name.ParsingNameResolver; -import org.apache.jackrabbit.name.ParsingPathResolver; -import org.apache.jackrabbit.name.PathResolver; -import org.apache.jackrabbit.name.QName; -import org.apache.jackrabbit.name.NameCache; +import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; +import org.apache.jackrabbit.namespace.NamespaceListener; +import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.XMLChar; import javax.jcr.NamespaceException; @@ -49,7 +43,7 @@ * underlying namespace registry. */ class LocalNamespaceMappings extends AbstractNamespaceResolver - implements NamespaceListener, NameCache { + implements NamespaceListener { /** The underlying global and persistent namespace registry. */ private final NamespaceRegistryImpl nsReg; @@ -60,10 +54,6 @@ /** URI to prefix mappings of local namespaces. */ private final HashMap uriToPrefix = new HashMap(); - private final NameResolver nameResolver; - - private final PathResolver pathResolver; - /** * Creates a local namespace manager with the given underlying * namespace registry. @@ -73,8 +63,6 @@ LocalNamespaceMappings(NamespaceRegistryImpl nsReg) { this.nsReg = nsReg; this.nsReg.addListener(this); - nameResolver = new ParsingNameResolver(this); - pathResolver = new ParsingPathResolver(nameResolver); } /** @@ -90,16 +78,16 @@ if (prefix == null || uri == null) { throw new IllegalArgumentException("prefix/uri can not be null"); } - if (QName.NS_EMPTY_PREFIX.equals(prefix) - || QName.NS_DEFAULT_URI.equals(uri)) { + if (Name.NS_EMPTY_PREFIX.equals(prefix) + || Name.NS_DEFAULT_URI.equals(uri)) { throw new NamespaceException("default namespace is reserved and can not be changed"); } // special case: xml namespace - if (uri.equals(QName.NS_XML_URI)) { + if (uri.equals(Name.NS_XML_URI)) { throw new NamespaceException("xml namespace is reserved and can not be changed."); } // special case: prefixes xml* - if (prefix.toLowerCase().startsWith(QName.NS_XML_PREFIX)) { + if (prefix.toLowerCase().startsWith(Name.NS_XML_PREFIX)) { throw new NamespaceException("reserved prefix: " + prefix); } // check if the prefix is a valid XML prefix @@ -166,60 +154,6 @@ */ void dispose() { nsReg.removeListener(this); - } - - public NameResolver getNameResolver() { - if (prefixToURI.isEmpty()) { - return nsReg.getNameResolver(); - } else { - return nameResolver; - } - } - - public PathResolver getPathResolver() { - if (prefixToURI.isEmpty()) { - return nsReg.getPathResolver(); - } else { - return pathResolver; - } - } - - //-------------------------------------------------------------< NameCache > - - /** - * {@inheritDoc} - */ - public QName retrieveName(String jcrName) { - try { - return getNameResolver().getQName(jcrName); - } catch (NameException e) { - return null; - } catch (NamespaceException e) { - return null; - } - } - - /** - * {@inheritDoc} - */ - public String retrieveName(QName name) { - try { - return getNameResolver().getJCRName(name); - } catch (NamespaceException e) { - return null; - } - } - - /** - * {@inheritDoc} - */ - public void cacheName(String jcrName, QName name) { - } - - /** - * {@inheritDoc} - */ - public void evictAllNames() { } //-----------------------------------------------------< NamespaceResolver > Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java?rev=590014&r1=590013&r2=590014&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java (original) +++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/NamespaceRegistryImpl.java Tue Oct 30 03:02:41 2007 @@ -20,16 +20,10 @@ import org.apache.jackrabbit.core.cluster.NamespaceEventListener; import org.apache.jackrabbit.core.fs.FileSystem; import org.apache.jackrabbit.core.fs.FileSystemResource; -import org.apache.jackrabbit.name.AbstractNamespaceResolver; -import org.apache.jackrabbit.name.CachingNameResolver; -import org.apache.jackrabbit.name.CachingPathResolver; -import org.apache.jackrabbit.name.NameCache; -import org.apache.jackrabbit.name.NameException; -import org.apache.jackrabbit.name.NameResolver; -import org.apache.jackrabbit.name.ParsingNameResolver; -import org.apache.jackrabbit.name.ParsingPathResolver; -import org.apache.jackrabbit.name.PathResolver; -import org.apache.jackrabbit.name.QName; +import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; +import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.conversion.PathResolver; +import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.XMLChar; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +45,7 @@ * A NamespaceRegistryImpl ... */ public class NamespaceRegistryImpl extends AbstractNamespaceResolver - implements NamespaceRegistry, NameCache, NamespaceEventListener { + implements NamespaceRegistry, NamespaceEventListener { private static Logger log = LoggerFactory.getLogger(NamespaceRegistryImpl.class); @@ -63,23 +57,23 @@ static { // reserved prefixes - reservedPrefixes.add(QName.NS_XML_PREFIX); - reservedPrefixes.add(QName.NS_XMLNS_PREFIX); + reservedPrefixes.add(Name.NS_XML_PREFIX); + reservedPrefixes.add(Name.NS_XMLNS_PREFIX); // predefined (e.g. built-in) prefixes - reservedPrefixes.add(QName.NS_REP_PREFIX); - reservedPrefixes.add(QName.NS_JCR_PREFIX); - reservedPrefixes.add(QName.NS_NT_PREFIX); - reservedPrefixes.add(QName.NS_MIX_PREFIX); - reservedPrefixes.add(QName.NS_SV_PREFIX); + reservedPrefixes.add(Name.NS_REP_PREFIX); + reservedPrefixes.add(Name.NS_JCR_PREFIX); + reservedPrefixes.add(Name.NS_NT_PREFIX); + reservedPrefixes.add(Name.NS_MIX_PREFIX); + reservedPrefixes.add(Name.NS_SV_PREFIX); // reserved namespace URI's - reservedURIs.add(QName.NS_XML_URI); - reservedURIs.add(QName.NS_XMLNS_URI); + reservedURIs.add(Name.NS_XML_URI); + reservedURIs.add(Name.NS_XMLNS_URI); // predefined (e.g. built-in) namespace URI's - reservedURIs.add(QName.NS_REP_URI); - reservedURIs.add(QName.NS_JCR_URI); - reservedURIs.add(QName.NS_NT_URI); - reservedURIs.add(QName.NS_MIX_URI); - reservedURIs.add(QName.NS_SV_URI); + reservedURIs.add(Name.NS_REP_URI); + reservedURIs.add(Name.NS_JCR_URI); + reservedURIs.add(Name.NS_NT_URI); + reservedURIs.add(Name.NS_MIX_URI); + reservedURIs.add(Name.NS_SV_URI); } private HashMap prefixToURI = new HashMap(); @@ -112,7 +106,6 @@ super(true); // enable listener support this.nsRegStore = nsRegStore; load(); - evictAllNames(); } /** @@ -169,21 +162,21 @@ clear(); // default namespace (if no prefix is specified) - map(QName.NS_EMPTY_PREFIX, QName.NS_DEFAULT_URI); + map(Name.NS_EMPTY_PREFIX, Name.NS_DEFAULT_URI); // declare the predefined mappings // rep: - map(QName.NS_REP_PREFIX, QName.NS_REP_URI); + map(Name.NS_REP_PREFIX, Name.NS_REP_URI); // jcr: - map(QName.NS_JCR_PREFIX, QName.NS_JCR_URI); + map(Name.NS_JCR_PREFIX, Name.NS_JCR_URI); // nt: - map(QName.NS_NT_PREFIX, QName.NS_NT_URI); + map(Name.NS_NT_PREFIX, Name.NS_NT_URI); // mix: - map(QName.NS_MIX_PREFIX, QName.NS_MIX_URI); + map(Name.NS_MIX_PREFIX, Name.NS_MIX_URI); // sv: - map(QName.NS_SV_PREFIX, QName.NS_SV_URI); + map(Name.NS_SV_PREFIX, Name.NS_SV_URI); // xml: - map(QName.NS_XML_PREFIX, QName.NS_XML_URI); + map(Name.NS_XML_PREFIX, Name.NS_XML_URI); // persist mappings store(); @@ -342,7 +335,7 @@ // ... it is not, try to find a unique prefix. // First, check and replace troublesome prefix hints. - if (prefixHint.toLowerCase().startsWith(QName.NS_XML_PREFIX) + if (prefixHint.toLowerCase().startsWith(Name.NS_XML_PREFIX) || !XMLChar.isValidNCName(prefixHint)) { prefixHint = "_pre"; } @@ -413,7 +406,7 @@ if (prefix == null || uri == null) { throw new IllegalArgumentException("prefix/uri can not be null"); } - if (QName.NS_EMPTY_PREFIX.equals(prefix) || QName.NS_DEFAULT_URI.equals(uri)) { + if (Name.NS_EMPTY_PREFIX.equals(prefix) || Name.NS_DEFAULT_URI.equals(uri)) { throw new NamespaceException("default namespace is reserved and can not be changed"); } if (reservedURIs.contains(uri)) { @@ -425,7 +418,7 @@ + prefix + " -> " + uri + ": reserved prefix"); } // special case: prefixes xml* - if (prefix.toLowerCase().startsWith(QName.NS_XML_PREFIX)) { + if (prefix.toLowerCase().startsWith(Name.NS_XML_PREFIX)) { throw new NamespaceException("failed to register namespace " + prefix + " -> " + uri + ": reserved prefix"); } @@ -462,9 +455,6 @@ // add new prefix mapping map(prefix, uri); - // Clear cache - evictAllNames(); - if (eventChannel != null) { eventChannel.remapped(oldPrefix, prefix, uri); } @@ -541,37 +531,6 @@ return prefix; } - //------------------------------------------------------------< NameCache > - /** - * {@inheritDoc} - */ - public QName retrieveName(String jcrName) { - try { - return nameResolver.getQName(jcrName); - } catch (NameException e) { - return null; - } catch (NamespaceException e) { - return null; - } - } - - public String retrieveName(QName name) { - try { - return nameResolver.getJCRName(name); - } catch (NamespaceException e) { - return null; - } - } - - public void cacheName(String jcrName, QName name) { - } - - public void evictAllNames() { - nameResolver = new CachingNameResolver(new ParsingNameResolver(this)); - pathResolver = - new CachingPathResolver(new ParsingPathResolver(nameResolver)); - } - //-----------------------------------------------< NamespaceEventListener > /** @@ -597,9 +556,6 @@ // add new prefix mapping map(newPrefix, uri); - - // Clear cache - evictAllNames(); // persist mappings store();