You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2020/03/25 16:50:10 UTC
svn commit: r1875659 - in
/jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown:
nodetypes.md properties.md
Author: kwin
Date: Wed Mar 25 16:50:10 2020
New Revision: 1875659
URL: http://svn.apache.org/viewvc?rev=1875659&view=rev
Log:
clarify that nodetypes are always also picked up from
META-INF/vault/*.cnd
Modified:
jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/nodetypes.md
jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/properties.md
Modified: jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/nodetypes.md
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/nodetypes.md?rev=1875659&r1=1875658&r2=1875659&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/nodetypes.md (original)
+++ jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/nodetypes.md Wed Mar 25 16:50:10 2020
@@ -18,4 +18,4 @@
Nodetypes
===========
-Packages can register custom [JCR nodetypes](https://docs.adobe.com/docs/en/spec/jcr/2.0/8_Node_Type_Discovery.html) during import by carrying arbitrarily many `.cnd` files. All files names matching the regular expression pattern set in [package property](properties.html) `cndPattern` are considered. Details around the CND file format can be found at <https://jackrabbit.apache.org/jcr/node-type-notation.html>.
+Packages can register custom [JCR nodetypes](https://docs.adobe.com/docs/en/spec/jcr/2.0/8_Node_Type_Discovery.html) during import by carrying arbitrarily many `.cnd` files. All files names matching the regular expression pattern set in [package property](properties.html) `cndPattern` as well as all `*.cnd` files below `META-INF/vault` are considered. Details around the CND file format can be found at <https://jackrabbit.apache.org/jcr/node-type-notation.html>.
Modified: jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/properties.md
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/properties.md?rev=1875659&r1=1875658&r2=1875659&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/properties.md (original)
+++ jackrabbit/commons/filevault/trunk/vault-doc/src/site/markdown/properties.md Wed Mar 25 16:50:10 2020
@@ -69,7 +69,7 @@ Example:
| lastWrapped | A date string in the format `±YYYY-MM-DDThh:mm:ss.SSSTZD` specifying when the package has been last wrapped (i.e. rebuilt) (see also [ISO8601][api.ISO8601]) | no | empty
| lastWrappedBy | A user name indicating who last modified this package | no | empty
| acHandling | See [AccessControlHandling][api.AccessControlHandling]. | no | ignore
-| cndPattern | A [Java regular expression pattern](https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html) which specifies where to look for CND files within the given package | no | `^/(apps|libs)/([^/]+/){1,2}nodetypes/.+\\.cnd$`
+| cndPattern | A [Java regular expression pattern](https://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html) which specifies where to look for CND files within the given package (in addition to all `*.cnd` files below `META-INF/vault`) | no | `^/(apps|libs)/([^/]+/){1,2}nodetypes/.+\\.cnd$`
| requiresRoot | If set to `true` indicates that only admin sessions can install this package | no | `false`
| requiresRestart | If set to `true` indicates that the system should be restarted after this package has been installed | no | `false`
| noIntermediateSaves | If set to `true` indicates no intermediate saves should be performed while installing this package | no | `false`