Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JCRVLT-646 fix ConstraingViolationException during intermediate save
when deserializing enhanced file aggregate improve logging for failed intermediate saves
- Loading branch information
Showing
9 changed files
with
173 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
93 changes: 93 additions & 0 deletions
93
...re/src/test/resources/test-packages/enhanced_file_aggregate.zip/META-INF/vault/config.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<!-- | ||
Licensed to the Apache Software Foundation (ASF) under one or more | ||
contributor license agreements. See the NOTICE file distributed with | ||
this work for additional information regarding copyright ownership. | ||
The ASF licenses this file to You under the Apache License, Version 2.0 | ||
(the "License"); you may not use this file except in compliance with | ||
the License. You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
--> | ||
<vaultfs version="1.1"> | ||
<!-- | ||
Defines the content aggregation. The order of the defined aggregates | ||
is important for finding the correct aggregator. | ||
--> | ||
<aggregates> | ||
<!-- | ||
Defines an aggregate that handles nt:file and nt:resource nodes. | ||
--> | ||
<aggregate type="file" title="File Aggregate"/> | ||
|
||
<!-- | ||
Defines an aggregate that handles file/folder like nodes. It matches | ||
all nt:hierarchyNode nodes that have or define a jcr:content | ||
child node and excludes child nodes that are nt:hierarchyNodes. | ||
--> | ||
<aggregate type="filefolder" title="File/Folder Aggregate"/> | ||
|
||
<!-- | ||
Defines an aggregate that handles nt:nodeType nodes and serializes | ||
them into .cnd notation. | ||
--> | ||
<aggregate type="nodetype" title="Node Type Aggregate" /> | ||
|
||
<!-- | ||
Defines an aggregate that defines full coverage for certain node | ||
types that cannot be covered by the default aggregator. | ||
--> | ||
<aggregate type="full" title="Full Coverage Aggregate"> | ||
<matches> | ||
<include nodeType="rep:AccessControl" respectSupertype="true" /> | ||
<include nodeType="cq:Widget" respectSupertype="true" /> | ||
<include nodeType="cq:WidgetCollection" respectSupertype="true" /> | ||
<include nodeType="cq:EditConfig" respectSupertype="true" /> | ||
<include nodeType="cq:WorkflowModel" respectSupertype="true" /> | ||
<include nodeType="vlt:FullCoverage" respectSupertype="true" /> | ||
<include nodeType="mix:language" respectSupertype="true" /> | ||
<include nodeType="sling:OsgiConfig" respectSupertype="true" /> | ||
</matches> | ||
</aggregate> | ||
|
||
<!-- | ||
Defines an aggregate that handles nt:folder like nodes. | ||
--> | ||
<aggregate type="generic" title="Folder Aggregate"> | ||
<matches> | ||
<include nodeType="nt:folder" respectSupertype="true" /> | ||
</matches> | ||
<contains> | ||
<exclude isNode="true" /> | ||
</contains> | ||
</aggregate> | ||
|
||
<!-- | ||
Defines the default aggregate | ||
--> | ||
<aggregate type="generic" title="Default Aggregator" isDefault="true"> | ||
<contains> | ||
<exclude nodeType="nt:hierarchyNode" respectSupertype="true" /> | ||
</contains> | ||
<matches> | ||
<!-- all --> | ||
</matches> | ||
</aggregate> | ||
|
||
</aggregates> | ||
|
||
<!-- | ||
defines the input handlers | ||
--> | ||
<handlers> | ||
<handler type="folder"/> | ||
<handler type="file"/> | ||
<handler type="nodetype"/> | ||
<handler type="generic"/> | ||
</handlers> | ||
</vaultfs> |
4 changes: 4 additions & 0 deletions
4
...re/src/test/resources/test-packages/enhanced_file_aggregate.zip/META-INF/vault/filter.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<workspaceFilter version="1.0"> | ||
<filter root="/apps/testnode"/> | ||
</workspaceFilter> |
13 changes: 13 additions & 0 deletions
13
...rc/test/resources/test-packages/enhanced_file_aggregate.zip/META-INF/vault/properties.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"> | ||
<properties> | ||
<entry key="createdBy">root</entry> | ||
<entry key="allowIndexDefinitions">true</entry> | ||
<entry key="name">enhanced-file-aggregate-package</entry> | ||
<entry key="created">2022-05-26T10:38:55.609Z</entry> | ||
<entry key="version">1.0.0</entry> | ||
<entry key="packageType">application</entry> | ||
<entry key="requiresRoot">false</entry> | ||
<entry key="group">testpackages</entry> | ||
<entry key="description">test package containing enhanced file aggregate</entry> | ||
</properties> |
21 changes: 21 additions & 0 deletions
21
.../src/test/resources/test-packages/enhanced_file_aggregate.zip/META-INF/vault/settings.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<!-- | ||
Licensed to the Apache Software Foundation (ASF) under one or more | ||
contributor license agreements. See the NOTICE file distributed with | ||
this work for additional information regarding copyright ownership. | ||
The ASF licenses this file to You under the Apache License, Version 2.0 | ||
(the "License"); you may not use this file except in compliance with | ||
the License. You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
--> | ||
<vault version="1.0"> | ||
<ignore name=".svn"/> | ||
<ignore name=".DS_Store"/> | ||
</vault> |
9 changes: 9 additions & 0 deletions
9
...t/resources/test-packages/enhanced_file_aggregate.zip/jcr_root/apps/testnode/.content.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" | ||
jcr:primaryType="nt:unstructured"> | ||
<tika jcr:primaryType="nt:unstructured"> | ||
<config.xml jcr:primaryType="nt:file"> | ||
<jcr:content jcr:primaryType="nt:resource" jcr:mimeType="text/xml"/> | ||
</config.xml> | ||
</tika> | ||
</jcr:root> |
11 changes: 11 additions & 0 deletions
11
...esources/test-packages/enhanced_file_aggregate.zip/jcr_root/apps/testnode/tika/config.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
<properties> | ||
<detectors> | ||
<detector class="org.apache.tika.detect.TypeDetector"/> | ||
</detectors> | ||
<parsers> | ||
<parser class="org.apache.tika.parser.DefaultParser"> | ||
<mime>text/plain</mime> | ||
</parser> | ||
</parsers> | ||
<service-loader initializableProblemHandler="ignore" dynamic="true"/> | ||
</properties> |