[jackrabbit] 09/21: Merge tag 'upstream/2.10.1'

Markus Koschany apo-guest at moszumanska.debian.org
Sat Jun 20 22:06:17 UTC 2015


This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository jackrabbit.

commit bf79fca613076bc43ed34374d055274346f6f07f
Merge: ee27eaf c138f74
Author: Markus Koschany <apo at gambaru.de>
Date:   Sat Jun 20 21:04:53 2015 +0200

    Merge tag 'upstream/2.10.1'
    
    Upstream version 2.10.1
    
    # gpg: Signature made Sat 20 Jun 2015 21:04:49 CEST using RSA key ID 513B51E4
    # gpg: Good signature from "Markus Koschany <apo at gambaru.de>" [ultimate]
    # gpg:                 aka "Markus Koschany <markus at koschany.net>" [ultimate]

 NOTICE.txt                                         |    2 +-
 README.txt                                         |    6 +-
 RELEASE-NOTES.txt                                  |  192 +--
 check-release.sh                                   |  115 --
 examples/jackrabbit-firsthops/pom.xml              |   20 +-
 .../org/apache/jackrabbit/firsthops/FirstHop.java  |    7 +-
 .../org/apache/jackrabbit/firsthops/SecondHop.java |    9 +-
 .../org/apache/jackrabbit/firsthops/ThirdHop.java  |    9 +-
 jackrabbit-api/pom.xml                             |    4 +-
 .../jackrabbit/api/JackrabbitRepository.java       |   53 +
 .../org/apache/jackrabbit/api/ReferenceBinary.java |   39 +
 .../jackrabbit/api/ReferenceBinaryException.java   |   27 +
 .../jackrabbit/api/jmx/EventListenerMBean.java     |  110 ++
 .../apache/jackrabbit/api/jmx/package-info.java    |    2 +-
 .../api/management/DataStoreGarbageCollector.java  |    8 +-
 .../jackrabbit/api/management/package-info.java    |    2 +-
 .../api/observation/JackrabbitEvent.java           |   70 +-
 .../api/observation/JackrabbitEventFilter.java     |  309 +++++
 .../observation/JackrabbitObservationManager.java  |   55 +
 .../jackrabbit/api/observation/package-info.java   |    2 +-
 .../api/query/JackrabbitQueryResult.java           |   38 +
 .../api/security/JackrabbitAccessControlEntry.java |   29 +-
 .../api/security/JackrabbitAccessControlList.java  |   46 +-
 .../api/security/principal/PrincipalManager.java   |   10 +-
 .../jackrabbit/api/security/user/Authorizable.java |   12 +-
 .../security/user/AuthorizableTypeException.java   |   29 +
 .../apache/jackrabbit/api/security/user/User.java  |   11 +-
 .../jackrabbit/api/security/user/UserManager.java  |   81 +-
 .../jackrabbit/api/security/user/package-info.java |    2 +-
 .../jackrabbit/api/stats/RepositoryStatistics.java |   87 +-
 jackrabbit-aws-ext/README.txt                      |   28 +
 jackrabbit-aws-ext/pom.xml                         |  109 ++
 .../org/apache/jackrabbit/aws/ext/S3Constants.java |  107 ++
 .../jackrabbit/aws/ext/S3RequestDecorator.java     |   87 ++
 .../java/org/apache/jackrabbit/aws/ext/Utils.java  |  188 +++
 .../apache/jackrabbit/aws/ext/ds/S3Backend.java    |  912 +++++++++++++
 .../apache/jackrabbit/aws/ext/ds/S3DataStore.java  |   50 +
 .../org/apache/jackrabbit/aws/ext/TestAll.java     |   59 +
 .../jackrabbit/aws/ext/ds/S3TestDataStore.java     |   47 +
 .../jackrabbit/aws/ext/ds/TestS3DSAsyncTouch.java  |   53 +
 .../jackrabbit/aws/ext/ds/TestS3DSWithSSES3.java   |   94 ++
 .../aws/ext/ds/TestS3DSWithSmallCache.java         |   53 +
 .../org/apache/jackrabbit/aws/ext/ds/TestS3Ds.java |  144 ++
 .../jackrabbit/aws/ext/ds/TestS3DsCacheOff.java    |   50 +
 .../src/test/resources/aws.properties              |   45 +
 .../src/test/resources/log4j.properties            |   31 +
 .../src/test/resources/repository_sample.xml       |  170 +++
 jackrabbit-bundle/pom.xml                          |    6 +-
 jackrabbit-core/assembly.xml                       |   30 -
 jackrabbit-core/pom.xml                            |   68 +-
 .../jackrabbit/core/BatchedItemOperations.java     |   60 +-
 .../jackrabbit/core/CachingHierarchyManager.java   |   58 +-
 .../jackrabbit/core/DefaultSecurityManager.java    |   40 +-
 .../apache/jackrabbit/core/HierarchyManager.java   |    8 +-
 .../jackrabbit/core/HierarchyManagerImpl.java      |   60 +-
 .../apache/jackrabbit/core/InternalXAResource.java |   70 -
 .../jackrabbit/core/ItemLifeCycleListener.java     |    4 +-
 .../org/apache/jackrabbit/core/ItemManager.java    |   13 +-
 .../apache/jackrabbit/core/ItemSaveOperation.java  |   11 +-
 .../jackrabbit/core/JackrabbitRepositoryStub.java  |    6 +-
 .../apache/jackrabbit/core/LazyItemIterator.java   |    6 +-
 .../java/org/apache/jackrabbit/core/NodeImpl.java  |  108 +-
 .../jackrabbit/core/ProtectedItemModifier.java     |   14 +-
 .../apache/jackrabbit/core/RepositoryChecker.java  |   93 +-
 .../apache/jackrabbit/core/RepositoryContext.java  |   47 +-
 .../org/apache/jackrabbit/core/RepositoryImpl.java |   78 +-
 .../org/apache/jackrabbit/core/SessionImpl.java    |    6 +-
 .../jackrabbit/core/SessionMoveOperation.java      |    8 +-
 .../org/apache/jackrabbit/core/SystemSession.java  |   23 +-
 .../apache/jackrabbit/core/TransactionContext.java |  346 -----
 .../jackrabbit/core/TransactionException.java      |   44 -
 .../core/UserPerWorkspaceSecurityManager.java      |   29 +-
 .../apache/jackrabbit/core/VersionManagerImpl.java |    2 +-
 .../org/apache/jackrabbit/core/WorkspaceImpl.java  |   12 +-
 .../org/apache/jackrabbit/core/XASessionImpl.java  |   14 +-
 .../jackrabbit/core/ZombieHierarchyManager.java    |   12 +-
 .../apache/jackrabbit/core/cache/CacheManager.java |    7 +-
 .../jackrabbit/core/cluster/ClusterNode.java       |  121 +-
 .../core/cluster/UpdateEventChannel.java           |    6 +-
 .../core/cluster/WorkspaceEventChannel.java        |   60 +-
 .../jackrabbit/core/cluster/WorkspaceListener.java |   76 +-
 .../jackrabbit/core/cluster/WorkspaceRecord.java   |  412 +++---
 .../apache/jackrabbit/core/config/BeanConfig.java  |   88 +-
 .../jackrabbit/core/config/BeanConfigVisitor.java  |   25 +
 .../apache/jackrabbit/core/config/BeanFactory.java |   22 +
 .../jackrabbit/core/config/ClusterConfig.java      |   28 +-
 .../core/config/ConfigurationEntityResolver.java   |   17 +
 .../core/config/ConfigurationParser.java           |    8 +-
 .../jackrabbit/core/config/NoOpConfigVisitor.java  |   24 +
 .../jackrabbit/core/config/RepositoryConfig.java   |    4 +-
 .../core/config/RepositoryConfigurationParser.java |  162 ++-
 .../jackrabbit/core/config/SimpleBeanFactory.java  |   57 +
 .../jackrabbit/core/config/WorkspaceConfig.java    |   40 +-
 .../jackrabbit/core/data/AbstractDataRecord.java   |   82 --
 .../jackrabbit/core/data/DataIdentifier.java       |  100 --
 .../apache/jackrabbit/core/data/DataRecord.java    |   55 -
 .../org/apache/jackrabbit/core/data/DataStore.java |  140 --
 .../jackrabbit/core/data/DataStoreFactory.java     |   42 -
 .../jackrabbit/core/data/FileDataRecord.java       |   69 -
 .../apache/jackrabbit/core/data/FileDataStore.java |  459 -------
 .../jackrabbit/core/data/GarbageCollector.java     |  436 ------
 .../jackrabbit/core/data/LazyFileInputStream.java  |  167 ---
 .../jackrabbit/core/data/db/DbDataRecord.java      |   71 -
 .../jackrabbit/core/data/db/DbDataStore.java       |  993 --------------
 .../core/data/db/TempFileInputStream.java          |  134 --
 .../apache/jackrabbit/core/fs/BasedFileSystem.java |  186 ---
 .../jackrabbit/core/fs/FileSystemFactory.java      |   39 -
 .../jackrabbit/core/fs/FileSystemPathUtil.java     |  228 ----
 .../jackrabbit/core/fs/FileSystemResource.java     |  225 ----
 .../jackrabbit/core/fs/db/DB2FileSystem.java       |    6 +-
 .../apache/jackrabbit/core/fs/db/DbFileSystem.java |    4 +-
 .../jackrabbit/core/fs/db/DerbyFileSystem.java     |    4 +-
 .../jackrabbit/core/fs/db/MSSqlFileSystem.java     |    4 +-
 .../jackrabbit/core/fs/db/OracleFileSystem.java    |    8 +-
 .../jackrabbit/core/fs/local/LocalFileSystem.java  |  386 ------
 .../jackrabbit/core/gc/GarbageCollector.java       |  511 +++++++
 .../java/org/apache/jackrabbit/core/id/NodeId.java |   28 +-
 .../jackrabbit/core/id/SeededSecureRandom.java     |  221 ++--
 .../jackrabbit/core/jmx/QueryStatManager.java      |  139 --
 .../jackrabbit/core/jndi/BindableRepository.java   |    6 +-
 .../jackrabbit/core/journal/AbstractJournal.java   |  125 +-
 .../jackrabbit/core/journal/AppendRecord.java      |   15 +-
 .../jackrabbit/core/journal/DatabaseJournal.java   |   37 +-
 .../jackrabbit/core/journal/FileJournal.java       |    2 +-
 .../jackrabbit/core/journal/FileRevision.java      |   21 +-
 .../apache/jackrabbit/core/journal/Journal.java    |    7 +-
 .../core/journal/OracleDatabaseJournal.java        |    2 +-
 .../apache/jackrabbit/core/journal/ReadRecord.java |    2 +-
 .../org/apache/jackrabbit/core/journal/Record.java |    3 +-
 .../org/apache/jackrabbit/core/lock/LockImpl.java  |   14 +-
 .../jackrabbit/core/lock/LockManagerImpl.java      |  288 ++--
 .../apache/jackrabbit/core/lock/XAEnvironment.java |    4 +-
 .../apache/jackrabbit/core/lock/XALockImpl.java    |    2 +-
 .../apache/jackrabbit/core/lock/XALockManager.java |   10 +-
 .../core/nodetype/BitSetENTCacheImpl.java          |    8 +-
 .../core/nodetype/EffectiveNodeType.java           |    8 +-
 .../core/nodetype/EffectiveNodeTypeCache.java      |    2 +-
 .../core/nodetype/EffectiveNodeTypeCacheImpl.java  |    8 +-
 .../core/nodetype/NodeTypeDefinitionImpl.java      |    6 +-
 .../jackrabbit/core/nodetype/NodeTypeImpl.java     |    2 +-
 .../core/nodetype/NodeTypeManagerImpl.java         |   19 +-
 .../jackrabbit/core/nodetype/NodeTypeRegistry.java |  136 +-
 .../virtual/VirtualNodeTypeStateProvider.java      |    2 +-
 .../jackrabbit/core/observation/EventConsumer.java |    7 +-
 .../jackrabbit/core/observation/EventFilter.java   |   65 +-
 .../jackrabbit/core/observation/EventImpl.java     |    4 +-
 .../core/observation/EventJournalImpl.java         |    3 +-
 .../jackrabbit/core/observation/EventState.java    |   94 ++
 .../core/observation/EventStateCollection.java     |   26 +-
 .../core/observation/ObservationDispatcher.java    |   19 +-
 .../core/observation/ObservationManagerImpl.java   |   95 +-
 .../core/observation/SynchronousEventListener.java |    2 +-
 .../persistence/IterablePersistenceManager.java    |   34 +-
 .../jackrabbit/core/persistence/PMContext.java     |    2 +-
 .../bundle/AbstractBundlePersistenceManager.java   |   96 +-
 .../bundle/BundleFsPersistenceManager.java         |    5 +-
 .../bundle/ConsistencyCheckerError.java            |   78 ++
 .../persistence/bundle/ConsistencyCheckerImpl.java |  707 ++++++++++
 .../check/ConsistencyCheckListener.java            |   46 +
 .../core/persistence/check/ConsistencyChecker.java |   26 +-
 .../core/persistence/check/ReportItem.java         |   16 +-
 .../core/persistence/check/ReportItemImpl.java     |   18 +-
 .../persistence/db/DatabasePersistenceManager.java |   10 +-
 .../persistence/db/DerbyPersistenceManager.java    |    4 +-
 .../persistence/db/MSSqlPersistenceManager.java    |    4 +-
 .../persistence/db/OraclePersistenceManager.java   |   14 +-
 .../persistence/db/SimpleDbPersistenceManager.java |    4 +-
 .../mem/InMemBundlePersistenceManager.java         |   28 +-
 .../persistence/mem/InMemPersistenceManager.java   |    2 +-
 .../pool/BundleDbPersistenceManager.java           |  368 ++----
 .../core/persistence/pool/DbNameIndex.java         |    7 +-
 .../persistence/pool/DerbyPersistenceManager.java  |   26 +-
 .../persistence/pool/H2PersistenceManager.java     |    2 +-
 .../persistence/pool/MySqlPersistenceManager.java  |    2 +-
 .../core/persistence/pool/NGKDbNameIndex.java      |    2 +-
 .../persistence/pool/OraclePersistenceManager.java |    2 +-
 .../core/persistence/pool/PostgreSQLNameIndex.java |    3 +-
 .../pool/PostgreSQLPersistenceManager.java         |    2 +-
 .../core/persistence/util/BundleReader.java        |    6 +-
 .../core/persistence/util/BundleWriter.java        |   77 +-
 .../jackrabbit/core/persistence/util/NodeInfo.java |  189 +++
 .../core/persistence/util/NodePropBundle.java      |   29 +-
 .../core/query/OnWorkspaceInconsistency.java       |   32 +
 .../apache/jackrabbit/core/query/QueryImpl.java    |    2 +-
 .../core/query/QueryObjectModelImpl.java           |    2 +-
 .../core/query/lucene/AbstractExcerpt.java         |   29 +-
 .../core/query/lucene/AbstractIndex.java           |   75 +-
 .../core/query/lucene/AbstractQueryImpl.java       |    2 +-
 .../core/query/lucene/AbstractWeight.java          |    4 +-
 .../core/query/lucene/CachingIndexReader.java      |   14 +-
 .../core/query/lucene/CachingMultiIndexReader.java |   38 -
 .../core/query/lucene/CaseTermQuery.java           |    1 +
 .../core/query/lucene/ChildAxisQuery.java          |   11 +-
 .../core/query/lucene/ChildNodesQueryHits.java     |    3 +
 .../core/query/lucene/CommittableIndexReader.java  |   90 +-
 .../core/query/lucene/ConsistencyCheck.java        |  493 ++++++-
 .../core/query/lucene/ConsistencyCheckError.java   |   17 +-
 .../core/query/lucene/DefaultHighlighter.java      |    2 +-
 .../core/query/lucene/DefaultRedoLog.java          |    2 +-
 .../jackrabbit/core/query/lucene/DerefQuery.java   |    4 +-
 .../core/query/lucene/DescendantSelfAxisQuery.java |   31 +-
 .../query/lucene/FileBasedNamespaceMappings.java   |    2 +-
 .../core/query/lucene/FilterSearcher.java          |  100 ++
 .../jackrabbit/core/query/lucene/IDField.java      |    9 +-
 .../jackrabbit/core/query/lucene/IOCounters.java   |   13 +-
 .../core/query/lucene/IndexFormatVersion.java      |    4 +-
 .../jackrabbit/core/query/lucene/IndexHistory.java |   10 +-
 .../jackrabbit/core/query/lucene/IndexInfos.java   |   46 +-
 .../core/query/lucene/IndexMigration.java          |   42 +-
 .../query/lucene/IndexingConfigurationImpl.java    |   57 +-
 .../core/query/lucene/JackrabbitAnalyzer.java      |   79 +-
 .../core/query/lucene/JackrabbitQuery.java         |    2 +-
 .../core/query/lucene/JackrabbitQueryParser.java   |   10 +-
 .../core/query/lucene/JackrabbitTermQuery.java     |    6 +-
 .../core/query/lucene/LazyTextExtractorField.java  |   85 +-
 .../core/query/lucene/LuceneQueryBuilder.java      |    4 +-
 .../core/query/lucene/LuceneQueryFactory.java      |    9 +-
 .../core/query/lucene/LuceneQueryHits.java         |    2 +-
 .../core/query/lucene/MatchAllQuery.java           |    2 +-
 .../jackrabbit/core/query/lucene/MoreLikeThis.java |    7 +-
 .../jackrabbit/core/query/lucene/MultiIndex.java   |   26 +-
 .../jackrabbit/core/query/lucene/MultiScorer.java  |    2 +-
 .../jackrabbit/core/query/lucene/NodeIndexer.java  |  241 ++--
 .../core/query/lucene/NodeIteratorImpl.java        |    2 +-
 .../core/query/lucene/NormalizeSortComparator.java |   86 ++
 .../jackrabbit/core/query/lucene/NotQuery.java     |   11 +-
 .../core/query/lucene/ParentAxisQuery.java         |    4 +-
 .../core/query/lucene/PersistentIndex.java         |    2 +-
 .../core/query/lucene/PredicateDerefQuery.java     |    4 +-
 .../core/query/lucene/QueryResultImpl.java         |  116 +-
 .../jackrabbit/core/query/lucene/RangeQuery.java   |    8 +-
 .../core/query/lucene/ReadOnlyIndexReader.java     |   37 +-
 .../jackrabbit/core/query/lucene/Recovery.java     |    2 +-
 .../core/query/lucene/RefCountingIndexReader.java  |   14 +-
 .../core/query/lucene/RowIteratorImpl.java         |   14 +-
 .../jackrabbit/core/query/lucene/SearchIndex.java  |  193 ++-
 .../core/query/lucene/SharedFieldCache.java        |   35 +-
 .../apache/jackrabbit/core/query/lucene/Util.java  |   10 +-
 .../core/query/lucene/WildcardNameQuery.java       |    2 +-
 .../core/query/lucene/WildcardQuery.java           |   56 +-
 .../query/lucene/directory/FSDirectoryManager.java |   27 +-
 .../query/lucene/directory/IndexInputStream.java   |    2 +-
 .../query/lucene/directory/IndexOutputStream.java  |    4 +-
 .../query/lucene/hits/AbstractHitCollector.java    |    2 +-
 .../core/query/lucene/join/AbstractRow.java        |    5 +-
 .../core/query/lucene/join/AncestorNodeJoin.java   |    2 +-
 .../query/lucene/join/AncestorPathNodeJoin.java    |    2 +-
 .../core/query/lucene/join/ChildNodeJoin.java      |    2 +-
 .../core/query/lucene/join/DescendantNodeJoin.java |    2 +-
 .../query/lucene/join/DescendantPathNodeJoin.java  |    2 +-
 .../core/query/lucene/join/EquiJoin.java           |    2 +-
 .../core/query/lucene/join/JoinMerger.java         |    6 +-
 .../core/query/lucene/join/QueryEngine.java        |    5 +
 .../core/retention/RetentionRegistryImpl.java      |    4 +-
 .../core/security/DefaultAccessManager.java        |    4 +-
 .../authentication/AbstractLoginModule.java        |   44 +-
 .../authentication/CryptedSimpleCredentials.java   |  121 +-
 .../authentication/DefaultLoginModule.java         |   45 +-
 .../authentication/token/CompatTokenProvider.java  |  427 ++++++
 .../token/TokenBasedAuthentication.java            |  342 +----
 .../security/authentication/token/TokenInfo.java   |   40 +
 .../authentication/token/TokenProvider.java        |  478 +++++++
 .../authorization/AbstractACLTemplate.java         |   11 +
 .../authorization/AccessControlEditor.java         |    6 +-
 .../authorization/AccessControlEntryImpl.java      |   10 +-
 .../authorization/AccessControlProvider.java       |    2 +-
 .../AccessControlProviderFactory.java              |    4 +-
 .../core/security/authorization/GlobPattern.java   |   26 +-
 .../authorization/PrivilegeManagerImpl.java        |    9 +-
 .../security/authorization/PrivilegeRegistry.java  |   23 +-
 .../UnmodifiableAccessControlList.java             |    4 +
 .../core/security/authorization/acl/ACLEditor.java |    8 +-
 .../security/authorization/acl/ACLProvider.java    |   59 +-
 .../security/authorization/acl/ACLTemplate.java    |   91 +-
 .../authorization/acl/CachingEntryCollector.java   |  397 ++++--
 .../authorization/acl/CompiledPermissionsImpl.java |    8 +-
 .../core/security/authorization/acl/Entry.java     |  199 +++
 .../security/authorization/acl/EntryCollector.java |   27 +-
 .../security/authorization/acl/EntryFilter.java    |    3 +-
 .../authorization/acl/EntryFilterImpl.java         |   17 +-
 .../authorization/principalbased/ACLProvider.java  |    6 +-
 .../authorization/principalbased/ACLTemplate.java  |    1 -
 .../authorization/principalbased/EntriesCache.java |    2 +-
 .../principal/AbstractPrincipalProvider.java       |    2 +-
 .../principal/DefaultPrincipalProvider.java        |    8 +-
 .../security/principal/PrincipalManagerImpl.java   |    5 +-
 .../core/security/principal/PrincipalProvider.java |    2 +-
 .../principal/PrincipalProviderRegistry.java       |    2 +-
 .../core/security/user/AuthorizableImpl.java       |   25 +-
 .../jackrabbit/core/security/user/GroupImpl.java   |   89 +-
 .../core/security/user/MembershipCache.java        |  290 ++--
 .../core/security/user/PasswordUtility.java        |  268 ++++
 .../security/user/UserAccessControlProvider.java   |   14 +-
 .../jackrabbit/core/security/user/UserImpl.java    |   43 +-
 .../core/security/user/UserImporter.java           |  136 +-
 .../core/security/user/UserManagerConfig.java      |  102 ++
 .../core/security/user/UserManagerImpl.java        |  279 ++--
 .../security/user/UserPerWorkspaceUserManager.java |    3 +-
 .../core/security/user/XPathQueryEvaluator.java    |   53 +-
 .../security/user/action/AuthorizableAction.java   |   15 +-
 .../user/action/PasswordValidationAction.java      |   16 +-
 .../core/session/NodeNameNormalizer.java           |   59 +
 .../jackrabbit/core/session/SessionContext.java    |    4 +-
 .../core/session/SessionSaveOperation.java         |    4 +-
 .../jackrabbit/core/session/SessionState.java      |    4 +-
 .../apache/jackrabbit/core/state/ChangeLog.java    |   31 +
 .../jackrabbit/core/state/ChildNodeEntries.java    |    4 +-
 .../jackrabbit/core/state/ChildNodeEntry.java      |    2 +-
 .../jackrabbit/core/state/DefaultISMLocking.java   |    4 +-
 .../core/state/DummyUpdateEventChannel.java        |    2 +-
 .../core/state/FineGrainedISMLocking.java          |    4 +-
 .../apache/jackrabbit/core/state/ISMLocking.java   |    2 +-
 .../core/state/ItemStateReferenceCache.java        |    5 +-
 .../core/state/LocalItemStateManager.java          |   16 +-
 .../jackrabbit/core/state/MLRUItemStateCache.java  |    2 +-
 .../org/apache/jackrabbit/core/state/NameSet.java  |    4 +-
 .../jackrabbit/core/state/NodeReferences.java      |    2 +-
 .../apache/jackrabbit/core/state/NodeState.java    |   22 +-
 .../jackrabbit/core/state/NodeStateListener.java   |    2 +-
 .../jackrabbit/core/state/NodeStateMerger.java     |   18 +-
 .../core/state/SessionItemStateManager.java        |   16 +-
 .../core/state/SharedItemStateManager.java         |  125 +-
 .../jackrabbit/core/state/XAItemStateManager.java  |   18 +-
 .../jackrabbit/core/stats/QueryStatCore.java       |   40 -
 .../core/stats/QueryStatDtoComparator.java         |   31 -
 .../jackrabbit/core/stats/QueryStatDtoImpl.java    |  145 --
 .../stats/QueryStatDtoOccurrenceComparator.java    |   33 -
 .../jackrabbit/core/stats/QueryStatImpl.java       |  174 ---
 .../core/stats/RepositoryStatisticsImpl.java       |  105 --
 .../apache/jackrabbit/core/stats/StatManager.java  |    2 +
 .../jackrabbit/core/stats/TimeSeriesAverage.java   |   85 --
 .../jackrabbit/core/stats/TimeSeriesRecorder.java  |  158 ---
 .../jackrabbit/core/util/XAReentrantLock.java      |   80 ++
 .../XAReentrantWriterPreferenceReadWriteLock.java  |  130 ++
 .../jackrabbit/core/util/db/ConnectionFactory.java |  366 -----
 .../jackrabbit/core/util/db/ConnectionHelper.java  |  516 --------
 .../apache/jackrabbit/core/util/db/DbUtility.java  |   98 --
 .../core/util/db/PostgreSQLConnectionHelper.java   |   34 -
 .../jackrabbit/core/util/db/ResultSetWrapper.java  |   69 -
 .../jackrabbit/core/util/db/StreamWrapper.java     |   47 -
 .../jackrabbit/core/value/BLOBFileValue.java       |    4 +-
 .../jackrabbit/core/value/BLOBInDataStore.java     |   18 +-
 .../jackrabbit/core/value/InternalValue.java       |   26 +-
 .../core/value/InternalValueFactory.java           |   14 +-
 .../jackrabbit/core/value/ValueFactoryImpl.java    |    9 +
 .../jackrabbit/core/version/InternalBaseline.java  |    4 +-
 .../core/version/InternalFrozenNodeImpl.java       |    6 +-
 .../core/version/InternalFrozenVersionHistory.java |    2 +-
 .../core/version/InternalVersionHistoryImpl.java   |    5 +-
 .../core/version/InternalVersionImpl.java          |    4 +-
 .../core/version/InternalVersionManager.java       |    9 +
 .../core/version/InternalVersionManagerBase.java   |   64 +-
 .../core/version/InternalVersionManagerImpl.java   |   39 +-
 .../core/version/InternalXAVersionManager.java     |   46 +-
 .../jackrabbit/core/version/NodeStateEx.java       |   28 +-
 .../core/version/VersionHistoryImpl.java           |   16 +-
 .../core/version/VersionIteratorImpl.java          |    2 +-
 .../core/version/VersionManagerImplBase.java       |    2 +-
 .../core/version/VersionManagerImplConfig.java     |    8 +-
 .../core/version/VersionManagerImplMerge.java      |    7 +-
 .../core/version/VersionManagerImplRestore.java    |    4 +-
 .../jackrabbit/core/version/VersionSelector.java   |    4 +-
 .../jackrabbit/core/version/VersioningLock.java    |  151 +--
 .../jackrabbit/core/xml/AccessControlImporter.java |   63 +-
 .../jackrabbit/core/xml/BufferedStringValue.java   |    2 +-
 .../jackrabbit/core/xml/ClonedInputSource.java     |  334 ++---
 .../jackrabbit/core/xml/DocViewImportHandler.java  |    2 +-
 .../apache/jackrabbit/core/xml/ImportHandler.java  |    6 +-
 .../jackrabbit/core/xml/ProtectedNodeImporter.java |    6 +-
 .../jackrabbit/core/xml/WorkspaceImporter.java     |    4 +-
 .../core/JackrabbitRepositoryStub.properties       |   15 +-
 .../core/config/repository-2.4-elements.dtd        |   12 +-
 .../core/config/repository-2.6-elements.dtd        |  266 ++++
 .../jackrabbit/core/config/repository-2.6.dtd      |   64 +
 .../jackrabbit/core/data/db/azure.properties       |   17 -
 .../apache/jackrabbit/core/data/db/db2.properties  |   17 -
 .../jackrabbit/core/data/db/derby.properties       |   17 -
 .../apache/jackrabbit/core/data/db/h2.properties   |   18 -
 .../jackrabbit/core/data/db/ingres.properties      |   17 -
 .../jackrabbit/core/data/db/mssql.properties       |   17 -
 .../jackrabbit/core/data/db/mysql.properties       |   19 -
 .../jackrabbit/core/data/db/oracle.properties      |   18 -
 .../jackrabbit/core/data/db/postgresql.properties  |   20 -
 .../jackrabbit/core/data/db/sqlserver.properties   |   18 -
 .../jackrabbit/core/nodetype/builtin_nodetypes.cnd |   11 +-
 .../api/JackrabbitObservationManagerTest.java      |   59 +
 .../java/org/apache/jackrabbit/api/TestAll.java    |    1 +
 .../security/user/UserManagerCreateUserTest.java   |   29 +-
 .../api/security/user/UserManagerTest.java         |   56 +
 .../org/apache/jackrabbit/core/AddMoveTest.java    |   92 ++
 .../core/ConcurrentAddMoveRemoveTest.java          |  192 +++
 .../jackrabbit/core/ConcurrentCyclicMoveTest.java  |   92 ++
 .../jackrabbit/core/ConcurrentImportTest.java      |    2 +-
 .../core/ConcurrentNodeModificationTest.java       |    2 +-
 .../core/ConcurrentWorkspaceCopyTest.java          |  236 ++--
 .../apache/jackrabbit/core/ConsistencyCheck.java   |  100 +-
 .../org/apache/jackrabbit/core/MoveRemoveTest.java |   64 +
 .../java/org/apache/jackrabbit/core/MoveTest.java  |   48 +
 .../org/apache/jackrabbit/core/NodeImplTest.java   |   12 +
 .../jackrabbit/core/OverlappingNodeAddTest.java    |  264 ++--
 .../jackrabbit/core/ReadVersionsWhileModified.java |    2 +-
 .../jackrabbit/core/RemoveAddNodeWithUUIDTest.java |   71 +
 .../core/ReplacePropertyWhileOthersReadTest.java   |  137 ++
 .../test/java/org/apache/jackrabbit/core/Tail.java |   97 ++
 .../java/org/apache/jackrabbit/core/TestAll.java   |    6 +-
 .../org/apache/jackrabbit/core/TestHelper.java     |   38 +-
 .../java/org/apache/jackrabbit/core/XATest.java    |   37 +-
 .../core/cluster/ClusterDescriptorTest.java        |   68 +
 .../jackrabbit/core/cluster/DbClusterTest.java     |   14 +-
 .../core/cluster/DbClusterTestJCR3162.java         |   15 +-
 .../cluster/FailUpdateOnJournalExceptionTest.java  |  108 ++
 .../apache/jackrabbit/core/cluster/TestAll.java    |    1 +
 .../jackrabbit/core/cluster/TestJournal.java       |   62 +
 .../core/data/ConsistencyCheckerImplTest.java      |  500 +++++++
 .../apache/jackrabbit/core/data/DataStoreTest.java |   82 ++
 .../jackrabbit/core/data/GCEventListenerTest.java  |    4 +-
 .../jackrabbit/core/data/GCSubtreeMoveTest.java    |  207 +++
 .../org/apache/jackrabbit/core/data/GCThread.java  |    1 +
 .../jackrabbit/core/data/GarbageCollectorTest.java |   67 +-
 .../core/data/TempFileInputStreamTest.java         |   61 -
 .../org/apache/jackrabbit/core/data/TestAll.java   |    2 +-
 .../org/apache/jackrabbit/core/fs/TestAll.java     |   88 +-
 .../org/apache/jackrabbit/core/id/NodeIdTest.java  |  212 +--
 .../org/apache/jackrabbit/core/id/TestAll.java     |   82 +-
 .../integration/BackwardsCompatibilityTest.java    |  216 ---
 .../CachingHierarchyManagerConsistencyTest.java    |  127 ++
 .../core/integration/InterruptedQueryTest.java     |  134 ++
 .../jackrabbit/core/integration/NodeImplTest.java  |  186 +--
 .../core/integration/VersioningTest.java           |  430 +++---
 .../integration/daily/DailyIntegrationTest.java    |    4 +-
 .../jackrabbit/core/nodetype/xml/TestAll.java      |    8 +-
 .../jackrabbit/core/observation/MixinTest.java     |   84 +-
 .../jackrabbit/core/observation/ReorderTest.java   |    2 +-
 .../jackrabbit/core/observation/TestAll.java       |    1 +
 .../WarningOnSaveWithNotificationThreadTest.java   |   80 ++
 .../core/persistence/AutoFixCorruptNode.java       |  133 +-
 .../core/persistence/PersistenceManagerTest.java   |    6 +-
 .../util/BundleBindingRandomizedTest.java          |  231 ++++
 .../core/persistence/util/NodeCorruptionTest.java  |   88 ++
 .../jackrabbit/core/persistence/util/TestAll.java  |    2 +
 .../core/query/AbstractIndexingTest.java           |   63 +-
 .../jackrabbit/core/query/AbstractQueryTest.java   |   15 +-
 .../jackrabbit/core/query/ChildAxisQueryTest.java  |   35 +-
 .../core/query/DescendantSelfAxisTest.java         |   52 +
 .../apache/jackrabbit/core/query/ExcerptTest.java  |   60 +
 .../jackrabbit/core/query/FulltextQueryTest.java   |   38 +-
 .../core/query/IndexFormatVersionTest.java         |   59 -
 .../jackrabbit/core/query/IndexingRuleTest.java    |  187 ---
 .../jackrabbit/core/query/LargeResultSetTest.java  |   84 --
 .../core/query/LazyResultSetQueryTest.java         |   83 ++
 .../jackrabbit/core/query/LimitAndOffsetTest.java  |   31 +-
 .../apache/jackrabbit/core/query/MixinTest.java    |    5 +-
 .../apache/jackrabbit/core/query/OrderByTest.java  |   28 +-
 .../core/query/SQL2NodeLocalNameTest.java          |   20 +-
 .../jackrabbit/core/query/SQL2OrderByTest.java     |   20 +-
 .../jackrabbit/core/query/SQL2OuterJoinTest.java   |    4 +-
 .../jackrabbit/core/query/SQL2QueryResultTest.java |    6 +
 .../core/query/SQL2TooManyClausesTest.java         |    2 +-
 .../org/apache/jackrabbit/core/query/SQLTest.java  |    7 +-
 .../jackrabbit/core/query/ShareableNodeTest.java   |    6 +-
 .../jackrabbit/core/query/SimpleQueryTest.java     |   34 +
 .../jackrabbit/core/query/SynonymProviderTest.java |   63 -
 .../org/apache/jackrabbit/core/query/TestAll.java  |   10 +-
 .../core/query/lucene/ChainedTermEnumTest.java     |   36 +-
 .../core/query/lucene/DecimalConvertTest.java      |   24 +-
 .../core/query/lucene/IndexFormatVersionTest.java  |   54 +
 .../core/query/lucene/IndexInfosTest.java          |   77 ++
 .../core/query/lucene/IndexMigrationTest.java      |    2 +-
 .../core/query/lucene/IndexingAggregateTest.java   |    3 +-
 .../lucene/IndexingConfigurationImplTest.java      |   10 +-
 .../core/query/lucene/IndexingRuleTest.java        |  182 +++
 .../core/query/lucene/LargeResultSetTest.java      |  103 ++
 .../query/lucene/LazyTextExtractorFieldTest.java   |   51 +
 .../query/lucene/SQL2IndexingAggregateTest.java    |   14 +
 .../lucene/SearchIndexConsistencyCheckTest.java    |  327 +++++
 .../core/query/lucene/SearchIndexTest.java         |   38 +
 .../core/query/lucene/SynonymProviderTest.java     |   65 +
 .../jackrabbit/core/query/lucene/TestAll.java      |   11 +-
 .../core/query/lucene/TextExtractionQueryTest.java |   99 ++
 .../jackrabbit/core/query/lucene/UtilTest.java     |   67 +
 .../SimpleCredentialsAuthenticationTest.java       |    4 +
 .../token/CompatTokenProviderTest.java             |  192 +++
 .../security/authentication/token/TestAll.java     |    3 +
 .../token/TokenBasedAuthenticationCompatTest.java  |  232 ++++
 .../token/TokenBasedAuthenticationTest.java        |  161 ++-
 .../authentication/token/TokenProviderTest.java    |  198 +++
 .../authorization/AbstractACLTemplateTest.java     |   12 +-
 .../security/authorization/AbstractEntryTest.java  |   10 +
 .../authorization/AbstractLockManagementTest.java  |   47 +
 .../AbstractRepositoryOperationTest.java           |    5 +-
 .../authorization/acl/ACLTemplateEntryTest.java    |   89 ++
 .../authorization/acl/ACLTemplateTest.java         |    2 +-
 .../authorization/acl/EntryCollectorTest.java      |  184 ++-
 .../core/security/authorization/acl/EntryTest.java |  122 +-
 .../authorization/acl/ReadNodeTypeTest.java        |  118 ++
 .../core/security/authorization/acl/ReadTest.java  |  145 ++
 .../core/security/authorization/acl/TestAll.java   |    1 +
 .../core/security/authorization/acl/WriteTest.java |   23 +
 .../security/principal/PrincipalManagerTest.java   |   80 ++
 .../core/security/principal/TestAll.java           |    3 +-
 .../security/simple/SimpleSecurityManagerTest.java |   53 +
 .../jackrabbit/core/security/simple/TestAll.java   |   32 +
 .../core/security/user/AdministratorTest.java      |   14 +-
 .../core/security/user/AuthorizableActionTest.java |   44 +
 .../core/security/user/AuthorizableImplTest.java   |   81 +-
 .../user/DefaultPrincipalProviderTest.java         |   45 +-
 .../core/security/user/MembershipCacheTest.java    |  235 ++++
 .../core/security/user/NodeCreationTest.java       |    6 +-
 .../core/security/user/PasswordUtilityTest.java    |  170 +++
 .../jackrabbit/core/security/user/TestAll.java     |    1 +
 .../core/security/user/UserImplTest.java           |   22 +-
 .../core/security/user/UserImporterTest.java       |  216 ++-
 .../core/security/user/UserManagerImplTest.java    |   16 +-
 .../jackrabbit/core/stats/QueryStatCoreTest.java   |   79 ++
 .../org/apache/jackrabbit/core/stats/TestAll.java  |   42 +
 .../core/stats/TimeSeriesRecorderTest.java         |  123 --
 .../core/util/db/ConnectionFactoryTest.java        |    2 +-
 .../jackrabbit/core/value/BinaryValueTest.java     |    2 +-
 .../jackrabbit/core/value/ReferenceBinaryTest.java |   71 +
 .../org/apache/jackrabbit/core/value/TestAll.java  |    1 +
 .../core/version/CopyFrozenUuidTest.java           |   59 +
 .../core/version/RestoreNodeWithSNSTest.java       |  134 +-
 .../apache/jackrabbit/core/version/TestAll.java    |    1 +
 .../core/xml/AccessControlImporterTest.java        |   28 +
 jackrabbit-core/src/test/repository/repository.xml |    2 +-
 .../repository/workspaces/default/workspace.xml    |    2 +-
 .../workspaces/index-format-v1/index/_0/_2.cfs     |  Bin 0 -> 620 bytes
 .../workspaces/index-format-v1/index/_0/deletable  |  Bin 0 -> 4 bytes
 .../workspaces/index-format-v1/index/_0/segments   |  Bin 0 -> 27 bytes
 .../workspaces/index-format-v1/index/indexes       |  Bin 0 -> 12 bytes
 .../items/5a/9a/d0fcc7f542bbb435bcb9ed30a2e2.n     |  Bin 0 -> 50 bytes
 .../items/ca/fe/babecafebabecafebabecafebabe.n     |  Bin 0 -> 94 bytes
 .../items/de/ad/beefcafebabecafebabecafebabe.n     |  Bin 0 -> 119 bytes
 .../workspaces/index-format-v1/names.properties    |    5 +
 .../index-format-v1/namespaces.properties          |    6 +
 .../workspaces/index-format-v1/workspace.xml       |   33 +
 .../workspaces/index-format-v2/index/_0/_0.cfs     |  Bin 0 -> 590 bytes
 .../index-format-v2/index/_0/segments.gen          |  Bin 0 -> 20 bytes
 .../workspaces/index-format-v2/index/_0/segments_1 |  Bin 0 -> 20 bytes
 .../workspaces/index-format-v2/index/_0/segments_3 |  Bin 0 -> 41 bytes
 .../workspaces/index-format-v2/index/indexes       |  Bin 0 -> 12 bytes
 .../items/c9/bb/26c0edf0408b8ab22e88c1edc593.n     |  Bin 0 -> 50 bytes
 .../items/ca/fe/babecafebabecafebabecafebabe.n     |  Bin 0 -> 94 bytes
 .../items/de/ad/beefcafebabecafebabecafebabe.n     |  Bin 0 -> 119 bytes
 .../workspaces/index-format-v2/names.properties    |    5 +
 .../index-format-v2/namespaces.properties          |    6 +
 .../workspaces/index-format-v2/workspace.xml       |   33 +
 .../items/c9/bb/26c0edf0408b8ab22e88c1edc593.n     |  Bin 0 -> 50 bytes
 .../items/ca/fe/babecafebabecafebabecafebabe.n     |  Bin 0 -> 94 bytes
 .../items/de/ad/beefcafebabecafebabecafebabe.n     |  Bin 0 -> 119 bytes
 .../workspaces/index-format-v3/names.properties    |    5 +
 .../index-format-v3/namespaces.properties          |    6 +
 .../workspaces/index-format-v3/workspace.xml       |   33 +
 .../indexing-test/indexing-configuration.xml       |    1 +
 .../jackrabbit/core/cluster/repository-h2.xml      |   10 +-
 .../core/cluster/repository-with-test-journal.xml  |  164 +++
 .../apache/jackrabbit/core/config/workspace.xml    |   90 +-
 .../repository-with-SimpleFSDirectory.xml          |   74 ++
 .../core/nodetype/xml/test_ns_cnd_nodetypes.cnd    |    4 +-
 .../core/nodetype/xml/test_ns_xml_nodetypes.xml    |    4 +-
 .../xml/test_same_nt_name_cnd_nodetypes.cnd        |    2 +-
 .../xml/test_same_nt_name_xml_nodetypes.xml        |    2 +-
 .../org/apache/jackrabbit/core/query/test.rtf      |  157 +++
 .../core/security/simple/simple_repository.xml     |   78 ++
 .../jackrabbit/core/security/user/repository.xml   |   90 ++
 jackrabbit-data/pom.xml                            |  113 ++
 .../core/config/ConfigurationException.java        |    0
 .../jackrabbit/core/config/DataSourceConfig.java   |    0
 .../jackrabbit/core/data/AbstractDataRecord.java   |   94 ++
 .../jackrabbit/core/data/AbstractDataStore.java    |  135 ++
 .../jackrabbit/core/data/AsyncTouchCallback.java   |   41 +
 .../jackrabbit/core/data/AsyncTouchResult.java     |   50 +
 .../jackrabbit/core/data/AsyncUploadCache.java     |  352 +++++
 .../core/data/AsyncUploadCacheResult.java          |   70 +
 .../jackrabbit/core/data/AsyncUploadCallback.java  |   40 +
 .../jackrabbit/core/data/AsyncUploadResult.java    |   62 +
 .../org/apache/jackrabbit/core/data/Backend.java   |  186 +++
 .../jackrabbit/core/data/CachingDataRecord.java    |   62 +
 .../jackrabbit/core/data/CachingDataStore.java     | 1396 ++++++++++++++++++++
 .../apache/jackrabbit/core/data/CachingFDS.java    |   51 +
 .../jackrabbit/core/data/DataIdentifier.java       |   80 ++
 .../apache/jackrabbit/core/data/DataRecord.java    |   63 +
 .../org/apache/jackrabbit/core/data/DataStore.java |  154 +++
 .../jackrabbit/core/data/DataStoreException.java   |    0
 .../jackrabbit/core/data/DataStoreFactory.java     |   43 +
 .../org/apache/jackrabbit/core/data/FSBackend.java |  496 +++++++
 .../jackrabbit/core/data/FileDataRecord.java       |   71 +
 .../apache/jackrabbit/core/data/FileDataStore.java |  507 +++++++
 .../jackrabbit/core/data/LazyFileInputStream.java  |  167 +++
 .../apache/jackrabbit/core/data/LocalCache.java    |  643 +++++++++
 .../jackrabbit/core/data/MultiDataStore.java       |  722 ++++++++++
 .../jackrabbit/core/data/MultiDataStoreAware.java  |   38 +
 .../jackrabbit/core/data/ScanEventListener.java    |    0
 .../jackrabbit/core/data/db/DbDataRecord.java      |   71 +
 .../jackrabbit/core/data/db/DbDataStore.java       | 1013 ++++++++++++++
 .../jackrabbit/core/data/db/DbInputStream.java     |    0
 .../jackrabbit/core/data/db/DerbyDataStore.java    |    0
 .../data/db/ResettableTempFileInputStream.java     |   64 +
 .../core/data/db/TempFileInputStream.java          |   57 +
 .../core/data/util/NamedThreadFactory.java         |   44 +
 .../apache/jackrabbit/core/fs/BasedFileSystem.java |  187 +++
 .../org/apache/jackrabbit/core/fs/FileSystem.java  |    0
 .../jackrabbit/core/fs/FileSystemException.java    |    0
 .../jackrabbit/core/fs/FileSystemFactory.java      |   40 +
 .../jackrabbit/core/fs/FileSystemPathUtil.java     |  229 ++++
 .../jackrabbit/core/fs/FileSystemResource.java     |  226 ++++
 .../core/fs/RandomAccessOutputStream.java          |    0
 .../apache/jackrabbit/core/fs/local/FileUtil.java  |    0
 .../jackrabbit/core/fs/local/HandleMonitor.java    |    0
 .../jackrabbit/core/fs/local/LocalFileSystem.java  |  388 ++++++
 .../core/util/db/CheckSchemaOperation.java         |    0
 .../jackrabbit/core/util/db/ConnectionFactory.java |  377 ++++++
 .../jackrabbit/core/util/db/ConnectionHelper.java  |  599 +++++++++
 .../jackrabbit/core/util/db/DataSourceWrapper.java |    0
 .../jackrabbit/core/util/db/DatabaseAware.java     |    0
 .../apache/jackrabbit/core/util/db/DbUtility.java  |   98 ++
 .../core/util/db/DerbyConnectionHelper.java        |    0
 .../core/util/db/Oracle10R1ConnectionHelper.java   |    0
 .../core/util/db/OracleConnectionHelper.java       |    0
 .../core/util/db/PostgreSQLConnectionHelper.java   |   35 +
 .../jackrabbit/core/util/db/ResultSetWrapper.java  |   70 +
 .../jackrabbit/core/util/db/StreamWrapper.java     |  105 ++
 .../jackrabbit/data/core/InternalXAResource.java   |   72 +
 .../jackrabbit/data/core/TransactionContext.java   |  376 ++++++
 .../jackrabbit/data/core/TransactionException.java |   44 +
 .../jackrabbit/core/data/db/azure.properties       |   17 +
 .../apache/jackrabbit/core/data/db/db2.properties  |   17 +
 .../jackrabbit/core/data/db/derby.properties       |   17 +
 .../apache/jackrabbit/core/data/db/h2.properties   |   18 +
 .../jackrabbit/core/data/db/ingres.properties      |   17 +
 .../jackrabbit/core/data/db/mssql.properties       |   17 +
 .../jackrabbit/core/data/db/mysql.properties       |   19 +
 .../jackrabbit/core/data/db/oracle.properties      |   18 +
 .../jackrabbit/core/data/db/postgresql.properties  |   20 +
 .../jackrabbit/core/data/db/sqlserver.properties   |   18 +
 .../jackrabbit/core/data/InMemoryBackend.java      |  203 +++
 .../jackrabbit/core/data/InMemoryDataStore.java    |   51 +
 .../jackrabbit/core/data/RandomInputStream.java    |    0
 .../jackrabbit/core/data/TestCachingFDS.java       |   82 ++
 .../core/data/TestCachingFDSCacheOff.java          |   49 +
 .../apache/jackrabbit/core/data/TestCaseBase.java  |  682 ++++++++++
 .../jackrabbit/core/data/TestFileDataStore.java    |   70 +
 .../apache/jackrabbit/core/data/TestInMemDs.java   |   41 +
 .../jackrabbit/core/data/TestInMemDsCacheOff.java  |   40 +
 .../jackrabbit/core/data/TestLocalCache.java       |  402 ++++++
 .../data/db/ResettableTempFileInputStreamTest.java |   73 +
 .../core/data/db/TempFileInputStreamTest.java      |   42 +
 jackrabbit-data/src/test/resources/fs.properties   |   17 +
 .../src/test/resources/log4j.properties            |   29 +
 jackrabbit-jca/deploy/geronimo/geronimo-ra.xml     |   57 +
 jackrabbit-jca/pom.xml                             |    4 +-
 .../jackrabbit/jca/JCAConnectionRequestInfo.java   |   15 +-
 .../jackrabbit/jca/JCAManagedConnection.java       |  117 +-
 .../jca/JCAManagedConnectionFactory.java           |   60 +-
 .../jackrabbit/jca/JCARepositoryManager.java       |    8 +-
 .../jackrabbit/jca/TransactionBoundXAResource.java |    4 +-
 jackrabbit-jca/src/main/rar/META-INF/LICENSE       |  699 ++++++++++
 .../jackrabbit/jca/test/ConnectionFactoryTest.java |    3 +
 jackrabbit-jcr-client/pom.xml                      |   14 +-
 .../client/RepositoryFactoryImplTest.java          |   27 +
 jackrabbit-jcr-commons/pom.xml                     |    4 +-
 .../jackrabbit/commons/AbstractRepository.java     |   21 +
 .../apache/jackrabbit/commons/AbstractSession.java |   30 +-
 .../apache/jackrabbit/commons/ItemNameMatcher.java |  163 +++
 .../org/apache/jackrabbit/commons/JcrUtils.java    |  956 ++++++++++++--
 .../apache/jackrabbit/commons/NamespaceHelper.java |  480 +++----
 .../apache/jackrabbit/commons/cnd/CndImporter.java |   58 +-
 .../commons/cnd/CompactNodeTypeDefReader.java      |   26 +-
 .../jackrabbit/commons/flat/FilterIterator.java    |    2 +-
 .../commons/iterator/AbstractLazyIterator.java     |   68 +
 .../commons/iterator/FilteredRangeIterator.java    |    1 -
 .../jackrabbit/commons/iterator/NodeIterable.java  |    4 +
 .../commons/iterator/NodeIteratorAdapter.java      |    4 +
 .../commons/iterator/PropertyIterable.java         |    4 +
 .../commons/iterator/PropertyIteratorAdapter.java  |    4 +
 .../jackrabbit/commons/iterator/RowIterable.java   |    4 +
 .../jackrabbit/commons/iterator/package-info.java  |    2 +-
 .../commons/jackrabbit/SimpleReferenceBinary.java  |   68 +
 .../authorization/AccessControlUtils.java          |  390 ++++++
 .../jackrabbit/user/AuthorizableQueryManager.java  |   10 +-
 .../commons/observation/EventTracker.java          |  143 ++
 .../observation/JackrabbitEventTracker.java        |   45 +
 .../commons/observation/ListenerTracker.java       |  365 +++++
 .../apache/jackrabbit/commons/package-info.java    |    2 +-
 .../commons/packaging/ContentPackage.java          |   54 +-
 .../commons/packaging/ContentPackageExporter.java  |   54 +-
 .../commons/packaging/FilterContentPackage.java    |  410 +++---
 .../jackrabbit/commons/packaging/package-info.java |    2 +-
 .../org/apache/jackrabbit/commons/query/GQL.java   |  119 +-
 .../commons/query/qom/OperandEvaluator.java        |    1 -
 .../jackrabbit/commons/query/qom/Operator.java     |  322 ++---
 .../repository/SingletonRepositoryFactory.java     |   98 +-
 .../commons/visitor/FilteringItemVisitor.java      |  474 +++----
 .../commons/webdav/AtomFeedConstants.java          |  106 +-
 .../jackrabbit/commons/webdav/package-info.java    |    2 +-
 .../commons/xml/SerializingContentHandler.java     |    2 +-
 .../commons/xml/ToXmlContentHandler.java           |    2 +-
 .../org/apache/jackrabbit/stats/QueryStatCore.java |   40 +
 .../jackrabbit/stats/QueryStatDtoComparator.java   |   31 +
 .../apache/jackrabbit/stats/QueryStatDtoImpl.java  |  145 ++
 .../stats/QueryStatDtoOccurrenceComparator.java    |   33 +
 .../org/apache/jackrabbit/stats/QueryStatImpl.java |  186 +++
 .../jackrabbit/stats/RepositoryStatisticsImpl.java |  116 ++
 .../apache/jackrabbit/stats/TimeSeriesAverage.java |   85 ++
 .../org/apache/jackrabbit/stats/TimeSeriesMax.java |  142 ++
 .../jackrabbit/stats/TimeSeriesRecorder.java       |  161 +++
 .../jackrabbit/stats/TimeSeriesStatsUtil.java      |   56 +
 .../jackrabbit/stats/jmx/QueryStatManager.java     |  139 ++
 .../org/apache/jackrabbit/stats/package-info.java  |   18 +
 .../java/org/apache/jackrabbit/util/Base64.java    |    2 +-
 .../jackrabbit/util/ChildrenCollectorFilter.java   |  130 +-
 .../java/org/apache/jackrabbit/util/ISO8601.java   |   59 +-
 .../java/org/apache/jackrabbit/util/ISO9075.java   |    2 +-
 .../java/org/apache/jackrabbit/util/Locked.java    |    2 +-
 .../main/java/org/apache/jackrabbit/util/Text.java |    6 +-
 .../jackrabbit/util/TransientFileFactory.java      |   10 +-
 .../jackrabbit/util/WeakIdentityCollection.java    |    2 +-
 .../org/apache/jackrabbit/value/BinaryImpl.java    |    2 +-
 .../org/apache/jackrabbit/value/BinaryValue.java   |    2 +-
 .../org/apache/jackrabbit/value/BooleanValue.java  |    2 +-
 .../org/apache/jackrabbit/value/DateValue.java     |    4 +-
 .../org/apache/jackrabbit/value/DecimalValue.java  |    2 +-
 .../org/apache/jackrabbit/value/DoubleValue.java   |    2 +-
 .../org/apache/jackrabbit/value/LongValue.java     |    2 +-
 .../org/apache/jackrabbit/value/NameValue.java     |    4 +-
 .../org/apache/jackrabbit/value/PathValue.java     |    4 +-
 .../apache/jackrabbit/value/ReferenceValue.java    |    4 +-
 .../org/apache/jackrabbit/value/StringValue.java   |    2 +-
 .../java/org/apache/jackrabbit/value/URIValue.java |    4 +-
 .../org/apache/jackrabbit/value/ValueHelper.java   |   27 +
 .../jackrabbit/value/WeakReferenceValue.java       |    4 +-
 .../apache/jackrabbit/commons/JcrUtilsTest.java    |   17 +
 .../jackrabbit/commons/json/JsonUtilTest.java      |   46 +-
 .../apache/jackrabbit/commons/query/GQLTest.java   |   44 +
 .../stats/RepositoryStatisticsImplTest.java        |   59 +
 .../jackrabbit/stats/TimeSeriesRecorderTest.java   |  122 ++
 jackrabbit-jcr-rmi/pom.xml                         |  204 +--
 .../rmi/client/BrokenRemoteRepository.java         |   45 +
 .../rmi/client/ClientAdapterFactory.java           |   12 +-
 .../apache/jackrabbit/rmi/client/ClientLock.java   |   15 +-
 .../apache/jackrabbit/rmi/client/ClientNode.java   |   57 +-
 .../rmi/client/ClientNodeDefinition.java           |   14 +-
 .../jackrabbit/rmi/client/ClientNodeType.java      |   43 +-
 .../rmi/client/ClientNodeTypeManager.java          |   12 +-
 .../rmi/client/ClientObservationManager.java       |    6 +-
 .../rmi/client/ClientPropertyDefinition.java       |   21 +-
 .../apache/jackrabbit/rmi/client/ClientQuery.java  |   29 +-
 .../jackrabbit/rmi/client/ClientQueryManager.java  |    2 +-
 .../jackrabbit/rmi/client/ClientQueryResult.java   |   10 +-
 .../jackrabbit/rmi/client/ClientRepository.java    |    9 +-
 .../apache/jackrabbit/rmi/client/ClientRow.java    |   54 +-
 .../jackrabbit/rmi/client/ClientSession.java       |    4 +-
 .../jackrabbit/rmi/client/ClientVersion.java       |   32 +-
 .../rmi/client/ClientVersionHistory.java           |   41 +-
 .../rmi/client/ClientVersionManager.java           |   94 +-
 .../jackrabbit/rmi/client/ClientWorkspace.java     |    4 +-
 .../jackrabbit/rmi/client/LocalAdapterFactory.java |    6 +-
 .../rmi/client/SafeClientRepository.java           |   90 +-
 .../rmi/client/iterator/ClientRowIterator.java     |    9 +-
 .../rmi/client/security/ClientPrivilege.java       |    4 -
 .../rmi/observation/ClientEventPoll.java           |   67 +-
 .../rmi/remote/RemoteEventCollection.java          |   64 +-
 .../apache/jackrabbit/rmi/remote/RemoteLock.java   |   19 +
 .../apache/jackrabbit/rmi/remote/RemoteNode.java   |   88 ++
 .../rmi/remote/RemoteNodeDefinition.java           |   20 +
 .../jackrabbit/rmi/remote/RemoteNodeType.java      |   60 +
 .../rmi/remote/RemotePropertyDefinition.java       |   30 +
 .../apache/jackrabbit/rmi/remote/RemoteQuery.java  |   35 +
 .../jackrabbit/rmi/remote/RemoteQueryResult.java   |    8 +
 .../jackrabbit/rmi/remote/RemoteRepository.java    |   42 +
 .../apache/jackrabbit/rmi/remote/RemoteRow.java    |   57 +
 .../jackrabbit/rmi/remote/RemoteVersion.java       |   36 +-
 .../rmi/remote/RemoteVersionHistory.java           |   64 +-
 .../rmi/remote/RemoteVersionManager.java           |  108 +-
 .../jackrabbit/rmi/remote/SerializableXid.java     |  142 +-
 .../AbstractRemoteRepositoryFactory.java           |    1 -
 .../rmi/repository/RmiRepositoryFactory.java       |  144 +-
 .../rmi/server/RemoteAdapterFactory.java           |    2 +-
 .../rmi/server/ServerAdapterFactory.java           |   26 +-
 .../rmi/server/ServerEventCollection.java          |   50 +-
 .../apache/jackrabbit/rmi/server/ServerLock.java   |   12 +-
 .../apache/jackrabbit/rmi/server/ServerNode.java   |   81 ++
 .../rmi/server/ServerNodeDefinition.java           |   10 +
 .../jackrabbit/rmi/server/ServerNodeType.java      |   31 +
 .../rmi/server/ServerObservationManager.java       |    8 +-
 .../rmi/server/ServerPropertyDefinition.java       |   16 +-
 .../apache/jackrabbit/rmi/server/ServerQuery.java  |   27 +
 .../jackrabbit/rmi/server/ServerQueryResult.java   |    5 +
 .../jackrabbit/rmi/server/ServerRepository.java    |   30 +
 .../apache/jackrabbit/rmi/server/ServerRow.java    |   73 +-
 .../jackrabbit/rmi/server/ServerVersion.java       |   53 +-
 .../rmi/server/ServerVersionHistory.java           |   43 +
 .../rmi/server/ServerVersionManager.java           |  117 +-
 .../jackrabbit/rmi/server/ServerWorkspace.java     |    2 +-
 .../apache/jackrabbit/rmi/observation/package.html |    2 +-
 .../apache/jackrabbit/rmi/RepositoryStubImpl.java  |    2 +-
 jackrabbit-jcr-server/pom.xml                      |   54 +-
 .../server/BasicCredentialsProvider.java           |    2 +-
 .../jackrabbit/server/SessionProviderImpl.java     |  113 +-
 .../jackrabbit/server/io/DefaultHandler.java       |    2 +-
 .../server/io/DirListingExportHandler.java         |    4 +-
 .../jackrabbit/server/io/PropertyHandler.java      |    2 +-
 .../jackrabbit/server/jcr/JCRWebdavServer.java     |   67 +-
 .../org/apache/jackrabbit/server/package-info.java |   18 +
 .../server/remoting/davex/AclRemoveHandler.java    |   61 +
 .../server/remoting/davex/DavexServletService.java |  113 +-
 .../server/remoting/davex/JcrRemotingServlet.java  |   31 +-
 .../server/remoting/davex/JsonDiffHandler.java     |  378 +++++-
 .../server/remoting/davex/JsonWriter.java          |   41 +-
 .../remoting/davex/ProtectedItemRemoveHandler.java |   28 +
 .../remoting/davex/ProtectedRemoveManager.java     |  105 ++
 .../jackrabbit/server/util/HttpMultipartPost.java  |    4 +-
 .../apache/jackrabbit/server/util/RequestData.java |    4 +-
 .../webdav/jcr/AbstractItemResource.java           |   54 +-
 .../jackrabbit/webdav/jcr/AbstractResource.java    |   54 +-
 .../webdav/jcr/DavLocatorFactoryImpl.java          |    2 +-
 .../webdav/jcr/DavResourceFactoryImpl.java         |    2 +-
 .../webdav/jcr/DefaultItemCollection.java          |   37 +-
 .../jackrabbit/webdav/jcr/DefaultItemResource.java |    5 +
 .../webdav/jcr/EventJournalResourceImpl.java       |  956 +++++++-------
 .../webdav/jcr/ItemResourceConstants.java          |   23 +-
 .../jackrabbit/webdav/jcr/JcrDavSession.java       |   33 +-
 .../jackrabbit/webdav/jcr/RootCollection.java      |   62 +-
 .../jcr/VersionControlledItemCollection.java       |   27 +-
 .../webdav/jcr/WorkspaceResourceImpl.java          |   80 +-
 .../jackrabbit/webdav/jcr/lock/JcrActiveLock.java  |   49 +-
 .../webdav/jcr/lock/LockTokenMapper.java           |   74 ++
 .../webdav/jcr/observation/SubscriptionImpl.java   |   28 +-
 .../webdav/jcr/property/JcrDavPropertyNameSet.java |    2 -
 .../webdav/jcr/search/SearchResourceImpl.java      |  135 +-
 .../security/JcrSupportedPrivilegesProperty.java   |  122 ++
 .../jcr/security/JcrUserPrivilegesProperty.java    |   60 +
 .../webdav/jcr/security/SecurityUtils.java         |   30 +
 .../webdav/jcr/transaction/TxLockManagerImpl.java  |    2 +-
 .../jcr/version/report/ExportViewReport.java       |    2 +-
 .../jcr/version/report/JcrPrivilegeReport.java     |   42 +-
 .../jcr/version/report/LocateByUuidReport.java     |    2 +-
 .../report/LocateCorrespondingNodeReport.java      |    2 +-
 .../jackrabbit/webdav/simple/DavResourceImpl.java  |   23 +-
 .../webdav/simple/DeltaVResourceImpl.java          |   18 +-
 .../webdav/simple/LocatorFactoryImplEx.java        |    2 +-
 .../simple/VersionControlledResourceImpl.java      |    4 +-
 .../remoting/davex/JsonDiffHandlerImportTest.java  |  176 +++
 .../server/remoting/davex/JsonDiffHandlerTest.java |   53 +-
 .../webdav/jcr/LockTimeOutFormatTest.java          |  124 ++
 .../webdav/jcr/LockTokenMappingTest.java           |  107 ++
 .../webdav/jcr/security/AbstractSecurityTest.java  |   40 +
 .../JcrSupportedPrivilegePropertyTest.java         |   46 +
 .../security/JcrUserPrivilegesPropertyTest.java    |   69 +
 .../test/resources/protectedHandlers.properties    |   17 +
 .../src/test/resources/repository.xml              |  166 +++
 .../test/resources/repositoryStubImpl.properties   |   23 +
 jackrabbit-jcr-servlet/pom.xml                     |    8 +-
 .../servlet/AbstractRepositoryServlet.java         |   14 +-
 .../servlet/ContextRepositoryServlet.java          |    4 +-
 .../servlet/FilterRepositoryFactory.java           |  190 +--
 .../servlet/login/AbstractLoginFilter.java         |  226 ++--
 .../jackrabbit/servlet/login/BasicLoginFilter.java |   76 +-
 .../servlet/login/ContainerLoginFilter.java        |  128 +-
 .../jackrabbit/servlet/login/NullLoginFilter.java  |   86 +-
 jackrabbit-jcr-tests/pom.xml                       |    2 +-
 .../apache/jackrabbit/test/AbstractJCRTest.java    |   92 +-
 .../java/org/apache/jackrabbit/test/ISO8601.java   |    4 +-
 .../apache/jackrabbit/test/JNDIRepositoryStub.java |    5 +-
 .../jackrabbit/test/RepositoryHelperPool.java      |   10 +
 .../jackrabbit/test/RepositoryHelperPoolImpl.java  |   32 +-
 .../org/apache/jackrabbit/test/RepositoryStub.java |   25 +-
 .../jackrabbit/test/RepositoryStubException.java   |    9 +
 .../jackrabbit/test/api/AbstractImportXmlTest.java |   37 +-
 .../test/api/AbstractWorkspaceCopyTest.java        |    2 +-
 .../apache/jackrabbit/test/api/AddNodeTest.java    |   67 +-
 .../jackrabbit/test/api/BinaryPropertyTest.java    |    2 +-
 .../jackrabbit/test/api/ExportDocViewTest.java     |    2 -
 .../jackrabbit/test/api/NamespaceRegistryTest.java |    6 +-
 .../jackrabbit/test/api/NodeAddMixinTest.java      |    8 +-
 .../jackrabbit/test/api/NodeCanAddMixinTest.java   |    4 +-
 .../test/api/NodeDiscoveringNodeTypesTest.java     |   19 +-
 .../test/api/NodeItemIsModifiedTest.java           |    6 +-
 .../jackrabbit/test/api/NodeItemIsNewTest.java     |    2 +-
 .../apache/jackrabbit/test/api/NodeMixinUtil.java  |   20 +-
 .../jackrabbit/test/api/NodeRemoveMixinTest.java   |   14 +-
 .../test/api/NodeSetPrimaryTypeTest.java           |    2 +-
 .../org/apache/jackrabbit/test/api/NodeTest.java   |   38 +-
 .../test/api/PropertyItemIsModifiedTest.java       |    2 +-
 .../jackrabbit/test/api/PropertyItemIsNewTest.java |    2 +-
 .../apache/jackrabbit/test/api/PropertyTest.java   |    2 +-
 .../apache/jackrabbit/test/api/ReferencesTest.java |   28 +-
 .../jackrabbit/test/api/SerializationTest.java     |    7 +-
 .../jackrabbit/test/api/SessionRemoveItemTest.java |    5 +-
 .../apache/jackrabbit/test/api/SessionTest.java    |   35 +-
 .../test/api/SetPropertyAssumeTypeTest.java        |    8 +-
 .../test/api/SetPropertyBooleanTest.java           |   10 +-
 .../test/api/SetPropertyCalendarTest.java          |   10 +-
 ...etPropertyConstraintViolationExceptionTest.java |   44 +-
 .../jackrabbit/test/api/SetPropertyDoubleTest.java |   23 +-
 .../test/api/SetPropertyInputStreamTest.java       |   12 +-
 .../jackrabbit/test/api/SetPropertyLongTest.java   |   10 +-
 .../jackrabbit/test/api/SetPropertyNodeTest.java   |   12 +-
 .../jackrabbit/test/api/SetPropertyStringTest.java |   78 +-
 .../jackrabbit/test/api/SetPropertyValueTest.java  |   78 +-
 .../jackrabbit/test/api/SetValueBinaryTest.java    |    2 +-
 .../SetValueConstraintViolationExceptionTest.java  |   96 +-
 .../test/api/SetValueInputStreamTest.java          |    6 +-
 .../jackrabbit/test/api/SetValueStringTest.java    |    2 +-
 .../test/api/SetValueValueFormatExceptionTest.java |    4 +-
 .../test/api/SetValueVersionExceptionTest.java     |   40 +-
 .../jackrabbit/test/api/ShareableNodeTest.java     |  189 ++-
 .../apache/jackrabbit/test/api/TreeComparator.java |    2 +-
 .../jackrabbit/test/api/ValueFactoryTest.java      |    2 +-
 .../test/api/WorkspaceCopySameNameSibsTest.java    |    4 +-
 .../jackrabbit/test/api/WorkspaceCopyTest.java     |    2 +-
 .../test/api/WorkspaceMoveSameNameSibsTest.java    |    4 +-
 .../jackrabbit/test/api/WorkspaceMoveTest.java     |    2 +-
 .../jackrabbit/test/api/lock/AbstractLockTest.java |   38 +-
 .../jackrabbit/test/api/lock/DeepLockTest.java     |    6 +-
 .../jackrabbit/test/api/lock/LockManagerTest.java  |   10 +-
 .../apache/jackrabbit/test/api/lock/LockTest.java  |   55 +-
 .../test/api/lock/OpenScopedLockTest.java          |    5 -
 .../test/api/lock/SessionScopedLockTest.java       |    4 -
 .../test/api/lock/SetValueLockExceptionTest.java   |    2 +-
 .../CanAddChildNodeCallWithNodeTypeTest.java       |   25 +-
 .../jackrabbit/test/api/nodetype/NodeTypeTest.java |   54 +-
 .../jackrabbit/test/api/nodetype/NodeTypeUtil.java |  111 ++
 .../test/api/nodetype/PropertyDefTest.java         |    2 +-
 .../test/api/observation/AddEventListenerTest.java |   18 +-
 .../test/api/observation/EventIteratorTest.java    |    6 +-
 .../test/api/observation/EventJournalTest.java     |    2 +
 .../jackrabbit/test/api/observation/EventTest.java |    6 +-
 .../test/api/observation/GetDateTest.java          |    2 +-
 .../test/api/observation/GetIdentifierTest.java    |   18 +-
 .../test/api/observation/GetInfoTest.java          |   41 +-
 .../test/api/observation/GetUserDataTest.java      |    6 +-
 .../test/api/observation/LockingTest.java          |    4 +-
 .../test/api/observation/NodeAddedTest.java        |    8 +-
 .../test/api/observation/NodeMovedTest.java        |   12 +-
 .../test/api/observation/NodeRemovedTest.java      |   14 +-
 .../test/api/observation/NodeReorderTest.java      |   91 +-
 .../test/api/observation/PropertyAddedTest.java    |   10 +-
 .../test/api/observation/PropertyChangedTest.java  |   16 +-
 .../test/api/observation/PropertyRemovedTest.java  |    8 +-
 .../api/observation/WorkspaceOperationTest.java    |   10 +-
 .../test/api/query/AbstractOrderByTest.java        |   10 +-
 .../test/api/query/AbstractQueryLevel2Test.java    |    6 +-
 .../test/api/query/AbstractQueryTest.java          |   99 +-
 .../jackrabbit/test/api/query/ElementTest.java     |   16 +-
 .../jackrabbit/test/api/query/GetLanguageTest.java |   10 +-
 .../query/GetPersistentQueryPathLevel1Test.java    |    2 +-
 .../test/api/query/GetPersistentQueryPathTest.java |    2 +-
 .../test/api/query/GetPropertyNamesTest.java       |    2 +-
 .../test/api/query/GetStatementTest.java           |    2 +-
 .../api/query/GetSupportedQueryLanguagesTest.java  |    2 +-
 .../test/api/query/OrderByMultiTypeTest.java       |   16 +-
 .../jackrabbit/test/api/query/PredicatesTest.java  |   11 +-
 .../api/query/QueryResultNodeIteratorTest.java     |   17 +-
 .../jackrabbit/test/api/query/SQLJcrPathTest.java  |    2 +-
 .../jackrabbit/test/api/query/SQLJoinTest.java     |    8 +-
 .../jackrabbit/test/api/query/SQLOrderByTest.java  |    9 +-
 .../jackrabbit/test/api/query/SQLPathTest.java     |   18 +-
 .../test/api/query/SQLQueryLevel2Test.java         |    7 +-
 .../apache/jackrabbit/test/api/query/SaveTest.java |    9 +-
 .../test/api/query/SimpleSelectionTest.java        |    2 +-
 .../jackrabbit/test/api/query/TextNodeTest.java    |    8 +-
 .../test/api/query/XPathDocOrderTest.java          |    9 +-
 .../test/api/query/XPathJcrPathTest.java           |    2 +-
 .../test/api/query/XPathOrderByTest.java           |    8 +-
 .../test/api/query/XPathPosIndexTest.java          |    3 +-
 .../test/api/query/XPathQueryLevel2Test.java       |    7 +-
 .../jackrabbit/test/api/query/qom/ColumnTest.java  |   18 +-
 .../test/api/query/qom/EquiJoinConditionTest.java  |    4 +-
 .../test/api/query/qom/GetQueryTest.java           |   10 +-
 .../test/api/retention/HoldEffectTest.java         |    1 -
 .../jackrabbit/test/api/retention/HoldTest.java    |    8 +-
 .../api/retention/RetentionPolicyEffectTest.java   |    1 -
 .../test/api/retention/RetentionPolicyTest.java    |    6 +-
 .../api/security/RSessionAccessControlTest.java    |    5 +-
 .../apache/jackrabbit/test/api/util/ISO9075.java   |    2 +-
 .../org/apache/jackrabbit/test/api/util/Text.java  |    6 +-
 .../test/api/version/AbstractMergeTest.java        |    6 +-
 .../api/version/AbstractOnParentVersionTest.java   |    2 +-
 .../test/api/version/AbstractVersionTest.java      |    3 +
 .../jackrabbit/test/api/version/CheckinTest.java   |    9 +
 .../jackrabbit/test/api/version/CheckoutTest.java  |    4 +
 .../jackrabbit/test/api/version/CopyTest.java      |    2 -
 .../test/api/version/GetReferencesNodeTest.java    |    9 +-
 .../test/api/version/MergeActivityTest.java        |    6 +-
 .../test/api/version/MergeCancelMergeTest.java     |    1 +
 .../jackrabbit/test/api/version/MergeNodeTest.java |    9 +
 .../test/api/version/MergeSubNodeTest.java         |    7 +-
 .../test/api/version/OnParentVersionAbortTest.java |    2 +-
 .../test/api/version/OnParentVersionCopyTest.java  |    1 +
 .../test/api/version/RemoveVersionTest.java        |    2 +-
 .../jackrabbit/test/api/version/RestoreTest.java   |   33 +-
 .../version/SessionMoveVersionExceptionTest.java   |    2 +-
 .../test/api/version/VersionHistoryTest.java       |   17 +-
 .../test/api/version/VersionLabelTest.java         |   66 +-
 .../version/WorkspaceMoveVersionExceptionTest.java |    6 +-
 .../test/api/version/WorkspaceRestoreTest.java     |    7 +
 .../api/version/simple/AbstractVersionTest.java    |    3 +
 .../test/api/version/simple/CheckinTest.java       |    6 +
 .../test/api/version/simple/RestoreTest.java       |   18 +
 jackrabbit-jcr2dav/pom.xml                         |   50 +-
 .../resources/accessControlProvider.properties     |   16 +
 .../apache/jackrabbit/jcr2dav/ConformanceTest.java |    2 +
 .../jackrabbit/jcr2dav/RepositoryStubImpl.java     |   79 +-
 .../src/test/resources/repository.xml              |  166 +++
 .../test/resources/repositoryStubImpl.properties   |   20 +
 jackrabbit-jcr2spi/pom.xml                         |   21 +-
 .../jackrabbit/jcr2spi/ItemLifeCycleListener.java  |    2 +-
 .../org/apache/jackrabbit/jcr2spi/ItemManager.java |   13 +-
 .../apache/jackrabbit/jcr2spi/ItemManagerImpl.java |   12 +-
 .../jcr2spi/Jcr2spiRepositoryFactory.java          |   88 +-
 .../jackrabbit/jcr2spi/LazyItemIterator.java       |   16 +-
 .../apache/jackrabbit/jcr2spi/ManagerProvider.java |    3 +
 .../org/apache/jackrabbit/jcr2spi/NodeImpl.java    |    4 +-
 .../org/apache/jackrabbit/jcr2spi/SessionImpl.java |   19 +-
 .../apache/jackrabbit/jcr2spi/WorkspaceImpl.java   |   35 +-
 .../jackrabbit/jcr2spi/WorkspaceManager.java       |   72 +-
 .../jcr2spi/config/RepositoryConfig.java           |    2 +
 .../jcr2spi/hierarchy/NodeEntryImpl.java           |    4 +-
 .../jcr2spi/hierarchy/PropertyEntryImpl.java       |    2 +-
 .../jackrabbit/jcr2spi/lock/LockManagerImpl.java   |    6 +-
 .../jcr2spi/nodetype/BitsetENTCacheImpl.java       |    4 +-
 .../jcr2spi/nodetype/EffectiveNodeTypeCache.java   |    2 +-
 .../jcr2spi/nodetype/EffectiveNodeTypeImpl.java    |    4 +-
 .../jackrabbit/jcr2spi/nodetype/NodeTypeImpl.java  |    4 +-
 .../jackrabbit/jcr2spi/operation/AddNode.java      |    5 +-
 .../jackrabbit/jcr2spi/operation/AddProperty.java  |    8 +-
 .../jcr2spi/operation/IgnoreOperation.java         |   25 +
 .../apache/jackrabbit/jcr2spi/operation/Merge.java |    4 +-
 .../jcr2spi/operation/OperationVisitor.java        |    4 +-
 .../jackrabbit/jcr2spi/operation/Remove.java       |   14 +-
 .../jackrabbit/jcr2spi/operation/SetTree.java      |  196 +++
 .../jcr2spi/operation/WorkspaceImport.java         |  220 +--
 .../jackrabbit/jcr2spi/query/QueryResultImpl.java  |   10 +-
 .../jackrabbit/jcr2spi/query/RowIteratorImpl.java  |    8 +-
 .../authorization/AccessControlProvider.java       |   73 +
 .../authorization/AccessControlProviderStub.java   |  117 ++
 .../security/authorization/PrivilegeImpl.java      |  133 ++
 .../jackrabbit/AccessControlConstants.java         |   62 +
 .../jackrabbit/acl/AccessControlEntryImpl.java     |  227 ++++
 .../jackrabbit/acl/AccessControlListImpl.java      |  276 ++++
 .../jackrabbit/acl/AccessControlManagerImpl.java   |  440 ++++++
 .../jackrabbit/acl/AccessControlProviderImpl.java  |  119 ++
 .../apache/jackrabbit/jcr2spi/state/ItemState.java |    7 +-
 .../jcr2spi/state/ItemStateValidator.java          |    2 +-
 .../jcr2spi/state/SessionItemStateManager.java     |   15 +-
 .../jcr2spi/xml/DocViewImportHandler.java          |    2 +-
 .../jackrabbit/jcr2spi/xml/ImportHandler.java      |    6 +-
 .../jcr2spi/xml/TargetImportHandler.java           |    6 +-
 .../jackrabbit/jcr2spi/AbstractJCR2SPITest.java    |   35 +
 .../jcr2spi/AbstractRepositoryConfig.java          |    5 +
 .../jackrabbit/jcr2spi/ReorderMixedTest.java       |   90 +-
 .../apache/jackrabbit/jcr2spi/ReorderMoveTest.java |  514 +++----
 .../jackrabbit/jcr2spi/ReorderNewAndSavedTest.java |  128 +-
 .../jackrabbit/jcr2spi/ReorderNewSNSTest.java      |  142 +-
 .../apache/jackrabbit/jcr2spi/ReorderNewTest.java  |  142 +-
 .../jcr2spi/ReorderReferenceableSNSTest.java       |   98 +-
 .../apache/jackrabbit/jcr2spi/ReorderSNSTest.java  |  146 +-
 .../org/apache/jackrabbit/jcr2spi/ReorderTest.java |  332 ++---
 .../jcr2spi/lock/OpenScopedLockTest.java           |   68 +-
 .../jcr2spi/security/Jcr2SpiSecurityTestSuite.java |   32 +
 .../jackrabbit/acl/AccessControlListImplTest.java  |  177 +++
 .../acl/AccessControlManagerImplTest.java          |  213 +++
 .../authorization/jackrabbit/acl/TestAll.java      |   33 +
 .../jackrabbit/jcr2spi/version/LabelTest.java      |  154 +--
 .../resources/accessControlProvider.properties     |   16 +
 jackrabbit-parent/pom.xml                          |   56 +-
 jackrabbit-spi-commons/pom.xml                     |   10 +-
 .../spi/commons/AbstractRepositoryService.java     |    9 +
 .../apache/jackrabbit/spi/commons/EventImpl.java   |    3 +-
 .../jackrabbit/spi/commons/SerializableBatch.java  |   24 +
 .../jackrabbit/spi/commons/SessionExtensions.java  |   64 +-
 .../spi/commons/batch/ChangeLogImpl.java           |    5 +
 .../spi/commons/batch/ConsolidatingChangeLog.java  |   47 +
 .../jackrabbit/spi/commons/batch/Operations.java   |   71 +-
 .../commons/conversion/CachingNameResolver.java    |    3 +
 .../spi/commons/conversion/PathParser.java         |   21 +-
 .../spi/commons/iterator/Transformer.java          |    2 +-
 .../apache/jackrabbit/spi/commons/lock/Locked.java |    2 +-
 .../spi/commons/logging/AbstractLogger.java        |    4 +-
 .../spi/commons/logging/BatchLogger.java           |   11 +-
 .../commons/logging/RepositoryServiceLogger.java   |   35 +
 .../jackrabbit/spi/commons/name/NameConstants.java |    9 +-
 .../spi/commons/name/NameFactoryImpl.java          |    2 +-
 .../namespace/RegistryNamespaceResolver.java       |  132 +-
 .../spi/commons/nodetype/NodeTypeDefDiff.java      |  185 ++-
 .../commons/nodetype/NodeTypeDefinitionImpl.java   |    2 +-
 .../nodetype/constraint/ValueConstraint.java       |    4 +-
 .../jackrabbit/spi/commons/package-info.java       |    2 +-
 .../spi/commons/query/LocationStepQueryNode.java   |    2 +-
 .../jackrabbit/spi/commons/query/QueryParser.java  |    2 +-
 .../spi/commons/query/qom/ColumnImpl.java          |    2 +-
 .../query/qom/QueryObjectModelFactoryImpl.java     |    8 +-
 .../spi/commons/query/qom/SelectorImpl.java        |    4 +-
 .../spi/commons/query/sql/JCRSQLQueryBuilder.java  |   10 +-
 .../spi/commons/query/xpath/QueryFormat.java       |    2 +-
 .../spi/commons/query/xpath/XPathQueryBuilder.java |   29 +-
 .../jackrabbit/spi/commons/tree/AbstractTree.java  |   77 ++
 .../spi/commons/value/AbstractQValue.java          |   34 +-
 .../spi/commons/value/QValueFactoryImpl.java       |    4 +-
 .../spi/commons/value/ValueFactoryQImpl.java       |   24 +-
 .../spi/commons/conversion/PathParserTest.java     |    5 +-
 .../spi/commons/nodetype/NodeTypeDefDiffTest.java  |  139 ++
 .../jackrabbit/spi/commons/nodetype/TestAll.java   |    1 +
 .../spi/commons/query/xpath/QueryFormatTest.java   |    8 +
 jackrabbit-spi/pom.xml                             |    2 +-
 .../main/java/org/apache/jackrabbit/spi/Batch.java |    9 +
 .../java/org/apache/jackrabbit/spi/ItemId.java     |    2 +-
 .../main/java/org/apache/jackrabbit/spi/Name.java  |    6 +-
 .../org/apache/jackrabbit/spi/NameFactory.java     |    2 +-
 .../main/java/org/apache/jackrabbit/spi/Path.java  |   20 +-
 .../org/apache/jackrabbit/spi/PathFactory.java     |    4 +-
 .../apache/jackrabbit/spi/QNodeTypeDefinition.java |    2 +-
 .../apache/jackrabbit/spi/QValueConstraint.java    |    2 +-
 .../java/org/apache/jackrabbit/spi/QueryInfo.java  |    6 +-
 .../org/apache/jackrabbit/spi/QueryResultRow.java  |    4 +-
 .../apache/jackrabbit/spi/RepositoryService.java   |   53 +-
 .../org/apache/jackrabbit/spi/SessionInfo.java     |    1 -
 .../main/java/org/apache/jackrabbit/spi/Tree.java  |   38 +
 .../org/apache/jackrabbit/spi/package-info.java    |    2 +-
 .../java/org/apache/jackrabbit/spi/Helper.java     |    2 +-
 jackrabbit-spi2dav/pom.xml                         |   27 +-
 .../org/apache/jackrabbit/spi2dav/BatchUtils.java  |   79 ++
 .../apache/jackrabbit/spi2dav/DocumentTree.java    |   94 ++
 .../org/apache/jackrabbit/spi2dav/EventImpl.java   |   13 +-
 .../org/apache/jackrabbit/spi2dav/IdURICache.java  |   32 +-
 .../apache/jackrabbit/spi2dav/LockInfoImpl.java    |   19 +-
 .../apache/jackrabbit/spi2dav/QueryInfoImpl.java   |   72 +-
 .../jackrabbit/spi2dav/QueryResultRowImpl.java     |   45 +-
 .../jackrabbit/spi2dav/RepositoryServiceImpl.java  |  471 +++++--
 .../apache/jackrabbit/spi2dav/SessionInfoImpl.java |    9 +-
 .../apache/jackrabbit/spi2dav/URIResolverImpl.java |   29 +-
 .../jackrabbit/spi2davex/QValueFactoryImpl.java    |    2 +-
 .../spi2davex/RepositoryServiceImpl.java           |  314 +++--
 .../Spi2davexRepositoryServiceFactory.java         |   16 +-
 .../org/apache/jackrabbit/spi2davex/Utils.java     |  115 ++
 .../apache/jackrabbit/spi2davex/ValueLoader.java   |    6 +-
 .../jackrabbit/spi2dav/RepositoryStubImpl.java     |    2 +-
 .../test/resources/repositoryStubImpl.properties   |    8 +-
 jackrabbit-spi2jcr/pom.xml                         |   40 +-
 .../apache/jackrabbit/spi2jcr/QueryInfoImpl.java   |   27 +-
 .../jackrabbit/spi2jcr/QueryResultRowImpl.java     |   20 +-
 .../jackrabbit/spi2jcr/RepositoryServiceImpl.java  |  120 ++
 .../org/apache/jackrabbit/spi2jcr/XmlTree.java     |   95 ++
 .../jackrabbit/spi2jcr/RepositoryStubImpl.java     |   13 +-
 .../src/test/resources/repository.xml              |   11 +-
 jackrabbit-standalone/pom.xml                      |    8 +-
 .../src/main/appended-resources/META-INF/LICENSE   |  529 +++++++-
 .../standalone/cli/ext/ConnectToJNDIServer.java    |  142 +-
 jackrabbit-webapp/README.txt                       |    8 +-
 jackrabbit-webapp/pom.xml                          |   43 +-
 .../java/org/apache/jackrabbit/j2ee/Installer.java |   43 +-
 .../jackrabbit/j2ee/JcrApiNotFoundException.java   |   76 +-
 .../jackrabbit/j2ee/RepositoryAccessServlet.java   |   10 +-
 .../jackrabbit/j2ee/RepositoryStartupServlet.java  |   89 +-
 jackrabbit-webapp/src/main/webapp/META-INF/LICENSE |  739 ++++++++++-
 .../webapp/WEB-INF/protectedHandlers.properties    |   17 +
 jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml  |    5 +
 .../src/main/webapp/bootstrap/missing.jsp          |    9 +
 .../src/main/webapp/error/classpath.jsp            |   56 +-
 .../src/main/webapp/error/repository.jsp           |   82 +-
 jackrabbit-webapp/src/main/webapp/footer.jsp       |   52 +-
 jackrabbit-webapp/src/main/webapp/header.jsp       |  178 +--
 jackrabbit-webapp/src/main/webapp/local.jsp        |  206 +--
 jackrabbit-webapp/src/main/webapp/populate.jsp     |   61 +-
 jackrabbit-webapp/src/main/webapp/remote.jsp       |  212 +--
 .../src/main/webapp/troubleshooting.jsp            |  210 +--
 jackrabbit-webapp/src/main/webapp/webdav-jcr.jsp   |  175 +--
 .../src/main/webapp/webdav-remoting.jsp            |    3 +-
 .../src/main/webapp/webdav-simple.jsp              |    3 +-
 .../jackrabbit/j2ee/BackwardsCompatibilityIT.java  |  243 ++++
 .../java/org/apache/jackrabbit/j2ee/TomcatIT.java  |   61 +-
 .../src/test/resources/compatibility.zip           |  Bin 0 -> 5589219 bytes
 .../src/test/resources/default-web.xml             | 1205 -----------------
 .../src/test/resources/logback-test.xml            |    2 +-
 jackrabbit-webdav/pom.xml                          |    2 +-
 .../jackrabbit/webdav/AbstractLocatorFactory.java  |    4 +-
 .../org/apache/jackrabbit/webdav/DavConstants.java |    2 +-
 .../org/apache/jackrabbit/webdav/DavException.java |    4 +-
 .../jackrabbit/webdav/MultiStatusResponse.java     |    2 +-
 .../jackrabbit/webdav/WebdavRequestImpl.java       |   13 +-
 .../jackrabbit/webdav/bind/BindServletRequest.java |  130 +-
 .../webdav/client/methods/RebindMethod.java        |  108 +-
 .../apache/jackrabbit/webdav/io/package-info.java  |    2 +-
 .../jackrabbit/webdav/lock/AbstractActiveLock.java |    4 +-
 .../apache/jackrabbit/webdav/lock/ActiveLock.java  |    4 +-
 .../webdav/observation/ObservationConstants.java   |   15 +-
 .../org/apache/jackrabbit/webdav/package-info.java |    2 +-
 .../webdav/property/DefaultDavProperty.java        |   12 +-
 .../jackrabbit/webdav/property/PropContainer.java  |    4 +-
 .../jackrabbit/webdav/search/SearchInfo.java       |    2 +-
 .../webdav/security/SupportedPrivilege.java        |   56 +
 .../security/SupportedPrivilegeSetProperty.java    |   28 +
 .../webdav/security/report/AclPrincipalReport.java |    2 +-
 .../security/report/PrincipalMatchReport.java      |    2 +-
 .../security/report/PrincipalSearchReport.java     |    6 +-
 .../security/report/SearchablePropertyReport.java  |    4 +-
 .../webdav/server/AbstractWebdavServlet.java       |   32 +-
 .../apache/jackrabbit/webdav/util/EncodeUtil.java  |    2 +-
 .../webdav/util/LinkHeaderFieldParser.java         |  398 +++---
 .../jackrabbit/webdav/util/package-info.java       |    2 +-
 .../webdav/version/ActivityResource.java           |    6 +-
 .../webdav/version/BaselineResource.java           |    4 +-
 .../jackrabbit/webdav/version/DeltaVConstants.java |    4 +-
 .../jackrabbit/webdav/version/DeltaVResource.java  |    4 +-
 .../webdav/version/VersionControlledResource.java  |    8 +-
 .../webdav/version/VersionHistoryResource.java     |    4 +-
 .../jackrabbit/webdav/version/VersionResource.java |    8 +-
 .../webdav/version/VersionableResource.java        |    4 +-
 .../webdav/version/WorkspaceResource.java          |    8 +-
 .../version/report/ExpandPropertyReport.java       |    2 +-
 .../webdav/xml/DavDocumentBuilderFactory.java      |   87 ++
 .../org/apache/jackrabbit/webdav/xml/DomUtil.java  |   54 +-
 .../apache/jackrabbit/webdav/xml/package-info.java |    2 +-
 .../server/RFC4918DestinationHeaderTest.java       |  240 ++--
 .../webdav/util/LinkHeaderFieldParserTest.java     |  132 +-
 .../apache/jackrabbit/webdav/xml/ParserTest.java   |  143 ++
 .../org/apache/jackrabbit/webdav/xml/TestAll.java  |    1 +
 pom.xml                                            |   25 +-
 test/compatibility/README.txt                      |   10 +-
 test/compatibility/assembly.xml                    |    8 +
 test/compatibility/create24/pom.xml                |   64 +
 .../compatibility/CreateRepositoryTest.java        |   28 +
 test/compatibility/create26/pom.xml                |   64 +
 .../compatibility/CreateRepositoryTest.java        |   28 +
 test/compatibility/pom.xml                         |    2 +
 test/performance/base/pom.xml                      |    2 +-
 .../performance/AbstractDeepTreeTest.java          |  105 ++
 .../ConcurrentReadAccessControlledTreeTest.java    |  109 ++
 .../performance/ConcurrentReadDeepTreeTest.java    |   63 +
 .../jackrabbit/performance/ReadDeepTreeTest.java   |   45 +
 .../base/src/main/resources/deepTree.xml           |    1 +
 test/performance/jackrabbit26/pom.xml              |   58 +
 .../jackrabbit/performance/PerformanceTest.java    |   32 +
 .../resources/btree-usermanager-repository.xml     |  159 +++
 .../resources/default-usermanager-repository.xml   |  156 +++
 test/performance/pom.xml                           |    5 +-
 1237 files changed, 55778 insertions(+), 21657 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackrabbit.git



More information about the pkg-java-commits mailing list