From ccee83f92d72745925a0e0ca3344970a7b47bbb7 Mon Sep 17 00:00:00 2001 From: Jose Luis Osorno Date: Thu, 17 Jan 2019 11:32:21 +0100 Subject: [PATCH] Documentation - Reorganise documentation content Reorganise the documentation content to fix the required folder structure and file naming for the migration to ABN. --- docs/{sdk.md => README.md} | 38 +++++++++--------- docs/{ => advanced-topics}/amps.md | 0 .../debugging}/debug-eclipse.md | 10 ++--- .../debugging}/debug-intellij.md | 10 ++--- .../hot-reloading}/hotswap-agent.md | 4 +- .../hot-reloading}/jrebel.md | 16 ++++---- .../integration-testing/README.md} | 0 .../integration-testing}/it-running.md | 12 +++--- .../integration-testing}/it-working.md | 0 .../switching-versions.md | 4 +- .../working-with-enterprise/README.md} | 0 .../alfresco-transform-service.md | 2 - .../enterprise-docker-registry.md | 0 .../enterprise-mvn-repo.md | 0 .../images}/sdk-debug-eclipse-breakpoint.png | Bin .../images}/sdk-debug-eclipse-config.png | Bin .../images}/sdk-debug-eclipse-create.png | Bin .../images}/sdk-debug-eclipse-launch.png | Bin .../images}/sdk-debug-intellij-breakpoint.png | Bin .../images}/sdk-debug-intellij-config.png | Bin .../images}/sdk-debug-intellij-create.png | Bin .../images}/sdk-debug-intellij-launch.png | Bin .../images}/sdk-dev-env-eclipse-import.png | Bin .../images}/sdk-dev-env-eclipse-project.png | Bin .../images}/sdk-dev-env-eclipse-quickfix.png | Bin .../images}/sdk-dev-env-eclipse-warning.png | Bin .../images}/sdk-dev-env-intellij-finish.png | Bin .../images}/sdk-dev-env-intellij-import.png | Bin .../images}/sdk-hellofromjava.png | Bin .../images}/sdk-hellofromme.png | Bin .../images}/sdk-it-eclipse-results.png | Bin .../images}/sdk-it-eclipse-run.png | Bin .../images}/sdk-it-intellij-results.png | Bin .../images}/sdk-it-intellij-run.png | Bin .../images}/sdk-jrebel-eclipse-projects.png | Bin .../images}/sdk-jrebel-eclipse-server.png | Bin .../images}/sdk-jrebel-eclipse-servers.png | Bin .../images}/sdk-jrebel-intellij-projects.png | Bin .../images}/sdk-jrebel-intellij-server.png | Bin .../images}/sdk-jrebel-intellij-servers.png | Bin docs/getting-started.md | 2 +- docs/mvn-archetypes.md | 6 +-- .../dev-env-eclipse.md | 12 +++--- .../dev-env-intellij.md | 8 ++-- docs/troubleshooting.md | 3 -- .../README.md} | 4 +- .../structure-aio.md | 2 +- .../structure-platform.md | 2 +- .../structure-share.md | 4 +- 49 files changed, 67 insertions(+), 72 deletions(-) rename docs/{sdk.md => README.md} (55%) rename docs/{ => advanced-topics}/amps.md (100%) rename docs/{ => advanced-topics/debugging}/debug-eclipse.md (87%) rename docs/{ => advanced-topics/debugging}/debug-intellij.md (86%) rename docs/{ => advanced-topics/hot-reloading}/hotswap-agent.md (98%) rename docs/{ => advanced-topics/hot-reloading}/jrebel.md (89%) rename docs/{integration-testing.md => advanced-topics/integration-testing/README.md} (100%) rename docs/{ => advanced-topics/integration-testing}/it-running.md (87%) rename docs/{ => advanced-topics/integration-testing}/it-working.md (100%) rename docs/{ => advanced-topics}/switching-versions.md (96%) rename docs/{enterprise.md => advanced-topics/working-with-enterprise/README.md} (100%) rename docs/{ => advanced-topics/working-with-enterprise}/alfresco-transform-service.md (99%) rename docs/{ => advanced-topics/working-with-enterprise}/enterprise-docker-registry.md (100%) rename docs/{ => advanced-topics/working-with-enterprise}/enterprise-mvn-repo.md (100%) rename docs/{imgs => docassets/images}/sdk-debug-eclipse-breakpoint.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-eclipse-config.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-eclipse-create.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-eclipse-launch.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-intellij-breakpoint.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-intellij-config.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-intellij-create.png (100%) rename docs/{imgs => docassets/images}/sdk-debug-intellij-launch.png (100%) rename docs/{imgs => docassets/images}/sdk-dev-env-eclipse-import.png (100%) rename docs/{imgs => docassets/images}/sdk-dev-env-eclipse-project.png (100%) rename docs/{imgs => docassets/images}/sdk-dev-env-eclipse-quickfix.png (100%) rename docs/{imgs => docassets/images}/sdk-dev-env-eclipse-warning.png (100%) rename docs/{imgs => docassets/images}/sdk-dev-env-intellij-finish.png (100%) rename docs/{imgs => docassets/images}/sdk-dev-env-intellij-import.png (100%) rename docs/{imgs => docassets/images}/sdk-hellofromjava.png (100%) rename docs/{imgs => docassets/images}/sdk-hellofromme.png (100%) rename docs/{imgs => docassets/images}/sdk-it-eclipse-results.png (100%) rename docs/{imgs => docassets/images}/sdk-it-eclipse-run.png (100%) rename docs/{imgs => docassets/images}/sdk-it-intellij-results.png (100%) rename docs/{imgs => docassets/images}/sdk-it-intellij-run.png (100%) rename docs/{imgs => docassets/images}/sdk-jrebel-eclipse-projects.png (100%) rename docs/{imgs => docassets/images}/sdk-jrebel-eclipse-server.png (100%) rename docs/{imgs => docassets/images}/sdk-jrebel-eclipse-servers.png (100%) rename docs/{imgs => docassets/images}/sdk-jrebel-intellij-projects.png (100%) rename docs/{imgs => docassets/images}/sdk-jrebel-intellij-server.png (100%) rename docs/{imgs => docassets/images}/sdk-jrebel-intellij-servers.png (100%) rename docs/{ => setting-up-your-development-environment}/dev-env-eclipse.md (77%) rename docs/{ => setting-up-your-development-environment}/dev-env-intellij.md (73%) rename docs/{projects-usage.md => working-with-generated-projects/README.md} (95%) rename docs/{ => working-with-generated-projects}/structure-aio.md (99%) rename docs/{ => working-with-generated-projects}/structure-platform.md (98%) rename docs/{ => working-with-generated-projects}/structure-share.md (98%) diff --git a/docs/sdk.md b/docs/README.md similarity index 55% rename from docs/sdk.md rename to docs/README.md index 9b87b7c5..076b08b2 100644 --- a/docs/sdk.md +++ b/docs/README.md @@ -31,27 +31,27 @@ code into place. * [What's new?]() **TODO** * [Getting started with Alfresco SDK 4.0](getting-started.md) * [Alfresco SDK Maven archetypes](mvn-archetypes.md) -* [Working with generated projects](projects-usage.md) - * [All-In-One project structure](structure-aio.md) - * [Platform JAR project structure](structure-platform.md) - * [Share JAR project structure](structure-share.md) +* [Working with generated projects](working-with-generated-projects/README.md) + * [All-In-One project structure](working-with-generated-projects/structure-aio.md) + * [Platform JAR project structure](working-with-generated-projects/structure-platform.md) + * [Share JAR project structure](working-with-generated-projects/structure-share.md) * Setting up your development environment - * [Setting up your development environment using Eclipse](dev-env-eclipse.md) - * [Setting up your development environment using Intellij IDEA](dev-env-intellij.md) + * [Setting up your development environment using Eclipse](setting-up-your-development-environment/dev-env-eclipse.md) + * [Setting up your development environment using Intellij IDEA](setting-up-your-development-environment/dev-env-intellij.md) * Advanced topics - * [Switching Alfresco Content Services and Share versions](switching-versions.md) - * [Working with Enterprise](enterprise.md) - * [How to configure private Alfresco Nexus repository](enterprise-mvn-repo.md) - * [How to configure private Alfresco Docker registry](enterprise-docker-registry.md) - * [How to set up Alfresco Transform Service](alfresco-transform-service.md) - * [Working with AMPs](amps.md) + * [Switching Alfresco Content Services and Share versions](advanced-topics/switching-versions.md) + * [Working with Enterprise](advanced-topics/working-with-enterprise/README.md) + * [How to configure private Alfresco Nexus repository](advanced-topics/working-with-enterprise/enterprise-mvn-repo.md) + * [How to configure private Alfresco Docker registry](advanced-topics/working-with-enterprise/enterprise-docker-registry.md) + * [How to set up Alfresco Transform Service](advanced-topics/working-with-enterprise/alfresco-transform-service.md) + * [Working with AMPs](advanced-topics/amps.md) * Debugging - * [Remote debugging using Eclipse](debug-eclipse.md) - * [Remote debugging using IntelliJ](debug-intellij.md) - * [Integration testing](integration-testing.md) - * [How SDK's integration tests work](it-working.md) - * [How to run SDK's integration tests](it-running.md) + * [Remote debugging using Eclipse](advanced-topics/debugging/debug-eclipse.md) + * [Remote debugging using IntelliJ](advanced-topics/debugging/debug-intellij.md) + * [Integration testing](advanced-topics/integration-testing/README.md) + * [How SDK's integration tests work](advanced-topics/integration-testing/it-working.md) + * [How to run SDK's integration tests](advanced-topics/integration-testing/it-running.md) * Hot reloading - * [How to configure and use JRebel](jrebel.md) - * [How to configure and use Hotswap Agent](hotswap-agent.md) + * [How to configure and use JRebel](advanced-topics/hot-reloading/jrebel.md) + * [How to configure and use Hotswap Agent](advanced-topics/hot-reloading/hotswap-agent.md) * [Troubleshooting](troubleshooting.md) diff --git a/docs/amps.md b/docs/advanced-topics/amps.md similarity index 100% rename from docs/amps.md rename to docs/advanced-topics/amps.md diff --git a/docs/debug-eclipse.md b/docs/advanced-topics/debugging/debug-eclipse.md similarity index 87% rename from docs/debug-eclipse.md rename to docs/advanced-topics/debugging/debug-eclipse.md index 62b89abe..8b476708 100644 --- a/docs/debug-eclipse.md +++ b/docs/advanced-topics/debugging/debug-eclipse.md @@ -52,13 +52,13 @@ For more details on how to import an Alfresco project into your Eclipse IDE, see 1. Open the Eclipse IDE and click on `Run Configurations` (top right). -![Alt text](./imgs/sdk-debug-eclipse-create.png?raw=true "Eclipse remote debug create configuration") +![Alt text](../../docassets/images/sdk-debug-eclipse-create.png?raw=true "Eclipse remote debug create configuration") 2. Click on the green plus sign (top left) and select `Remote Java Application` to add a new configuration for a remote app. 3. Enter a descriptive name for your configuration, for example, `Sample project ACS debug`. -![Alt text](./imgs/sdk-debug-eclipse-config.png?raw=true "Eclipse remote debug configuration detail") +![Alt text](../../docassets/images/sdk-debug-eclipse-config.png?raw=true "Eclipse remote debug configuration detail") 4. Click Browse then locate the platform project JAR if you want to debug ACS or the share project JAR if you want to debug share. @@ -72,7 +72,7 @@ You will be taken back to the project source code. 7. Click on the bug icon and select the new configuration to run it. -![Alt text](./imgs/sdk-debug-eclipse-launch.png?raw=true "Eclipse remote debug configuration launch") +![Alt text](../../docassets/images/sdk-debug-eclipse-launch.png?raw=true "Eclipse remote debug configuration launch") The IDE connects the source code to the deployed one at the docker container. Once the code is linked, you can open a browser and start using your application. In our case, we are going to test the behaviour of debugging by running the sample webscript. @@ -81,7 +81,7 @@ application. In our case, we are going to test the behaviour of debugging by run This is a sample webscript generated in every project created using SDK 4.0 and the platform artifact. -![Alt text](./imgs/sdk-hellofromjava.png?raw=true "Hello World webscript original result") +![Alt text](../../docassets/images/sdk-hellofromjava.png?raw=true "Hello World webscript original result") Now let's find the `HelloWorldWebScript.java` file in the `src/main/java/.../platformsample` folder of your project. If you're using an All-In-One project, the folder is located in the platform sub-project. @@ -94,7 +94,7 @@ model.put(“fromJava”,”HelloFromJava”); 10. Refresh the browser. Eclipse will intercept the execution at the breakpoint: -![Alt text](./imgs/sdk-debug-eclipse-breakpoint.png?raw=true "Eclipse remote debug stopped at breakpoint") +![Alt text](../../docassets/images/sdk-debug-eclipse-breakpoint.png?raw=true "Eclipse remote debug stopped at breakpoint") From here the management is the same as for a regular Java application using your preferred IDE. Please note that the whole Alfresco source code is available at debug time, thanks to the local maven repository. diff --git a/docs/debug-intellij.md b/docs/advanced-topics/debugging/debug-intellij.md similarity index 86% rename from docs/debug-intellij.md rename to docs/advanced-topics/debugging/debug-intellij.md index 9da1c520..320657ea 100644 --- a/docs/debug-intellij.md +++ b/docs/advanced-topics/debugging/debug-intellij.md @@ -52,13 +52,13 @@ For more details on how to import an Alfresco project into your IntelliJ IDEA ID 1. Open the IntelliJ IDEA IDE and click on `Add/Edit Configurations` (top right). -![Alt text](./imgs/sdk-debug-intellij-create.png?raw=true "IntelliJ remote debug create configuration") +![Alt text](../../docassets/images/sdk-debug-intellij-create.png?raw=true "IntelliJ remote debug create configuration") 2. Click on the plus icon (top left) and select `Remote` to add a new configuration for a remote app. 3. Enter a descriptive name for your configuration, for example, `Sample project ACS debug`. -![Alt text](./imgs/sdk-debug-intellij-config.png?raw=true "IntelliJ remote debug configuration detail") +![Alt text](../../docassets/images/sdk-debug-intellij-config.png?raw=true "IntelliJ remote debug configuration detail") 4. Check that your settings match the screenshot. This is a sample to debug ACS. If you want to debug share or you have configured custom ports for remote debugging you'll need to modify that configuration. If you're working with _Docker Toolbox_ instead of _Docker Desktop_ the host to access the container won't @@ -70,7 +70,7 @@ You will be taken back to the project source code. 6. Click on the `Edit Configurations` dropdown box and select the new configuration to run it. -![Alt text](./imgs/sdk-debug-intellij-launch.png?raw=true "IntelliJ remote debug configuration launch") +![Alt text](../../docassets/images/sdk-debug-intellij-launch.png?raw=true "IntelliJ remote debug configuration launch") The IDE connects the source code with the deployed one at the docker container. Once the code is linked, you can open a browser and start using your application. In our case, we are going to test the behaviour of debugging by running the sample webscript. @@ -79,7 +79,7 @@ application. In our case, we are going to test the behaviour of debugging by run This is a sample webscript generated in every project created using SDK 4.0 and the platform artifact. -![Alt text](./imgs/sdk-hellofromjava.png?raw=true "Hello World webscript original result") +![Alt text](../../docassets/images/sdk-hellofromjava.png?raw=true "Hello World webscript original result") Now let's find the `HelloWorldWebScript.java` file in the `src/main/java/.../platformsample` folder of your project. If you're using an All-In-One project, the folder is located in the platform sub-project. @@ -92,7 +92,7 @@ model.put(“fromJava”,”HelloFromJava”); 9. Refresh the browser. IntelliJ IDEA will intercept the execution at the breakpoint: -![Alt text](./imgs/sdk-debug-intellij-breakpoint.png?raw=true "IntelliJ remote debug stopped at breakpoint") +![Alt text](../../docassets/images/sdk-debug-intellij-breakpoint.png?raw=true "IntelliJ remote debug stopped at breakpoint") From here the management is the same as for a regular Java application using your preferred IDE. Please note that the whole Alfresco source code is available at debug time, thanks to the local maven repository. diff --git a/docs/hotswap-agent.md b/docs/advanced-topics/hot-reloading/hotswap-agent.md similarity index 98% rename from docs/hotswap-agent.md rename to docs/advanced-topics/hot-reloading/hotswap-agent.md index 6c70c70c..13eca1cc 100644 --- a/docs/hotswap-agent.md +++ b/docs/advanced-topics/hot-reloading/hotswap-agent.md @@ -252,7 +252,7 @@ You'll recognize HotSwapAgent is working when you see similar log messages: This is a sample webscript generated in every project created using SDK 4.0 and the platform artifact. -![Alt text](./imgs/sdk-hellofromjava.png?raw=true "Hello World webscript original result") +![Alt text](../../docassets/images/sdk-hellofromjava.png?raw=true "Hello World webscript original result") 3. Locate `HelloWorldWebScript.java` in the `src/main/java/.../platformsample` folder of your project (If you are using an All-In-One project, the folder is located in the platform sub-project). @@ -280,6 +280,6 @@ A number of log messages appear in the Alfresco project terminal, for example: 6. Refresh the browser to see the updated message: -![alt text](./imgs/sdk-hellofromme.png?raw=true "Hello World webscript modified result") +![alt text](../../docassets/images/sdk-hellofromme.png?raw=true "Hello World webscript modified result") By changing the code and compiling it again, the changes have been dynamically received from Alfresco Content Services. diff --git a/docs/jrebel.md b/docs/advanced-topics/hot-reloading/jrebel.md similarity index 89% rename from docs/jrebel.md rename to docs/advanced-topics/hot-reloading/jrebel.md index 63e5a943..94a27047 100644 --- a/docs/jrebel.md +++ b/docs/advanced-topics/hot-reloading/jrebel.md @@ -35,16 +35,16 @@ _Note that a license is required. In this step you will be able to request a tri 5. Select `Help > JRebel > Configuration > Remote servers` to add a new remote server. 6. Give a descriptive name to the new server and set the `Server URL` as `http://localhost:8080/alfresco`. -![Alt text](./imgs/sdk-jrebel-eclipse-server.png?raw=true "Eclipse JRebel remote server configuration") +![Alt text](../../docassets/images/sdk-jrebel-eclipse-server.png?raw=true "Eclipse JRebel remote server configuration") 7. Select the checkbox to enable the server synchronisation and the checkbox to `Synchronize on build`. -![Alt text](./imgs/sdk-jrebel-eclipse-servers.png?raw=true "Eclipse JRebel remote servers synchronization") +![Alt text](../../docassets/images/sdk-jrebel-eclipse-servers.png?raw=true "Eclipse JRebel remote servers synchronization") 8. Select `Help > JRebel > Configuration > Projects` and select the checkbox to enable JRebel and the remote server support for required projects (the complete project in case of the Platform Jar archetype or the `PROJECT_ARTIFACT_ID-platform-jar` and `integration-tests` modules in case of the All-In-One archetype). -![Alt text](./imgs/sdk-jrebel-eclipse-projects.png?raw=true "Eclipse JRebel projects configuration") +![Alt text](../../docassets/images/sdk-jrebel-eclipse-projects.png?raw=true "Eclipse JRebel projects configuration") ## Installing JRebel using IntelliJ IDEA @@ -58,16 +58,16 @@ _Note that a license is required. In this step you will be able to request a tri 5. Select `Preferences > JRebel > Remote Servers` to add a new remote server. 6. Give a descriptive name to the new server and set the `Server URL` as `http://localhost:8080/alfresco. -![Alt text](./imgs/sdk-jrebel-intellij-server.png?raw=true "Eclipse JRebel remote server configuration") +![Alt text](../../docassets/images/sdk-jrebel-intellij-server.png?raw=true "Eclipse JRebel remote server configuration") 7. Select the checkbox to enable the server synchronisation and the checkbox to `Synchronize on build`. -![Alt text](./imgs/sdk-jrebel-intellij-servers.png?raw=true "Eclipse JRebel remote server configuration") +![Alt text](../../docassets/images/sdk-jrebel-intellij-servers.png?raw=true "Eclipse JRebel remote server configuration") 8. Open the JRebel Panel and select the checkbox to enable JRebel and the remote server support for required projects (the complete project in case of the Platform Jar archetype or the `PROJECT_ARTIFACT_ID-platform-jar` and `integration-tests` modules in case of the All-In-One archetype). -![Alt text](./imgs/sdk-jrebel-intellij-projects.png?raw=true "Eclipse JRebel projects configuration") +![Alt text](../../docassets/images/sdk-jrebel-intellij-projects.png?raw=true "Eclipse JRebel projects configuration") ## Configuring JRebel in the project @@ -142,7 +142,7 @@ You'll recognize JRebel is working when you see similar log messages: This is a sample webscript generated in every project created using SDK 4.0 and the platform artifact. -![Alt text](./imgs/sdk-hellofromjava.png?raw=true "Hello World webscript original result") +![Alt text](../../docassets/images/sdk-hellofromjava.png?raw=true "Hello World webscript original result") 3. Locate `HelloWorldWebScript.java` in the `src/main/java/.../platformsample` folder of your project (If you are using an All-In-One project, the folder is located in the platform sub-project). @@ -165,6 +165,6 @@ A number of log messages appear in the Alfresco project terminal, for example: 6. Refresh the browser to see the updated message: -![alt text](./imgs/sdk-hellofromme.png?raw=true "Hello World webscript modified result") +![alt text](../../docassets/images/sdk-hellofromme.png?raw=true "Hello World webscript modified result") By changing the code and compiling it again, the changes have been dynamically received from Alfresco Content Services. diff --git a/docs/integration-testing.md b/docs/advanced-topics/integration-testing/README.md similarity index 100% rename from docs/integration-testing.md rename to docs/advanced-topics/integration-testing/README.md diff --git a/docs/it-running.md b/docs/advanced-topics/integration-testing/it-running.md similarity index 87% rename from docs/it-running.md rename to docs/advanced-topics/integration-testing/it-running.md index 0b70804e..612fdbc4 100644 --- a/docs/it-running.md +++ b/docs/advanced-topics/integration-testing/it-running.md @@ -78,16 +78,16 @@ the `build_start` or the `start` goal of the `run` script. 4. Right click and select `Run As ...`, then click `JUnit Test`. -![Alt text](./imgs/sdk-it-eclipse-run.png?raw=true "Eclipse integration tests run") +![Alt text](../../docassets/images/sdk-it-eclipse-run.png?raw=true "Eclipse integration tests run") Once the tests have completed (typically, after a few seconds), the results are presented. -![Alt text](./imgs/sdk-it-eclipse-results.png?raw=true "Eclipse integration test execution results") +![Alt text](../../docassets/images/sdk-it-eclipse-results.png?raw=true "Eclipse integration test execution results") When using an IDE, the source code related to the integration tests is the one deployed directly on the platform side. This means that an update in the code for the Java classes will be included when you run the integration tests _if and only if_ they are deployed in the platform. To avoid stopping/starting Alfresco Content Services with every change, use **hot reloading** as the only way to deploy the new version of the Java classes. For more details, see -[JRebel](jrebel.md) / [HotSwapAgent](hotswap-agent.md) Hot reloading. +[JRebel](../hot-reloading/jrebel.md) / [HotSwapAgent](../hot-reloading/hotswap-agent.md) Hot reloading. ## IntelliJ IDEA IDE @@ -104,13 +104,13 @@ the `build_start` or the `start` goal of the `run` script. 4. Right click and select `Run Tests`. -![Alt text](./imgs/sdk-it-intellij-run.png?raw=true "IntelliJ IDEA integration tests run") +![Alt text](../../docassets/images/sdk-it-intellij-run.png?raw=true "IntelliJ IDEA integration tests run") Once the tests have completed (typically, after a few seconds), the results are presented. -![Alt text](./imgs/sdk-it-intellij-results.png?raw=true "IntelliJ IDEA integration test execution results") +![Alt text](../../docassets/images/sdk-it-intellij-results.png?raw=true "IntelliJ IDEA integration test execution results") When using an IDE, the source code related to the integration tests is the one deployed directly on the platform side. This means that an update in the code for the Java classes will be included when you run the integration tests _if and only if_ they are deployed in the platform. To avoid stopping/starting Alfresco Content Services with every change, use **hot reloading** as the only way to deploy the new version of the Java classes. For more details, see -[JRebel](jrebel.md) / [HotSwapAgent](hotswap-agent.md) Hot reloading. +[JRebel](../hot-reloading/jrebel.md) / [HotSwapAgent](../hot-reloading/hotswap-agent.md) Hot reloading. diff --git a/docs/it-working.md b/docs/advanced-topics/integration-testing/it-working.md similarity index 100% rename from docs/it-working.md rename to docs/advanced-topics/integration-testing/it-working.md diff --git a/docs/switching-versions.md b/docs/advanced-topics/switching-versions.md similarity index 96% rename from docs/switching-versions.md rename to docs/advanced-topics/switching-versions.md index 84183dd0..cedb76cb 100644 --- a/docs/switching-versions.md +++ b/docs/advanced-topics/switching-versions.md @@ -22,7 +22,7 @@ When editing `pom.xml` you will see a number of properties that define the Alfre Before continuing, always remember to start from a newly generated SDK project before changing the version numbers. We do not recommend changing the versions using developed customizations or source code. -This article is focused on the Community version. If you want to switch to Alfresco Enterprise, please visit [Working with Enterprise](enterprise.md). +This article is focused on the Community version. If you want to switch to Alfresco Enterprise, please visit [Working with Enterprise](working-with-enterprise/README.md). The supported versions are explained in the next sections of this article. @@ -55,5 +55,5 @@ $ ./run.sh build_start ``` **IMPORTANT:** Alfresco 6.1 is ready to work with JDK 11, but Alfresco 6.0 needs to be compiled and run using JDK 8, so please take this into account when you -switch from version 6.1.x to 6.0.x. If you compile Alfresco 6.0.x with JDK 11 you'll experience the issue described in the [Troubleshooting page](troubleshooting.md) +switch from version 6.1.x to 6.0.x. If you compile Alfresco 6.0.x with JDK 11 you'll experience the issue described in the [Troubleshooting page](../troubleshooting.md) about wrong JDK versions. diff --git a/docs/enterprise.md b/docs/advanced-topics/working-with-enterprise/README.md similarity index 100% rename from docs/enterprise.md rename to docs/advanced-topics/working-with-enterprise/README.md diff --git a/docs/alfresco-transform-service.md b/docs/advanced-topics/working-with-enterprise/alfresco-transform-service.md similarity index 99% rename from docs/alfresco-transform-service.md rename to docs/advanced-topics/working-with-enterprise/alfresco-transform-service.md index fd4ce9a1..ff811295 100644 --- a/docs/alfresco-transform-service.md +++ b/docs/advanced-topics/working-with-enterprise/alfresco-transform-service.md @@ -116,5 +116,3 @@ messaging.broker.url=failover:(nio://activemq:61616)?timeout=3000&jms.useCompres Once these 2 modifications are done, rebuild and restart all the services (`run.sh/run.bat build_start`) and ACS will use ATS to execute remote transformations asynchronously whenever possible. - - diff --git a/docs/enterprise-docker-registry.md b/docs/advanced-topics/working-with-enterprise/enterprise-docker-registry.md similarity index 100% rename from docs/enterprise-docker-registry.md rename to docs/advanced-topics/working-with-enterprise/enterprise-docker-registry.md diff --git a/docs/enterprise-mvn-repo.md b/docs/advanced-topics/working-with-enterprise/enterprise-mvn-repo.md similarity index 100% rename from docs/enterprise-mvn-repo.md rename to docs/advanced-topics/working-with-enterprise/enterprise-mvn-repo.md diff --git a/docs/imgs/sdk-debug-eclipse-breakpoint.png b/docs/docassets/images/sdk-debug-eclipse-breakpoint.png similarity index 100% rename from docs/imgs/sdk-debug-eclipse-breakpoint.png rename to docs/docassets/images/sdk-debug-eclipse-breakpoint.png diff --git a/docs/imgs/sdk-debug-eclipse-config.png b/docs/docassets/images/sdk-debug-eclipse-config.png similarity index 100% rename from docs/imgs/sdk-debug-eclipse-config.png rename to docs/docassets/images/sdk-debug-eclipse-config.png diff --git a/docs/imgs/sdk-debug-eclipse-create.png b/docs/docassets/images/sdk-debug-eclipse-create.png similarity index 100% rename from docs/imgs/sdk-debug-eclipse-create.png rename to docs/docassets/images/sdk-debug-eclipse-create.png diff --git a/docs/imgs/sdk-debug-eclipse-launch.png b/docs/docassets/images/sdk-debug-eclipse-launch.png similarity index 100% rename from docs/imgs/sdk-debug-eclipse-launch.png rename to docs/docassets/images/sdk-debug-eclipse-launch.png diff --git a/docs/imgs/sdk-debug-intellij-breakpoint.png b/docs/docassets/images/sdk-debug-intellij-breakpoint.png similarity index 100% rename from docs/imgs/sdk-debug-intellij-breakpoint.png rename to docs/docassets/images/sdk-debug-intellij-breakpoint.png diff --git a/docs/imgs/sdk-debug-intellij-config.png b/docs/docassets/images/sdk-debug-intellij-config.png similarity index 100% rename from docs/imgs/sdk-debug-intellij-config.png rename to docs/docassets/images/sdk-debug-intellij-config.png diff --git a/docs/imgs/sdk-debug-intellij-create.png b/docs/docassets/images/sdk-debug-intellij-create.png similarity index 100% rename from docs/imgs/sdk-debug-intellij-create.png rename to docs/docassets/images/sdk-debug-intellij-create.png diff --git a/docs/imgs/sdk-debug-intellij-launch.png b/docs/docassets/images/sdk-debug-intellij-launch.png similarity index 100% rename from docs/imgs/sdk-debug-intellij-launch.png rename to docs/docassets/images/sdk-debug-intellij-launch.png diff --git a/docs/imgs/sdk-dev-env-eclipse-import.png b/docs/docassets/images/sdk-dev-env-eclipse-import.png similarity index 100% rename from docs/imgs/sdk-dev-env-eclipse-import.png rename to docs/docassets/images/sdk-dev-env-eclipse-import.png diff --git a/docs/imgs/sdk-dev-env-eclipse-project.png b/docs/docassets/images/sdk-dev-env-eclipse-project.png similarity index 100% rename from docs/imgs/sdk-dev-env-eclipse-project.png rename to docs/docassets/images/sdk-dev-env-eclipse-project.png diff --git a/docs/imgs/sdk-dev-env-eclipse-quickfix.png b/docs/docassets/images/sdk-dev-env-eclipse-quickfix.png similarity index 100% rename from docs/imgs/sdk-dev-env-eclipse-quickfix.png rename to docs/docassets/images/sdk-dev-env-eclipse-quickfix.png diff --git a/docs/imgs/sdk-dev-env-eclipse-warning.png b/docs/docassets/images/sdk-dev-env-eclipse-warning.png similarity index 100% rename from docs/imgs/sdk-dev-env-eclipse-warning.png rename to docs/docassets/images/sdk-dev-env-eclipse-warning.png diff --git a/docs/imgs/sdk-dev-env-intellij-finish.png b/docs/docassets/images/sdk-dev-env-intellij-finish.png similarity index 100% rename from docs/imgs/sdk-dev-env-intellij-finish.png rename to docs/docassets/images/sdk-dev-env-intellij-finish.png diff --git a/docs/imgs/sdk-dev-env-intellij-import.png b/docs/docassets/images/sdk-dev-env-intellij-import.png similarity index 100% rename from docs/imgs/sdk-dev-env-intellij-import.png rename to docs/docassets/images/sdk-dev-env-intellij-import.png diff --git a/docs/imgs/sdk-hellofromjava.png b/docs/docassets/images/sdk-hellofromjava.png similarity index 100% rename from docs/imgs/sdk-hellofromjava.png rename to docs/docassets/images/sdk-hellofromjava.png diff --git a/docs/imgs/sdk-hellofromme.png b/docs/docassets/images/sdk-hellofromme.png similarity index 100% rename from docs/imgs/sdk-hellofromme.png rename to docs/docassets/images/sdk-hellofromme.png diff --git a/docs/imgs/sdk-it-eclipse-results.png b/docs/docassets/images/sdk-it-eclipse-results.png similarity index 100% rename from docs/imgs/sdk-it-eclipse-results.png rename to docs/docassets/images/sdk-it-eclipse-results.png diff --git a/docs/imgs/sdk-it-eclipse-run.png b/docs/docassets/images/sdk-it-eclipse-run.png similarity index 100% rename from docs/imgs/sdk-it-eclipse-run.png rename to docs/docassets/images/sdk-it-eclipse-run.png diff --git a/docs/imgs/sdk-it-intellij-results.png b/docs/docassets/images/sdk-it-intellij-results.png similarity index 100% rename from docs/imgs/sdk-it-intellij-results.png rename to docs/docassets/images/sdk-it-intellij-results.png diff --git a/docs/imgs/sdk-it-intellij-run.png b/docs/docassets/images/sdk-it-intellij-run.png similarity index 100% rename from docs/imgs/sdk-it-intellij-run.png rename to docs/docassets/images/sdk-it-intellij-run.png diff --git a/docs/imgs/sdk-jrebel-eclipse-projects.png b/docs/docassets/images/sdk-jrebel-eclipse-projects.png similarity index 100% rename from docs/imgs/sdk-jrebel-eclipse-projects.png rename to docs/docassets/images/sdk-jrebel-eclipse-projects.png diff --git a/docs/imgs/sdk-jrebel-eclipse-server.png b/docs/docassets/images/sdk-jrebel-eclipse-server.png similarity index 100% rename from docs/imgs/sdk-jrebel-eclipse-server.png rename to docs/docassets/images/sdk-jrebel-eclipse-server.png diff --git a/docs/imgs/sdk-jrebel-eclipse-servers.png b/docs/docassets/images/sdk-jrebel-eclipse-servers.png similarity index 100% rename from docs/imgs/sdk-jrebel-eclipse-servers.png rename to docs/docassets/images/sdk-jrebel-eclipse-servers.png diff --git a/docs/imgs/sdk-jrebel-intellij-projects.png b/docs/docassets/images/sdk-jrebel-intellij-projects.png similarity index 100% rename from docs/imgs/sdk-jrebel-intellij-projects.png rename to docs/docassets/images/sdk-jrebel-intellij-projects.png diff --git a/docs/imgs/sdk-jrebel-intellij-server.png b/docs/docassets/images/sdk-jrebel-intellij-server.png similarity index 100% rename from docs/imgs/sdk-jrebel-intellij-server.png rename to docs/docassets/images/sdk-jrebel-intellij-server.png diff --git a/docs/imgs/sdk-jrebel-intellij-servers.png b/docs/docassets/images/sdk-jrebel-intellij-servers.png similarity index 100% rename from docs/imgs/sdk-jrebel-intellij-servers.png rename to docs/docassets/images/sdk-jrebel-intellij-servers.png diff --git a/docs/getting-started.md b/docs/getting-started.md index 2ffc2b7d..b7de9b66 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -199,4 +199,4 @@ In the terminal window, use: If this is the first time you are doing this, it will take a while for Maven to download all the required dependencies and for Docker to download all the required images. -For more information about how to work with the projects, please visit [Working with generated projects](projects-usage.md). +For more information about how to work with the projects, please visit [Working with generated projects](working-with-generated-projects/README.md). diff --git a/docs/mvn-archetypes.md b/docs/mvn-archetypes.md index bd003706..a0756bb0 100644 --- a/docs/mvn-archetypes.md +++ b/docs/mvn-archetypes.md @@ -76,7 +76,7 @@ The All-In-One project is recommended to be used if you have to develop a custom customizations on Alfresco Share client. If your plan to develop a project on the Alfresco Content Services Repository only, use the Platform JAR Maven archetype. If you plan to develop a project on the Alfresco Share client only, use the Share JAR Maven archetype. -For more information about the All-In-One project, see [All-In-One project structure](structure-aio.md). +For more information about the All-In-One project, see [All-In-One project structure](working-with-generated-projects/structure-aio.md). ### org.alfresco.maven.archetype:alfresco-platform-jar-archetype @@ -95,7 +95,7 @@ Services Repository. The samples included in the project are basic and straightf The Platform JAR project is recommended to be used if you have to develop a customization of the Alfresco Content Services Repository. If you also plan to develop a customization of the Alfresco Share client, use the All-In-One Maven archetype instead. -For more information about the Platform JAR project, see [Platform JAR project structure](structure-platform.md). +For more information about the Platform JAR project, see [Platform JAR project structure](working-with-generated-projects/structure-platform.md). ### org.alfresco.maven.archetype:alfresco-share-jar-archetype @@ -114,7 +114,7 @@ The samples included in the project are basic and straightforward, and can help The Share JAR project is recommended to be used if you have to develop a customization of the Alfresco Share client. If you also plan to develop a customization of the Alfresco Content Services Repository, use the All-In-One Maven archetype instead. -For more information about the Share JAR project, see [Share JAR project structure](structure-share.md). +For more information about the Share JAR project, see [Share JAR project structure](working-with-generated-projects/structure-share.md). ### org.alfresco.maven.archetype:activiti-jar-archetype (for use with SDK 2.2 only) diff --git a/docs/dev-env-eclipse.md b/docs/setting-up-your-development-environment/dev-env-eclipse.md similarity index 77% rename from docs/dev-env-eclipse.md rename to docs/setting-up-your-development-environment/dev-env-eclipse.md index bbb09d4b..99ac06e8 100644 --- a/docs/dev-env-eclipse.md +++ b/docs/setting-up-your-development-environment/dev-env-eclipse.md @@ -9,18 +9,18 @@ The Maven Alfresco SDK is designed to work well with Eclipse. This support inclu Alfresco SDK. Here we assume you already have an Eclipse installation up and running, together with an available Alfresco project created using the Alfresco SDK. If you -don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.0](getting-started.md) to learn how to quickly generate it in a few +don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.0](../getting-started.md) to learn how to quickly generate it in a few easy steps. ## Importing the Alfresco project into Eclipse 1. Starting from Eclipse, select `File > Import > Maven > Existing Maven Projects` from the main menu to import the Alfresco project. -![Alt text](./imgs/sdk-dev-env-eclipse-import.png?raw=true "Eclipse maven project import") +![Alt text](../docassets/images/sdk-dev-env-eclipse-import.png?raw=true "Eclipse maven project import") 2. Click `Next` then browse to the root of the Alfresco project. -![Alt text](./imgs/sdk-dev-env-eclipse-project.png?raw=true "Eclipse maven project selection") +![Alt text](../docassets/images/sdk-dev-env-eclipse-project.png?raw=true "Eclipse maven project selection") 3. Click `Finish` to start importing the project into Eclipse. @@ -29,14 +29,14 @@ required dependencies, this task will finish relatively quickly. Otherwise, be p Once the import is complete, a warning message may be displayed. -![Alt text](./imgs/sdk-dev-env-eclipse-warning.png?raw=true "Eclipse maven project import warning") +![Alt text](../docassets/images/sdk-dev-env-eclipse-warning.png?raw=true "Eclipse maven project import warning") 4. Click `Resolve All Later` to complete the import task. 5. Check the Markers tab in the bottom panel, where you may see some Maven problems. Expand the list and right click on a item with an error, then select `Quick Fix` and mark as shown. -![Alt text](./imgs/sdk-dev-env-eclipse-quickfix.png?raw=true "Eclipse maven project import quick fix") +![Alt text](../docassets/images/sdk-dev-env-eclipse-quickfix.png?raw=true "Eclipse maven project import quick fix") 6. Click `Finish` to confirm the fix. @@ -51,4 +51,4 @@ and then click `OK`. Once this is done, the project is successfully imported in Eclipse. -If you want more detail about how to work with the project, please visit [Working with generated projects](projects-usage.md). +If you want more detail about how to work with the project, please visit [Working with generated projects](../working-with-generated-projects/README.md). diff --git a/docs/dev-env-intellij.md b/docs/setting-up-your-development-environment/dev-env-intellij.md similarity index 73% rename from docs/dev-env-intellij.md rename to docs/setting-up-your-development-environment/dev-env-intellij.md index d1238f0e..931ab0bb 100644 --- a/docs/dev-env-intellij.md +++ b/docs/setting-up-your-development-environment/dev-env-intellij.md @@ -9,7 +9,7 @@ The Maven Alfresco SDK is designed to work well with Eclipse. This support inclu Alfresco SDK. Here we assume you already have an Eclipse installation up and running, together with an available Alfresco project created using the Alfresco SDK. If you -don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.0](getting-started.md) to learn how to quickly generate it in a few +don't have a project already, follow the steps in [Getting started with Alfresco SDK 4.0](../getting-started.md) to learn how to quickly generate it in a few easy steps. ## Importing the Alfresco project into Intellij IDEA @@ -17,12 +17,12 @@ easy steps. 1. Starting from IntelliJ IDEA, select `File > Open` from the main menu to open the Alfresco project. Alternatively, select `Import Project` if you're running IntelliJ IDEA for the first time in your development environment. -![Alt text](./imgs/sdk-dev-env-intellij-import.png?raw=true "IntelliJ maven project import") +![Alt text](../docassets/images/sdk-dev-env-intellij-import.png?raw=true "IntelliJ maven project import") 2. After the project is imported, you will see a window similar to the following: -![Alt text](./imgs/sdk-dev-env-intellij-finish.png?raw=true "IntelliJ maven project imported") +![Alt text](../docassets/images/sdk-dev-env-intellij-finish.png?raw=true "IntelliJ maven project imported") Once this is done, the project is successfully imported in IntelliJ IDEA. -If you want more detail about how to work with the project, please visit [Working with generated projects](projects-usage.md). +If you want more detail about how to work with the project, please visit [Working with generated projects](../working-with-generated-projects/README.md). diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index f6c4235d..96c13a31 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -146,6 +146,3 @@ That allows you to modify the number of the exposed ports through maven properti ``` That way, if you face a port conflict, you only need to change the port in the corresponding maven property and rebuilt and restart the project. - - - diff --git a/docs/projects-usage.md b/docs/working-with-generated-projects/README.md similarity index 95% rename from docs/projects-usage.md rename to docs/working-with-generated-projects/README.md index 867fda87..1ddb9873 100644 --- a/docs/projects-usage.md +++ b/docs/working-with-generated-projects/README.md @@ -18,9 +18,9 @@ a great quantity of training resources about [Docker](https://docs.docker.com/ge After generating your project, using one of the Maven archetypes, review the project structure. The directory structure and content of each folder and file can help you to understand how to start developing with the Alfresco SDK 4.0. Before continuing, make sure that you have read and completed the tasks in the -[Getting started](getting-started.md) tutorial. +[Getting started](../getting-started.md) tutorial. -The structure of the project and the purpose of the files it contains vary according to the [Maven archetype](mvn-archetypes.md) used to generate the project +The structure of the project and the purpose of the files it contains vary according to the [Maven archetype](../mvn-archetypes.md) used to generate the project itself. The following links provide detailed descriptions of the different project types. * [All-In-One project structure](structure-aio.md) diff --git a/docs/structure-aio.md b/docs/working-with-generated-projects/structure-aio.md similarity index 99% rename from docs/structure-aio.md rename to docs/working-with-generated-projects/structure-aio.md index 1d16bc58..2a40a6b7 100644 --- a/docs/structure-aio.md +++ b/docs/working-with-generated-projects/structure-aio.md @@ -183,7 +183,7 @@ Below is a description of the files in the root of the project (in this case, `m File | Description --- | --- -`run` (`sh` and `bat`) | Utility script to work with the project (compile, run, test, show logs, etc.). For detailed information about it, check [Working with generated projects](projects-usage.md). +`run` (`sh` and `bat`) | Utility script to work with the project (compile, run, test, show logs, etc.). For detailed information about it, check [Working with generated projects](README.md). `pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. You can define all the configurations, parameters, and settings in this file for projects as well as for sub-projects. `README.md` | File in Markdown format containing the documentation for the project. diff --git a/docs/structure-platform.md b/docs/working-with-generated-projects/structure-platform.md similarity index 98% rename from docs/structure-platform.md rename to docs/working-with-generated-projects/structure-platform.md index 315d32dd..8c24ac68 100644 --- a/docs/structure-platform.md +++ b/docs/working-with-generated-projects/structure-platform.md @@ -95,7 +95,7 @@ Below is a description of the files in the root of the project (in this case, `m File | Description --- | --- -`run` (`sh` and `bat`) | Utility script to work with the project (compile, run, test, show logs, etc.). For detailed information about it, check [Working with generated projects](projects-usage.md). +`run` (`sh` and `bat`) | Utility script to work with the project (compile, run, test, show logs, etc.). For detailed information about it, check [Working with generated projects](README.md). `pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. `README.md` | File in Markdown format containing the documentation for the project. diff --git a/docs/structure-share.md b/docs/working-with-generated-projects/structure-share.md similarity index 98% rename from docs/structure-share.md rename to docs/working-with-generated-projects/structure-share.md index d6498a05..595d6907 100644 --- a/docs/structure-share.md +++ b/docs/working-with-generated-projects/structure-share.md @@ -90,7 +90,7 @@ Below is a description of the files in the root of the project (in this case, `m File | Description --- | --- -`run` (`sh` and `bat`) | Utility script to work with the project (compile, run, test, show logs, etc.). For detailed information about it, check [Working with generated projects](projects-usage.md). +`run` (`sh` and `bat`) | Utility script to work with the project (compile, run, test, show logs, etc.). For detailed information about it, check [Working with generated projects](README.md). `pom.xml` | This XML file contains information about the project and configuration details used by Apache Maven to build the project. `README.md` | File in Markdown format containing the documentation for the project. @@ -108,5 +108,5 @@ Content | Description `src/main/resources/alfresco/module/` | This folder contains all the configuration files and settings for the Alfresco Share module. Here you can find the property file for the module. `src/main/resources/alfresco/web-extension` | In this folder you can find the extensions to the web client (Alfresco Share) and it's where you store Spring configurations that extend and override the system Share configuration. There are two important sub-directories here: `site-data` and `site-webscripts`. `src/main/resources/alfresco/META-INF/resources` | This folder hosts the content that will be placed in the `META-INF` folder of a standard Java web application. It is best practice to use a further subdirectory based on the module name. This allows you to manage multiple modules, so that their web resources don't conflict with each other. -`src/main/resources/alfresco/META-INF/share-config-custom.xml` | This file is a relevant Alfresco Share file used to configure the sub-project with the correct settings, depending on your environment. For more details, see [Share configuration](http://docs.alfresco.com/5.2/concepts/dev-extensions-share-configuration.html). +`src/main/resources/alfresco/META-INF/share-config-custom.xml` | This file is a relevant Alfresco Share file used to configure the sub-project with the correct settings, depending on your environment. For more details, see [Share configuration](http://docs.alfresco.com/6.0/concepts/dev-extensions-share-configuration.html). `src/test/java/...` | This folder contains the same content you can find in a regular Java project, i.e. the Java source code for tests. Here you should put all the custom classes, interfaces, and Java source code related to tests.