You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2025/03/11 15:30:53 UTC

(jackrabbit-filevault) 01/02: Merge branch 'master' into JCRVLT-789

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch JCRVLT-789
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git

commit 2dc9110f003aa59188f5b4375ab177650306f1d9
Merge: a1e0c7cf 14727e59
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Mar 11 09:39:41 2025 +0100

    Merge branch 'master' into JCRVLT-789

 parent/pom.xml                                     | 36 +++++++++++++++++++-
 src/site/markdown/filter.md                        |  2 +-
 src/site/markdown/importmode.md                    | 10 +++---
 src/site/markdown/properties.md                    |  4 ++-
 src/site/markdown/validation.md                    |  2 +-
 .../apache/jackrabbit/vault/cli/AbstractCmdLs.java |  3 +-
 .../org/apache/jackrabbit/vault/cli/CmdCat.java    |  3 +-
 .../org/apache/jackrabbit/vault/cli/CmdDebug.java  |  4 ++-
 .../org/apache/jackrabbit/vault/cli/CmdDump.java   |  6 ++--
 .../org/apache/jackrabbit/vault/cli/CmdExport.java |  1 +
 .../apache/jackrabbit/vault/cli/CmdExportCli.java  |  4 ++-
 .../apache/jackrabbit/vault/cli/CmdFormatCli.java  |  7 ++--
 .../org/apache/jackrabbit/vault/cli/CmdSync.java   |  3 +-
 .../apache/jackrabbit/vault/cli/VaultFsApp.java    |  3 +-
 .../vault/util/console/AbstractApplication.java    |  5 +--
 .../vault/util/console/platform/CmdLs.java         |  3 +-
 vault-core-it/pom.xml                              |  7 ++++
 vault-core/pom.xml                                 | 14 ++++++++
 .../jackrabbit/vault/fs/api/DumpContext.java       |  3 +-
 .../jackrabbit/vault/fs/config/ConfigHelper.java   |  3 +-
 .../vault/fs/config/DefaultWorkspaceFilter.java    |  7 ++--
 .../vault/fs/impl/io/CompressionUtil.java          |  3 +-
 .../vault/fs/impl/io/DocViewImporter.java          |  5 ++-
 .../vault/fs/impl/io/DocViewSAXHandler.java        |  5 +++
 .../vault/fs/impl/io/FileArtifactHandler.java      |  5 ++-
 .../jackrabbit/vault/fs/impl/io/NodeStash.java     |  5 +--
 .../jackrabbit/vault/fs/io/AbstractExporter.java   |  7 ++--
 .../apache/jackrabbit/vault/fs/io/AutoSave.java    |  4 ++-
 .../vault/fs/io/DocViewParserHandler.java          | 17 ++++++++--
 .../apache/jackrabbit/vault/fs/io/Importer.java    |  7 ++--
 .../apache/jackrabbit/vault/fs/io/JcrExporter.java |  7 ++--
 .../jackrabbit/vault/fs/io/package-info.java       |  2 +-
 .../vault/packaging/SubPackageHandling.java        |  5 +--
 .../vault/packaging/impl/ActivityLog.java          |  8 +++--
 .../vault/packaging/impl/DefaultPackageInfo.java   |  3 +-
 .../packaging/impl/JcrPackageDefinitionImpl.java   | 15 +++++----
 .../vault/packaging/impl/JcrPackageImpl.java       | 19 ++++++-----
 .../packaging/impl/JcrPackageManagerImpl.java      |  9 +++--
 .../vault/packaging/impl/JcrWorkspaceFilter.java   |  7 ++--
 .../packaging/impl/PackagePropertiesImpl.java      |  9 ++---
 .../registry/impl/ExecutionPlanBuilderImpl.java    |  5 +--
 .../packaging/registry/impl/FSInstallState.java    |  5 +--
 .../registry/impl/FSInstallStateCache.java         |  5 ++-
 .../registry/impl/FSRegisteredPackage.java         |  5 ++-
 .../registry/impl/JcrPackageRegistry.java          |  5 ++-
 .../vault/util/DefaultProgressListener.java        |  9 +++--
 .../jackrabbit/vault/util/LineInputStream.java     |  3 +-
 .../jackrabbit/vault/util/LineOutputStream.java    |  3 +-
 .../java/org/apache/jackrabbit/vault/util/MD5.java |  3 +-
 .../jackrabbit/vault/util/NodeNameComparator.java  |  5 +--
 .../jackrabbit/vault/util/RepositoryCopier.java    |  3 +-
 .../org/apache/jackrabbit/vault/util/SHA1.java     |  3 +-
 .../registry/impl/FSPackageRegistryTest.java       | 15 +++++++++
 .../vault/davex/DAVExRepositoryFactory.java        |  6 ++--
 .../vault/util/diff/LineElementsFactory.java       | 16 ++++-----
 .../vault/packaging/hooks/ExampleHook.java         |  5 ++-
 vault-rcp/pom.xml                                  | 12 +++++++
 vault-sync/pom.xml                                 | 10 ++++++
 .../jackrabbit/vault/sync/impl/SyncConfig.java     |  5 +--
 .../apache/jackrabbit/vault/sync/impl/SyncLog.java | 14 +++++---
 .../jackrabbit/vault/sync/impl/TreeSync.java       |  6 ++--
 .../jackrabbit/vault/sync/impl/XmlAnalyzer.java    |  3 +-
 vault-validation/pom.xml                           | 10 ++++++
 .../vault/validation/ValidationExecutor.java       |  3 +-
 .../context/AbstractDependencyResolver.java        |  7 +++-
 .../impl/util/ValidatorDocViewParserHandler.java   | 19 ++++++++---
 .../spi/impl/AccessControlValidator.java           |  5 +--
 .../spi/impl/AdvancedFilterValidator.java          | 21 ++++++------
 .../spi/impl/AdvancedFilterValidatorFactory.java   |  8 ++---
 .../validation/spi/impl/DependencyValidator.java   |  5 +--
 .../spi/impl/DependencyValidatorFactory.java       |  4 ++-
 .../spi/impl/DocumentViewParserValidator.java      |  6 ++--
 .../impl/DocumentViewParserValidatorFactory.java   | 16 ++++++++-
 .../spi/impl/DuplicateUuidValidator.java           |  3 +-
 .../spi/impl/MergeLimitationsValidator.java        |  3 +-
 .../spi/impl/OakIndexDefinitionValidator.java      |  5 +--
 .../spi/impl/OverlappingFilterValidator.java       |  5 +--
 .../impl/OverlappingFilterValidatorFactory.java    |  3 +-
 .../validation/spi/impl/PackageTypeValidator.java  | 39 +++++++++++-----------
 .../spi/impl/PackageTypeValidatorFactory.java      |  6 ++--
 .../spi/impl/nodetype/JcrNodeTypeMetaDataImpl.java | 27 +++++++--------
 .../spi/impl/nodetype/NodeTypeValidator.java       | 20 ++++++-----
 .../impl/nodetype/NodeTypeValidatorFactory.java    |  5 +--
 .../DocumentViewParserValidatorTest.java           | 18 ++++++++--
 .../jcr_root/apps/invalid/unusedcharacterdata.xml  | 22 ++++++++++++
 .../apache/jackrabbit/vault/vlt/FileAction.java    |  4 ++-
 .../apache/jackrabbit/vault/vlt/VltContext.java    | 17 +++++-----
 .../org/apache/jackrabbit/vault/vlt/VltFile.java   | 13 +++++---
 .../jackrabbit/vault/vlt/actions/Checkout.java     |  4 ++-
 .../apache/jackrabbit/vault/vlt/actions/Info.java  | 11 +++---
 .../apache/jackrabbit/vault/vlt/actions/Sync.java  | 15 ++++++---
 .../apache/jackrabbit/vault/vlt/meta/VltEntry.java |  3 +-
 .../vault/vlt/meta/xml/XmlEntryInfo.java           | 10 +++---
 .../vault/vlt/meta/xml/file/FileMetaDir.java       |  3 +-
 94 files changed, 531 insertions(+), 227 deletions(-)