Commit 5f2a42b672f26de429e135b3a66c90a8e5e794e1

Authored by Stefan Kopf
Exists in master

Merge remote-tracking branch 'origin/master' into REPO-1259

... ... @@ -10,7 +10,7 @@
10 10 <artifactId>alfresco-data-model</artifactId>
11 11 <name>Alfresco Data Model</name>
12 12 <description>Alfresco Data Model classes</description>
13   - <version>6.4-SNAPSHOT</version>
  13 + <version>6.5-SNAPSHOT</version>
14 14  
15 15 <scm>
16 16 <connection>scm:git:https://gitlab.alfresco.com/platform/alfresco-data-model.git</connection>
... ...
src/main/java/org/alfresco/repo/content/ContentStore.java
... ... @@ -42,7 +42,11 @@ import org.alfresco.service.cmr.repository.ContentWriter;
42 42 * <code>content URL</code>.
43 43 * <p>
44 44 * Content URLs must consist of a prefix or protocol followed by an
45   - * implementation-specific identifier. For example, the content URL format
  45 + * implementation-specific identifier. See
  46 + * {@link org.alfresco.repo.content.filestore.TimeBasedFileContentUrlProvider TimeBasedFileContentUrlProvider} and
  47 + * {@link org.alfresco.repo.content.filestore.VolumeAwareContentUrlProvider VolumeAwareContentUrlProvider} implementations of
  48 + * {@link org.alfresco.repo.content.filestore.FileContentUrlProvider FileContentUrlProvider}
  49 + * For example, default content URL format
46 50 * for file stores is <b>store://year/month/day/hour/minute/GUID.bin</b> <br>
47 51 * <ul>
48 52 * <li> <b>store://</b>: prefix identifying an Alfresco content stores
... ...