Skip to content

Commit

Permalink
DOCS-6212 Clean up version numbers in 7.0 docs (#182)
Browse files Browse the repository at this point in the history
  • Loading branch information
anxumalo authored Mar 24, 2021
1 parent 9717888 commit 6a1519c
Show file tree
Hide file tree
Showing 16 changed files with 304 additions and 305 deletions.
2 changes: 1 addition & 1 deletion content-services/latest/admin/auth-sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -912,7 +912,7 @@ Active Directory is not used for LDAP authentication; it is used for Kerberos au
#### Enable Kerberos authentication
Use this information to enable and configure Kerberos authentication in Content Services 6.2.
Use this information to enable and configure Kerberos authentication.
> **Note:** These instructions assume that you want to use SSO Kerberos.
Expand Down
12 changes: 6 additions & 6 deletions content-services/latest/admin/cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ A cluster represents a collection of nodes. Clustering is implemented to provide

## Prerequisites for upgrades

There are a number of prerequisites for upgrading from a version of Content Services prior to 4.2 to 6.2 in a clustered environment.
There are a number of prerequisites for upgrading from a version of Content Services prior to 4.2 in a clustered environment.

Before upgrading, ensure that all files and configuration are backed up. Any customization(s) that you've made, for example, creation of custom caches, might need to be reapplied using the new Content Services 6.2 clustering infrastructure.
Before upgrading, ensure that all files and configuration are backed up. Any customization(s) that you've made, for example, creation of custom caches, might need to be reapplied using the new Content Services clustering infrastructure.

The following libraries are no longer used in Content Services 4.2 onwards, so any configuration related to these libraries should be removed before upgrading:

* JGroups
* EHCache

> **Note:** You do not need to follow these steps if you're upgrading from Content Services 4.2 to Content Services 6.2. This information is only relevant if you're upgrading from any version prior to 4.2.
> **Note:** You do not need to follow these steps if you're upgrading from Content Services 4.2. This information is only relevant if you're upgrading from any version prior to 4.2.
Follow the steps to remove the configuration not supported in version 6.2:
Follow the steps to remove the configuration not supported in version 7.0:

1. Browse to the `<classpathRoot>` directory.

Expand Down Expand Up @@ -58,7 +58,7 @@ Follow the steps to remove the configuration not supported in version 6.2:

The `filesystem.cluster.configFile` property mentioned in Step 5 refers to the `hazelcastConfig.xml` file.

8. After you've performed all the specified steps, if you want to initiate clustering, see [Setting up repository server cluster](#setuprepocluster) for the instructions on installing a Content Services 6.2 cluster.
8. After you've performed all the specified steps, if you want to initiate clustering, see [Setting up repository server cluster](#setuprepocluster).

## Components of a Content Services solution

Expand Down Expand Up @@ -554,7 +554,7 @@ Use this information to track clustering issues.
```
This controls clustering initialization and shutdown. It provides `INFO` level startup and shutdown messages.
It also provides `WARN` level messages, if clustering is disabled or an invalid 6.2 license is installed.
It also provides `WARN` level messages, if clustering is disabled or an invalid license is installed.
Here is an example output:
Expand Down
4 changes: 2 additions & 2 deletions content-services/latest/admin/db-cleanup.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ system.delete_not_exists.read_only=false
system.delete_not_exists.timeout_seconds=-1
```

If you're running an earlier version tha Content Services 6.2.1, then follow the steps in the remainder of this page to use the V2 algorithm.
If you're running an earlier version than Content Services 6.2.1, then follow the steps in the remainder of this page to use the V2 algorithm.

### Run new job in read-only mode

Expand Down Expand Up @@ -129,7 +129,7 @@ If you're running an earlier version tha Content Services 6.2.1, then follow the
3. Set the prop cleaner timeout:
```text
# This will stop the next batch from being processed if the elapsed time from
# This will stop the next batch from being processed if the elapsed time from
the job start is greater than 1 hour
system.delete_not_exists.timeout_seconds=3600
```
Expand Down
4 changes: 2 additions & 2 deletions content-services/latest/admin/import-transfer.md
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ The File System Transfer Receiver is delivered as a compressed zip file.

1. Download the following file from the Alfresco Support Portal:

`alfresco-file-transfer-receiver-6.2.1.zip`
`alfresco-file-transfer-receiver-7.0.x.zip`

2. Extract the zip file into a relevant directory.

Expand Down Expand Up @@ -359,7 +359,7 @@ Use this information to start the File System Transfer Receiver.
1. Ensure that you've expanded the File System Transfer Receiver zip file:
`alfresco-file-transfer-receiver-6.2.1.zip`
`alfresco-file-transfer-receiver-7.0.x.zip`
2. To run the File System Transfer Receiver, enter the following command:
Expand Down
108 changes: 54 additions & 54 deletions content-services/latest/admin/security.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion content-services/latest/config/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ The Spring bean definitions are within configuration files in the following dire

The Activity Email Summary ignores certain activity types by default. Use this information to override the Spring bean definition to include these activity types.

The Spring bean definition for the ActivitiesFeed subsystem is called `activities-feed-context.xml` and can be downloaded from the Alfresco SVN: [`activities-feed-context.xml`](https://github.com/Alfresco/alfresco-community-repo/blob/release/6.2.2/repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml){:target="_blank"}.
The Spring bean definition for the ActivitiesFeed subsystem is called `activities-feed-context.xml` and can be downloaded from the Alfresco SVN: [`activities-feed-context.xml`](https://github.com/Alfresco/alfresco-community-repo/blob/release/7.0.0/repository/src/main/resources/alfresco/subsystems/ActivitiesFeed/default/activities-feed-context.xml){:target="_blank"}.

1. Download the file and save to the `<subsystems/ActivitiesFeed/default>` directory.

Expand Down
26 changes: 13 additions & 13 deletions content-services/latest/config/repository.md
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@ For security reasons, configure your proxy to forward only requests to the resou
1. Set your proxy to forward the following URL extensions:
```bash
/share
/share
/share/*
/alfresco/api/*/public/cmis/versions/*
/alfresco/api/*/public/alfresco/versions/*
Expand All @@ -485,7 +485,7 @@ For security reasons, configure your proxy to forward only requests to the resou
2. If you're using WebDAV, add these URL extensions to your proxy:
```bash
/alfresco/webdav
/alfresco/webdav
/alfresco/webdav/*
```
Expand Down Expand Up @@ -600,7 +600,7 @@ For security reasons, configure your proxy to forward only requests to the resou
JkWorkersFile **/path/to/your/workers.properties**
JkLogFile **/path/to/your/apache/log/mod\_jk.log**
JkLogLevel info
JkShmFile **/path/to/your/apache/log/jk-runtime-status**
JkShmFile **/path/to/your/apache/log/jk-runtime-status**
# -------
# SSL
Expand Down Expand Up @@ -656,7 +656,7 @@ For security reasons, configure your proxy to forward only requests to the resou
In this example, Apache is configured to accept strong encryption only. Adapt SSLCipherSuite if this causes you problems.
9. (Optional) Only required if configuring Alfresco Share.
9. (Optional) Only required if configuring Alfresco Share.
Add and set the following properties in the `JAVA_OPTS` environmental variable referenced by the Share application, as they're required at Share start up:
Expand All @@ -665,9 +665,9 @@ For security reasons, configure your proxy to forward only requests to the resou
-Dcookies.sameSite=none
```
When using Share with Chromium-based browsers (such as Google Chrome or the latest releases of Microsoft Edge) with either Alfresco Content Connector for Salesforce or the SAML Module, the share web must be secured using an HTTPS (SSL/TLS) certificate.
When using Share with Chromium-based browsers (such as Google Chrome or the latest releases of Microsoft Edge) with either Alfresco Content Connector for Salesforce or the SAML Module, the share web must be secured using an HTTPS (SSL/TLS) certificate.
10. (Optional) Only required if configuring Alfresco Share.
10. (Optional) Only required if configuring Alfresco Share.
Add and set the property in the `JAVA_OPTS` environmental variable corresponding to the JVM of the Tomcat instance when deploying Share:
Expand Down Expand Up @@ -775,7 +775,7 @@ Here's an example of how to configure Tomcat 8.5 to work with HTTPS for your dev
aos.baseUrlOverwrite=https://localhost:7070/alfresco/aos
```
7. (Optional) Only required if configuring Alfresco Share to use HTTPS.
7. (Optional) Only required if configuring Alfresco Share to use HTTPS.
Add and set the following properties in the `JAVA_OPTS` environmental variable referenced by the Share application, as they're required at Share start up:
Expand All @@ -786,7 +786,7 @@ Here's an example of how to configure Tomcat 8.5 to work with HTTPS for your dev
When using Share with Chromium-based browsers (such as Google Chrome or the latest releases of Microsoft Edge), the Share communication must be secured using an HTTPS (SSL/TLS) certificate.
8. (Optional) Only required if configuring Alfresco Share to use HTTPS.
8. (Optional) Only required if configuring Alfresco Share to use HTTPS.
Add and set the property in the `JAVA_OPTS` environmental variable corresponding to the JVM of the Tomcat instance when deploying Share:
Expand Down Expand Up @@ -824,7 +824,7 @@ From Alfresco One version 5.0 and later, the caches can be configured by setting
> **Note:** It's advisable not to change the cache values unless you have performance issues.
1. Download the files [tx-cache-context.xml](https://github.com/Alfresco/alfresco-community-repo/blob/release/6.2.2/repository/src/main/resources/alfresco/tx-cache-context.xml){:target="_blank"} and [caches.properties](https://github.com/Alfresco/alfresco-community-repo/blob/release/6.2.2/repository/src/main/resources/alfresco/caches.properties){:target="_blank"}.
1. Download the files [tx-cache-context.xml](https://github.com/Alfresco/alfresco-community-repo/blob/release/7.0.0/repository/src/main/resources/alfresco/tx-cache-context.xml){:target="_blank"} and [caches.properties](https://github.com/Alfresco/alfresco-community-repo/blob/release/7.0.0/repository/src/main/resources/alfresco/caches.properties){:target="_blank"}.
The `caches.properties` file lists a series of properties for configuring a cache. The cache properties are used for both clustered and non-clustered configurations.
Expand Down Expand Up @@ -969,10 +969,10 @@ The MIME type is available in the repository.
## Configure metadata extraction
Metadata extraction automatically extracts metadata information from inbound and/or updated content and updates the
Metadata extraction automatically extracts metadata information from inbound and/or updated content and updates the
corresponding nodes properties with the metadata values.
For more information see [metadata extraction extension point]({% link content-services/latest/develop/repo-ext-points/metadata-extractors.md %}).
For more information see [metadata extraction extension point]({% link content-services/latest/develop/repo-ext-points/metadata-extractors.md %}).
## About aspects
Expand Down Expand Up @@ -1014,7 +1014,7 @@ To change this behavior, you can set `cm:autoVersionOnUpdateProps` to `true`.
Edit the `contentModel.xml` file to enable versioning for all content in the repository.
1. Download the [contentModel.xml](https://github.com/Alfresco/alfresco-community-repo/blob/release/6.2.2/repository/src/main/resources/alfresco/model/contentModel.xml){:target="_blank"} file.
1. Download the [contentModel.xml](https://github.com/Alfresco/alfresco-community-repo/blob/release/7.0.0/repository/src/main/resources/alfresco/model/contentModel.xml){:target="_blank"} file.
2. Create a `$TOMCAT\_HOME/shared/classes/alfresco/extension/models` directory.
Expand Down Expand Up @@ -1130,7 +1130,7 @@ Follow these replication steps for the MySQL database.
This task describes how to customize content transformations.
1. Download the [content-services-context.xml](https://github.com/Alfresco/alfresco-community-repo/blob/release/6.2.2/repository/src/main/resources/alfresco/content-services-context.xml){:target="_blank"} file.
1. Download the [content-services-context.xml](https://github.com/Alfresco/alfresco-community-repo/blob/release/7.0.0/repository/src/main/resources/alfresco/content-services-context.xml){:target="_blank"} file.
2. Paste this file into the `<extension>` directory, and open the file.
Expand Down
18 changes: 9 additions & 9 deletions content-services/latest/config/smart-folders/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -238,21 +238,21 @@ A node is defined by the following properties:
| language | Mandatory property, set to `fts-alfresco`. |
| query | Mandatory FTS query that defines the folder content. |
| filing | Optional rule that defines the filing action for a new file when it is uploaded to the Smart Folder. If no filing rule is defined, files can't be uploaded to that folder. Parameters include: {::nomarkdown}<ul><li>path: path where a document is physically stored</li><li>classification: type and aspects assigned to the new file</li><li>properties: property values attributed to the new file</li></ul>{:/} |
| path | Mandatory property in a filing rule. Path to store new documents. This is the [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/6.2.2/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded `QName`. |
| path | Mandatory property in a filing rule. Path to store new documents. This is the [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/7.0.0/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded `QName`. |
| classification | Mandatory property in a filing rule. Type and aspects of the new object. |
| properties | Optional property. Defines property values and inheritance. |
Here are some tips on notation:
* Use percent (%) signs to use predefined placeholders in queries and filing rules
* For repository path expressions use QNames, for example; `/app:company_home/st:sites/cm:swsdp/cm:documentLibrary`.
* Special characters and whitespace are [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/6.2.2/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded. Use this notation to encode special characters in repository path names. For example, use `_x0020_` for the whitespace character.
* Special characters and whitespace are [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/7.0.0/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded. Use this notation to encode special characters in repository path names. For example, use `_x0020_` for the whitespace character.
| Placeholder | Description |
| ----------- | ----------- |
| %ACTUAL_PATH% | [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/6.2.2/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded repository path of the physical parent folder. Only the physical parent folder (or next physical folder up the folder tree) can use `%ACTUAL_PATH%`. |
| %ACTUAL_PATH% | [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/7.0.0/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded repository path of the physical parent folder. Only the physical parent folder (or next physical folder up the folder tree) can use `%ACTUAL_PATH%`. |
| %CURRENT_USER% | Account name of the user. |
| \_x0020\_ | [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/6.2.2/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded whitespace character. |
| \_x0020\_ | [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/7.0.0/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded whitespace character. |
| <> | Use angle brackets, for example, `<cm:name>`, to inherit property values from the physical parent folder. Used for inheritance in a filing rule and in a query. |
The following code fragments give more information about these properties.
Expand Down Expand Up @@ -309,7 +309,7 @@ Information is populated by running a search query:
}
},
{
...
...
}
]
}
Expand Down Expand Up @@ -367,7 +367,7 @@ These define the path where a document uploaded to a Smart Folder should be crea
The path can be an existing folder location, for example:
* Using an XPath expression, and ensuring the expression is [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/6.2.2/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded:
* Using an XPath expression, and ensuring the expression is [ISO9075](https://github.com/Alfresco/alfresco-community-repo/tree/release/7.0.0/data-model/src/main/java/org/alfresco/util){:target="_blank"} encoded:
```json
"path":"/app:company_home/cm:Claims_x0020_Pool"
Expand Down Expand Up @@ -436,12 +436,12 @@ smart.folders.model.labels=alfresco/messages/smartfolder-model
#Smart store config
#Company home relative download associations of smart entries
#Company home relative download associations of smart entries
#smart.download.associations.folder=${spaces.dictionary.childname}/${spaces.smartdownloads.childname}
#Generic virtualization methods config
#Vanilla JSON templates javascript processor classpath. A java script processor used to
#Vanilla JSON templates javascript processor classpath. A java script processor used to
#covert JSON templates to internal smart folder definitions.
#smart.folders.config.vanilla.processor.classpath=/org/alfresco/repo/virtual/node/vanilla.js
Expand Down Expand Up @@ -471,7 +471,7 @@ smart.folders.model.labels=alfresco/messages/smartfolder-model
#A company home relative name or qname path location of the type mapped templates.
#smart.folders.config.type.templates.path=${spaces.dictionary.childname}/${spaces.smartfolders.childname}
#Type and aspect qname regular expression filter.
#Type and aspect qname regular expression filter.
#smart.folders.config.type.templates.qname.filter=none
```
Expand Down
Loading

0 comments on commit 6a1519c

Please sign in to comment.