[jackrabbit] 03/06: Merge tag 'upstream/2.12.1'

Markus Koschany apo at moszumanska.debian.org
Fri Apr 1 03:07:30 UTC 2016


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

apo pushed a commit to branch master
in repository jackrabbit.

commit 65efbee8dab7f23e70a39f192bdd83c672170b7d
Merge: 2024c84 47ac133
Author: Markus Koschany <apo at debian.org>
Date:   Fri Apr 1 04:19:12 2016 +0200

    Merge tag 'upstream/2.12.1'
    
    Upstream version 2.12.1
    
    # gpg: Signature made Fri 01 Apr 2016 04:19:07 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]
    # gpg:                 aka "Markus Koschany <apo at debian.org>" [ultimate]

 README.txt                                         |   4 +-
 RELEASE-NOTES.txt                                  |  70 +---
 jackrabbit-api/pom.xml                             |   9 +-
 .../apache/jackrabbit/api/JackrabbitSession.java   | 200 +++++++++-
 .../org/apache/jackrabbit/api/package-info.java    |   2 +-
 .../security/authorization/PrincipalSetPolicy.java |  76 ++++
 .../apache/jackrabbit/api/security/user/Group.java |  36 ++
 .../apache/jackrabbit/api/stats/TimeSeries.java    |   7 +
 jackrabbit-aws-ext/pom.xml                         |   4 +-
 .../org/apache/jackrabbit/aws/ext/S3Constants.java |  10 +
 .../java/org/apache/jackrabbit/aws/ext/Utils.java  |  53 ++-
 .../apache/jackrabbit/aws/ext/ds/S3Backend.java    |  28 +-
 .../src/test/resources/aws.properties              |   4 +-
 jackrabbit-bundle/pom.xml                          |   6 +-
 jackrabbit-core/pom.xml                            |   6 +-
 .../org/apache/jackrabbit/core/ItemManager.java    |   2 +-
 .../org/apache/jackrabbit/core/SessionImpl.java    |  38 ++
 .../jackrabbit/core/cluster/ClusterNode.java       |   3 +-
 .../jackrabbit/core/journal/MemoryJournal.java     |   6 +-
 .../apache/jackrabbit/core/lock/XAEnvironment.java |   0
 .../apache/jackrabbit/core/lock/XALockImpl.java    |   0
 .../apache/jackrabbit/core/lock/XALockManager.java |   0
 .../core/observation/EventDispatcher.java          |   0
 .../observation/EventStateCollectionFactory.java   |   0
 .../bundle/AbstractBundlePersistenceManager.java   |   6 +-
 .../core/persistence/util/BundleReader.java        |   1 -
 .../core/persistence/util/NodePropBundle.java      |   1 -
 .../jackrabbit/core/security/user/GroupImpl.java   |  11 +
 .../core/security/user/XPathQueryEvaluator.java    |   2 +-
 .../core/state/SessionItemStateManager.java        |  14 +-
 .../core/state/SharedItemStateManager.java         |   5 +-
 .../core/version/InternalVersionManagerBase.java   |   0
 .../core/version/InternalXAVersionManager.java     |   0
 .../api/security/user/UserManagerTest.java         |  83 ++++
 .../jackrabbit/core/LostFromCacheIssueTest.java    | 146 +++++++
 .../jackrabbit/core/OracleRepositoryTest.java      |   0
 .../core/OracleRetrocompatibleRepositoryTest.java  |   0
 .../jackrabbit/core/OverlappingNodeAddTest.java    |   0
 .../java/org/apache/jackrabbit/core/TestAll.java   |   2 +
 .../core/cluster/DbClusterTestJCR3162.java         |  12 +-
 .../core/config/RepositoryConfigTest.java          |   4 +
 .../core/fs/db/OracleFileSystemTest.java           |   0
 .../fs/db/OracleRetrocompatibleFileSystemTest.java |   0
 .../jackrabbit/core/integration/GetOrNullTest.java | 101 +++++
 .../core/integration/SessionImplTest.java          |  28 ++
 .../lucene/SearchIndexConsistencyCheckTest.java    |  14 +-
 .../authorization/AbstractEvaluationTest.java      |   2 +-
 .../authorization/acl/RestrictionTest.java         | 134 +++++++
 .../core/security/authorization/acl/TestAll.java   |   1 +
 .../security/user/MembershipCachePerfTest.java     | 363 ++++++++++++++++++
 .../core/security/user/UserImporterTest.java       |  17 +
 .../core/version/RestoreNodeWithSNSTest.java       |   0
 .../jackrabbit/core/repository-oracle-compat.xml   |   0
 .../apache/jackrabbit/core/repository-oracle.xml   |   0
 .../core/security/user/repository-membersplit.xml  |  92 +++++
 jackrabbit-data/pom.xml                            |   2 +-
 .../jackrabbit/core/data/CachingDataStore.java     |   4 +-
 .../apache/jackrabbit/core/data/LocalCache.java    |  15 +
 jackrabbit-jca/pom.xml                             |   2 +-
 jackrabbit-jcr-client/pom.xml                      |   2 +-
 jackrabbit-jcr-commons/pom.xml                     |  10 +-
 .../apache/jackrabbit/stats/TimeSeriesAverage.java |  45 ++-
 .../org/apache/jackrabbit/stats/TimeSeriesMax.java |  65 +++-
 .../jackrabbit/stats/TimeSeriesRecorder.java       |  79 +++-
 .../main/java/org/apache/jackrabbit/util/Text.java |  21 +-
 .../org/apache/jackrabbit/value/ValueHelper.java   |  53 ++-
 .../jackrabbit/stats/TimeSeriesAverageTest.java    | 202 ++++++++++
 .../apache/jackrabbit/stats/TimeSeriesMaxTest.java | 186 +++++++++
 .../jackrabbit/stats/TimeSeriesRecorderTest.java   |  98 ++++-
 .../java/org/apache/jackrabbit/util/TextTest.java  |   7 +
 jackrabbit-jcr-rmi/pom.xml                         |   2 +-
 jackrabbit-jcr-server/pom.xml                      |   2 +-
 .../jackrabbit/server/io/DefaultHandler.java       |  31 +-
 .../apache/jackrabbit/server/io/DeleteContext.java |  16 +-
 .../jackrabbit/server/io/DeleteContextImpl.java    |  23 +-
 .../apache/jackrabbit/server/io/DeleteHandler.java |  51 +++
 .../apache/jackrabbit/server/io/DeleteManager.java |  54 +++
 .../jackrabbit/server/io/DeleteManagerImpl.java    |  77 ++++
 .../server/io/DirListingExportHandler.java         |  36 +-
 .../server/remoting/davex/JcrRemotingServlet.java  |  22 +-
 .../remoting/davex/ProtectedRemoveConfig.java      |  83 ++++
 .../remoting/davex/ProtectedRemoveManager.java     |  65 ++--
 .../jackrabbit/webdav/simple/DavResourceImpl.java  |  33 +-
 .../jackrabbit/webdav/simple/ResourceConfig.java   |  15 +
 .../jackrabbit/server/remoting/davex/TestAll.java  |   1 +
 .../src/test/resources/protectedHandlersConfig.xml |  26 ++
 jackrabbit-jcr-servlet/pom.xml                     |   2 +-
 jackrabbit-jcr-tests/pom.xml                       |   2 +-
 .../test/api/query/qom/NodeLocalNameTest.java      |  33 +-
 jackrabbit-jcr2dav/pom.xml                         |   6 +-
 .../src/test/resources/protectedHandlersConfig.xml |  26 ++
 jackrabbit-jcr2spi/pom.xml                         |  12 +-
 jackrabbit-parent/pom.xml                          |  25 +-
 jackrabbit-spi-commons/pom.xml                     |   2 +-
 .../spi/commons/nodetype/NodeTypeDefDiff.java      | 418 ++++++++++-----------
 .../spi/commons/nodetype/NodeTypeDefDiffTest.java  |  36 ++
 jackrabbit-spi/pom.xml                             |   2 +-
 jackrabbit-spi2dav/pom.xml                         |   2 +-
 jackrabbit-spi2jcr/pom.xml                         |   6 +-
 jackrabbit-standalone/pom.xml                      |   2 +-
 jackrabbit-webapp/pom.xml                          |   2 +-
 jackrabbit-webapp/src/main/webapp/WEB-INF/web.xml  |   2 +-
 jackrabbit-webdav/pom.xml                          |   2 +-
 .../apache/jackrabbit/webdav/util/CSRFUtil.java    |  33 +-
 .../jackrabbit/webdav/util/CSRFUtilTest.java       |  99 +++--
 pom.xml                                            |   8 +-
 test/performance/plot.sh                           |   0
 107 files changed, 3111 insertions(+), 540 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