You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by jo...@apache.org on 2025/07/18 17:57:45 UTC
(jackrabbit-filevault) branch JCRVLT-809 created (now bce76d76)
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a change to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
at bce76d76 JCRVLT-809 read child- and property-definitions just once
This branch includes the following new commits:
new 2b4eb021 Merge branch 'master' of github.com:apache/jackrabbit-filevault
new 90e186be Merge branch 'master' of github.com:apache/jackrabbit-filevault
new 55d20c83 Merge branch 'master' of github.com:apache/jackrabbit-filevault
new 60f6ccd7 Merge branch 'master' of github.com:apache/jackrabbit-filevault
new 5d42753d Merge branch 'master' of github.com:apache/jackrabbit-filevault
new 744aedde Merge branch 'master' of github.com:apache/jackrabbit-filevault
new d15befbf Merge branch 'master' of github.com:apache/jackrabbit-filevault
new bce76d76 JCRVLT-809 read child- and property-definitions just once
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-filevault) 01/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 2b4eb021e709d2b4d22805a5e3cc7682b739c32f
Merge: d089f935 f22c1e2c
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Tue Feb 13 10:49:26 2024 +0100
Merge branch 'master' of github.com:apache/jackrabbit-filevault
assembly.xml | 31 -----
pom.xml | 48 +-------
.../vault/packaging/integration/CugHandlingIT.java | 98 ++++++++-------
.../vault/packaging/integration/ImportIT.java | 34 +++---
.../ReferenceableIdentifiersImportIT.java | 136 ++++++++++++++++++++-
5 files changed, 204 insertions(+), 143 deletions(-)
(jackrabbit-filevault) 02/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 90e186be01006e8c5130e8928c09a506746c7c71
Merge: 2b4eb021 3684cca5
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Mon Sep 23 12:56:26 2024 +0200
Merge branch 'master' of github.com:apache/jackrabbit-filevault
Jenkinsfile | 3 +-
RELEASE-NOTES.txt | 53 +++++-
parent/pom.xml | 50 +++++-
pom.xml | 8 +-
src/site/markdown/docview.md | 4 +-
src/site/markdown/howto_release.md | 2 +-
src/site/markdown/packagetypes.md | 2 +-
src/site/markdown/properties.md | 2 +-
src/site/markdown/referenceablenodes.md | 8 +-
.../packaging/integration/BinaryPropertiesIT.java | 87 ++++++----
.../ReferenceableIdentifiersImportIT.java | 186 +++++++++++++++++++--
.../integration/UserContentPackageIT.java | 2 +-
.../vault/packaging/integration/UserExportIT.java | 134 +++++++++++++++
.../org/apache/jackrabbit/vault/fs/Mounter.java | 5 +-
.../jackrabbit/vault/fs/api/IdConflictPolicy.java | 5 +
.../apache/jackrabbit/vault/fs/api/VaultFile.java | 14 +-
.../jackrabbit/vault/fs/api/VaultFileSystem.java | 6 +-
.../vault/fs/impl/DirectoryArtifact.java | 2 +-
.../jackrabbit/vault/fs/impl/VaultFileImpl.java | 2 +-
.../vault/fs/impl/VaultFileSystemImpl.java | 3 +-
.../vault/fs/impl/io/DocViewImporter.java | 10 ++
.../vault/fs/impl/io/JcrSysViewTransformer.java | 55 +++++-
.../jackrabbit/vault/fs/impl/io/NodeStash.java | 52 +++++-
.../jackrabbit/vault/fs/io/AbstractExporter.java | 3 +-
.../jackrabbit/vault/packaging/ExportOptions.java | 9 +-
.../jackrabbit/vault/packaging/VersionRange.java | 2 +-
.../jackrabbit/vault/fs/api/PathMappingTest.java | 2 +-
.../vault/fs/api/RepositoryAddressTest.java | 41 ++++-
.../jackrabbit/vault/fs/filter/FilterSetTest.java | 14 +-
.../vault/packaging/DepResolverTest.java | 13 +-
.../jackrabbit/vault/packaging/DependencyTest.java | 23 ++-
.../jackrabbit/vault/packaging/PackageIdTest.java | 46 ++++-
.../vault/packaging/SubPackageHandlingTest.java | 14 +-
.../vault/packaging/VersionRangeTest.java | 41 ++++-
.../jackrabbit/vault/util/LineInputTest.java | 17 +-
.../jackrabbit/vault/util/LineOutputTest.java | 14 +-
.../org/apache/jackrabbit/vault/util/MD5Test.java | 23 ++-
.../jackrabbit/vault/util/PathComparatorTest.java | 9 +-
.../apache/jackrabbit/vault/util/PathUtilTest.java | 11 +-
.../org/apache/jackrabbit/vault/util/SHA1Test.java | 24 ++-
.../org/apache/jackrabbit/vault/util/TreeTest.java | 21 ++-
vault-coverage-aggregate/pom.xml | 4 +
.../jackrabbit/vault/util/diff/Diff3Test.java | 23 ++-
.../jackrabbit/vault/util/diff/DiffTest.java | 11 +-
.../vault/util/diff/LineElementTest.java | 9 +-
.../jackrabbit/vault/rcp/impl/RcpTaskImpl.java | 1 +
.../context/AbstractDependencyResolver.java | 53 ++++--
.../vault/validation/context/package-info.java | 2 +-
.../impl/util/ValidatorDocViewParserHandler.java | 24 ++-
.../vault/validation/spi/NodeContext.java | 15 ++
.../vault/validation/spi/package-info.java | 2 +-
.../vault/validation/spi/util/NodeContextImpl.java | 25 ++-
.../vault/validation/spi/util/package-info.java | 2 +-
.../context/AbstractDependencyResolverTest.java | 4 +-
54 files changed, 1013 insertions(+), 184 deletions(-)
(jackrabbit-filevault) 03/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 55d20c833fc530f6301a3b959547d6eb4cce3023
Merge: 90e186be 367ffb42
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Wed Dec 18 17:05:54 2024 +0100
Merge branch 'master' of github.com:apache/jackrabbit-filevault
LICENSE.txt | 264 ---------------------
NOTICE.txt | 9 -
src/site/markdown/properties.md | 2 +-
.../packaging/integration/BinaryPropertiesIT.java | 34 ++-
.../vault/fs/io/DocViewParserHandler.java | 2 +-
.../validation/spi/DocumentViewXmlValidator.java | 4 +-
6 files changed, 29 insertions(+), 286 deletions(-)
(jackrabbit-filevault) 05/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 5d42753d63cd502ffcf6fdb156a40337afe3f911
Merge: 60f6ccd7 33917e21
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Thu Jun 26 08:32:20 2025 +0300
Merge branch 'master' of github.com:apache/jackrabbit-filevault
README.md | 2 +-
parent/pom.xml | 10 +++---
.../min-target-osgi-environment/min-target.bndrun | 2 +-
vault-core-it/vault-core-integration-tests/pom.xml | 2 +-
.../packaging/impl/JcrPackageManagerImplIT.java | 2 +-
.../vault/packaging/integration/ACEsAtRootIT.java | 26 ++++++++++------
vault-core/pom.xml | 2 +-
.../jackrabbit/vault/fs/config/ConfigHelper.java | 36 +++++++++-------------
.../jackrabbit/vault/fs/config/Registry.java | 4 +--
.../packaging/impl/InstallHookProcessorImpl.java | 2 +-
.../impl/ExecutionPlanBuilderImplTest.java | 3 +-
vault-rcp/pom.xml | 13 ++++++++
12 files changed, 59 insertions(+), 45 deletions(-)
(jackrabbit-filevault) 06/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 744aedde4d618e8b567b2c1220ba50e8f2cadce7
Merge: 5d42753d 233b1542
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Thu Jul 17 19:27:25 2025 +0200
Merge branch 'master' of github.com:apache/jackrabbit-filevault
src/site/markdown/filter.md | 20 +++++++--
.../vault-core-it-support-jackrabbit/pom.xml | 15 +++++++
.../vault-core-it-support-oak/pom.xml | 15 +++++++
.../vault/fs/impl/io/DocViewImporter.java | 2 +-
.../packaging/impl/PackagePropertiesImpl.java | 11 ++---
.../src/main/resources/workspacefilter-1.0.xsd | 47 +++++++++++++++++++---
6 files changed, 96 insertions(+), 14 deletions(-)
(jackrabbit-filevault) 07/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit d15befbff33ad5ab564ab012f0084ea47e02a528
Merge: 744aedde 4d31d5fb
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Fri Jul 18 19:55:47 2025 +0200
Merge branch 'master' of github.com:apache/jackrabbit-filevault
parent/pom.xml | 36 +++++++++++
pom.xml | 15 +++--
vault-coverage-aggregate/pom.xml | 126 ---------------------------------------
3 files changed, 46 insertions(+), 131 deletions(-)
(jackrabbit-filevault) 04/08: Merge branch 'master' of github.com:apache/jackrabbit-filevault
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit 60f6ccd73ab9407c48dd70d338940223f7d4319e
Merge: 55d20c83 4da7c7c7
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Tue May 13 11:37:36 2025 +0200
Merge branch 'master' of github.com:apache/jackrabbit-filevault
.asf.yaml | 2 +
RELEASE-NOTES.txt | 27 +++-
parent/pom.xml | 52 +++++--
parent/src/site/site.xml | 20 ++-
pom.xml | 2 +-
src/site/markdown/filter.md | 2 +-
src/site/markdown/importmode.md | 10 +-
src/site/markdown/properties.md | 4 +-
src/site/markdown/validation.md | 2 +-
src/site/site.xml | 8 +-
vault-cli/pom.xml | 10 +-
.../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 | 6 +-
.../vault/util/console/platform/CmdLs.java | 3 +-
vault-core-it/pom.xml | 7 +
vault-core-it/vault-core-integration-tests/pom.xml | 7 +
.../packaging/integration/SiblingIterationIT.java | 149 +++++++++++++++++++++
vault-core/pom.xml | 14 ++
.../jackrabbit/vault/fs/api/DumpContext.java | 3 +-
.../apache/jackrabbit/vault/fs/api/FilterSet.java | 70 +++++++++-
.../jackrabbit/vault/fs/api/IdConflictPolicy.java | 7 +-
.../jackrabbit/vault/fs/api/WorkspaceFilter.java | 17 +++
.../jackrabbit/vault/fs/api/package-info.java | 2 +-
.../jackrabbit/vault/fs/config/ConfigHelper.java | 3 +-
.../vault/fs/config/DefaultWorkspaceFilter.java | 27 +++-
.../jackrabbit/vault/fs/config/package-info.java | 2 +-
.../jackrabbit/vault/fs/impl/AggregateImpl.java | 52 ++++++-
.../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 +-
.../jackrabbit/vault/packaging/package-info.java | 2 +-
.../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 +-
.../vault/fs/filter/DefaultPathFilterTest.java | 27 ++++
.../vault/fs/filter/WorkspaceFilterTest.java | 54 +++++++-
.../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 | 61 ++++++---
.../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 ++-
.../spi/impl/PackageTypeValidatorTest.java | 28 +++-
.../filter-with-mutable-and-immutable-roots.xml | 21 +++
.../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 +-
113 files changed, 1052 insertions(+), 272 deletions(-)
(jackrabbit-filevault) 08/08: JCRVLT-809 read child- and property-definitions just once
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joerghoh pushed a commit to branch JCRVLT-809
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit bce76d76d8230de9f0e6b4286d1fe7d67f10b758
Author: Joerg Hoh <jh...@adobe.com>
AuthorDate: Fri Jul 18 19:57:30 2025 +0200
JCRVLT-809 read child- and property-definitions just once
---
.../java/org/apache/jackrabbit/vault/util/EffectiveNodeType.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/EffectiveNodeType.java b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/EffectiveNodeType.java
index 52814f04..bf8fa1ec 100644
--- a/vault-core/src/main/java/org/apache/jackrabbit/vault/util/EffectiveNodeType.java
+++ b/vault-core/src/main/java/org/apache/jackrabbit/vault/util/EffectiveNodeType.java
@@ -51,6 +51,9 @@ import org.jetbrains.annotations.Nullable;
*/
public final class EffectiveNodeType {
+ final List<NodeDefinition> nodeDefinitions;
+ final List<PropertyDefinition> propertyDefinitions;
+
public static @NotNull EffectiveNodeType ofNode(@NotNull Node node) throws RepositoryException {
return ofPrimaryTypeAndMixins(node.getPrimaryNodeType(), node.getMixinNodeTypes());
}
@@ -68,6 +71,8 @@ public final class EffectiveNodeType {
private EffectiveNodeType(@NotNull List<NodeType> nodeTypes) {
this.nodeTypes = nodeTypes;
+ nodeDefinitions = nodeTypes.stream().flatMap(nt -> Arrays.stream(nt.getChildNodeDefinitions())).collect(Collectors.toList());
+ propertyDefinitions = nodeTypes.stream().flatMap(nt -> Arrays.stream(nt.getPropertyDefinitions())).collect(Collectors.toList());
}
@Override
@@ -108,7 +113,6 @@ public final class EffectiveNodeType {
}
public Optional<PropertyDefinition> getApplicablePropertyDefinition(Predicate<PropertyDefinition> predicate, @NotNull String name) {
- List<PropertyDefinition> propertyDefinitions = nodeTypes.stream().flatMap(nt -> Arrays.stream(nt.getPropertyDefinitions())).collect(Collectors.toList());
// first named then unnamed
Optional<PropertyDefinition> namedPropertyDef = EffectiveNodeType.<PropertyDefinition>getApplicableItemDefinition(propertyDefinitions, predicate, name);
if (!namedPropertyDef.isPresent()) {
@@ -131,7 +135,7 @@ public final class EffectiveNodeType {
}
public Optional<NodeDefinition> getApplicableChildNodeDefinition(@NotNull Predicate<NodeDefinition> predicate, @NotNull String name) {
- List<NodeDefinition> nodeDefinitions = nodeTypes.stream().flatMap(nt -> Arrays.stream(nt.getChildNodeDefinitions())).collect(Collectors.toList());
+
// first named then unnamed
Optional<NodeDefinition> namedNodeDef = EffectiveNodeType.<NodeDefinition>getApplicableItemDefinition(nodeDefinitions, predicate, name);
if (!namedNodeDef.isPresent()) {