diff --git a/content/en/docs/refguide/modeling/integration/mapping-documents/xml-documents/xml-schemas.md b/content/en/docs/refguide/modeling/integration/mapping-documents/xml-documents/xml-schemas.md
index 2808836ca2f..2951e0bbefa 100644
--- a/content/en/docs/refguide/modeling/integration/mapping-documents/xml-documents/xml-schemas.md
+++ b/content/en/docs/refguide/modeling/integration/mapping-documents/xml-documents/xml-schemas.md
@@ -8,7 +8,7 @@ weight: 15
An XML schema is defined in an XML Schema Definition (XSD) file and can be imported in your model. It describes what a certain XML document should look like. The schema can then be used in [Import Mappings](/refguide/import-mappings/) and [Export Mappings](/refguide/export-mappings/).
-{{< figure src="/attachments/refguide/modeling/integration/xml-schemas/18582294.png" alt="Figure 1" class="no-border" >}}
+{{< figure src="/attachments/refguide/modeling/integration/mapping-documents/xml-schemas/schema.png" alt="Figure 1" class="no-border" >}}
## XSD File Support
@@ -33,7 +33,7 @@ In the mapping editor for import mappings, you can check elements that can occur
### XSD Constraints
-* If the XSD contains any of the unsupported constructs, they will be highlighted in the mapping editor with this warning icon: {{< figure src="/attachments/refguide/modeling/integration/xml-schemas/xml-schema-support/16843903.png" class="no-border" >}}
+* If the XSD contains any of the unsupported constructs, they will be highlighted in the mapping editor with this warning icon: {{< figure src="/attachments/refguide/modeling/integration/mapping-documents/xml-schemas/warning.png" class="no-border" >}}
* This will be next to each unsupported element or attribute. Checking any of such elements or attributes will result in consistency errors.
diff --git a/content/en/docs/refguide/modeling/integration/use-excel-documents/export-to-excel.md b/content/en/docs/refguide/modeling/integration/use-excel-documents/export-to-excel.md
index c2ba998f909..7d04d2fc9ed 100644
--- a/content/en/docs/refguide/modeling/integration/use-excel-documents/export-to-excel.md
+++ b/content/en/docs/refguide/modeling/integration/use-excel-documents/export-to-excel.md
@@ -29,12 +29,12 @@ To download the modules, follow these steps:
1. Open the **Mendix Marketplace** from within Studio Pro.
2. Search for the keyword *reflection* and select **Mx Model reflection**:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581166.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/mx-model-reflection.png" class="no-border" >}}
3. Click **Download** to include the module in your app. It will be imported into **App** > **Marketplace modules** in the **App Explorer**.
4. Search for the keyword *Excel*, select **Excel exporter**, and download that module into your app:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/exporter.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/exporter.png" class="no-border" >}}
{{% alert color="warning" %}}
Depending on the layout selected when the app was created, errors in Studio Pro may arise due to the new module's default layouts. To correct this, open each page that has an error and update the layout to the desired layout within the app.
@@ -47,15 +47,15 @@ In this section, you will learn how to add the required pages in the app's **Nav
1. In the [App Explorer](/refguide/app-explorer/), go to **Navigation**.
2. Add a **New item** to the navigation to open the page **MxModelReflection.MxObjects_Overview**:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-menu-item-mxreflection.png" alt="new-menu-item-mxreflection" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-mxreflection.png" alt="new-menu-item-mxreflection" class="no-border" >}}
3. Add a new item to the Navigation to open the page **XLSReport.Excel_Document_Overview**:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-menu-item-excel-exporter.png" alt="new-menu-item-excel-exporter" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-excel-exporter.png" alt="new-menu-item-excel-exporter" class="no-border" >}}
4. Open **App Security** and assign these two modules to the Administrator user role:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/security.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/security.png" class="no-border" >}}
## Creating an Input Object Entity
@@ -64,7 +64,7 @@ In this section, you will create an entity which will be used to export the Exce
1. Open the domain model for your app and add an entity to serve as a "primary export" entity that is a specialization of **FileDocument**.
2. Create an association between the newly created entity and the entity (or entities) that you will want to serve as a base for the Excel export.
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581908.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/create-association.png" class="no-border" >}}
## Configuring Mx Model Reflection {#configure-mx-model-reflection}
@@ -104,7 +104,7 @@ To set up a template, follow these steps:
7. Provide a **Description** for identifying and documenting what this template is for:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-excel-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-excel-template.png" class="no-border" >}}
8. Specify the **Date time export format** which defines how the dates and times should appear in the Excel file once exported.
@@ -116,7 +116,7 @@ To upload an Excel file as a template, perform the following steps:
1. Click the following icon:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/upload-excel-file.png" alt="upload-excel-file" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/upload-excel-file.png" alt="upload-excel-file" class="no-border" >}}
2. For **File**, click **Browse** and navigate to the Excel file that you want to use as a template.
@@ -132,7 +132,7 @@ To create the worksheet layout, follow these steps:
1. Under the **Worksheets** section for the template, select **New** to create a new sheet template:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581907.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-sheet-template.png" class="no-border" >}}
2. Specify the **Name** that will be given to the sheet when the file is exported.
@@ -144,11 +144,11 @@ To create the worksheet layout, follow these steps:
The following figure shows a template where worksheet has **Reference to the template input object** and **Sheet input Object** configured:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/worksheet-with-input-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/worksheet-with-input-object.png" class="no-border" >}}
The following figure shows a template where worksheet does not have **Reference to the template input object** and **Sheet input Object** configured:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/worksheet-without-input-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/worksheet-without-input-object.png" class="no-border" >}}
5. Configure the **Start retrieved data at row** to set the ordinal number in which the data should be exported.
@@ -180,7 +180,7 @@ To create the worksheet layout, follow these steps:
Below you can find an example of the definition of a template and the corresponding exported Excel file: the two worksheets are defined as **Topic** and **PubMessage** in the template, and the corresponding Excel file has two sheets that have the same names.
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/multiple-sheets.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/multiple-sheets.png" class="no-border" >}}
### Configuring Dynamic Column Data {#dynamic-column-data}
@@ -188,7 +188,7 @@ To configure the dynamic column data, follow these steps:
1. On the **Column Data** tab, select **New** to create a new export column:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581905.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-export-column.png" class="no-border" >}}
2. The **Column number** will be set automatically, but can be overwritten to the desired ordinal number.
3. Define a **Name** for the column. This will be the **Column Header** when exported.
@@ -205,7 +205,7 @@ To configure the static data in the sheet, follow these steps:
1. Open the **Static Data tab** and select **New** to create a new export column.
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581903.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/static-data-tab.png" class="no-border" >}}
2. Specify the **Row** and **Column** that the static value should be placed.
3. Enter a name for the cell in the **Name** field.
@@ -218,7 +218,7 @@ To configure the custom formatting and styling for the cells, follow these steps
1. Back on the main page for your new template, click **New** in the **Styles** section to create a new style that can be applied to any of the data in the Excel export:
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581900.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/styles.png" class="no-border" >}}
2. Specify the properties of the style that will be applied to the cells.
@@ -234,17 +234,17 @@ In this section, you will learn how to call the newly created Excel export templ
2. In the microflow, retrieve a single object which is the template you set up earlier to use for the export.
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/retrieve-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/retrieve-template.png" class="no-border" >}}
3. In your microflow, call the **XLSReport.GenerateExcelDoc** Java action (available from the module's **JavaActions** folder) to pass the required objects to the module.
- {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/java-action.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/java-action.png" class="no-border" >}}
4. In your microflow, download the resulting FileDocument object.
Your microflow should look similar to this:
-{{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/microflow-for-generate.png" class="no-border" >}}
+{{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/microflow-for-generate.png" class="no-border" >}}
If your template definition does not have **Input Object**, your microflow can directly retrieve the template object and **Row Object** from the database for the export.
@@ -272,7 +272,7 @@ To run the microflow you created above, you will need to create another microflo
Your new microflow should look similar to this:
-{{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/associating-objects.png" class="no-border" >}}
+{{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/associating-objects.png" class="no-border" >}}
{{% alert color="info" %}}
If you create a **PolicyDoc** with *no* associations to **Policy** objects, you will export an empty spreadsheet with the structure defined in the template.
diff --git a/content/en/docs/refguide/modeling/integration/use-excel-documents/import-excel-documents.md b/content/en/docs/refguide/modeling/integration/use-excel-documents/import-excel-documents.md
index fe72b70ba2b..551dbc3d1af 100644
--- a/content/en/docs/refguide/modeling/integration/use-excel-documents/import-excel-documents.md
+++ b/content/en/docs/refguide/modeling/integration/use-excel-documents/import-excel-documents.md
@@ -28,7 +28,7 @@ Before you can start importing data into your application, set up the data struc
1. Create the following domain model:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/domain-model.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/domain-model.png" class="no-border" >}}
Create an enumeration for the **OrderStatus** attribute with the values **Open**, **Processing**, and **Complete**.
@@ -45,7 +45,7 @@ Because an enumeration is used for the **OrderStatus** attribute, you need to cr
1. Create the following microflow and name it **IVK_ParseStatus**.
- {{< figure src="/attachments/howto/integration/importing-excel-documents/microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/microflow.png" class="no-border" >}}
2. Set the **Return value** as follows:
@@ -68,7 +68,7 @@ In order to set up import templates for importing data, your application model m
4. Click the menu item for the **MxObjects_Overview** in your navigation.
5. Select the module that contains the objects you want to use in your client by checking the box to the left of it. In this example, the module is **MyFirstModule**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/module-example.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/module-example.png" class="no-border" >}}
6. Click the button next to **Synchronize all entities and microflows of checked modules on the left**. Now, the two objects and the parse microflow from the **MyFirstModule** module can be seen and used in the client.
@@ -78,26 +78,26 @@ Before you can import data from an Excel File, you have to set up an import temp
In this section, you will import data from a simple Excel file example, which can be downloaded here:
-{{% button color="info" href="/attachments/howto/integration/importing-excel-documents/sample-excel-file.xlsx" text="Download Example" title="Download sample Excel template" %}}
+{{% button color="info" href="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sample-excel-file.xlsx" text="Download Example" title="Download sample Excel template" %}}
Based on the structure of the file you want to import, you need to manually set up your template by following these steps:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Click **New Template**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/new-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/new-template.png" class="no-border" >}}
3. Name the template.
4. Click the arrow next to the **Mendix object** box.
5. Double-click the **Customer** object:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/customer-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/customer-object.png" class="no-border" >}}
6. Click the arrow next to the **Reference to import objects** box.
7. Select the **MyFirstModule.Customer_XLSFile** association. By setting the association to the XLS file, the XLS file is saved on disk and the imported data is linked to the source file.
8. Make sure **Import Action** is set to **Synchronize objects**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/sychronize-objects.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sychronize-objects.png" class="no-border" >}}
{{% alert color="info" %}}For this example, you use a simple Excel file that has only one sheet and column headers on the first row. If a more comprehensive Excel file is used, you can change these values in the **Sheet nr**, **Header row nr**, and **Import from row nr** fields.{{% /alert %}}
@@ -110,17 +110,17 @@ Based on the structure of the file you want to import, you need to manually set
12. Select **Attribute** for the **Type**.
13. Click the arrow next to the **Attribute** box:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/attribute-box.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/attribute-box.png" class="no-border" >}}
14. Double-click the **Attribute** to which you want to map the Excel value:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/double-click-attribute.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/double-click-attribute.png" class="no-border" >}}
15. Repeat steps 9 to 14 above for each attribute of the **Customer** object.
* For the mapping of attribute **Name**, set the **Key** value to **Yes** to prevent a customer from being duplicated.
- {{< figure src="/attachments/howto/integration/importing-excel-documents/repeat-attribute.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/repeat-attribute.png" class="no-border" >}}
{{% alert color="info" %}}If the mapping is set up correctly, a green check appears in front of the row.{{% /alert %}}
@@ -133,11 +133,11 @@ Based on the structure of the file you want to import, you need to manually set
6. For the mapping of attribute **Number**, set the **Key** value to **Yes, only for the associated object** in order to prevent orders from being duplicated.
7. Click **Save**.
- {{< figure src="/attachments/howto/integration/importing-excel-documents/save-order-attribute.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/save-order-attribute.png" class="no-border" >}}
17. For the mapping of the **OrderStatus** attribute, the Excel file value needs to be parsed to an enumeration value. To achieve this, use the **IVK_ParseStatus** microflow (created in the [Preparing the Logic for Data Import](#preparing) section above). Click the arrow next to the **Parse with** box and select the **IVK_ParseStatus** microflow:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/mapping-attribute.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/mapping-attribute.png" class="no-border" >}}
18. Save the import template.
@@ -150,17 +150,17 @@ Follow these steps to import the Excel file:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Go to the **Import files** tab and click **New**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/import-file.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/import-file.png" class="no-border" >}}
3. Select the template you just created.
4. Click **Browse**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/browse-file.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/browse-file.png" class="no-border" >}}
5. Select the example Excel file you downloaded and click **Save**.
6. Click the Excel file under **Filename** to select it, then click **Import file**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/confirm-import.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/confirm-import.png" class="no-border" >}}
7. Click **OK** when the import has finished.
@@ -168,31 +168,31 @@ Follow these steps to import the Excel file:
In this section, you will create the same Excel template in an automated way, which you can do using the specific **New template by excelfile** button. You can use this same Excel file example:
-{{< figure src="/attachments/howto/integration/importing-excel-documents/download-example.png" link="/attachments/howto/integration/importing-excel-documents/sample-excel-file.xlsx" class="no-border" >}}
+{{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/download-example.png" link="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sample-excel-file.xlsx" class="no-border" >}}
Follow these steps to create the import template via the Excel file:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Click **New template by excelfile**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/new-template-excel=file.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/new-template-excel=file.png" class="no-border" >}}
3. Select the example Excel file you downloaded.
4. Define the **Sheet nr**, **Header row nr**, and **Import from row nr**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/define-sheet.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/define-sheet.png" class="no-border" >}}
5. Click **Save & next**. This will automatically create a row for every header of the Excel file:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/save-and-next.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/save-and-next.png" class="no-border" >}}
6. In the top section of the page, click the arrow next to **Mendix object** and select the **Customer** object type:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/select-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/select-object.png" class="no-border" >}}
7. Under **Connect columns to attributes**, click **Connect matching attributes**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/connect-matching-attributes.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/connect-matching-attributes.png" class="no-border" >}}
This will automatically match attributes of the selected Mendix object that have the same name as the **Caption**.
@@ -209,11 +209,11 @@ Follow these steps to export and import your template:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Click the Excel template you created in the [Creating the Import Template](#creating) section above to select it, then click **Export template** and save the file on your computer:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/export-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/export-template.png" class="no-border" >}}
3. Import the file you just downloaded by clicking **Import template**, selecting the file, and clicking **Import**:
- {{< figure src="/attachments/howto/integration/importing-excel-documents/import-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/import-template.png" class="no-border" >}}
You have now imported a complete import template.
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/_index.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/_index.md
index 5b6479e111f..f607d5e5eb2 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/_index.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/_index.md
@@ -20,7 +20,7 @@ Import mappings are used to define how incoming XML or JSON is converted into Me
This is an example of an import mapping document that maps an **Order** from a web service to a **ReceivedOrder** entity:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/16843933.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mapping.png" class="no-border" >}}
For more details, see [Import Mappings](/refguide10/import-mappings/).
@@ -33,7 +33,7 @@ Export mappings are used to define how Mendix objects can be converted to XML ac
This is an example of an export mapping document:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/16843940.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mapping.png" class="no-border" >}}
In this example, a **Cheesecake** entity will be passed when the export mapping is called. Subsequently, the **Topping** entities will be fetched by following the **Topping_Cheesecake** association from the passed Cheesecake Mendix object. The result is passed to an XML document or sent to a web service.
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/export-mappings.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/export-mappings.md
index fae0afb5cb3..69201a3d66d 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/export-mappings.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/export-mappings.md
@@ -12,7 +12,7 @@ For an introduction to export mappings, refer to [Mapping Documents](/refguide10
Figure 1 shows an example of an Export Mapping document in which two elements from a schema have been selected using the [Select Elements](/refguide10/select--elements/) dialog. The entity Cheesecake (on the left) was dragged into the mapping to map to the Cheesecake element (on the right). The entity Topping was mapped to the Topping element.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843939.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/example-mapping-document.png" width="400" class="no-border" >}}
**Figure 1**
@@ -28,7 +28,7 @@ When the top element in the mapping is [optional](#optional), you can specify a
For child objects, it is possible to get the objects via an association with the parent object, as shown in Figure 1. In the example, the **Topping** objects that need to be exported will be fetched at runtime using the **Topping_Cheesecake** association. It is possible to edit the mapping element by double-clicking the **Topping** entity (left) or the **Topping** schema element (right). This window will be shown:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843938.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/topping-object.png" width="400" class="no-border" >}}
**Figure 2**
@@ -36,13 +36,13 @@ For child objects, it is possible to get the objects via an association with the
In this window, you can choose to either get the object by association with the parent (Figure 3) or by microflow (for details, see [Mapping Attributes in Export Mappings](#mapping-attributes)). If you choose to get the object by microflow, you can pass any of the parent objects to that microflow as arguments to help determine what object you should return. This is the window in which this is configured:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843937.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/object-by-microflow.png" width="400" class="no-border" >}}
**Figure 3**
When you choose to get an object by microflow, this is shown in the Export Mapping document:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843936.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/object-by-microflow-example.png" width="400" class="no-border" >}}
**Figure 4**
@@ -52,7 +52,7 @@ The user can also define what should be done when the chosen method to get the M
For each value element that the complex schema element encompasses, an attribute needs to be mapped from the entity. These properties are not applicable for choice or inheritance elements because they do not contain value elements. Configuring how to map the attributes is done in the window depicted in Figure 5, which is shown after double-clicking a specific mapping element.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843935.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/mapping-attributes.png" width="400" class="no-border" >}}
**Figure 5**
@@ -77,7 +77,7 @@ For some selected schemas, elements defining an entity is optional. This is the
An example of this is shown in Figure 6.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843934.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/optional-mapping.png" width="400" class="no-border" >}}
**Figure 6**
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/import-mappings.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/import-mappings.md
index 87e69887a7f..cf3eeb479ce 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/import-mappings.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/import-mappings.md
@@ -10,7 +10,7 @@ Please refer to [Mapping Documents](/refguide10/mapping-documents/) for an intro
Figure 1 depicts an example of an Import Mapping document in which two elements from an XML Schema have been selected using the **Select elements...** dialog. Then, the ReceivedPartners and ReceivedClient entities were added and mapped to the Result and Client schema elements. Each time the Import Mapping is invoked, a new ReceivedPartners object is obtained.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843942.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/im-example.png" class="no-border" >}}
**Figure 1**
@@ -18,7 +18,7 @@ Figure 1 depicts an example of an Import Mapping document in which two elements
For each XML or JSON object, a Mendix object needs to be obtained. You can create one or find an existing object in the database. Alternatively, you can use a custom microflow that returns an object. You can define how a Mendix object is obtained in the window depicted in Figure 2, which is shown after double-clicking a specific mapping element.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843943.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/mapping-entity.png" class="no-border" >}}
**Figure 2**
@@ -42,8 +42,6 @@ In each case, if the object is found or created, mapped attributes will be given
This is the action that the runtime will perform when an error occurred in the specified **Obtain Mendix Object** action.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/no-object-found.png" class="no-border" >}}
-
| Property | Description |
| --- | --- |
| **Create** | Create an object of the correct entity to map to and process as in **Create an object**, above. |
@@ -66,13 +64,13 @@ Be aware that lists are not stored ordered in the Mendix database. The XML schem
Each schema value in a selected XML or JSON schema object needs to be mapped to an attribute of an entity to be used in your app. If you don't want to map certain values, uncheck them in the **Select elements...** dialog box. Configuring how to map the attributes is done in the screen depicted in Figure 3, which is shown after double-clicking a specific mapping element.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843943.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/no-object-found.png" class="no-border" >}}
**Figure 3**
Having defined the mappings for the attributes, these mappings are also shown in the mapping document. When a specific attribute is selected, the schema element is also selected. This works the other way around too. An example of this is shown in Figure 4, where the **dati** attribute is selected in both the entity and the schema element (in this case, dati is mapped to dati).
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843944.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/schema-example.png" class="no-border" >}}
**Figure 4**
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/map-automatically.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/map-automatically.md
index 5dc643799fb..8a5f404a9af 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/map-automatically.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/map-automatically.md
@@ -7,11 +7,11 @@ url: /refguide10/map-automatically/
After you have selected a schema source for the mapping document, you need to connect it to entities, associations, and attributes. When you do not yet have suitable entities available in your domain model, creating new ones by hand can be difficult, especially in large mappings. The **Map automatically** button does the majority of the work for you. Based on the selected schema elements, it creates domain model entities and uses them in the mapping.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579457.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/domain-model-mapping.png" class="no-border" >}}
In the above picture, no entities are connected to the schema elements and the domain model in the module is empty. After clicking **Map automatically**, the situation is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579459.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/auto-map-example.png" class="no-border" >}}
The following actions will be applied:
@@ -21,13 +21,13 @@ The following actions will be applied:
A dialog is shown with the changes that have been applied to the domain model and mapping document (click **Details**"** to expand the dialog).
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579458.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/change-dialog.png" class="no-border" >}}
## Using Existing Entities, Attributes and Associations
If the domain model already contains entities that map to schema elements, they are reused in the mapping. By default, an entity with the same name of the schema type is used. New attributes may be added, or a generalization may be set if the entity did not already have one. New associations may be created as well if they do not yet exist. The result dialog reports if it reuses existing domain model elements:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579460.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/change-dialog-reuse.png" class="no-border" >}}
## Limitations
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/select--elements.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/select--elements.md
index 7ba3e79cf95..ad7d750994c 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/select--elements.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/select--elements.md
@@ -11,7 +11,7 @@ aliases:
For both [import](/refguide10/import-mappings/) and [export mappings](/refguide10/export-mappings/), you need to specify the elements structure you want to map. You do this in the **Select schema elements** window. An example of this screen is shown below:
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/select--elements/19399143.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/select--elements/schema-elements-window.png" class="no-border" >}}
Perform the following steps in the **Select schema elements** window:
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents.md
index d08ee861c4d..14ad724ec48 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents.md
@@ -29,30 +29,30 @@ Before starting this how-to, make sure you have completed the following prerequi
1. Create the following **Customer** entity in your domain model:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581816.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/customer-entity.png" class="no-border" >}}
2. Create overview and detail pages to manage the Customer objects.
3. Create a menu item to access the customer overview page.
4. Create the **XMLDocument** entity that inherits all the properties from *System.FileDocument*:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581650.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/xmldocument-entity.png" class="no-border" >}}
5. Create a reference set (multiplicity **[*-*]**) between XMLDocument and Customer:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581814.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/reference-set.png" class="no-border" >}}
## Adding an XML Schema (XSD)
-Whether you plan to import documents or export documents, working with XML means that your application must contain an XML schema (also called XSD). An XSD describes the possible contents of an XML file. Based on this XSD, your application knows how to read or write an XML file. If you don't have an XSD file, there are a couple of online XSD generators that accept an XML document as input. For this how-to, you can use [Customers.xsd](/attachments/refguide10/modeling/integration/export-xml-documents/18581813.xsd).
+Whether you plan to import documents or export documents, working with XML means that your application must contain an XML schema (also called XSD). An XSD describes the possible contents of an XML file. Based on this XSD, your application knows how to read or write an XML file. If you don't have an XSD file, there are a couple of online XSD generators that accept an XML document as input. For this how-to, you can use [Customers.xsd](/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/customer-schema.xsd).
1. Right-click your module in the **App Explorer** and select **Add other** > **XML schema**.
2. Enter *CustomersXSD* for the **Name** and click **OK**:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581696.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-schema.png" class="no-border" >}}
3. In the **XML Schema** editor, click **Select** for **XML Schema** and select the XSD file that you downloaded earlier:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581812.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/schema-editor.png" class="no-border" >}}
4. Click **OK** to save the XML Schema. We'll be using this schema in the following steps.
@@ -63,39 +63,39 @@ The XML schema describes what the contents of an XML document should be. We need
1. Right-click your module in the **App Explorer** and select **Add other** > **Export mapping**.
2. Enter *ExportCustomersMapping* for the **Name**:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581849.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-mapping.png" class="no-border" >}}
3. Click **OK**, and the **Select schema elements for export mapping** dialog box will automatically open. Now do the following:
1. For **Schema source**, select **XML schema**.
1. For the schema, select the previously added **CustomersXSD**.
1. In the **Schema elements** section of the dialog box, click the **Expand all** and **Check all** buttons. This automatically selects the **Customer** element and its child elements. Your screen should now look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581811.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/select-schema-elements.png" class="no-border" >}}
4. Click **OK**. You should now see the first part of the import mappings:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581810.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/im-part-1.png" class="no-border" >}}
5. Open the **Connector** pane and drag the **XMLDocument** entity from the **Connector** into the placeholder:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581809.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/connector-pane.png" class="no-border" >}}
The mapping editor for this element will pop up which can be closed by clicking **OK**.
6. Drag the **Customer** entity from the **Connector** into the placeholder:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581808.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/drag-entity.png" class="no-border" >}}
The mapping editor for this element will open up:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581806.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/mapping-editor.png" class="no-border" >}}
7. In the mapping editor, verify the following:
* **Method** is set to **By association**
* **Association to parent** is set to **XMLDocument_Customer**
8. Select attributes for all five **Attribute to value element mapping** instances (or click **Map attributes by name**). You should have the following mapping:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581807.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/select-attributes.png" class="no-border" >}}
9. Click **OK** to save the mapping.
@@ -107,19 +107,19 @@ To create the export logic, follow these steps:
1. Open the **Customer** overview page, right-click the toolbar of the data grid widget, and select **Add button** > **Action** to add a new Action button:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581804.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/add-action-button.png" class="no-border" >}}
2. Double-click the new button to open the properties editor and do the following:
* For **Caption**, enter *Export as XML*
* For **On click**, select **Call a microflow**
* In the **Select Microflow** dialog box, click **New** to create a new microflow and enter *Customers_Export* for its **Name**
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581803.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/action-button-editor.png" class="no-border" >}}
3. Click **OK** to save the button properties.
4. Right-click the new action button and click **Go to microflow** in the context menu. You should see an empty microflow with one input parameter:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581802.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/parameter.png" class="no-border" >}}
5. Select the input parameter and delete it.
6. Open the **Toolbox**, which should be on the lower-right side of Studio Pro (you can also open it from the **View** menu).
@@ -128,33 +128,33 @@ To create the export logic, follow these steps:
* For **Source**, select **From database**
* For **Entity**, click **Select...** and select the customer entity
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581830.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/retrieve-objects.png" class="no-border" >}}
9. Click **OK**. The microflow should now look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581827.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/microflow.png" class="no-border" >}}
10. Drag a **Create object** activity from the **Toolbox** to the line between the start event and end event.
11. Double-click the activity to open the **Create Object** editor and do the following:
* For **Entity**, select **XMLDocument**
* Click **New** to add a change item
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581801.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/create-object-editor.png" class="no-border" >}}
12. In the **Edit Change Item** editor, do the following:
* For the **Member**, for the change item, select the **XMLDocument_Customer** reference:
* For the **Value**, enter `$CustomerList`
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581825.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/edit-changed-item.png" class="no-border" >}}
13. Click **OK** to save the change item.
14. Create a change item to set the **Name** attribute to *'customers.xml'* (including the single quotation marks [']). The **Create Object** dialog box should now look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/create-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/create-object.png" class="no-border" >}}
15. Click **OK** to save the action properties. The microflow should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581823.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/microflow-final.png" class="no-border" >}}
16. Drag an **Export with mapping** activity from the **Toolbox** to the line between the start event and end event. This inserts a new export XML activity.
17. Double-click the new activity to open the properties editor and do the following:
@@ -163,20 +163,20 @@ To create the export logic, follow these steps:
* For the **Parameter**, select the created **NewXMLDocument**
* For the output **Name**, select the created **NewXMLDocument**
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581822.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/export-with-mapping-dialog.png" class="no-border" >}}
18. Click **OK** to save the properties. The microflow should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581821.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/save-microflow.png" class="no-border" >}}
19. Drag a **Download file** activity from the **Toolbox** to the line between the start event and end event.
20. Double-click the activity to open the **Download File** dialog box and select **NewXMLDocument** as the **File document**:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581818.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/download-file.png" class="no-border" >}}
21. Click **OK**. The microflow should now look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581819.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/edited-microflow.png" class="no-border" >}}
22. Deploy the application and open the customer overview page.
23. Click the **Export as XML** button and download the generated XML document.
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents.md
index 86ce23da316..8b63f282918 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents.md
@@ -34,31 +34,31 @@ To prepare the data structure and the GUI, follow these steps:
1. Create the following **Customer** entity in your domain model:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581649.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customer-entity.png" class="no-border" >}}
2. Create the overview and detail pages to manage objects of the **Customer** type.
3. Create a menu item to access the customer overview page.
4. Create an entity called *XMLDocument* that inherits all the properties from **System.FileDocument**:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581650.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/xmldocument-entity.png" class="no-border" >}}
5. Create the overview and detail pages to manage objects of the **XMLDocument** type.
6. Create a menu item to access the XML document overview page (for more information, see [Setting Up Navigation](/refguide10/setting-up-the-navigation-structure/)).
## Adding an XML Schema (XSD)
-Whether you plan to import or export documents, working with XML means your application must contain an XML schema, which is also called an XSD. An XSD describes the possible contents of an XML file. Based on the XSD, your application knows how to read or write an XML file. If you don't have an XSD file, there are some online XSD generators that accept an XML document as input. For this how-to, you can use [Customers.xsd](/attachments/refguide10/modeling/integration/importing-xml-documents/18581652.xsd).
+Whether you plan to import or export documents, working with XML means your application must contain an XML schema, which is also called an XSD. An XSD describes the possible contents of an XML file. Based on the XSD, your application knows how to read or write an XML file. If you don't have an XSD file, there are some online XSD generators that accept an XML document as input. For this how-to, you can use [Customers.xsd](/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customers-xml.xml).
To add an XML schema (XSD), follow these steps:
1. Right-click a module in the **App Explorer** and select **Add Other** > **XML schema** from the menu.
2. Enter *CustomersXSD* as the **Name** and click **OK**:
- {{< figure src="/attachments/refguide10/modeling/integration/export-xml-documents/18581696.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-schema.png" class="no-border" >}}
3. In the **XML Schema** editor, click **Select** and select the XSD file that you downloaded earlier:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581657.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/select-schema.png" class="no-border" >}}
4. Click **OK** to save the XML schema, which you will be using in the following steps.
@@ -71,25 +71,25 @@ To create the XML-to-domain mapping, follow these steps:
1. Right-click a module in the **App Explorer** and select **Add Other** > **Import mapping**.
2. Enter *ImportCustomersMapping* as the **Name** and click **OK**. The new mapping will open automatically and the elements will be shown.
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581689.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/name-import-mapping.png" class="no-border" >}}
3. On the **Select schema elements** dialog box, make sure **XML schema** is selected as the **Schema source**, and select **CustomerXSD** as the schema. Then, click **Expand all** to see the tree with elements.
4. Select the following elements: **Customer**, **ID**, **CompanyName**, **Address**, **City**, and **PostalCode**:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581656.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/select-elements.png" class="no-border" >}}
5. Click **OK**. The first part of the import mapping should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581655.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/im-example.png" class="no-border" >}}
6. Open the connector (from the lower-right side of Studio Pro or from the **View** menu).
7. Drag the entity **Customer** from the connector into the placeholder in the mapping editor:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581681.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/drag-entity.png" class="no-border" >}}
The **Map entity** editor for this element will open automatically:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581654.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/map-entity-editor.png" class="no-border" >}}
8. In the **Map entity** editor, do the following:
* Select **Find an object (by key)** for the **Method** (to be able to search for an object, you need to define one or more keys in the value-to-attribute mappings)
@@ -97,34 +97,34 @@ To create the XML-to-domain mapping, follow these steps:
* Select attributes for all five value-to-attribute mappings
* Set **CustomerID** as the **Key**
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581653.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/editor-filled.png" class="no-border" >}}
9. Click **OK** to save the mapping.
## Creating the Import Logic
-In this section, you will create the logic to import the customers stored in an [XML document](/attachments/refguide10/modeling/integration/importing-xml-documents/18581651.xml) in your application.
+In this section, you will create the logic to import the customers stored in an [XML document](/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customers-xml.xml) in your application.
To create the import logic, follow these steps:
1. Open the **XMLDocument** overview page. It should look this, using a default layout:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581648.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/xml-overview-page.png" class="no-border" >}}
2. Right-click the toolbar of the data grid widget and select **Add button** > **Action** to add a new action button:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581647.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/add-action.png" class="no-border" >}}
3. Double-click the new button to open the **Edit Action Button** editor and do the following:
1. Change the caption to *Import XML Document*
2. For the **On click** event, select **Call a microflow**, then click **Select** for the microflow, create a new microflow, and name it *XMLDocument_Import*.
3. Click **OK** to save the properties.
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581646.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/edit-action-button-editor.png" class="no-border" >}}
4. Right-click the new **Import XML Document** button and select **Go to on click microflow** in the context menu. You should see an empty microflow with **XMLDocument** as the input parameter:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581669.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/import-parameter.png" class="no-border" >}}
5. Open the **Toolbox** and drag an **Import with mapping** activity to the line between the start and end event. This inserts a new import XML activity.
6. Double-click the new activity to open the **Import With Mapping** dialog box and do the following:
@@ -132,17 +132,17 @@ To create the import logic, follow these steps:
2. Select the previously created XML-to-domain mapping **ImportCustomersMapping** as the mapping.
3. Click **OK** to save the properties.
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581668.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/im-properties.png" class="no-border" >}}
The microflow should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/importing-xml-documents/18581667.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/microflow-example.png" class="no-border" >}}
## Importing an XML File
To import the XML file, follow these steps:
-1. Deploy the application, upload [Customers.xml](/attachments/refguide10/modeling/integration/importing-xml-documents/18581651.xml), and trigger the import microflow.
+1. Deploy the application, upload [Customers.xml](/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/sample-xsd.xsd), and trigger the import microflow.
2. Open the customer overview page and check if the customer data has been imported into your application.
## Read More
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice.md
index ba9bbdb9595..ea03e51a084 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice.md
@@ -19,7 +19,7 @@ In Mendix, both inheritance and choice are mapped by entity specialization.
In the image below, an example of an Export Mapping with inheritance is shown. For Import Mappings, the structure is the same, only the direction of the arrows is reversed. One Persons object has a one-to-many association to Person. The person can be either a Customer or Employee.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-inheritance-and-choice/16843946.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice/inheritance.png" class="no-border" >}}
For Import Mappings, mapping the incoming XML to a specific XSD type is defined by the attribute *xsi:type*. However, this attribute is optional. When the *xsi:type* attribute is not present and the base type of the element is not abstract, that type will be used (in the example, that is Person). If the base type does not have a mapping defined in the import mapping document, it will be skipped. When the base type is abstract, an error will be thrown.
@@ -35,6 +35,6 @@ When the root element is an inheritance element, you can only maps the entire bo
The image below shows an Export Mapping with a choice element. The schema specifies a choice with two alternatives: an employee id or member ID. In this image, a base entity Person is mapped to the choice element to serve as a generalization for the choice options.
-{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-inheritance-and-choice/16843945.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice/choice.png" class="no-border" >}}
For exporting objects, optionality on choice elements is handled differently than for other elements because they do not explicitly occur in XML. There are two cases in which it is valid to export an empty object for a choice element: first, when the choice element itself is **Optional** and second, when at least one of the choice options is **Optional**. In these cases, no element will be created, otherwise an error is thrown. When one or more options of a choice element are **Nillable** and at the choice element you export an empty object, Mendix throws an **Unsupported** error because it is impossible to determine which XML element should be sent with the *xsi:nil* attribute.
diff --git a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-schemas.md b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-schemas.md
index 06fb685fd40..c062e5274c3 100644
--- a/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-schemas.md
+++ b/content/en/docs/refguide10/modeling/integration/mapping-documents/xml-documents/xml-schemas.md
@@ -8,7 +8,7 @@ weight: 15
An XML schema is defined in an XML Schema Definition (XSD) file and can be imported in your model. It describes what a certain XML document should look like. The schema can then be used in [Import Mappings](/refguide10/import-mappings/) and [Export Mappings](/refguide10/export-mappings/).
-{{< figure src="/attachments/refguide10/modeling/integration/xml-schemas/18582294.png" alt="Figure 1" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-schemas/schema.png" alt="Figure 1" class="no-border" >}}
## XSD File Support
@@ -33,7 +33,7 @@ In the mapping editor for import mappings, you can check elements that can occur
### XSD Constraints
-* If the XSD contains any of the unsupported constructs, they will be highlighted in the mapping editor with this warning icon: {{< figure src="/attachments/refguide10/modeling/integration/xml-schemas/xml-schema-support/16843903.png" class="no-border" >}}
+* If the XSD contains any of the unsupported constructs, they will be highlighted in the mapping editor with this warning icon: {{< figure src="/attachments/refguide10/modeling/integration/mapping-documents/xml-schemas/warning.png" class="no-border" >}}
* This will be next to each unsupported element or attribute. Checking any of such elements or attributes will result in consistency errors.
diff --git a/content/en/docs/refguide10/modeling/integration/odata-services/build-odata-apis.md b/content/en/docs/refguide10/modeling/integration/odata-services/build-odata-apis.md
index b478c3f8165..f1636f62561 100644
--- a/content/en/docs/refguide10/modeling/integration/odata-services/build-odata-apis.md
+++ b/content/en/docs/refguide10/modeling/integration/odata-services/build-odata-apis.md
@@ -30,7 +30,7 @@ REST API best practices usually include some of the following:
This document uses the following domain model as an example:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/example-domain-model.png" width="500" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/example-domain-model.png" width="500" class="no-border" >}}
REST APIs, and especially OData APIs, often provide access to data within the app. Mendix OData APIs are excellent for providing APIs for entities, but can also be used for accessing other types of data. For more information, see the [API-First](#api-first) section to learn about decoupling APIs from the domain model.
@@ -42,7 +42,7 @@ Create OData APIs by right-clicking on an entity > **Publish in OData service**
In the [published OData service](/refguide10/published-odata-services/) document, select which attributes and associations are available in the API:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/select-attributes-associations.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/select-attributes-associations.png" class="no-border" >}}
For every published entity, you can define what functionality is available:
@@ -57,19 +57,19 @@ You can also define other capabilities, such as if you can count results (using
When you start your app, you see the Swagger UI documentation and test page:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/swagger-doc.png" width="400" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/swagger-doc.png" width="400" class="no-border" >}}
The test page lists all accepted parameters and example payloads for regular responses and error payloads:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/test-page.png" width="500" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/test-page.png" width="500" class="no-border" >}}
It provides a JSON schema of all the payload types:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/json-schema.png" width="400" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/json-schema.png" width="400" class="no-border" >}}
And it provides an OpenAPI 3.0.1 contract:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/openapi-contract.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/openapi-contract.png" class="no-border" >}}
## Retrieving Data {#retrieving-data}
@@ -85,7 +85,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/fetch-all-customers.png" width="400" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/fetch-all-customers.png" width="400" class="no-border" >}}
### Getting a Resource by Identifier
@@ -97,7 +97,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers(1)
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/fetch-single-customer.png" width="500" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/fetch-single-customer.png" width="500" class="no-border" >}}
OData also supports using multi-field IDs by providing the required attributes as a key value list between the brackets.
@@ -124,7 +124,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers?$filter=contains(Lastna
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/filter-sort-page-attribute.png" width="500" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/filter-sort-page-attribute.png" width="500" class="no-border" >}}
Alternatively, you can specify the query in the payload of a `POST` call, which is useful if you have a long complex query.
@@ -151,7 +151,7 @@ POST http://localhost:8080/odata/CustomerApi/v1/Customers
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/insert-new-data.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/insert-new-data.png" class="no-border" >}}
The following `GET` request uses the returned location header to query the new resource at its endpoint:
@@ -161,7 +161,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers(5)
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/query-resource-endpoint.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/query-resource-endpoint.png" class="no-border" >}}
#### Using a Prefer Header
@@ -183,7 +183,7 @@ Prefer: return=representation
The following is the response:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/prefer-header.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/prefer-header.png" class="no-border" >}}
#### Creating Resources with Associations
@@ -207,7 +207,7 @@ Prefer: return=representation
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/create-resources-associations.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/create-resources-associations.png" class="no-border" >}}
### Modifying Existing Data
@@ -225,7 +225,7 @@ PATCH http://localhost:8080/odata/CustomerApi/v1/Customers(5)
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/modify-existing-data-1.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/modify-existing-data-1.png" class="no-border" >}}
And a subsequent `GET` request:
@@ -235,7 +235,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers(5)
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/modify-existing-data-2.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/modify-existing-data-2.png" class="no-border" >}}
[Validation rules](#validation-rules) defined on the entity will be respected automatically. You can use a [validation microflow](#validation-microflows) if you want to enrich the default behavior, including adding additional validations.
@@ -243,7 +243,7 @@ The response is as follows:
When changing data with `POST`, `PUT`, or `DELETE`, validation rules specified on the underlying entities are applied automatically. A failed validation rule will result in a HTTP status code 422. The error message will be included in the response payload:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/validation-rules.png" width="400" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-rules.png" width="400" class="no-border" >}}
The validation rules on **Customer** show that both `Firstname` and `Lastname` are mandatory. When you try to create a new customer without a last name, this will fail with status code 422, and the error message as defined in the validation rule will be returned in the response. See the following `POST` request:
@@ -259,7 +259,7 @@ POST http://localhost:8080/odata/CustomerApi/v1/Customers
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/error-422.png" width="350" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/error-422.png" width="350" class="no-border" >}}
#### Validation Microflows {#validation-microflows}
@@ -267,17 +267,17 @@ You can generate and reuse generated validation microflows. The following exampl
1. On a save button, right-click and select **Generate validation microflow**. The resulting validation microflow looks like this:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/validation-microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-microflow.png" class="no-border" >}}
2. Use the **Show validation message** activity to set the errors to be shown in the UI in this generated validation microflow. This microflow will be called in the insert microflow displayed below.
3. Specify that you want to use a microflow to insert a new **Customer** resource via the OData API. This microflow will be called when you do a `POST` operation on the endpoint of the resource:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/specify-use-microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/specify-use-microflow.png" class="no-border" >}}
4. In the insert microflow, call the generated validation microflow and commit the object if the validation succeeds:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/insert-microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/insert-microflow.png" class="no-border" >}}
If validation fails, the show validation message texts are provided automatically in the response payload. See the following `POST` request:
@@ -294,7 +294,7 @@ You can generate and reuse generated validation microflows. The following exampl
The response is as follows:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/validation-response-payload.png" width="300" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-response-payload.png" width="300" class="no-border" >}}
### Deleting Data
@@ -316,7 +316,7 @@ DELETE http://localhost:8080/odata/CustomerApi/v1/Customers(5)
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/standard-error-codes.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/standard-error-codes.png" class="no-border" >}}
## Performance
@@ -330,7 +330,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers(1)?$expand=Addresses,No
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/expand-expression.png" width="300" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/expand-expression.png" width="300" class="no-border" >}}
You can use `select` and `expand` in combination with `filter`, `orderby`, `top`, and `skip`. For more information, see the [Filtering, Sorting, Paginating, and Selecting Data](#filter-sort-page-select-data) section below.
@@ -345,7 +345,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/Customers
&$top=1
```
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/sort-top-skip.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/sort-top-skip.png" class="no-border" >}}
For long queries, place the query in the request body. You can do this by using `POST` and adding `$query` to the endpoint. See the following `POST` request:
@@ -356,7 +356,7 @@ Content-Type: text/plain
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/long-queries.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/long-queries.png" class="no-border" >}}
This result is very similar to using GraphQL, where you can query a graph of objects and limit the attributes returned to only those that you need.
@@ -383,23 +383,23 @@ Refer to the [example domain model](#starting-domain-model) for this section.
In this example, you can publish a single REST resource that combines data from the **Customer** entity and the **Address** entity. It will join data from both entities and combine the **Firstname** and **Lastname** attributes into a single attribute, **Fullname**. Provide the home address information and exclude other address types:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/expose-single-resource-domain-model.png" width="300" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/expose-single-resource-domain-model.png" width="300" class="no-border" >}}
1. Add the **CustomerHomeAddress** entity as a resource to the OData service:
2. Use an OQL dataset to define the query to fetch this information from your entities:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/oql-database.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/oql-database.png" class="no-border" >}}
3. Define a microflow that will fetch the correct data when a user does a `GET` on the **CustomerHomeAddress** resource:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/get-microflow.png" width="400" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-microflow.png" width="400" class="no-border" >}}
The microflow uses a Java action to translate the OData query to an OQL expression using the OQL Dataset as the base query. This ensures that filtering, sorting, and paging work as expected.
{{% alert color="info" %}}This action can be built using custom Java actions. This action will be updated in the second half of 2024.{{% /alert %}}
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/translate-to-odl-expression.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/translate-to-odl-expression.png" class="no-border" >}}
4. Do a REST `GET` call and define which attributes you need, how you want it sorted, and how many objects you need:
@@ -409,17 +409,17 @@ In this example, you can publish a single REST resource that combines data from
The response is as follows:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/get-call.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-call.png" class="no-border" >}}
5. You have decoupled your REST resource from your domain model persistable entities. You can change your entities and use the OQL query to ensure the published data remains backwards compatible.
The Java action used above adds the OData query to the original OQL query as follows:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/view-log-line-details.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/view-log-line-details.png" class="no-border" >}}
With some formatting, it can be more readable. The original OQL query is used as a subquery (inline view) for the OData query. All the expressions will be pushed down into the database and benefit from the performance of the database optimizer:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/subquery.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/subquery.png" class="no-border" >}}
### Defining Logic in an Insert Microflow
@@ -431,11 +431,11 @@ This example shows a **CustomerEmailRequest** entity that a client can create us
1. The API will execute the logic to send the customer an email when this resource is created:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/create-customer-email-request-entity.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/create-customer-email-request-entity.png" class="no-border" >}}
2. Define the logic as the insert (`POST`) action:
- {{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/define-insert-action.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/define-insert-action.png" class="no-border" >}}
### Running Operations Asynchronously
@@ -443,7 +443,7 @@ Consider running operations that take longer to complete [asynchronously](https:
The last activity of the insert microflow calls the SendCustomerEmail microflow using the task queue:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/task-queue.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/task-queue.png" class="no-border" >}}
The `POST` response provides the location where the client can retrieve request status. See the following `POST` request:
@@ -459,7 +459,7 @@ POST http://localhost:8080/odata/CustomerApi/v1/CustomerEmailRequests
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/call-send-email-logic.png" width="300" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/call-send-email-logic.png" width="300" class="no-border" >}}
When you `GET` the resource from the location provided, the status has the value **Sent**, indicating that the logic has completed. See the following `GET` request:
@@ -469,7 +469,7 @@ GET http://localhost:8080/odata/CustomerApi/v1/CustomerEmailRequests(12)
The response is as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/get-resource-sent.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-resource-sent.png" class="no-border" >}}
## Versioning {#versioning}
@@ -479,7 +479,7 @@ With OData, similar to REST APIs in Studio Pro, you have full control over how y
If you need to introduce breaking changes, duplicate the entire OData service and change the major version:
-{{< figure src="/attachments/refguide10/modeling/integration/build-odata-apis/versioning.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/versioning.png" class="no-border" >}}
This approach ensures customer applications can migrate at their own pace because you will have the old version and the new major version of the API in your application. Once all customer applications have migrated, you can remove the old API from your application.
diff --git a/content/en/docs/refguide10/modeling/integration/odata-services/consumed-odata-services/consumed-odata-service.md b/content/en/docs/refguide10/modeling/integration/odata-services/consumed-odata-services/consumed-odata-service.md
index b12a6523289..4adbe3529ef 100644
--- a/content/en/docs/refguide10/modeling/integration/odata-services/consumed-odata-services/consumed-odata-service.md
+++ b/content/en/docs/refguide10/modeling/integration/odata-services/consumed-odata-services/consumed-odata-service.md
@@ -17,7 +17,7 @@ You can create a consumed OData service and specify its metadata in a file or a
The **Consumed OData Service** document contains the following information:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/consumed-odata-service-screen.png" alt="Connection Tab" width="850" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/consumed-odata-service-screen.png" alt="Connection Tab" width="850" class="no-border" >}}
* Service name and icon for the source application of the originating app
* Version number of the consumed service
@@ -68,7 +68,7 @@ The **Service URL** displays constant that specifies the URL of the service endp
* Click **Select** to choose another [constant](/refguide10/constants/) for the service
* Click **Show** to open the **Constant** dialog box displaying the service URL or endpoint:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/service-url.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/service-url.png" class="no-border" >}}
### Timeout
@@ -123,7 +123,7 @@ When you create a consumed OData service, the metadata editor allows you to open
To open the **Metadata Editor**, click **Update**. In the editor, you can specify a URL or file for the metadata:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/update-metadata.png" alt="Metadata Editor" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/update-metadata.png" alt="Metadata Editor" class="no-border" >}}
The following settings are available:
@@ -145,7 +145,7 @@ When you import the metadata, you can add external entities and actions from the
Click the **Properties** tab for the consumed OData service which displays the properties that were defined for the OData service document and the following additional properties:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/properties-tab.png" width="300" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/properties-tab.png" width="300" class="no-border" >}}
* **Entities** – the URL of the metadata defining the entities and associated datasets
* **Documentation** – an additional description about this service for the current app
@@ -170,7 +170,7 @@ When you add an external entity to your app, you are consuming the entity from a
The same service deployed to a different environment will be to a different service endpoint and registered as a different asset in the Catalog. In the following example, there are three endpoints for the **Sales 3.0.0** service, which is deployed to the production environment and the **Acceptance** and **Test** environments:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/consuming-from-service-endpoints.png" alt="2 endpoints" width="350" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/consuming-from-service-endpoints.png" alt="2 endpoints" width="350" class="no-border" >}}
When you drag the **Users** entity from **Sales version 3.0.0** deployed to the **Acceptance** environment into your app, Studio Pro retrieves the information it requires from the contract that is at that endpoint.
@@ -196,7 +196,7 @@ When a major change has been made to a published service, Mendix recommends the
In this case, the new service should be registered in the Catalog as a different service and show up as a separate asset. In the following example, there are two registered occurrences of the **BikeSubscriptionService**:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/major-service-updates.png" alt="4 endpoints" width="300" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/major-service-updates.png" alt="4 endpoints" width="300" class="no-border" >}}
There is a major service update indicated by the change in the version number from **1.4.0** to **2.0.0**.
@@ -228,7 +228,7 @@ In the [Integration pane](/refguide10/integration-pane/), search results, and in
When you click **Update** on the **Consumed OData Service** document or the update icon in the **Integration pane**, the **Update** dialog box is displayed.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/update-dialog-box.png" width="700" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/update-dialog-box.png" width="700" class="no-border" >}}
The consumed OData service that is currently consumed in the app (**1.2.0**) is shown on the left. Click **Update** to retrieve the new contract from the Catalog (**1.4.0**).
@@ -244,21 +244,21 @@ A published OData service that is deployed to multiple environments or is publis
In the following example, the consumed **SalesOrders** service version **1.0.0** deployed to **Acceptance** environment is consumed in the app. However, the same service is deployed to the **Production** environment:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/switching-consumed-services.png" alt="major change environment" class="no-border" width="300" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/switching-consumed-services.png" alt="major change environment" class="no-border" width="300" >}}
To consume the service deployed to the **Acceptance environment**, follow these steps:
1. Click **Update** > **Switch** on the **Consumed OData Service** document:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/salesorders-header.png" alt="major change environment" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/salesorders-header.png" alt="major change environment" class="no-border" >}}
2. On the **Switch** dialog box, from the drop-down list, select the service you want to consume from and click **Switch**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/switch-dialog-box.png" alt="major change environment" width="700" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/switch-dialog-box.png" alt="major change environment" width="700" class="no-border" >}}
3. The consumed service is be consumed from the new selected environment. The information on the **Consumed OData Service** document displays the changed service details and the [Integration pane](/refguide10/integration-pane/) will display that you are consuming from the selected environment:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/integration-pane-2.png" width="350" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/integration-pane-2.png" width="350" class="no-border" >}}
## Read More
diff --git a/content/en/docs/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata.md b/content/en/docs/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata.md
index 1a950f3bd6c..a5cf27f5c0e 100644
--- a/content/en/docs/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata.md
+++ b/content/en/docs/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata.md
@@ -68,7 +68,7 @@ In this section, we will outline the steps for adding more than one published en
Imagine you have an app that helps with asset management. You have a Published OData Service with persistable entities called **SmartTask** and **Employee** that expose information. The domain model looks like this:
-{{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/asset-manager-domain-model.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/asset-manager-domain-model.png" class="no-border" >}}
To visualize data from your app in Tableau, follow these steps:
@@ -76,7 +76,7 @@ To visualize data from your app in Tableau, follow these steps:
2. Return to Studio Pro and double-click the published OData service. Copy the link in the **Location** field to the clipboard.
3. On the **Server Connection** dialog box, enter the copied OData service **Location** link for the **Server** address:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582020.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582020.png" class="no-border" >}}
Include authentication credentials if you set them up.
@@ -85,7 +85,7 @@ To visualize data from your app in Tableau, follow these steps:
6. Click **Data** > **New Data Source** and repeat steps 1–5 to add a server connection for other published OData services.
7. Open **Sheet1**. Under **Data**, click the first entity and drag a desired entity **Attribute** from **Measures** to **Dimensions**. In this case, click **Engineers** and drag **ID** from **Measures** to **Dimensions**:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582012.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582012.png" class="no-border" >}}
8. Similarly, click and drag an attribute from the second entity from **Measures** to **Dimensions**. In this case, click **SmartTasks** and drag **SmartTask_Engineer** from **Measures** to **Dimensions**.
9. Go to **Data** > **Edit Relationships...** to define the relationship between the different data sources.
@@ -96,25 +96,25 @@ To visualize data from your app in Tableau, follow these steps:
4. Remove any default mappings.
5. Click **Add...** to configure a field mapping.
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582013.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582013.png" class="no-border" >}}
11. In the **Add/Edit Field Mapping** window, select the attribute for the first entity for the **Primary data source field** and **Entity1_Entity2** for the **Secondary data source field**, then click **OK** to save the field mapping. In this case, select **ID** for the **Primary data source field** and **SmartTask_Engineer** for the **Secondary data source field**:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582011.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582011.png" class="no-border" >}}
12. In the **Relationships** window, click **OK** to save the relationships:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582007.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582007.png" class="no-border" >}}
13. Select the second entity for the data source (in this case, **Engineers**) and drag the **Name** attribute from the **Dimensions** section to **Rows**:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582006.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582006.png" class="no-border" >}}
14. Select your first published entity (in this case, **SmartTasks**) for the data source and do the following:
1. Click the **SmartTask_Engineer** attribute to use it as the linking field.
2. Drag **Number of Records** from the **Measures** section to **Columns**.
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582005.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582005.png" class="no-border" >}}
You should now see a bar chart of the data.
@@ -128,12 +128,12 @@ To filter data with query parameters, follow these steps:
2. Click the OData URL to change the connection settings.
3. Add `?$top=2` to the server URL (in order to only retrieve the first two values) and click **Sign In**:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18581998.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18581998.png" class="no-border" >}}
4. On the warning indicating that the data being used was refreshed, click **OK**.
5. Open **Sheet1** and drag **Name** to **Rows** again. Now you should now see a bar chart with only the data of the two engineers:
- {{< figure src="/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18581997.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18581997.png" class="no-border" >}}
6. You can combine filters by using the `&` character. Repeat steps 1–4, but now use `http://localhost:8080/odata/Expenses/Expenses?$skip=1` as the server URL. You should now see a bar chart showing the data of 2 and 3.
diff --git a/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-attribute.md b/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-attribute.md
index 40c7c2982e3..e84117d83df 100644
--- a/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-attribute.md
+++ b/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-attribute.md
@@ -9,7 +9,7 @@ weight: 30
The **Edit published attribute** dialog allows you to edit the properties of an attribute published in an OData/GraphQL service.
-{{< figure src="/attachments/refguide10/modeling/integration/published-odata-attribute/edit-published-attribute.png" alt="Edit published attribute dialog box." class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/published-odata-attribute/edit-published-attribute.png" alt="Edit published attribute dialog box." class="no-border" >}}
## General
diff --git a/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-microflow.md b/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-microflow.md
index 8c5cc53bda0..2651647c405 100644
--- a/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-microflow.md
+++ b/content/en/docs/refguide10/modeling/integration/odata-services/published-odata-services/published-odata-microflow.md
@@ -17,7 +17,7 @@ As of Mendix 10.2.0, Studio Pro allows you to publish microflows as part of an O
Open your [published OData service](/refguide10/published-odata-services/) or create a new one.
-{{< figure src="/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/microflows-grid.png" alt="Published microflows" width="600" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/microflows-grid.png" alt="Published microflows" width="600" class="no-border" >}}
In the **Microflows** tab of the published OData service, click **Add**. This opens a selector dialog box where you can select the microflow you want to publish. You can also click **New** to create a new microflow.
@@ -58,7 +58,7 @@ This shows the return type of the published microflow.
When you publish a microflow for the first time, the current microflow parameters are added to the **Parameters for microflow** grid of the published microflow.
-{{< figure src="/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/parameters-grid.png" alt="published microflow parameters" width="600" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/parameters-grid.png" alt="published microflow parameters" width="600" class="no-border" >}}
You can **Add** or **Delete** parameters from the published microflow.
@@ -68,7 +68,7 @@ To edit a published parameter, either select the parameter and click **Edit** or
You can also select **Can be empty**. If this checkbox is cleared, calls to the published microflow will fail unless the parameter is provided.
-{{< figure src="/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/published-parameter.png" alt="Published microflow parameter" width="700" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/published-parameter.png" alt="Published microflow parameter" width="700" class="no-border" >}}
{{% alert color="info" %}}
Boolean and list parameters can never be empty.
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/consumed-rest-service.md b/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/consumed-rest-service.md
index 404626fc2fc..2fe4cf53e53 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/consumed-rest-service.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/consumed-rest-service.md
@@ -48,7 +48,7 @@ Download [Studio Pro](https://marketplace.mendix.com/link/studiopro/) and add th
1. Right-click the module you want to add the Consumed REST Service document to.
2. Select **Add other** > **Consumed REST service**.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/add-consumed-rest-service.png" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-consumed-rest-service.png" width="500" class="no-border" >}}
3. Name the service.
4. Under **Add request(s)**, choose whether you want to add your request **Manually**, or **From OpenAPI/Swagger contract**.
@@ -76,19 +76,19 @@ Create a `GET`, `POST`, `PUT`, `PATCH`, or `DELETE` request to send data to your
1. In the **Method & URL** field, use the drop-down to select the HTTP method you want to use.
2. Add an endpoint and click **Send**.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/general-section.png" class="no-border" width="500" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/general-section.png" class="no-border" width="500" >}}
3. Click **Base URL**.
4. Add a base URL to use the same URL across all requests in this consumed REST Service document.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/base-url.png" class="no-border" width="500" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/base-url.png" class="no-border" width="500" >}}
To make the base URL dynamic, see the [Dynamic Base URL](#dynamic-base-url) section below.
5. Click **Authentication**.
6. Select an authentication method, then click **OK**. For more information, see [Authentication methods](#authentication).
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/configuration-screen.png" width="500" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/configuration-screen.png" width="500" >}}
7. Click **Send**.
@@ -100,11 +100,11 @@ To add more requests from your existing contract, do the following:
1. In the **Request** field, click **Add Request**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/add-request-button.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-request-button.png" class="no-border" >}}
2. In the **Add Request(s)** dialog box, select the additional requests you want to add to the document, then click **Add**.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/add-request.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-request.png" class="no-border" >}}
To create a new blank request, click **New** in the **Add Request(s)** dialog box.
@@ -115,7 +115,7 @@ You can configure basic authentication to use for all requests in your document.
1. Click **Authentication**.
2. In the **Authentication method** field, click the drop-down and select **Basic authentication**.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/authentication-setup.png" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/authentication-setup.png" >}}
3. Select a constant or create a new one for your username and password. To create a new constant, follow these steps:
1. Next to **Username** or **Password**, click **Select** > **New**.
@@ -132,14 +132,14 @@ Parameters are not supported in the Authentication section.
Parameters are fully supported in the path and query part of the URL, in the header value, and in the body. They are defined within curly brackets. For example, in the URL, defining `number` as parameter would be `http://numbersapi.com/{number}`. The parameters that are configured for the URL, headers, or body within curly brackets are automatically added to the parameters grid.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/get-header.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/get-header.png" class="no-border" >}}
You can manually add new parameters to the parameters grid directly. To do so, follow these steps:
1. Open the **Parameters** tab and click **Add parameter**.
2. Name your parameter and add a test value.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/adding-parameters.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/adding-parameters.png" class="no-border" width="600" >}}
3. To test the parameters, click **Send**.
@@ -151,7 +151,7 @@ You can add a Base URL as a parameter. To do this, follow these steps:
2. In the Dynamic field, select **Yes**.
3. Click **OK**
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/dynamic-base-url.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/dynamic-base-url.png" class="no-border" width="600" >}}
Your base URL is now considered as a parameter. You can change its value in the [Send REST Request](/refguide10/send-rest-request/) microflow activity.
@@ -161,7 +161,7 @@ You can add a header for any HTTP request you have specified in your document. T
1. Open the **Headers** tab and click **Add header**.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/header-example.png" class="no-border" width="300" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/header-example.png" class="no-border" width="300" >}}
2. In the **Key** field, click the drop-down and choose from the list of the most commonly used HTTP headers. You can also create a custom header by typing directly in the key field and adding a value in the **Value** field.
@@ -169,7 +169,7 @@ You can add a header for any HTTP request you have specified in your document. T
You can also add a parameter as the test value of a header, as seen below. For example, you can define an Authorization header where the authentication token is dynamic.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/parameters-for-header.png" class="no-border" width="300" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/parameters-for-header.png" class="no-border" width="300" >}}
### Adding a Request Body (for POST, PUT, and PATCH requests only) {#add-a-request-body}
@@ -179,13 +179,13 @@ You can also add a parameter as the test value of a header, as seen below. For e
If the request body content is static, paste the text into the **Body** tab. This text will be included as the body content when you send the request.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/json-example.png" class="no-border" width="300" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/json-example.png" class="no-border" width="300" >}}
#### Adding a Request Body Using Parameters
When the text in the Body tab contains a parameter name surrounded by curly braces, it is interpreted as a parameter. These parameters can be used to change the body content dynamically.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/body-structure-example.png" class="no-border" width="500" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/body-structure-example.png" class="no-border" width="500" >}}
For example, if your body content is `product_curr={currency}&product_price={price}`, the parameters `currency` and `price` can be used to change the body content.
@@ -201,7 +201,7 @@ Create body entities from a JSON snippet to your request by doing the following:
3. If you want to use the newly-created JSON string as an entity in your domain model, click **Use JSON Snippet**. The body string can be viewed in the **Body structure** tab.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/body-structure-tab.png" class="no-border" width="400" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/body-structure-tab.png" class="no-border" width="400" >}}
The entity name is prefilled, but you can change it to a custom name.
@@ -211,13 +211,13 @@ Create body entities from a JSON snippet to your request by doing the following:
You can check the response of your request in the **Response data** tab.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/response-tab.png" class="no-border" width="500" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-tab.png" class="no-border" width="500" >}}
#### Response is in JSON Format {#create-entity}
If the response is in JSON format and you want to use the response to create an entity, open the **Response structure** tab, which displays a preview of the response data:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/response-structure-tab.png" class="no-border" width="500" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-structure-tab.png" class="no-border" width="500" >}}
The entity name is prefilled, but you can change it to a custom name. To create an entity, do the following:
@@ -249,6 +249,6 @@ To select a request in the microflow, complete the following steps:
1. Create a new microflow and drag the [Send REST request](/refguide10/send-rest-request/) activity into it.
2. Double-click the activity and click **Select** to choose the request you want to add, then click **Select** > **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-service/send-request-activity.png" class="no-border" width="500" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/send-request-activity.png" class="no-border" width="500" >}}
If you have defined parameters in the request, they will be added to the activity. Click **Edit** to change the parameter in the microflow. The parameter values in this activity are used by the runtime instead of the test value defined in the request.
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/server-side-paging.md b/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/server-side-paging.md
index 67a31752656..30897bf19f9 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/server-side-paging.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/server-side-paging.md
@@ -34,15 +34,15 @@ Once successful, your app should have the following elements:
* A JSON structure based on the airport data:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/json-structure.png" alt="json structure" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/json-structure.png" alt="json structure" width="500" class="no-border" >}}
* Import mapping:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/import-mapping.png" alt="import mapping" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/import-mapping.png" alt="import mapping" width="500" class="no-border" >}}
* An input entity added to the domain model:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/input-entity.png" alt="input entity" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/input-entity.png" alt="input entity" width="500" class="no-border" >}}
Now, you can start calling the REST service from your microflow data source. To create a microflow data source which returns a list of characters, do the following:
@@ -51,21 +51,21 @@ Now, you can start calling the REST service from your microflow data source. To
3. Double-click your **Call REST service** activity.
4. Click the **Location** > **Edit** button:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/edit-call-rest.png" alt="edit call rest" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/edit-call-rest.png" alt="edit call rest" width="500" class="no-border" >}}
5. In the **Template** field, add `https://my-json-server.typicode.com/mendix/howto-api-data/airports` and click **OK**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/add-airport-url.png" alt="airport template" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/add-airport-url.png" alt="airport template" width="500" class="no-border" >}}
6. Click the **Response** tab:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/response-tab.png" alt="response tab" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/response-tab.png" alt="response tab" width="500" class="no-border" >}}
7. Select **Apply import mapping** from the **Response handling** drop-down menu.
8. Click **Mapping** > **Select** and select the import mapping you created.
9. For **Variable Name**, type *Result*. Click **OK** to accept the changes:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/call-rest-response.png" alt="variable result" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/call-rest-response.png" alt="variable result" width="500" class="no-border" >}}
10. From the **Toolbox**, drag the **Retrieve** activity into the microflow and double-click it.
11. Click **Association** > **Select**.
@@ -73,7 +73,7 @@ Now, you can start calling the REST service from your microflow data source. To
13. Click **OK** to accept this association.
14. Right-click the **Retrieve** activity and select **Set $JsonObjectList as return value**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/call-rest-returned.png" alt="set return value" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/call-rest-returned.png" alt="set return value" width="500" class="no-border" >}}
## Creating a Data Grid with a Microflow Data Source
@@ -83,22 +83,22 @@ In the previous section, you created a microflow which returns a list of charact
2. Double-click the blue header of the newly-placed data grid.
3. Click the **Data source** tab:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/data-source.png" alt="data source tab" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/data-source.png" alt="data source tab" class="no-border" >}}
4. Select **Type** > **Microflow**.
5. Click **Microflow** > **Select** and select the **Call_REST** microflow.
6. Click **OK** to accept the changes to the data source.
7. When you see the **“Do you want to automatically fill the contents of the data grid?”** pop-up window, click **Yes**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/auto-fill.png" alt="click yes" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/auto-fill.png" alt="click yes" width="500" class="no-border" >}}
8. When you see the **“Do you want to generate controls for microflow source parameters of the data grid? This will enable server-side paging sorting and searching for the grid.”** pop-up window, click **Yes**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/question-dialog.png" alt="click yes again" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/question-dialog.png" alt="click yes again" width="500" class="no-border" >}}
This generates a data view around your data grid, creates the necessary widgets and nanoflows, and adds the **Paging** object as an input to your microflow:
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/paging.png" alt="paging object" width="500" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/paging.png" alt="paging object" width="500" class="no-border" >}}
## Adding Paging Support to the Microflow Data Source
@@ -108,11 +108,11 @@ In the previous section, you added the **Paging** input parameter to your microf
2. Double-click the **Call REST service** activity and click **Location** > **Edit**.
3. Change **Template** to `https://my-json-server.typicode.com/mendix/howto-api-data/airports?_limit=5&_page={1}`:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/template-param-one.png" alt="add page bit to template" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/template-param-one.png" alt="add page bit to template" width="500" class="no-border" >}}
4. Click **Parameters** > **New** for a new parameter and enter the expression `toString($Paging/PageNumber)` for this parameter:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/page-parameter.png" alt="add page number parameter" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/page-parameter.png" alt="add page number parameter" width="500" class="no-border" >}}
5. Click **OK** > **OK** to accept this expression and in the location.
6. Click **OK** to accept the changes for the **Call REST service** activity. You are now back at your microflow.
@@ -131,23 +131,23 @@ Use these attributes when calling your REST service:
2. Double-click the **Call REST service** activity and click **Location** > **Edit**.
3. Add `&_sort={2}&_order={3}` to the end of your current **Template** address:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/appended-template.png" alt="add sort and order bits to template" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/appended-template.png" alt="add sort and order bits to template" width="500" class="no-border" >}}
4. Click **Parameters** > **New** to add the second parameter and enter the expression `toLowerCase($Paging/SortAttribute)`:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/second-param.png" alt="add second parameter" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/second-param.png" alt="add second parameter" width="500" class="no-border" >}}
5. Click **OK** to accept this expression.
6. Click **Parameters** > **New** to add the third parameter and enter the expression `if $Paging/SortAscending then 'asc' else 'desc'`:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/third-param.png" alt="add third parameter" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/third-param.png" alt="add third parameter" width="500" class="no-border" >}}
7. Click **OK** > **OK** to accept this expression and in the location.
8. Click **OK** to accept the changes in the **Call REST service** activity.
Deploy your app again and navigate to the page with your data grid. Click the column headers to see your server-side sorting in action.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/header-sorting-smaller2.gif" alt="click headers to sort" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/header-sorting-smaller2.gif" alt="click headers to sort" class="no-border" >}}
### Setting a Default Sort Order
@@ -158,19 +158,19 @@ You can set a default sort order for data. When a user has not clicked a header,
3. Select **Go to data source nanoflow**.
4. Double-click the **Create object** activity:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/create-nano.png" alt="create object activity one" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/create-nano.png" alt="create object activity one" width="500" class="no-border" >}}
5. Click **New** to set the value for a member of the **Paging** entity.
6. Click the **Member** drop-down menu and select **SortAttribute (String (200))**.
7. Set **Value** to `'Name'`:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/name-value.png" alt="name value" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/name-value.png" alt="name value" width="500" class="no-border" >}}
8. Click **OK** > **OK** to accept the changes to the member and the **Create object** activity.
Deploy your app again and navigate to the page with your data grid. The data is now ordered by **Name**.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/data-by-name.png" alt="sorted by name" width="500" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/data-by-name.png" alt="sorted by name" width="500" class="no-border" >}}
### Disabling Server-Side Sorting
@@ -183,13 +183,13 @@ Apps that use a REST service that does not support sorting, or apps that do not
5. Select **Member** > **IsSortable (Boolean)** from the drop-down menu.
6. Type *false* into **Value**:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/disable-sort.png" alt="value false" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/disable-sort.png" alt="value false" class="no-border" >}}
7. Click **OK** > **OK** to accept the changes to the member and the **Create object** activity.
Deploy your app again and navigate to the page with your data grid. The data is still ordered by **Name**, but you can no longer change the sorting by clicking the header. Note the lack of an arrow above the **Name** header.
-{{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/sorting-disabled.png" alt="sorted but not clickable" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/sorting-disabled.png" alt="sorted but not clickable" class="no-border" >}}
## Adding Server-Side Searching
@@ -201,7 +201,7 @@ You only need to use this data in your microflow and pass the search criteria to
2. Double-click the **Call REST service** activity and click **Location** > **Edit**.
3. Add `&name_like={4}` to the end of your current **Template** address:
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/template-add-search.png" alt="add search bits to template" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/template-add-search.png" alt="add search bits to template" width="500" class="no-border" >}}
4. Click **Parameters** > **New** to add the fourth parameter and enter the following expression:
@@ -209,7 +209,7 @@ You only need to use this data in your microflow and pass the search criteria to
if $Paging/Name = empty then '' else $Paging/Name
```
- {{< figure src="/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/fourth-param.png" alt="add fourth parameter" width="500" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/server-side-paging/fourth-param.png" alt="add fourth parameter" width="500" class="no-border" >}}
5. Click **OK** > **OK** to accept this expression and the changes in the location.
6. Click **OK** to accept the changes in the **Call REST service** activity.
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/use-call-rest-action-in-microflow.md b/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/use-call-rest-action-in-microflow.md
index 1e4981f0f32..037de464d8b 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/use-call-rest-action-in-microflow.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/consumed-rest-services/use-call-rest-action-in-microflow.md
@@ -10,7 +10,7 @@ aliases:
## Introduction
-In your Mendix app, you can use information from REST services. This how-to shows you how to do that through an example where you create an app that retrieves Wikipedia pages from a REST service. The resulting app is [available for download](/attachments/refguide10/modeling/integration/consume-a-rest-service/WikipediaApi.mpk).
+In your Mendix app, you can use information from REST services. This how-to shows you how to do that through an example where you create an app that retrieves Wikipedia pages from a REST service. The resulting app is [available for download](/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/WikipediaApi.mpk).
This how-to teaches you how to do the following:
@@ -29,7 +29,7 @@ The steps below use Studio Pro as an example of what the REST service returns:
5. Enter *JSON_structure* in the **Name** field and click **OK**.
6. In the **JSON Structure** dialog box, paste the JSON snippet in the **General** tab and click **Refresh** in the **Structure** section. This analyzes the structure of the JSON snippet and provides a representation of it.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/json-structure.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/json-structure.png" class="no-border" >}}
7. Click **OK**
@@ -43,7 +43,7 @@ An [import mapping](/refguide10/import-mappings/) specifies how the JSON relates
4. Double-click **JSON_structure** in the **Select JSON Structure** dialog box.
5. Click **Expand all**, then click **Check all**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/import-mapping.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/import-mapping.png" class="no-border" >}}
6. Click **OK**. The **Import_mapping** document is displayed with the JSON structure on the right.
7. Click **Map automatically** in the editor toolbar.
@@ -66,13 +66,13 @@ To add an input entity to the domain model, follow these steps:
6. On the **Attributes** tab, click **New** to add a string attribute, name it *Title*, then click **OK**.
7. Drag an association from **Input** to **Summary**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/domain-model.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/domain-model.png" class="no-border" >}}
8. Double-click **Import_mapping** in the **App Explorer** and from the **Connector** pane, drag **Input** as the input parameter for the input mapping.
9. Double-click **Summary**.
10. In the **Map entity 'Summary' from schema object element 'Root** dialog box, **Set association** to **Yes** and select the **RESTconsume_input_Summary** for the **Association** to enable the import mapping to set the association:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/map-entity-from-input-mapping.png" alt="map entity from input mapping" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/map-entity-from-input-mapping.png" alt="map entity from input mapping" class="no-border" >}}
11. Click **OK**.
@@ -88,13 +88,13 @@ To call the REST service in a microflow, follow these steps:
4. Right-click and select **Add** > **Activity** and insert this to the microflow. Double-click the activity and select **Call REST service** to change the type of action.
5. In the **Call REST** dialog box, click **Edit** for the **Location** and add the following to **Template**: `https://en.wikipedia.org/api/rest_v1/page/summary/{1}`, with the parameter being the Title attribute from the **Input** parameter `$Input/Title`. Click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/location.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/location.png" class="no-border" >}}
6. In the **Response** tab, the response has to be mapped using the import mapping. For **Response handling**, select **Apply import mapping**.
7. For **Mapping**, click **Select** and double-click **Import_mapping**. For the **Parameter**, select **Input**.
8. For **Output** select **Yes** for **Store in variable** and specify *Summary* for the **Variable name**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/response.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/response.png" class="no-border" >}}
9. Click **OK**.
10. Right-click after the **Call REST service** object and select **Insert** > **Activity**. Double-click it and change it to a **Change object**.
@@ -104,15 +104,15 @@ To call the REST service in a microflow, follow these steps:
14. On the **Edit Change Item** dialog box, for **Member**, select **RESTconsume.Input_Summary (RESTconsume.Summary)**.
15. Under **Value**, enter `$Summary`.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/set-association.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/set-association.png" class="no-border" >}}
16. Click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/change-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/change-object.png" class="no-border" >}}
17. Click **OK**. You have created microflow that takes the title of an article as input and associates it with its summary.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/microflow.png" class="no-border" >}}
You have successfully consumed a REST service and created a microflow to show the results. The rest of this how-to describes how to use this microflow in an app so you can see the REST call in action.
@@ -138,7 +138,7 @@ To create a page for this app, follow these steps:
16. For **Show label**, select **No**, then click **OK**.
17. Delete the **Save** and **Cancel** buttons.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-rest-service/page.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/page.png" class="no-border" >}}
## Filling in the Create Input Microflow {#createinput}
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/http-request-and-response-entities.md b/content/en/docs/refguide10/modeling/integration/rest-services/http-request-and-response-entities.md
index ec0ac57e687..f55ed3e5e10 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/http-request-and-response-entities.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/http-request-and-response-entities.md
@@ -8,7 +8,7 @@ weight: 45
`HttpRequest` is a system entity that represents a request to a server. `HttpResponse` represents the response from the server. Use these entities when [publishing](/refguide10/published-rest-services/) or [consuming](/refguide10/consumed-rest-services/) REST services.
-{{< figure src="/attachments/refguide10/modeling/integration/http-request-and-response-entities/http-request-and-response-domain-model.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/http-request-and-response-entities/http-request-and-response-domain-model.png" class="no-border" >}}
## HttpRequest {#http-request}
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/integrating-a-legacy-system-into-a-mendix-app.md b/content/en/docs/refguide10/modeling/integration/rest-services/integrating-a-legacy-system-into-a-mendix-app.md
index a93a46892c2..22bd7933f80 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/integrating-a-legacy-system-into-a-mendix-app.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/integrating-a-legacy-system-into-a-mendix-app.md
@@ -46,35 +46,35 @@ For this how-to, we will use the publicly available Google Books API (for detail
2. Create a non-persistable search entity called **BookSearch** that allows the user to enter an author and title. This should be linked to a second object:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582034.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582034.png" class="no-border" >}}
3. Create a page that contains a data view that will allow users to enter search terms. The data source for this data view should be a new microflow that generates a new search object and returns it:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582041.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582041.png" class="no-border" >}}
4. Create a microflow button and a corresponding microflow that will perform your search. This microflow will use the REST `GET` Java Action included in the Marketplace REST module:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582030.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582030.png" class="no-border" >}}
The microflow activities for this flow are the following:
* Creates a new response object.
* Makes the REST call to the API using the following target:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582035.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582035.png" class="no-border" >}}
* Calls a sub microflow that retrieves all the items associated with the response. Each item then has all the associated volumes retrieved:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582031.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582031.png" class="no-border" >}}
* Iterates through the **VolumeList** and makes a new **BookResult** object to display the search results:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582037.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582037.png" class="no-border" >}}
* Retrieves the author list **Over Association** for each volume.
* Iterates through the list of author names and uses a **Change** activity to add the author name. This is done to accommodate this situation:
- {{< figure src="/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582036.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582036.png" class="no-border" >}}
5. When a user signs into the application and enters a search term, the results are successfully populated via the REST calls.
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/_index.md b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/_index.md
index 8efb9f8c387..5322869d2f4 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/_index.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/_index.md
@@ -134,7 +134,7 @@ When you select a resource, you see the [operations](/refguide10/published-rest-
Resources and operations are appended to [Location](#location) to form a URL on which they can be accessed.
-{{< figure src="/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/example-location-url.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/published-rest-service/example-location-url.png" class="no-border" >}}
## Read More
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/gfm-syntax.md b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/gfm-syntax.md
index 3daed837f9c..8c7cb36bf92 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/gfm-syntax.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/gfm-syntax.md
@@ -12,4 +12,4 @@ Several places in published REST services indicate that you can use [GitHub-flav
This is especially useful in case you want to include JSON example payload in your rest documentation. To do this, add three backticks, `json`, the JSON structure, and three backticks to close the code, as illustrated in this example:
-{{< figure src="/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/gfm-syntax/snippet.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/gfm-syntax/snippet.png" class="no-border" >}}
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/publish-rest-service.md b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/publish-rest-service.md
index f93cd2dbea3..5d417377701 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/publish-rest-service.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/publish-rest-service.md
@@ -19,16 +19,16 @@ To set up the example app you will use in the next sections, follow these steps:
2. Open the domain model of the **RESTExample** module.
3. Create **OrderItem** and **Order** entities with a many-to-one association, as seen below:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/domainmodel.png" alt="Many-to-one association from OrderItem to Order" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/domainmodel.png" alt="Many-to-one association from OrderItem to Order" class="no-border" >}}
4. [Generate overview and detail pages](/howto10/front-end/create-your-first-two-overview-and-detail-pages/#create-automatically) for the **Order** and **OrderItem** entities.
5. [Add a data grid](/refguide10/data-grid/) to the **Order_NewEdit** page. Set it to display the **OrderItem** objects from the database over an association:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/DataGridSettings.png" alt="Data grid settings for the Order_NewEdit page" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/DataGridSettings.png" alt="Data grid settings for the Order_NewEdit page" class="no-border" >}}
Your completed **Order_Overview** page should look like this:
-{{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/order_NewEdit_Page.png" alt="Structure mode view of the Order_NewEdit page with data grid" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/order_NewEdit_Page.png" alt="Structure mode view of the Order_NewEdit page with data grid" class="no-border" >}}
Add the overview page to your app navigation. Then, run the application and create a couple of orders and order items.
@@ -47,7 +47,7 @@ To create the mapping, follow these steps:
5. Select the **OrderID** and **Customer** attributes.
6. Select and expand the **OrderItem_Order** association, then select the **Product** and **Quantity** attributes:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/MD_SelectedAttributes.png" alt="Checkbox selections in the Message Definition 'Order' dialog box" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MD_SelectedAttributes.png" alt="Checkbox selections in the Message Definition 'Order' dialog box" class="no-border" >}}
7. Click **OK** to close the dialog box.
8. Save and close the **MD_Orders** message definition.
@@ -58,18 +58,18 @@ To create the mapping, follow these steps:
2. Enter *PRS_OrderService* for the **Name** of your REST service. Then press **OK** to create and start editing the new REST service.
3. Add a new resource to your service by clicking **Add** in the **Resources** field. Enter **GetOrderByID** for the **Resource name**, then click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/AddRestResource.png" alt="Adding a GetOrderByID resource" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddRestResource.png" alt="Adding a GetOrderByID resource" class="no-border" >}}
4. Add an operation to your resource by clicking **Add** in the **Operations for resource** field.
5. In the **Operation** dialog box, enter `{OrderID}` in the **Operation path** field, making sure to include the braces (`{}`). This allows the REST service to be invoked with the order ID in the URL shown in the **Example location** field of the dialog box.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/AddOperation.png" alt="{OrderID} in the Operation path field" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddOperation.png" alt="{OrderID} in the Operation path field" class="no-border" >}}
6. In the same dialog box, click **Select** next to the **Microflow** field. You do not yet have a microflow for this operation, so select the **RESTExample** module in the dialog box and click **New** to create a new microflow. Enter *PRS_GetGetOrderByID* for the **Name** of this new microflow, then click **OK**.
7. In the **Parameters** field of the same **Operation** dialog box, click **Add** and add an **OrderID** path parameter.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/OperationsDialogSettings.png" alt="Operation path, microflow, and parameter settings" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OperationsDialogSettings.png" alt="Operation path, microflow, and parameter settings" class="no-border" >}}
8. Click **OK** to close out the **Operation** dialog box, then click **Show** to start editing the newly created microflow. Add a **OrderID** parameter.
@@ -78,11 +78,11 @@ To create the mapping, follow these steps:
9. Add a **Create variable** activity to the microflow to convert the **OrderID** variable from data type **String** to **Integer/Long**. This makes it possible to search for the **OrderID** (an **AutoNumber** data type).
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/ConvertOrderID.png" alt="Create Variable dialog box used to parse OrderID as an integer variable" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ConvertOrderID.png" alt="Create Variable dialog box used to parse OrderID as an integer variable" class="no-border" >}}
10. Add a **Retrieve** activity to the microflow to retrieve the **Order** based on the **OrderID**. Set this activity to retrieve the first matching order from the database.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/RetrieveOrder.png" alt="Range and XPath constraint settings in the Retrieve dialog box" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RetrieveOrder.png" alt="Range and XPath constraint settings in the Retrieve dialog box" >}}
#### Building an Export Mapping (optional){#export-mapping}
@@ -96,35 +96,35 @@ To build an export mapping, follow these steps:
2. In the **Select schema elements for export mapping** dialog box, select **Message definition**. Then, click **Select** to choose **Order** from the **MD_Orders** mapping you created earlier. Select all the attributes, as shown below, and click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/SelectSchemaForExport.png" alt="All attribute checkboxes selected in the Select schema elements for export mapping dialog" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/SelectSchemaForExport.png" alt="All attribute checkboxes selected in the Select schema elements for export mapping dialog" class="no-border" >}}
3. In the export mapping that is shown, map the schema object elements to the matching entities from the domain model by either double-clicking the schema object elements or dragging the entities from the **Connector** pane. Make sure to map the attributes with the same names. Your mapping should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/ExportMappingResult.png" alt="Mapping Order to Order and OrderItem to OrderItem" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ExportMappingResult.png" alt="Mapping Order to Order and OrderItem to OrderItem" class="no-border" >}}
4. Go back to the **PRS_GetGetOrderByID** microflow and add an **Export with mapping** activity.
5. In the **Mapping** field of the dialog box, select the **EM_ExportOrder** mapping. In the **Parameter** field, select the **Order** object that was retrieved with the **Retrieve** action in the microflow.
6. Select **JSON** for the result, and store the output in a **String Variable**. Enter *Order_JSON* for the **Variable name**.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/MFExportWithMapping.png" alt="Export With Mapping dialog box settings" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MFExportWithMapping.png" alt="Export With Mapping dialog box settings" class="no-border" >}}
7. Add a **Create object** activity to the microflow to create an object of type **HttpResponse**. Create three new members:
* A **StatusCode** that returns the value `200` to indicate success
* **Content** mapped to the exported JSON from the previous step
* The **HttpVersion** that you will be using (`'HTTP/1.1'` in this case)
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/httpResponse.png" alt="Create Object dialog box for HttpResponse object" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/httpResponse.png" alt="Create Object dialog box for HttpResponse object" class="no-border" >}}
8. Add a **Create object** activity to the microflow to create an object of type **HttpHeader**. Create three new members:
* **Key**, set to `'Content-Type'`
* **Value**, set to `'application/json'` (or `'application/xml'` if your response contains XML rather than JSON)
* **System.HttpHeaders**, set to your HTTP response (`$NewHttpResponse`).
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/httpResponseHeader.png" alt="Create Object dialog for HttpHeader" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/httpResponseHeader.png" alt="Create Object dialog for HttpHeader" class="no-border" >}}
9. Open the **End Event** in your microflow and enter `$NewHttpResponse` as the return value. Your completed microflow should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/CompleteMFNoErrorHandling.png" alt="Completed PRS_GetGetOrderByID microflow" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/CompleteMFNoErrorHandling.png" alt="Completed PRS_GetGetOrderByID microflow" class="no-border" >}}
{{% alert color="info" %}}You should have no errors. If you have error CE0346, check if an **httpResponse** parameter was automatically created when you [started editing the microflow](#edit-microflow). If there is one, remove it.{{% /alert %}}
@@ -135,15 +135,15 @@ To view and try out your app, follow these steps:
1. Run your app and open it in the browser using this URL: [http://localhost:8080/rest-doc/](http://localhost:8080/rest-doc/).
2. You will see a page with the documentation of all your published REST services. Click the **PRS_OrderService** link to view the details:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestDetails.png" alt="Details for the PRS_OrderService" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestDetails.png" alt="Details for the PRS_OrderService" class="no-border" >}}
3. Click **GET**. Then, click **Try it out** and enter an **OrderID**.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestExecute.png" alt="OrderID with Description input field" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestExecute.png" alt="OrderID with Description input field" class="no-border" >}}
4. Click **Execute** to run the request and return the result in the **Response body**.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestResponse.png" alt="Result in Response" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestResponse.png" alt="Result in Response" class="no-border" >}}
Congratulations! You have published your first REST service.
@@ -156,25 +156,25 @@ You have not yet implemented error handling in this new service. For example, if
1. Open the **PRS_GetGetOrderByID** microflow and right-click the first activity. Select **Set error handling** > **Custom with rollback** > **OK**.
2. Hover your mouse over the error handling flow. Click the blue circle and select **Create object**.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/create-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/create-object.png" class="no-border" >}}
3. Create a new **HttpResponse** object and enter *NewHttpErrorResponse* for the **Name**. Then, map the attributes as shown below:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorResponse.png" alt="Create Object dialog box for NewHttpErrorResponse" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorResponse.png" alt="Create Object dialog box for NewHttpErrorResponse" class="no-border" >}}
{{% alert color="info" %}}The **Content** value is the JSON string `'{"Error": "The OrderID can only be an integer"}'`.{{% /alert %}}
4. Hover your mouse over the next error handling flow, click the blue dot, and add another **Create object** activity to create a new **httpHeader** object. Map the attributes as shown below:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorResponseHeader.png" alt="Create Object dialog box for NewHttpHeader_1" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorResponseHeader.png" alt="Create Object dialog box for NewHttpHeader_1" class="no-border" >}}
5. Add an **End Event** and set `$NewHttpErrorResponse` as its return value. Your microflow should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorMicroflow.png" alt="Updated microflow with error handling" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorMicroflow.png" alt="Updated microflow with error handling" class="no-border" >}}
6. Test your error handler, as you did with the app in the [Viewing the App](#viewing) section. Enter some text in the **OrderID** parameter, click **Execute**, and observe the request's response:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorRESTResult.png" alt="Error in server response" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorRESTResult.png" alt="Error in server response" class="no-border" >}}
### Additional Error Handling
@@ -182,17 +182,17 @@ Now that you have covered the **OrderID** parameter error handling, it is time t
1. After the Retrieve order from database activity, add a decision activity with the following expression: `$Order != empty`. Connect the **true** exit to the activity for exporting to JSON. For the **false** exit, add a new **Create object** activity that creates a **NewHttpErrorNotFoundResponse** object.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/OrderNotFoundResponse.png" alt="Create Object dialog box for NewHttpErrorNotFoundResponse" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OrderNotFoundResponse.png" alt="Create Object dialog box for NewHttpErrorNotFoundResponse" class="no-border" >}}
{{% alert color="info" %}}The **Content** value is the string `'{"Error": "No Order available for ID:'+$OrderID+'"}'`.{{% /alert %}}
2. Add an activity to create a **NewHttpErrorNotFoundHeader** object.
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/OrderNotFoundHeader.png" alt="Create Object dialog box for NewHttpErrorNotFoundHeader" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OrderNotFoundHeader.png" alt="Create Object dialog box for NewHttpErrorNotFoundHeader" class="no-border" >}}
3. Configure the **End Event** to return `$NewHttpErrorNotFoundResponse`. The microflow should look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/publish-rest-service/CompleteMFWithErrorHandling.png" alt="Updated microflow with decision activity and false exit" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/CompleteMFWithErrorHandling.png" alt="Updated microflow with decision activity and false exit" class="no-border" >}}
4. Test your new error responses, as you did with the app in the [Viewing the App](#viewing) section.
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/published-rest-operation.md b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/published-rest-operation.md
index 501369153fd..9f24c0c5b73 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/published-rest-operation.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-service/published-rest-operation.md
@@ -13,13 +13,13 @@ A published REST operation is part of a [published REST resource](/refguide10/pu
In the **Published REST Service** document, you can add items to be included in the service as **Resources**:
-{{< figure src="/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/published-rest-operation/publshed-rest-service.png" alt="Published REST Service" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/published-rest-operation/publshed-rest-service.png" alt="Published REST Service" class="no-border" >}}
## Operation Definition
When you **Add** or **Edit** a resource, you can define the resource in the **Operation** definition dialog box for the selected item as follows:
-{{< figure src="/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/published-rest-operation/operation-definition.png" alt="REST Operation" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/published-rest-operation/operation-definition.png" alt="REST Operation" class="no-border" >}}
### General
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-technical-details/published-rest-routing.md b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-technical-details/published-rest-routing.md
index f2fc7f30b40..4487a6a3889 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-technical-details/published-rest-routing.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/published-rest-services/published-rest-technical-details/published-rest-routing.md
@@ -25,4 +25,4 @@ Consult this flow chart to answer questions such as:
The example request is `GET /rest/petstore/pet/12`.
-{{< figure src="/attachments/refguide10/modeling/integration/published-rest-services/published-rest-technical-details/published-rest-routing/determine-operation.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/published-rest-routing/determine-operation.png" class="no-border" >}}
diff --git a/content/en/docs/refguide10/modeling/integration/rest-services/rest-binary.md b/content/en/docs/refguide10/modeling/integration/rest-services/rest-binary.md
index 6b4d7c26f41..541792d804f 100644
--- a/content/en/docs/refguide10/modeling/integration/rest-services/rest-binary.md
+++ b/content/en/docs/refguide10/modeling/integration/rest-services/rest-binary.md
@@ -39,7 +39,7 @@ To publish the **System.Image** or **System.Filedocument** entities as a [REST s
3. Add a **System.Image** or **System.FileDocument** [generalization](/refguide10/entities/#generalization) to the *MyFile* entity
- {{< figure src="/attachments/refguide10/modeling/integration/rest-binary/starting-entity.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/rest-services/rest-binary/starting-entity.png" class="no-border" >}}
4. Generate the overview pages for the file or image entity, then link them to the home page and navigation.
* Right-click on the **System.Image** or **System.FileDocument** entity that you want to publish and click **Generate overview pages**.
@@ -67,7 +67,7 @@ After you run your app, click the URL in the **Location** field to view the Open
Open your published REST service, then double-click the **Get by** key, or single-click and click **Edit** to open the **Get by** property details. By default, the **Get by** key will return a binary response. The **Export mapping** is blank because a binary object without an export mapping returns binary content.
-{{< figure src="/attachments/refguide10/modeling/integration/rest-binary/no-export-mapping.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/rest-services/rest-binary/no-export-mapping.png" class="no-border" >}}
Click **Show** next to the **Microflow** field to view the **MyFirstModule.MyFile_Get_ByKey** microflow. The generated **Get by** key returns a file document.
diff --git a/content/en/docs/refguide10/modeling/integration/share-data-sources/share-data-between-apps.md b/content/en/docs/refguide10/modeling/integration/share-data-sources/share-data-between-apps.md
index 13ccbfa394f..434b9cf14fc 100644
--- a/content/en/docs/refguide10/modeling/integration/share-data-sources/share-data-between-apps.md
+++ b/content/en/docs/refguide10/modeling/integration/share-data-sources/share-data-between-apps.md
@@ -46,7 +46,7 @@ Follow these steps to create a simple app in Studio Pro:
6. Repeat steps 5a and 5b to create attributes *FirstName*, *LastName*, *CompanyName*, *Address* and set type to *String* for all of them.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/entity-properties-pane.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/entity-properties-pane.png" class="no-border" >}}
7. Click **OK** to save your changes.
8. Right-click the entity and select **Generate overview pages** from the drop-down list.
@@ -54,7 +54,7 @@ Follow these steps to create a simple app in Studio Pro:
10. In the **Information** pop-up dialog, click **Close**.
Overview pages for the new entity are added in the **OverviewPages** folder of **MyFirstModule**.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/overview-pages-for-customer-entity.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/overview-pages-for-customer-entity.png" class="no-border" >}}
11. In the **App Explorer**, double-click **Home_Web** to open the Home_Web page.
12. From the **App Explorer**, drag **Customer_Overview** into the empty Auto-fill container under the Home banner.
@@ -75,25 +75,25 @@ Do the following:
2. In the **Domain model**, right-click the **Customer** entity and select **Publish in OData service...**.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/publish-in-odata-resource.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/publish-in-odata-resource.png" class="no-border" >}}
3. In the **Select Published OData Service** dialog box, select the **MyFirstModule** > **APIs** folder and click **New** to add a new OData service to this folder.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/select-published-odata-service.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/select-published-odata-service.png" class="no-border" >}}
4. Name the published OData service *{yourname}CustomerODataService* and click **OK**. The new **{yourname}CustomerODataService** is added to the module.
5. In the **Choose key** dialog box, move the attributes you want to be the key from **Available attributes** to **Key attributes**.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/choose-key.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/choose-key.png" class="no-border" >}}
6. Click **OK** to see the **Edit published entity** dialog.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/edit-published-resource-box.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/edit-published-resource-box.png" class="no-border" >}}
{{% alert color="info" %}} Make a note of the **Exposed set name**. This defaults to the **Exposed name** with an "**s"** added to the end. When the service is registered in the Catalog, the **Exposed set name** will be displayed as the available **Dataset**. {{% /alert %}}
7. Click **OK** to display the **OData Service** document that will be registered in the Catalog. In the **General** tab, notice the **Version** number.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/customer-odata-service-page.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/customer-odata-service-page.png" class="no-border" >}}
Under **Entities**, the **Customer** entity is listed. The details of the entity are displayed on the right. To expose more entities in the service, add them in this field.
@@ -103,7 +103,7 @@ Do the following:
10. On the app's home page, click **Customers Overview**.
11. Add data to the app. Click **New** to add data for a customer entry.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/add-data-in-app.png" alt="external entities" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/add-data-in-app.png" alt="external entities" class="no-border" >}}
When this entity set is consumed by another app via the Catalog, the other app will see the data entered here.
@@ -118,13 +118,13 @@ Do the following:
2. Click **Browse** and enter the search term *{yourname}*. All services and datasets that satisfy this search string are displayed in the search results pane.
3. In this scenario, your app was deployed to the **Sandbox** environment. To search within this environment, click **Filter** > Check **Sandbox** > **Apply**.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/filter-box.png" alt="Catalog screen" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/filter-box.png" alt="Catalog screen" class="no-border" >}}
4. From the new search results list on the left, select the *{yourname}CustomerODataService* service. Full details from the OData contract for the service are displayed on the right.
You have permissions edit the metadata for this service in the Catalog and are a **Technical Owner**. To edit the metadata, click the edit icon in the top-right corner of the Data Source field.
-{{< figure src="/attachments/refguide10/modeling/integration/share-data/search-details-screen.png" alt="Catalog search details" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/search-details-screen.png" alt="Catalog search details" class="no-border" >}}
{{% alert color="info" %}}For more information about roles in the Catalog, see [User Roles](/catalog/manage/user-roles/).{{% /alert %}}
@@ -141,7 +141,7 @@ To do this, follow the steps below:
3. In the Integration pane, enter the search string *{yourname}*.
4. By default, search in the Integration pane only shows services in **Production** environments. Your app was deployed as a **Sandbox** app. Click the **Filter** icon next to the search and check **Show development environments**.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/filter-icon.png" alt="Filter Icon" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/filter-icon.png" alt="Filter Icon" class="no-border" >}}
The search results now include **{yourname}CustomerOData_service** from your Mendix Cloud **Sandbox** environment.
@@ -179,7 +179,7 @@ You can view the two apps that you have created in the Landscape and see how the
2. Find your service using the search pane. Remember to use the filter to ensure you can see **Sandbox** apps.
3. Click **Landscape View** to see a visual representation of your apps (rounded squares), services (circles), and connections (lines). The number of entity sets/datasets that have been exposed appears beneath the service.
- {{< figure src="/attachments/refguide10/modeling/integration/share-data/landscape-full-screen.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/share-data/landscape-full-screen.png" class="no-border" >}}
The service **{yourname}CustomerODataAPI** is linked by a solid line to the running instance of **{yourname}CustomerCustomerServiceApp**, which is deployed as a Free App.
diff --git a/content/en/docs/refguide10/modeling/integration/share-data-sources/write-data-to-another-app.md b/content/en/docs/refguide10/modeling/integration/share-data-sources/write-data-to-another-app.md
index 217f9a60b14..44ee89ea953 100644
--- a/content/en/docs/refguide10/modeling/integration/share-data-sources/write-data-to-another-app.md
+++ b/content/en/docs/refguide10/modeling/integration/share-data-sources/write-data-to-another-app.md
@@ -62,7 +62,7 @@ Notice the highlighted **CRUD** letters next to the entity name in the search pa
Just like in the Catalog, you can see the **CRUD** capabilities of entities, attributes, and associations inside the [Integration pane](/refguide10/integration-pane/) of Studio Pro.
-{{< figure src="/attachments/refguide10/modeling/integration/write-data/crud-capabilities.png" alt="crud capabilities" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/write-data/crud-capabilities.png" alt="crud capabilities" class="no-border" >}}
To consume an OData entity, do the following:
@@ -80,8 +80,8 @@ How does the published service know that an insert fails? In the publishing app,
The domain model for the publishing app's validation message looks like this:
-{{< figure src="/attachments/refguide10/modeling/integration/write-data/validate-data-publishing-app.png" alt="publishing app validation" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/write-data/validate-data-publishing-app.png" alt="publishing app validation" class="no-border" >}}
In the client app, the error handler would look like this:
-{{< figure src="/attachments/refguide10/modeling/integration/write-data/validate-data-client-app.png" alt="client app validation" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/share-data-sources/write-data/validate-data-client-app.png" alt="client app validation" class="no-border" >}}
diff --git a/content/en/docs/refguide10/modeling/integration/use-excel-documents/export-to-excel.md b/content/en/docs/refguide10/modeling/integration/use-excel-documents/export-to-excel.md
index 0e02400ad8f..f5287b8aed9 100644
--- a/content/en/docs/refguide10/modeling/integration/use-excel-documents/export-to-excel.md
+++ b/content/en/docs/refguide10/modeling/integration/use-excel-documents/export-to-excel.md
@@ -29,12 +29,12 @@ To download the modules, follow these steps:
1. Open the **Mendix Marketplace** from within Studio Pro.
2. Search for the keyword *reflection* and select **Mx Model reflection**:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581166.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/mx-model-reflection.png" class="no-border" >}}
3. Click **Download** to include the module in your app. It will be imported into **App** > **Marketplace modules** in the **App Explorer**.
4. Search for the keyword *Excel*, select **Excel exporter**, and download that module into your app:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/exporter.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/exporter.png" class="no-border" >}}
{{% alert color="warning" %}}
Depending on the layout selected when the app was created, errors in Studio Pro may arise due to the new module's default layouts. To correct this, open each page that has an error and update the layout to the desired layout within the app.
@@ -47,15 +47,15 @@ In this section, you will learn how to add the required pages in the app's **Nav
1. In the [App Explorer](/refguide10/app-explorer/), go to **Navigation**.
2. Add a **New item** to the navigation to open the page **MxModelReflection.MxObjects_Overview**:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-menu-item-mxreflection.png" alt="new-menu-item-mxreflection" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-mxreflection.png" alt="new-menu-item-mxreflection" class="no-border" >}}
3. Add a new item to the Navigation to open the page **XLSReport.Excel_Document_Overview**:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-menu-item-excel-exporter.png" alt="new-menu-item-excel-exporter" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-excel-exporter.png" alt="new-menu-item-excel-exporter" class="no-border" >}}
4. Open **App Security** and assign these two modules to the Administrator user role:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/security.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/security.png" class="no-border" >}}
## Creating an Input Object Entity
@@ -64,7 +64,7 @@ In this section, you will create an entity which will be used to export the Exce
1. Open the domain model for your app and add an entity to serve as a "primary export" entity that is a specialization of **FileDocument**.
2. Create an association between the newly created entity and the entity (or entities) that you will want to serve as a base for the Excel export.
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581908.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/create-association.png" class="no-border" >}}
## Configuring Mx Model Reflection {#configure-mx-model-reflection}
@@ -104,7 +104,7 @@ To set up a template, follow these steps:
7. Provide a **Description** for identifying and documenting what this template is for:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-excel-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-excel-template.png" class="no-border" >}}
8. Specify the **Date time export format** which defines how the dates and times should appear in the Excel file once exported.
@@ -116,7 +116,7 @@ To upload an Excel file as a template, perform the following steps:
1. Click the following icon:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/upload-excel-file.png" alt="upload-excel-file" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/upload-excel-file.png" alt="upload-excel-file" class="no-border" >}}
2. For **File**, click **Browse** and navigate to the Excel file that you want to use as a template.
@@ -132,7 +132,7 @@ To create the worksheet layout, follow these steps:
1. Under the **Worksheets** section for the template, select **New** to create a new sheet template:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581907.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-sheet-template.png" class="no-border" >}}
2. Specify the **Name** that will be given to the sheet when the file is exported.
@@ -144,11 +144,11 @@ To create the worksheet layout, follow these steps:
The following figure shows a template where worksheet has **Reference to the template input object** and **Sheet input Object** configured:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/worksheet-with-input-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/worksheet-with-input-object.png" class="no-border" >}}
The following figure shows a template where worksheet does not have **Reference to the template input object** and **Sheet input Object** configured:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/worksheet-without-input-object.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/worksheet-without-input-object.png" class="no-border" >}}
5. Configure the **Start retrieved data at row** to set the ordinal number in which the data should be exported.
@@ -180,7 +180,7 @@ To create the worksheet layout, follow these steps:
Below you can find an example of the definition of a template and the corresponding exported Excel file: the two worksheets are defined as **Topic** and **PubMessage** in the template, and the corresponding Excel file has two sheets that have the same names.
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/multiple-sheets.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/multiple-sheets.png" class="no-border" >}}
### Configuring Dynamic Column Data {#dynamic-column-data}
@@ -188,7 +188,7 @@ To configure the dynamic column data, follow these steps:
1. On the **Column Data** tab, select **New** to create a new export column:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581905.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-export-column.png" class="no-border" >}}
2. The **Column number** will be set automatically, but can be overwritten to the desired ordinal number.
3. Define a **Name** for the column. This will be the **Column Header** when exported.
@@ -205,7 +205,7 @@ To configure the static data in the sheet, follow these steps:
1. Open the **Static Data tab** and select **New** to create a new export column.
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581903.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/static-data-tab.png" class="no-border" >}}
2. Specify the **Row** and **Column** that the static value should be placed.
3. Enter a name for the cell in the **Name** field.
@@ -218,7 +218,7 @@ To configure the custom formatting and styling for the cells, follow these steps
1. Back on the main page for your new template, click **New** in the **Styles** section to create a new style that can be applied to any of the data in the Excel export:
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581900.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/styles.png" class="no-border" >}}
2. Specify the properties of the style that will be applied to the cells.
@@ -234,17 +234,17 @@ In this section, you will learn how to call the newly created Excel export templ
2. In the microflow, retrieve a single object which is the template you set up earlier to use for the export.
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/retrieve-template.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/retrieve-template.png" class="no-border" >}}
3. In your microflow, call the **XLSReport.GenerateExcelDoc** Java action (available from the module's **JavaActions** folder) to pass the required objects to the module.
- {{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/java-action.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/java-action.png" class="no-border" >}}
4. In your microflow, download the resulting FileDocument object.
Your microflow should look similar to this:
-{{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/microflow-for-generate.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/microflow-for-generate.png" class="no-border" >}}
If your template definition does not have **Input Object**, your microflow can directly retrieve the template object and **Row Object** from the database for the export.
@@ -272,7 +272,7 @@ To run the microflow you created above, you will need to create another microflo
Your new microflow should look similar to this:
-{{< figure src="/attachments/refguide10/modeling/integration/using-the-excel-exporter/associating-objects.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/associating-objects.png" class="no-border" >}}
{{% alert color="info" %}}
If you create a **PolicyDoc** with *no* associations to **Policy** objects, you will export an empty spreadsheet with the structure defined in the template.
diff --git a/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file.md b/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file.md
index 2edf0cada66..dec12e08813 100644
--- a/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file.md
+++ b/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file.md
@@ -24,7 +24,7 @@ Before starting this how-to, make sure you have completed the following prerequi
The Excel sheet you receive in this scenario contains almost every country in the world, as well as some supporting data. This data has to be imported into your application.
-You can find the Excel sheet here: [Countries](/attachments/refguide10/modeling/integration/import-a-large-excel-file/Countries.xlsx).
+You can find the Excel sheet here: [Countries](/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/Countries.xlsx).
You are going to make an XSD schema from the headers in the Excel sheet so you can import the data into the model.
@@ -33,9 +33,9 @@ To modify your Excel sheet, follow these steps:
1. Select the header row with all the country names.
2. Copy and paste them in a new sheet using the transpose function:
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/transpose.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/transpose.png" class="no-border" >}}
- Your headers should be listed vertically and your sheet should look like this: [Countries Transposed](/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesTransposed.xlsx).
+ Your headers should be listed vertically and your sheet should look like this: [Countries Transposed](/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesTransposed.xlsx).
You are now ready to add some tags around the column.
@@ -48,7 +48,7 @@ To modify your Excel sheet, follow these steps:
5. Drag the string all the way down to the last country.
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/country-sheet.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/country-sheet.png" class="no-border" >}}
6. In cell **C1**, enter the following string:
@@ -56,9 +56,9 @@ To modify your Excel sheet, follow these steps:
"/>
```
-7. Like you did with the previous string, drag it down to the last country. The Excel sheet should now look like this: [Countries with Tags](/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesWithTags.xlsx).
+7. Like you did with the previous string, drag it down to the last country. The Excel sheet should now look like this: [Countries with Tags](/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesWithTags.xlsx).
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/countries-with-tags.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/countries-with-tags.png" class="no-border" >}}
Now, group the three different columns into one column. This is necessary to copy the whole column into an XSD file.
@@ -68,7 +68,7 @@ To modify your Excel sheet, follow these steps:
=(A1&B1&C1)
```
-9. Drag the cells down like you’ve done with column **A1** and **C1**. Now, column **D** should have columns **A**, **B**, and **C** combined into one, and your sheet should look like this: [Countries with Tags and Column D](/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesWithTagsAndColumnD.xlsx).
+9. Drag the cells down like you’ve done with column **A1** and **C1**. Now, column **D** should have columns **A**, **B**, and **C** combined into one, and your sheet should look like this: [Countries with Tags and Column D](/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesWithTagsAndColumnD.xlsx).
## Preparing Your XSD File
@@ -98,7 +98,7 @@ You have used some of Excel's basic functionalities to create the first part of
```
- Your file should look like this: [Country Import](/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountryImport.xsd).
+ Your file should look like this: [Country Import](/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountryImport.xsd).
5. Click **Save**.
@@ -108,29 +108,29 @@ The XSD file is ready to be imported into your app. To import it, follow these s
1. Open your app and create a new XSD schema. Do this by right-clicking the module and selecting **Add other** > **XML schema**.
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-schema.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-schema.png" class="no-border" width="600" >}}
2. With the new XSD schema, create the XML-to-domain mapping by right-clicking the module > **Add other** > **Import mapping**.
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-mapping.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-mapping.png" class="no-border" width="600" >}}
3. Check all the attributes listed. After clicking **OK**, you see a mapping entity with all your countries.
4. You will now generate a real entity from it that you can use as an import table for your Excel sheet. Click **Map automatically**:
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/map-automatically.png" class="no-border" width="400" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/map-automatically.png" class="no-border" width="400" >}}
Your entity is created:
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/new-entity.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/new-entity.png" class="no-border" >}}
5. Open your domain model and set the entity’s **Persistable** property to **Yes**.
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/persistable-properties.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/persistable-properties.png" class="no-border" >}}
The data is imported to the page, as seen in the image below:
-{{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/large-file.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/large-file.png" class="no-border" >}}
To keep your application clean, you can delete the XSD schema and XML-to-domain files from your app.
@@ -156,6 +156,6 @@ To create entity in your domain model using an Excel sheet, follow these steps:
* If the column names do not conform to Mendix naming conventions, they will automatically be corrected.
* The extension identifies correct data types of each column (such as string, boolean, or date).
6. After reviewing the preview, click **Create Entity** and a non-persistable entity (NPE) is created in your domain model.
- {{< figure src="/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-entity-using-excel-input.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-entity-using-excel-input.png" class="no-border" >}}
You can change the name of the entity or change its persistence later, if necessary.
diff --git a/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-excel-documents.md b/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-excel-documents.md
index bd64562e644..74e0771d81f 100644
--- a/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-excel-documents.md
+++ b/content/en/docs/refguide10/modeling/integration/use-excel-documents/import-excel-documents.md
@@ -28,7 +28,7 @@ Before you can start importing data into your application, set up the data struc
1. Create the following domain model:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581969.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581969.png" class="no-border" >}}
Create an enumeration for the **OrderStatus** attribute with the values **Open**, **Processing**, and **Complete**.
@@ -45,7 +45,7 @@ Because an enumeration is used for the **OrderStatus** attribute, you need to cr
1. Create the following microflow and name it **IVK_ParseStatus**.
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581968.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581968.png" class="no-border" >}}
2. Set the **Return value** as follows:
@@ -68,7 +68,7 @@ In order to set up import templates for importing data, your application model m
4. Click the menu item for the **MxObjects_Overview** in your navigation.
5. Select the module that contains the objects you want to use in your client by checking the box to the left of it. In this example, the module is **MyFirstModule**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581937.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581937.png" class="no-border" >}}
6. Click the button next to **Synchronize all entities and microflows of checked modules on the left**. Now, the two objects and the parse microflow from the **MyFirstModule** module can be seen and used in the client.
@@ -78,26 +78,26 @@ Before you can import data from an Excel File, you have to set up an import temp
In this section, you will import data from a simple Excel file example, which can be downloaded here:
-{{% button color="info" href="/attachments/howto10/integration/importing-excel-documents/18581949.xlsx" text="Download Example" title="Download sample Excel template" %}}
+{{% button color="info" href="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581949.xlsx" text="Download Example" title="Download sample Excel template" %}}
Based on the structure of the file you want to import, you need to manually set up your template by following these steps:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Click **New Template**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581971.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581971.png" class="no-border" >}}
3. Name the template.
4. Click the arrow next to the **Mendix object** box.
5. Double-click the **Customer** object:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581966.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581966.png" class="no-border" >}}
6. Click the arrow next to the **Reference to import objects** box.
7. Select the **MyFirstModule.Customer_XLSFile** association. By setting the association to the XLS file, the XLS file is saved on disk and the imported data is linked to the source file.
8. Make sure **Import Action** is set to **Synchronize objects**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581965.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581965.png" class="no-border" >}}
{{% alert color="info" %}}For this example, you use a simple Excel file that has only one sheet and column headers on the first row. If a more comprehensive Excel file is used, you can change these values in the **Sheet nr**, **Header row nr**, and **Import from row nr** fields.{{% /alert %}}
@@ -110,17 +110,17 @@ Based on the structure of the file you want to import, you need to manually set
12. Select **Attribute** for the **Type**.
13. Click the arrow next to the **Attribute** box:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581963.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581963.png" class="no-border" >}}
14. Double-click the **Attribute** to which you want to map the Excel value:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581962.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581962.png" class="no-border" >}}
15. Repeat steps 9 to 14 above for each attribute of the **Customer** object.
* For the mapping of attribute **Name**, set the **Key** value to **Yes** to prevent a customer from being duplicated.
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581961.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581961.png" class="no-border" >}}
{{% alert color="info" %}}If the mapping is set up correctly, a green check appears in front of the row.{{% /alert %}}
@@ -133,11 +133,11 @@ Based on the structure of the file you want to import, you need to manually set
6. For the mapping of attribute **Number**, set the **Key** value to **Yes, only for the associated object** in order to prevent orders from being duplicated.
7. Click **Save**.
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581956.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581956.png" class="no-border" >}}
17. For the mapping of the **OrderStatus** attribute, the Excel file value needs to be parsed to an enumeration value. To achieve this, use the **IVK_ParseStatus** microflow (created in the [Preparing the Logic for Data Import](#preparing) section above). Click the arrow next to the **Parse with** box and select the **IVK_ParseStatus** microflow:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581953.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581953.png" class="no-border" >}}
18. Save the import template.
@@ -150,17 +150,17 @@ Follow these steps to import the Excel file:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Go to the **Import files** tab and click **New**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581952.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581952.png" class="no-border" >}}
3. Select the template you just created.
4. Click **Browse**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581951.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581951.png" class="no-border" >}}
5. Select the example Excel file you downloaded and click **Save**.
6. Click the Excel file under **Filename** to select it, then click **Import file**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581950.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581950.png" class="no-border" >}}
7. Click **OK** when the import has finished.
@@ -168,31 +168,31 @@ Follow these steps to import the Excel file:
In this section, you will create the same Excel template in an automated way, which you can do using the specific **New template by excelfile** button. You can use this same Excel file example:
-{{< figure src="/attachments/howto10/integration/importing-excel-documents/18581938.png" link="/attachments/howto10/integration/importing-excel-documents/18581949.xlsx" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581938.png" link="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581949.xlsx" class="no-border" >}}
Follow these steps to create the import template via the Excel file:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Click **New template by excelfile**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581948.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581948.png" class="no-border" >}}
3. Select the example Excel file you downloaded.
4. Define the **Sheet nr**, **Header row nr**, and **Import from row nr**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581947.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581947.png" class="no-border" >}}
5. Click **Save & next**. This will automatically create a row for every header of the Excel file:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581936.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581936.png" class="no-border" >}}
6. In the top section of the page, click the arrow next to **Mendix object** and select the **Customer** object type:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581935.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581935.png" class="no-border" >}}
7. Under **Connect columns to attributes**, click **Connect matching attributes**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581934.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581934.png" class="no-border" >}}
This will automatically match attributes of the selected Mendix object that have the same name as the **Caption**.
@@ -209,11 +209,11 @@ Follow these steps to export and import your template:
1. Click the menu item for **ExcelImportOverview** in the navigation of your app's home page.
2. Click the Excel template you created in the [Creating the Import Template](#creating) section above to select it, then click **Export template** and save the file on your computer:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581933.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581933.png" class="no-border" >}}
3. Import the file you just downloaded by clicking **Import template**, selecting the file, and clicking **Import**:
- {{< figure src="/attachments/howto10/integration/importing-excel-documents/18581932.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581932.png" class="no-border" >}}
You have now imported a complete import template.
diff --git a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/business-event-services.md b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/business-event-services.md
index 2083a86d9a9..fb0c1c91642 100644
--- a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/business-event-services.md
+++ b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/business-event-services.md
@@ -27,7 +27,7 @@ Business event services in are defined centrally by one app for a specific use c
To create a new business service, right-click on a module in your app and go to **Add other** > **Business event service** > **Create a new business event service**. The business event service document is open in Studio Pro:
-{{< figure src="/attachments/refguide10/modeling/integration/business-event-services/new-business-event-service.png" class="no-border" width="700" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/new-business-event-service.png" class="no-border" width="700" >}}
See the [Creating a New Business Event Service](/appstore/services/business-events/#two-way-be-create) section of *Mendix Business Events* for more information.
@@ -35,6 +35,6 @@ See the [Creating a New Business Event Service](/appstore/services/business-even
To create a new business service, right-click on a module in your app and go to **Add other** > **Business event service** > **Use an existing business event service**. After importing the YAML file, the business event service document is open in Studio Pro:
-{{< figure src="/attachments/refguide10/modeling/integration/business-event-services/existing-business-event-service.png" class="no-border" width="700" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/existing-business-event-service.png" class="no-border" width="700" >}}
See the [Using an Existing Business Event Service](/appstore/services/business-events/#two-way-be-existing) section of *Mendix Business Events* for more information.
diff --git a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/execute-an-sql-statement-on-an-external-database.md b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/execute-an-sql-statement-on-an-external-database.md
index af300c2958c..7abde948c41 100644
--- a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/execute-an-sql-statement-on-an-external-database.md
+++ b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/execute-an-sql-statement-on-an-external-database.md
@@ -60,7 +60,7 @@ To use an **Execute statement** action in a microflow, follow these steps:
2. Drag the **Execute statement** action into your microflow:
- {{< figure src="/attachments/refguide10/modeling/integration/execute-an-sql-statement-on-an-external-database/19399123.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/execute-an-sql-statement-on-an-external-database/19399123.png" class="no-border" >}}
3. Configure the statement:
* Provide all the valid arguments to the statement action
@@ -69,7 +69,7 @@ To use an **Execute statement** action in a microflow, follow these steps:
* Specify the **Output Variable name**
* In the example below, the variable is **amountOfUpdatedRows**, which is the output of the SQL statement; this is also the output of the SQL statement provided for the **Sql** argument within the connector
- {{< figure src="/attachments/refguide10/modeling/integration/execute-an-sql-statement-on-an-external-database/19399146.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/execute-an-sql-statement-on-an-external-database/19399146.png" class="no-border" >}}
The statement action's result is either an **Integer** or a **Long** value, which usually represents the amount of affected rows.
diff --git a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/use-the-external-database-connector.md b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/use-the-external-database-connector.md
index 54be55b7e59..4a53ae56b11 100644
--- a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/use-the-external-database-connector.md
+++ b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/external-database-connection/use-the-external-database-connector.md
@@ -50,13 +50,13 @@ For example, the query below retrieves a list of RequestedProductRequirement whe
SQL Query:
`Select requestedProductRequirement from productlines where productLine = {productLine}`
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/4.png" width="700" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/4.png" width="700" >}}
### Typecast Parameter Data Type
You can typecast `String` into UUID, as shown below:
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/13.png" width="700" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/13.png" width="700" >}}
## Save Query
@@ -68,11 +68,11 @@ You can typecast `String` into UUID, as shown below:
a. If **New Entity** is selected, you can view the entity in the **Response structure** tab. Click **Save Query & Create Entity** to save the query and the newly created entity in the domain model.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/5.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5.png" width="600" >}}
b. If **Reuse Entity** is selected, all entities mapped to other queries of same document are listed in the drop-down list. Select the entity you want to reuse and click **Save Query**.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/5a.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5a.png" width="600" >}}
### Save DML Query
@@ -82,7 +82,7 @@ You can typecast `String` into UUID, as shown below:
2. Click **Save Query**.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/6.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/6.png" width="600" >}}
{{% alert color="info" %}} For all DML Queries, changes made to database in the Mendix Design phase are automatically rolled back. {{% /alert %}}
@@ -114,7 +114,7 @@ Do the following:
b. If **Update Entity** is selected, you can see changes that will be made to the existing entity. Click **Update Entity** to save the query and the changes made to the entity in the domain model.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/5b.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5b.png" width="600" >}}
## Call Stored Procedure
@@ -126,19 +126,19 @@ To call a stored procedure, do the following:
2. Enter the query to call a stored procedure. Add a schema name with the stored procedure name. For example, use the following syntax, where `latest_schema` is the schema name, and `InsertDataIntoTable1` is the stored procedure: `Call latest_schema.InsertDataIntoTable1({1},{2})`.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/9.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/9.png" width="600" >}}
3. Create **IN**, **OUT**, and **INOUT** parameters for all parameters present in the stored procedure. Make sure the **Name in DB** is the same as the name of parameter in the stored procedure.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/10.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/10.png" width="600" >}}
4. Click **Run Query**. This returns an entity with the number of affected rows and all INOUT and OUT parameters. If the stored procedure returns a **Result set**, an associated entity is created.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/11.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/11.png" width="600" >}}
5. Click **Use Response** > **Save Query & Create Entity** to save the query and the newly-created entities in the domain model.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/12.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/12.png" width="600" >}}
{{% alert color="info" %}}DML commands within a stored procedure are rolled back if they are not committed by a stored procedure, but DDL commands are not.{{% /alert %}}
@@ -178,7 +178,7 @@ For MSSQL, for **INOUT** and **OUT** parameters of type Decimal, test values (in
5. Output details for the selected query auto-populate.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-external-database-connector/7.png" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/7.png" width="600" >}}
You are now ready to use data from an external database in your Mendix App.
diff --git a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer.md b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer.md
index 4aeee891d26..7cdc4962a06 100644
--- a/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer.md
+++ b/content/en/docs/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer.md
@@ -35,7 +35,7 @@ The Data Importer document can be used along with the [Import data from file](/r
Right-click the module you want to add the Data Importer document to and click **Add other** > **Data Importer**.
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/data-importer-menu.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/data-importer-menu.png" class="no-border" width="600" >}}
Name the document, then click **OK**, and the new Data Importer document opens.
@@ -43,7 +43,7 @@ Name the document, then click **OK**, and the new Data Importer document opens.
Click **Select a local file** to import an Excel file (*.xls* or *.xslx*).
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/select-file-for-preview.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/select-file-for-preview.png" class="no-border" width="600" >}}
Select or drop the file in the **Select Source File** field. An Excel workbook can have single or multiple sheets; you can choose which sheet to import data from and specify the header row and starting data row.
@@ -51,7 +51,7 @@ Select or drop the file in the **Select Source File** field. An Excel workbook c
* **Header Row No.** – row number of the file header; the default is 1
* **Read Data From Row No.** – starting line for reading data; the default is 2
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/select-sheet-and-header-data-row.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/select-sheet-and-header-data-row.png" class="no-border" width="600" >}}
Click **Preview Source Data & Entity** to view the data from the file. The first 10 data rows from the source file are shown in the data preview section. If there are less than 10 data rows in the sample file, only the available rows are shown. The column names correspond to the attribute name within the entity, and the sheet name is used to define the entity.
@@ -59,7 +59,7 @@ All the columns are automatically selected (checked) for import. You can uncheck
{{% alert color="warning" %}} Column names that do not adhere to Mendix naming conventions will be autocorrected. For **Number** cell-types, the target Mendix type is mapped to **Decimal** to accommodate to integers and decimals. {{% /alert %}}
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/preview-data-and-entity.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/preview-data-and-entity.png" class="no-border" width="600" >}}
### Previewing CSV Data {#preview-csv-data}
@@ -80,11 +80,11 @@ All the columns are selected (checked) by default. You can uncheck the columns y
For example, for the following source data (CSV), the separator is specified as Comma and Quote, and the Escape Character is Double Quote and Header. This is already part of the input file.
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/source-csv-data.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/source-csv-data.png" class="no-border" width="600" >}}
The data preview and resulting entity are seen below:
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/preview-csv-data-and-entity.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/preview-csv-data-and-entity.png" class="no-border" width="600" >}}
### Editing an Entity {#edit-entity}
@@ -96,7 +96,7 @@ You can edit the entity in the **Entity Preview** section. The Data Importer sup
Click **Edit** at top-right corner of **Entity Preview**. This will render a pop-up window where you can change the name of the entity. You can also change the name of the attribute; *Original Name* is the name of the column from input file and *Attribute Name* will be the new name that you want to assign to this column. You can also change the data type of this attribute by selecting a relevant value from the drop-down as shown below.
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/edit-csv-entity.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/edit-csv-entity.png" class="no-border" width="600" >}}
Once you are satisfied with the changes, click **OK** to save or **Cancel** to discard your changes.
@@ -134,7 +134,7 @@ When you are done editing the entity, click **Create Entity** > **OK**. This wil
When the entity is created, you can view the mapping of the source columns to the target entity attributes.
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/source-to-target-mapping.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/source-to-target-mapping.png" class="no-border" width="600" >}}
The Data Importer document creation is complete and can be used to import data in a microflow.
@@ -146,7 +146,7 @@ The newly-created Data Importer document allows you to periodically import data
The **Import data from file** activity is found under **Integration activities** in the **Toolbox**. Double-click to view its properties:
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/custom-activity-params.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/custom-activity-params.png" class="no-border" width="600" >}}
The **Input** section includes:
@@ -166,17 +166,17 @@ The **Import data from file** custom activity needs an input file to import data
2. Double-click the button and in the **Events** field under the **On click** drop-down, select **Create object** to create a `System.FileDocument` entity.
3. Pass the control to a new page (**UploadCustomerData**) where the file is uploaded.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/home-page-button.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/home-page-button.png" class="no-border" width="600" >}}
4. On the **UploadCustomerData** page, include a data view for the *FileDocument* and include a 'File Manager' to assist with a file upload.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/data-view-file-manager.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/data-view-file-manager.png" class="no-border" width="600" >}}
5. Open the **Toolbox** and add a **Call microflow button**.
6. Click **New** and name the microflow *Import Customer Data*. You also see **FileDocument** in the parameters section; make sure this box is checked to include it as a parameter and click **OK**.
-{{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/add-parameter.png" class="no-border" width="600" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/add-parameter.png" class="no-border" width="600" >}}
### Configuring the Import data from file Activity in a Microflow
@@ -186,39 +186,39 @@ The steps below are shown using an Excel input file with its corresponding Data
1. In the created microflow, drag the **Import data from file** activity into it. You can find this activity in the **Toolbox** under **Integration activities**.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/integration-activity.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/integration-activity.png" class="no-border" width="600" >}}
2. When the **Import data from file** activity is added into microflow, you see three errors in the console:
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/custom-activity.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/custom-activity.png" class="no-border" width="600" >}}
To address these errors, double-click the activity and in the **File** field, choose the input file that is passed from the file upload page to this microflow as a parameter.
3. In the **Data Importer document** field, click **Select** and choose the Data Importer document you want to use.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/choose-data-importer-template.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/choose-data-importer-template.png" class="no-border" width="600" >}}
After selecting the Data Importer document, the **Return type** and **Variable name** auto-populates. You can change the name of the output variable if you wish.
4. Click **OK**. The custom activity is configured and all the errors will resolve.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/configured-custom-activity.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/configured-custom-activity.png" class="no-border" width="600" >}}
5. Add an **Aggregate list** activity and configure it to count the size of the 'CustomerList', which is returned from the previous activity.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/aggregate-list.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/aggregate-list.png" class="no-border" width="600" >}}
6. Configure a **Show message** activity. You can use a template message and a parameter, such as in the example below.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/show-message-with-list-size.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/show-message-with-list-size.png" class="no-border" width="600" >}}
7. Set '$CustomerList' as the return value from the **Import data from file** activity to be used later. Your completed microflow should look like the image below.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/example-microflow.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/example-microflow.png" class="no-border" width="600" >}}
8. Deploy your app locally. Browse and upload an input file, which is similar to the file that was used as a template while creating Data Importer document.
9. Check that you see a message that states **Imported xx rows from input file into a list of NPEs**.
- {{< figure src="/attachments/refguide10/modeling/integration/use-the-data-importer/local-app-run.png" class="no-border" width="600" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/local-app-run.png" class="no-border" width="600" >}}
You have successfully configured and used the Data Importer extension. You can extend this as per your requirements. For example, you can convert the list of NPEs into persistable entities by providing a message definition, or use each loop construct and individually create and commit entities into your database.
diff --git a/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-complex-web-service.md b/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-complex-web-service.md
index cfc14a90832..e5ebb78e322 100644
--- a/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-complex-web-service.md
+++ b/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-complex-web-service.md
@@ -26,13 +26,13 @@ To import a web service directly, follow these steps:
2. Specify a name for the new consumed web service and click **OK**.
3. In the **Consumed Web Service** box, specify the **WSDL Source** to be use this consumed web service. Click **Edit**, and in the **WSDL Source** dialog box, specify a **URL** or load a **File** from your computer.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/enter-wsdl-url.png" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/enter-wsdl-url.png" class="no-border" width="700" >}}
4. Click **Import** to fetch the services and operations in the WSDL. If prompted, in the **WSDL Source** dialog box, select the ports you want to use and click **OK**.
5. In the **Consumed web service** screen, review the **Services** and **Operations** available to the imported web service. If you click on any of the operations, information about the operation will be displayed in the right pane. You can select individual web service operations from the list, otherwise the whole service and operation will be imported:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/consumed-web-service-doc.png" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/consumed-web-service-doc.png" class="no-border" width="700" >}}
## Configuring the Web Service Call
@@ -40,7 +40,7 @@ To configure the web service call, follow these steps:
1. If you did not use the web service wizard or did not use the option in the wizard to automatically create a microflow, create a microflow that will call the imported web service:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/import-microflow.png" class="no-border" width="500" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/import-microflow.png" class="no-border" width="500" >}}
{{% alert color="info" %}}Make sure the microflow either creates the variables required as arguments for the web service call or has them passed to it.{{% /alert %}}
@@ -48,30 +48,30 @@ To configure the web service call, follow these steps:
3. Double-click the activity to open the **Call Web Service** properties editor and in the **Operation** field, click **Select**.
4. In the **Select Web Service Operation** dialog box, you can select the operation for this web service call:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/select-web-service-op.png" alt="select web service op" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/select-web-service-op.png" alt="select web service op" class="no-border" width="700" >}}
5. In the **SOAP Request Body** tab of the **Call Web Service** properties editor, you can configure the SOAP body. This contains the parameters needed to execute the web service request. The **Simple**, **Export Mapping**, and **Custom** options enable you to select the type of SOAP body to use. Click **Edit value** and use one of the following to change the domain-to-XML mapping or the variables from the microflow used as input arguments:
* **Simple expressions for each request parameter** — if the imported web service requires only primitive arguments:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/simple-expression-param.png" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/simple-expression-param.png" class="no-border" width="700" >}}
* **Export mappings for each request parameter** or **Export mapping for the entire request** — if the domain model entities need to be mapped to XML elements
* **Custom request template** — for the definition of a custom XML body with parameters:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/custom-request-temp.png" alt="custom-request-temp" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/custom-request-temp.png" alt="custom-request-temp" class="no-border" width="700" >}}
6. In the **HTTP Headers** tab, if the Mendix Runtime should use HTTP authentication before calling the web service, check **Use HTTP authentication** and enter the **User name** and **Password** using the **Edit** buttons:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/http-authentication.png" alt="http-authentication" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/http-authentication.png" alt="http-authentication" class="no-border" width="700" >}}
7. In the **SOAP Response** tab, you can configure the handling of the return from the web service call as follows:
* If the return is a complex XML structure, select **Mapping** and use an XML-to-domain mapping to map the XML elements to the domain model entities:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/18581790.png" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/18581790.png" class="no-border" width="700" >}}
* If the return is a primitive, you can store it in a variable by selecting **Store in variable** — **Yes** and provide the **Type** and **Variable**:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-complex-web-service/18581789.png" class="no-border" width="700" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/18581789.png" class="no-border" width="700" >}}
* If you want to ignore the return, select **Ignore**
diff --git a/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-simple-web-service.md b/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-simple-web-service.md
index 642d05289be..17695319293 100644
--- a/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-simple-web-service.md
+++ b/content/en/docs/refguide10/modeling/integration/web-services/consumed-web-services/consume-a-simple-web-service.md
@@ -29,11 +29,11 @@ To import a WSDL, follow these steps:
3. On the **Consumed Web Service** screen, click **Edit**. Enter `https://www.w3schools.com/xml/tempconvert.asmx?wsdl` as the **URL** and click **Import**.
4. The **Select Ports** dialog box is displayed for selecting a web service port:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/select-ports.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/select-ports.png" class="no-border" >}}
5. Click **OK** to select the default, then click **OK** to close the **WSDL Source** dialog. The operations **CelsiusToFahrenheit** and **FahrenheitToCelsius** are imported into the app:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/wsdl-source-dialog-box.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/wsdl-source-dialog-box.png" class="no-border" >}}
## Creating Logic to Call the Web Service
@@ -42,55 +42,55 @@ To create logic to call the web service, follow these steps:
1. Right-click your module in the **App Explorer** and select **Add microflow** from the menu:
2. Name your microflow *ConvertCelsiusToFahrenheit* and click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/add-microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/add-microflow.png" class="no-border" >}}
3. An empty microflow is displayed:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/empty-microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/empty-microflow.png" class="no-border" >}}
4. Open the **Toolbox** and drag a **Create variable** activity to the line between the start and end event.
5. Double-click the new activity to open the **Create Variable** properties editor.
6. For the **Data Type**, select **Integer/Long** and enter *100* as the value. For the **Output Variable Name** enter *TemperatureInCelsius*:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/create-variable.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/create-variable.png" class="no-border" >}}
7. Click **OK.** The microflow will look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/18582079.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/18582079.png" class="no-border" >}}
8. Drag a **Call web service** activity from the toolbox and add it to the microflow just before the end event.
9. Double-click this activity to open the **Call Web Service** properties editor. For the **Operation** of your consumed web service, click **Select**. Expand the **TemperatureConverter** web service and under **TempConvert**, click **CelsiusToFahrenheit** > **Select**:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/call-web-service-editor.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/call-web-service-editor.png" class="no-border" >}}
10. In the **Location** section for this operation, check the **Override location** box to override the location and use the secure location of the web service.
11. Click **Edit** and change `http` to `https` for the URL in the **Location** editor, then click **OK**.
12. In the **SOAP Request Body** tab of the **Call Web Service** properties editor, double-click the **Celsius (optional)** input parameter and enter `toString($TemperatureInCelsius)` for the expression, as the web service operation expects a string value. Then, click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/soap-request-body.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/soap-request-body.png" class="no-border" >}}
13. In the **SOAP Response** tab, select **Yes** for the **Store in variable** option. Enter *TemperatureInFahrenheit* for the **Variable name**:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/call-web-service-soap-response.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/call-web-service-soap-response.png" class="no-border" >}}
14. Click **OK**. The microflow will look like this:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/microflow-part-2.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/microflow-part-2.png" class="no-border" >}}
15. Drag a **Show message** activity from the **Toolbox** to the line before the end event.
16. Double-click the new activity to open the **Show Message** dialog box.
17. Select **Information** as the **Type**, and enter *The temperature in Fahrenheit is: {1}* for the **Template**. The *{1}* functions as a placeholder for the parameters.
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/show-message.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/show-message.png" class="no-border" >}}
18. Create a new parameter and enter `$TemperatureInFahrenheit` for the expression (this is the return value of the web service operation) and click **OK**:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/parameter.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/parameter.png" class="no-border" >}}
19. Click **OK** again to save the show message activity values. The microflow now looks like this:
- {{< figure src="/attachments/refguide10/modeling/integration/consume-a-simple-web-service/completed-microflow.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/completed-microflow.png" class="no-border" >}}
20. Create a menu item that triggers this microflow. For details on how to create a menu item, see [Setting Up Navigation](/refguide10/setting-up-the-navigation-structure/).
diff --git a/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/expose-a-web-service.md b/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/expose-a-web-service.md
index ab8962009ff..5261c6fa8e8 100644
--- a/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/expose-a-web-service.md
+++ b/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/expose-a-web-service.md
@@ -30,7 +30,7 @@ This how-to was written based on Studio Pro 9.24. All the images, names, and ste
1. Create the following **Customer** entity in your domain model (for details on how to create an entity, see [Configuring a Domain Model](/refguide10/configuring-a-domain-model/)):
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/8945665.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/8945665.png" class="no-border" >}}
2. Create overview and detail pages to manage objects of the **Customer** type (for details on how to create overview and detail pages, see [How to Create Your First Two Overview and Detail Pages](/howto10/front-end/create-your-first-two-overview-and-detail-pages/)).
3. Create a menu item to access the customer overview page (for details on how to create menu items, see [Setting Up Navigation](/refguide10/setting-up-the-navigation-structure/)).
@@ -44,16 +44,16 @@ To create a published web service, follow these steps:
2. In the **Add Published Web Service** window, enter *CustomerWebService* for the **Name**, then click **OK**:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581728.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581728.png" class="no-border" >}}
3. You should now see the **Published Web Service** properties window. Take note of the following tab details:
* On the **Operations** tab, you can see the available operations of the web service (currently, the list is empty, so an operation will be added in the section [Publishing a Microflow](#publish-a-microflow), below):
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581713.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581713.png" class="no-border" >}}
* On the **Settings** tab, you can configure the other settings. Do change them before publishing your web service, especially the **Target namespace** (for details on these settings, see [Published Web Service](/refguide10/published-web-service/)):
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581712.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581712.png" class="no-border" >}}
4. Click **OK**.
@@ -64,11 +64,11 @@ To create the functionality to expose, follow these steps:
1. Create a microflow that retrieves and returns a list of customers from the database (for details on how to create a microflow, see [Triggering a Microflow From a Menu Item](/refguide10/triggering-microflow-from-menu-item/)).
2. Add two input parameters to dynamically set the range settings of the retrieve action. Configure the range options of the retrieve action like this:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581709.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581709.png" class="no-border" >}}
Reference this microflow:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/model.jpg" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/model.jpg" class="no-border" >}}
If you get any errors, you will need to mark the input parameters in the **Operations** > **Parameters** section of the service document as **Optional** and **Nillable** (see the following section.)
@@ -78,11 +78,11 @@ To publish a microflow, follow these steps:
1. Right-click somewhere in the background of the microflow and select **Publish as Web service operation**:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581708.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581708.png" class="no-border" >}}
2. Locate the web service created in [Creating a Published Web Service](#create-published-web-service) and click **Select**:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581723.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581723.png" class="no-border" >}}
3. You should now see the **Operation Operation** properties editor. Take note of the following tab details:
@@ -92,7 +92,7 @@ To publish a microflow, follow these steps:
4. Click **Select...** to select which attributes and associations of the return object **Customer** you want to expose:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581704.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581704.png" class="no-border" >}}
5. Select the members you want to expose and click **OK**. Only the selected members will be returned by the web service.
6. Click **OK** to save the operation.
@@ -109,7 +109,7 @@ To get a WSDL, follow these steps:
* If you run the application in a Free App environment, the application URL should look like this: `https://myfirstapp.mendixcloud.com/index.html`
3. In both of the above cases, you can replace `/index.html` with `/ws-doc/` to open the web service documentation page:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581703.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581703.png" class="no-border" >}}
You should see the name of your web service in the list.
4. Click the "WSDL schema" URL to open the WSDL. This WSDL can be given to others so they can interact with your web service.
@@ -121,7 +121,7 @@ To change the user authentication, follow these steps:
1. Double-click the published web service in the **App Explorer**.
2. In the **Published Web Service** properties window, open the **Settings** tab. Because **No Authentication** is set, current users of the web service do not need to authenticate:
- {{< figure src="/attachments/refguide10/modeling/integration/expose-a-web-service/18581702.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581702.png" class="no-border" >}}
3. Change **Authentication** to **Username and password**.
diff --git a/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/operations.md b/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/operations.md
index 0c143d13515..d0d80a4195b 100644
--- a/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/operations.md
+++ b/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/operations.md
@@ -13,7 +13,7 @@ An operation has the properties described below.
## General
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/operations/16843884.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/operations/16843884.png" class="no-border" >}}
### Name
@@ -29,7 +29,7 @@ Describes the operation and is included in the WSDL.
## Parameters
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/operations/16843879.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/operations/16843879.png" class="no-border" >}}
### Microflow Parameter
@@ -59,7 +59,7 @@ This is available when the parameter is a list, and can be used to name the obje
The `CountCarsAndHp` operation takes a non-optional list of vehicles as a parameter, which is called *VehicleList* and consists of objects called *Vehicle*. This information is based on the microflow and entity model, but can be modified.
{{% /alert %}}
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/operations/918221.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/operations/918221.png" class="no-border" >}}
The microflow attached to the `CountCarsAndHp` operation. It takes a list of objects of the entity Vehicle as input and returns an object that holds the number of cars and the total amount of horsepower of those cars.
@@ -76,7 +76,7 @@ If you click **Select** in the **Parameter** tab, you can select individual memb
| All nillable | Checks the Nillable box on every expanded node and visible leaf node. |
| All non-nillable | Unchecks the Nillable box on every expanded node and visible leaf node. |
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/operations/16843878.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/operations/16843878.png" class="no-border" >}}
Here you can select which members of the entity can be passed and/or are optional or nillable, as well as set their names. Note that checking **Optional** or **Nillable** on the root element has no effect; set these values in the operation editor.
@@ -112,6 +112,6 @@ This determines if the element in the XML is sent as nil if the return value is
Optional and Nillable cannot both be checked.
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/operations/16843880.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/operations/16843880.png" class="no-border" >}}
Here, you can see an optional Order entity set as the return type of the operation ReturnsOrder.
diff --git a/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/published-web-service.md b/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/published-web-service.md
index 5b1df4dab06..18929fd8353 100644
--- a/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/published-web-service.md
+++ b/content/en/docs/refguide10/modeling/integration/web-services/published-web-services/published-web-service.md
@@ -9,13 +9,13 @@ This document describes the properties of a published web service. If you want a
## Operations
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/published-web-service/16843888.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/published-web-service/16843888.png" class="no-border" >}}
Provide the actual [operations](/refguide10/operations/) of which the web service is composed. Each of these operations is a microflow.
## Settings
-{{< figure src="/attachments/refguide10/modeling/integration/published-web-services/published-web-service/16843887.png" class="no-border" >}}
+{{< figure src="/attachments/refguide10/modeling/integration/web-services/published-web-service/16843887.png" class="no-border" >}}
### Validate Against WSDL
diff --git a/content/en/docs/refguide10/modeling/integration/web-services/testing-web-services-using-soapui.md b/content/en/docs/refguide10/modeling/integration/web-services/testing-web-services-using-soapui.md
index 0a660eacb92..ced30d2cb2f 100644
--- a/content/en/docs/refguide10/modeling/integration/web-services/testing-web-services-using-soapui.md
+++ b/content/en/docs/refguide10/modeling/integration/web-services/testing-web-services-using-soapui.md
@@ -39,11 +39,11 @@ In [Expose a Web Service](/howto10/integration/expose-a-web-service/), you publi
1. Open the app you created in [How to Expose a Web Service](/howto10/integration/expose-a-web-service/).
2. Create a microflow that creates a customer and returns a Boolean:
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/model1.jpg" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/model1.jpg" class="no-border" >}}
3. Create a microflow that deletes a customer and returns a Boolean:
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/model2.jpg" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/model2.jpg" class="no-border" >}}
4. Publish both microflows as web service operations of the **CustomerWebService** as described in [How to Expose a Web Service](/howto10/integration/expose-a-web-service/).
@@ -55,10 +55,10 @@ In this section, you will create a new SOAP project.
2. Press Ctrl + N to create a new SOAP project.
3. Run your app locally in Studio Pro.
4. Go to `http://localhost:8080/ws-doc/`.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580314.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580314.png" class="no-border" >}}
5. Enter the URL of the WSDL schema in the **Initial WSDL** field in SoapUI.
The **Project Name** field will automatically be filled with the name of the web service, followed by *?wsdl*.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580334.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580334.png" class="no-border" >}}
6. Click **OK**. This will create a new SOAP project in SoapUI.
## Building a TestSuite, TestCase, and TestStep
@@ -68,21 +68,21 @@ In this section, you will build a TestSuite. A TestSuite contains one or more Te
1. In SoapUI, press Ctrl + T to create a new TestSuite. You can use the given name `TestSuite 1.
2. Click **OK**.
3. Select `TestSuite 1` and press Ctrl + N to create a new TestCase.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580331.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580331.png" class="no-border" >}}
4. Click **OK**.
5. Expand TestSuite 1 and TestCase 1.
6. Right-click **Test Steps(0)** and select **SOAP Request**.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580312.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580312.png" class="no-border" >}}
7. Enter *Retrieve Customers* in the name field.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580329.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580329.png" class="no-border" >}}
8. Click **OK**.
9. Select **CustomerWebserviceSoap -> GetCustomers**.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580328.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580328.png" class="no-border" >}}
10. Click **OK**.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580327.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580327.png" class="no-border" >}}
11. Click **OK**.
12. Open SOAP request **Retrieve Customers**.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580326.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580326.png" class="no-border" >}}
13. Change the follow value:
```java
@@ -137,15 +137,15 @@ In this section, you will build a TestSuite. A TestSuite contains one or more Te
Assertions are used to validate the message received by a TestStep during execution, usually by comparing parts of the message (or the entire message) to some expected value. In this section, you will create an assertion that validates the number of customers.
1. Click **Assertions (1)**.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580307.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580307.png" class="no-border" >}}
In chapter 3 step 9 the *Add SOAP Response Assertion* checkbox was checked. That is the first assertion you see in the list, *SOAP Response - VALID*.
2. Click the add assertion icon.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580324.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580324.png" class="no-border" >}}
3. Click **Property Content**.
4. Click **XPath Match**.
5. Enter *count(//Customer)* in the XPath Expression field.
6. In step 1.4 of the previous how-to, you added some data. Enter the number of created customers in the **Expected Result** field. In this example, four customers were created.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580323.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580323.png" class="no-border" >}}
7. Click **Save**.
## Extending Your Test Case
@@ -176,11 +176,11 @@ In this section, you will extend your TestCase with multiple test steps and asse
```
3. Add a **Contains Assertion** and enter *true* in the content field.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580322.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580322.png" class="no-border" >}}
4. Right-click TestStep **Retrieve Customers**.
5. Select **Clone TestStep**.
6. Change **TestStep Name** to *Retrieve Customers 2*.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580320.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580320.png" class="no-border" >}}
7. Click **OK**.
8. Open TestStep **Retrieve Customers 2**.
9. Click **Assertions (2)**.
@@ -209,9 +209,9 @@ In this section, you will extend your TestCase with multiple test steps and asse
In this section, you will learn how to run the TestCase you created in previous chapters.
1. Open TestCase **TestCase 1**.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580310.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580310.png" class="no-border" >}}
2. Click the run this TestCase icon.
- {{< figure src="/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580309.png" class="no-border" >}}
+ {{< figure src="/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580309.png" class="no-border" >}}
Congratulations! You have created your first automated test with SoapUI.
diff --git a/static/attachments/refguide/modeling/integration/xml-schemas/18582294.png b/static/attachments/refguide/modeling/integration/mapping-documents/xml-schemas/schema.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/xml-schemas/18582294.png
rename to static/attachments/refguide/modeling/integration/mapping-documents/xml-schemas/schema.png
diff --git a/static/attachments/refguide/modeling/integration/xml-schemas/xml-schema-support/16843903.png b/static/attachments/refguide/modeling/integration/mapping-documents/xml-schemas/warning.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/xml-schemas/xml-schema-support/16843903.png
rename to static/attachments/refguide/modeling/integration/mapping-documents/xml-schemas/warning.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/associating-objects.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/associating-objects.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/associating-objects.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/associating-objects.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581908.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/create-association.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581908.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/create-association.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/exporter.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/exporter.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/exporter.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/exporter.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/java-action.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/java-action.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/java-action.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/java-action.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/microflow-for-generate.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/microflow-for-generate.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/microflow-for-generate.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/microflow-for-generate.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/multiple-sheets.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/multiple-sheets.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/multiple-sheets.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/multiple-sheets.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581166.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/mx-model-reflection.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581166.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/mx-model-reflection.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-excel-template.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-excel-template.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-excel-template.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-excel-template.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581905.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-export-column.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581905.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-export-column.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-menu-item-excel-exporter.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-excel-exporter.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-menu-item-excel-exporter.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-excel-exporter.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-menu-item-mxreflection.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-mxreflection.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/new-menu-item-mxreflection.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-mxreflection.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581907.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-sheet-template.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581907.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/new-sheet-template.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/retrieve-template.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/retrieve-template.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/retrieve-template.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/retrieve-template.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/security.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/security.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/security.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/security.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581903.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/static-data-tab.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581903.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/static-data-tab.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581900.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/styles.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/18581900.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/styles.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/upload-excel-file.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/upload-excel-file.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/upload-excel-file.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/upload-excel-file.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/worksheet-with-input-object.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/worksheet-with-input-object.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/worksheet-with-input-object.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/worksheet-with-input-object.png
diff --git a/static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/worksheet-without-input-object.png b/static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/worksheet-without-input-object.png
similarity index 100%
rename from static/attachments/refguide/modeling/integration/use-excel-documents/using-the-excel-exporter/worksheet-without-input-object.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/export-to-excel/worksheet-without-input-object.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/attribute-box.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/attribute-box.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/attribute-box.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/attribute-box.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/browse-file.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/browse-file.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/browse-file.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/browse-file.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/confirm-import.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/confirm-import.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/confirm-import.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/confirm-import.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/connect-matching-attributes.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/connect-matching-attributes.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/connect-matching-attributes.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/connect-matching-attributes.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/customer-object.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/customer-object.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/customer-object.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/customer-object.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/define-sheet.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/define-sheet.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/define-sheet.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/define-sheet.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/domain-model.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/domain-model.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/domain-model.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/domain-model.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/double-click-attribute.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/double-click-attribute.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/double-click-attribute.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/double-click-attribute.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/download-example.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/download-example.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/download-example.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/download-example.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/export-template.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/export-template.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/export-template.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/export-template.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/import-file.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/import-file.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/import-file.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/import-file.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/import-template.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/import-template.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/import-template.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/import-template.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/mapping-attribute.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/mapping-attribute.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/mapping-attribute.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/mapping-attribute.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/microflow.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/microflow.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/microflow.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/microflow.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/module-example.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/module-example.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/module-example.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/module-example.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/new-template-excel=file.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/new-template-excel=file.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/new-template-excel=file.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/new-template-excel=file.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/new-template.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/new-template.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/new-template.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/new-template.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/repeat-attribute.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/repeat-attribute.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/repeat-attribute.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/repeat-attribute.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/sample-excel-file.xlsx b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sample-excel-file.xlsx
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/sample-excel-file.xlsx
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sample-excel-file.xlsx
diff --git a/static/attachments/howto/integration/importing-excel-documents/save-and-next.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/save-and-next.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/save-and-next.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/save-and-next.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/save-order-attribute.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/save-order-attribute.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/save-order-attribute.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/save-order-attribute.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/select-object.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/select-object.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/select-object.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/select-object.png
diff --git a/static/attachments/howto/integration/importing-excel-documents/sychronize-objects.png b/static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sychronize-objects.png
similarity index 100%
rename from static/attachments/howto/integration/importing-excel-documents/sychronize-objects.png
rename to static/attachments/refguide/modeling/integration/use-excel-documents/importing-excel-documents/sychronize-objects.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/16843940.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/16843940.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843939.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/example-mapping-document.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843939.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/example-mapping-document.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843935.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/mapping-attributes.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843935.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/mapping-attributes.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843936.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/object-by-microflow-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843936.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/object-by-microflow-example.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843937.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/object-by-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843937.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/object-by-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843934.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/optional-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843934.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/optional-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843938.png b/static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/topping-object.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/16843938.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/export-mappings/topping-object.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/16843933.png b/static/attachments/refguide10/modeling/integration/mapping-documents/import-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/16843933.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/import-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843942.png b/static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/im-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843942.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/im-example.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843943.png b/static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/mapping-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843943.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/mapping-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843944.png b/static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/schema-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/16843944.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/import-mappings/schema-example.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579459.png b/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/auto-map-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579459.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/auto-map-example.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579460.png b/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/change-dialog-reuse.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579460.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/change-dialog-reuse.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579458.png b/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/change-dialog.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579458.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/change-dialog.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579457.png b/static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/domain-model-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/18579457.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/map-automatically/domain-model-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/select--elements/19399143.png b/static/attachments/refguide10/modeling/integration/mapping-documents/select--elements/schema-elements-window.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/select--elements/19399143.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/select--elements/schema-elements-window.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581803.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/action-button-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581803.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/action-button-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581804.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/add-action-button.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581804.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/add-action-button.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581809.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/connector-pane.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581809.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/connector-pane.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581801.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/create-object-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581801.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/create-object-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/create-object.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/create-object.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/create-object.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/create-object.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581816.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/customer-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581816.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/customer-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581813.xsd b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/customer-schema.xsd
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581813.xsd
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/customer-schema.xsd
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581818.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/download-file.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581818.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/download-file.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581808.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/drag-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581808.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/drag-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581825.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/edit-changed-item.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581825.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/edit-changed-item.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581819.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/edited-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581819.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/edited-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581822.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/export-with-mapping-dialog.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581822.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/export-with-mapping-dialog.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581810.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/im-part-1.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581810.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/im-part-1.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581806.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/mapping-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581806.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/mapping-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581823.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/microflow-final.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581823.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/microflow-final.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581827.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581827.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581849.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581849.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581696.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-schema.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581696.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/name-schema.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581802.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581802.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581814.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/reference-set.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581814.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/reference-set.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581830.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/retrieve-objects.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581830.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/retrieve-objects.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581821.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/save-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581821.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/save-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581812.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/schema-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581812.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/schema-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581807.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/select-attributes.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581807.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/select-attributes.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581811.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/select-schema-elements.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581811.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/select-schema-elements.png
diff --git a/static/attachments/refguide10/modeling/integration/export-xml-documents/18581650.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/xmldocument-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/export-xml-documents/18581650.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/export-xml-documents/xmldocument-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581647.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/add-action.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581647.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/add-action.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581649.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customer-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581649.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customer-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581651.xml b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customers-xml.xml
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581651.xml
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/customers-xml.xml
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581681.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/drag-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581681.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/drag-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581646.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/edit-action-button-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581646.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/edit-action-button-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581653.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/editor-filled.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581653.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/editor-filled.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581655.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/im-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581655.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/im-example.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581668.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/im-properties.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581668.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/im-properties.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581669.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/import-parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581669.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/import-parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581654.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/map-entity-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581654.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/map-entity-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581667.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/microflow-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581667.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/microflow-example.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581689.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/name-import-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581689.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/name-import-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581652.xsd b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/sample-xsd.xsd
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581652.xsd
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/sample-xsd.xsd
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581656.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/select-elements.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581656.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/select-elements.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581657.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/select-schema.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581657.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/select-schema.png
diff --git a/static/attachments/refguide10/modeling/integration/importing-xml-documents/18581648.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/xml-overview-page.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/importing-xml-documents/18581648.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/importing-xml-documents/xml-overview-page.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/xml-inheritance-and-choice/16843945.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice/choice.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/xml-inheritance-and-choice/16843945.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice/choice.png
diff --git a/static/attachments/refguide10/modeling/integration/mapping-documents/xml-inheritance-and-choice/16843946.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice/inheritance.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/mapping-documents/xml-inheritance-and-choice/16843946.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-documents/xml-inheritance-and-choice/inheritance.png
diff --git a/static/attachments/refguide10/modeling/integration/xml-schemas/18582294.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-schemas/schema.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/xml-schemas/18582294.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-schemas/schema.png
diff --git a/static/attachments/refguide10/modeling/integration/xml-schemas/xml-schema-support/16843903.png b/static/attachments/refguide10/modeling/integration/mapping-documents/xml-schemas/warning.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/xml-schemas/xml-schema-support/16843903.png
rename to static/attachments/refguide10/modeling/integration/mapping-documents/xml-schemas/warning.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/call-send-email-logic.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/call-send-email-logic.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/call-send-email-logic.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/call-send-email-logic.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/create-customer-email-request-entity.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/create-customer-email-request-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/create-customer-email-request-entity.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/create-customer-email-request-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/create-resources-associations.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/create-resources-associations.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/create-resources-associations.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/create-resources-associations.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/define-insert-action.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/define-insert-action.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/define-insert-action.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/define-insert-action.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/error-422.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/error-422.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/error-422.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/error-422.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/example-domain-model.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/example-domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/example-domain-model.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/example-domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/expand-expression.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/expand-expression.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/expand-expression.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/expand-expression.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/expose-single-resource-domain-model.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/expose-single-resource-domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/expose-single-resource-domain-model.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/expose-single-resource-domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/fetch-all-customers.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/fetch-all-customers.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/fetch-all-customers.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/fetch-all-customers.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/fetch-single-customer.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/fetch-single-customer.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/fetch-single-customer.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/fetch-single-customer.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/filter-sort-page-attribute.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/filter-sort-page-attribute.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/filter-sort-page-attribute.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/filter-sort-page-attribute.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/get-call.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-call.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/get-call.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-call.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/get-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/get-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/get-resource-sent.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-resource-sent.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/get-resource-sent.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/get-resource-sent.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/insert-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/insert-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/insert-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/insert-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/insert-new-data.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/insert-new-data.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/insert-new-data.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/insert-new-data.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/json-schema.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/json-schema.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/json-schema.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/json-schema.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/long-queries.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/long-queries.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/long-queries.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/long-queries.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/modify-existing-data-1.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/modify-existing-data-1.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/modify-existing-data-1.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/modify-existing-data-1.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/modify-existing-data-2.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/modify-existing-data-2.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/modify-existing-data-2.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/modify-existing-data-2.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/openapi-contract.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/openapi-contract.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/openapi-contract.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/openapi-contract.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/oql-database.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/oql-database.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/oql-database.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/oql-database.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/prefer-header.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/prefer-header.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/prefer-header.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/prefer-header.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/query-resource-endpoint.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/query-resource-endpoint.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/query-resource-endpoint.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/query-resource-endpoint.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/select-attributes-associations.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/select-attributes-associations.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/select-attributes-associations.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/select-attributes-associations.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/sort-top-skip.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/sort-top-skip.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/sort-top-skip.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/sort-top-skip.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/specify-use-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/specify-use-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/specify-use-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/specify-use-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/standard-error-codes.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/standard-error-codes.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/standard-error-codes.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/standard-error-codes.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/subquery.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/subquery.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/subquery.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/subquery.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/swagger-doc.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/swagger-doc.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/swagger-doc.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/swagger-doc.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/task-queue.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/task-queue.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/task-queue.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/task-queue.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/test-page.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/test-page.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/test-page.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/test-page.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/translate-to-odl-expression.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/translate-to-odl-expression.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/translate-to-odl-expression.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/translate-to-odl-expression.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/validation-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/validation-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/validation-response-payload.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-response-payload.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/validation-response-payload.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-response-payload.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/validation-rules.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-rules.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/validation-rules.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/validation-rules.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/versioning.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/versioning.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/versioning.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/versioning.png
diff --git a/static/attachments/refguide10/modeling/integration/build-odata-apis/view-log-line-details.png b/static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/view-log-line-details.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/build-odata-apis/view-log-line-details.png
rename to static/attachments/refguide10/modeling/integration/odata-services/build-odata-apis/view-log-line-details.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/consumed-odata-service-screen.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/consumed-odata-service-screen.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/consumed-odata-service-screen.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/consumed-odata-service-screen.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/consuming-from-service-endpoints.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/consuming-from-service-endpoints.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/consuming-from-service-endpoints.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/consuming-from-service-endpoints.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/integration-pane-2.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/integration-pane-2.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/integration-pane-2.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/integration-pane-2.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/major-service-updates.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/major-service-updates.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/major-service-updates.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/major-service-updates.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/properties-tab.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/properties-tab.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/properties-tab.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/properties-tab.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/salesorders-header.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/salesorders-header.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/salesorders-header.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/salesorders-header.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/service-url.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/service-url.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/service-url.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/service-url.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/switch-dialog-box.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/switch-dialog-box.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/switch-dialog-box.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/switch-dialog-box.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/switching-consumed-services.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/switching-consumed-services.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/switching-consumed-services.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/switching-consumed-services.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/update-dialog-box.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/update-dialog-box.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/update-dialog-box.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/update-dialog-box.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/update-metadata.png b/static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/update-metadata.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-odata-services/consumed-odata-service/update-metadata.png
rename to static/attachments/refguide10/modeling/integration/odata-services/consumed-odata-service/update-metadata.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18581997.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18581997.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18581997.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18581997.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18581998.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18581998.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18581998.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18581998.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582005.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582005.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582005.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582005.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582006.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582006.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582006.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582006.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582007.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582007.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582007.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582007.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582011.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582011.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582011.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582011.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582012.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582012.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582012.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582012.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582013.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582013.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582013.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582013.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582020.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582020.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/18582020.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/18582020.png
diff --git a/static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/asset-manager-domain-model.png b/static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/asset-manager-domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/exposing-data-to-bi-tools-using-odata/asset-manager-domain-model.png
rename to static/attachments/refguide10/modeling/integration/odata-services/exposing-data-to-bi-tools-using-odata/asset-manager-domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/published-odata-attribute/edit-published-attribute.png b/static/attachments/refguide10/modeling/integration/odata-services/published-odata-attribute/edit-published-attribute.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-odata-attribute/edit-published-attribute.png
rename to static/attachments/refguide10/modeling/integration/odata-services/published-odata-attribute/edit-published-attribute.png
diff --git a/static/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/microflows-grid.png b/static/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/microflows-grid.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/microflows-grid.png
rename to static/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/microflows-grid.png
diff --git a/static/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/parameters-grid.png b/static/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/parameters-grid.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/parameters-grid.png
rename to static/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/parameters-grid.png
diff --git a/static/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/published-parameter.png b/static/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/published-parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-odata-services/published-odata-microflow/published-parameter.png
rename to static/attachments/refguide10/modeling/integration/odata-services/published-odata-microflow/published-parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/call-microflow-implementation.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/call-microflow-implementation.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/call-microflow-implementation.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/call-microflow-implementation.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/newtwitterinput-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/newtwitterinput-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/newtwitterinput-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/newtwitterinput-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/query-followers-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/query-followers-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/query-followers-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/query-followers-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/read-uri-data.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/read-uri-data.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/read-uri-data.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/read-uri-data.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/showuserpage-microflow.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/showuserpage-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/showuserpage-microflow.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/showuserpage-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/twitter-client-domain-model.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/twitter-client-domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/twitter-client-domain-model.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/twitter-client-domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/wrap-services-odata/twitter-connector-domain-model.png b/static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/twitter-connector-domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/wrap-services-odata/twitter-connector-domain-model.png
rename to static/attachments/refguide10/modeling/integration/odata-services/wrap-services-odata/twitter-connector-domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/WikipediaApi.mpk b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/WikipediaApi.mpk
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/WikipediaApi.mpk
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/WikipediaApi.mpk
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/change-object.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/change-object.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/change-object.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/change-object.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/domain-model.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/domain-model.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/import-mapping.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/import-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/import-mapping.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/import-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/json-structure.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/json-structure.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/json-structure.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/json-structure.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/location.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/location.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/location.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/location.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/map-entity-from-input-mapping.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/map-entity-from-input-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/map-entity-from-input-mapping.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/map-entity-from-input-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/microflow.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/microflow.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/page.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/page.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/page.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/page.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/response.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/response.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/response.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/response.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-rest-service/set-association.png b/static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/set-association.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-rest-service/set-association.png
rename to static/attachments/refguide10/modeling/integration/rest-services/call-rest-action-in-microflow/set-association.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/add-consumed-rest-service.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-consumed-rest-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/add-consumed-rest-service.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-consumed-rest-service.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/add-request-button.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-request-button.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/add-request-button.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-request-button.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/add-request.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-request.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/add-request.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/add-request.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/adding-parameters.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/adding-parameters.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/adding-parameters.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/adding-parameters.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/authentication-setup.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/authentication-setup.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/authentication-setup.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/authentication-setup.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/base-url.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/base-url.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/base-url.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/base-url.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/body-structure-example.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/body-structure-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/body-structure-example.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/body-structure-example.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/body-structure-tab.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/body-structure-tab.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/body-structure-tab.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/body-structure-tab.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/configuration-screen.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/configuration-screen.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/configuration-screen.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/configuration-screen.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/dynamic-base-url.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/dynamic-base-url.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/dynamic-base-url.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/dynamic-base-url.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/general-section.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/general-section.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/general-section.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/general-section.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/get-header.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/get-header.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/get-header.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/get-header.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/header-example.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/header-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/header-example.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/header-example.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/json-example.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/json-example.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/json-example.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/json-example.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/parameter.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/parameter.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/parameters-for-header.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/parameters-for-header.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/parameters-for-header.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/parameters-for-header.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/response-structure-tab.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-structure-tab.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/response-structure-tab.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-structure-tab.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/response-structure.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-structure.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/response-structure.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-structure.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/response-tab.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-tab.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/response-tab.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/response-tab.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-service/send-request-activity.png b/static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/send-request-activity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-service/send-request-activity.png
rename to static/attachments/refguide10/modeling/integration/rest-services/consumed-rest-service/send-request-activity.png
diff --git a/static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/gfm-syntax/snippet.png b/static/attachments/refguide10/modeling/integration/rest-services/gfm-syntax/snippet.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/gfm-syntax/snippet.png
rename to static/attachments/refguide10/modeling/integration/rest-services/gfm-syntax/snippet.png
diff --git a/static/attachments/refguide10/modeling/integration/http-request-and-response-entities/http-request-and-response-domain-model.png b/static/attachments/refguide10/modeling/integration/rest-services/http-request-and-response-entities/http-request-and-response-domain-model.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/http-request-and-response-entities/http-request-and-response-domain-model.png
rename to static/attachments/refguide10/modeling/integration/rest-services/http-request-and-response-entities/http-request-and-response-domain-model.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582030.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582030.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582030.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582030.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582031.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582031.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582031.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582031.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582034.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582034.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582034.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582034.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582035.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582035.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582035.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582035.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582036.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582036.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582036.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582036.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582037.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582037.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582037.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582037.png
diff --git a/static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582041.png b/static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582041.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/integrating-a-legacy-system-into-a-mendix-app/18582041.png
rename to static/attachments/refguide10/modeling/integration/rest-services/integrating-a-legacy-system/18582041.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/AddOperation.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddOperation.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/AddOperation.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddOperation.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/AddOperationMicroflow.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddOperationMicroflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/AddOperationMicroflow.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddOperationMicroflow.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/AddRestResource.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddRestResource.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/AddRestResource.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/AddRestResource.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/CompleteMFNoErrorHandling.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/CompleteMFNoErrorHandling.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/CompleteMFNoErrorHandling.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/CompleteMFNoErrorHandling.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/CompleteMFWithErrorHandling.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/CompleteMFWithErrorHandling.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/CompleteMFWithErrorHandling.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/CompleteMFWithErrorHandling.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/ConvertOrderID.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ConvertOrderID.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/ConvertOrderID.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ConvertOrderID.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/DataGridSettings.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/DataGridSettings.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/DataGridSettings.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/DataGridSettings.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/ExportMappingResult.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ExportMappingResult.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/ExportMappingResult.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ExportMappingResult.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/MD_AddEntity.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MD_AddEntity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/MD_AddEntity.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MD_AddEntity.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/MD_SelectedAttributes.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MD_SelectedAttributes.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/MD_SelectedAttributes.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MD_SelectedAttributes.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/MFExportWithMapping.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MFExportWithMapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/MFExportWithMapping.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/MFExportWithMapping.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/OperationsDialogSettings.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OperationsDialogSettings.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/OperationsDialogSettings.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OperationsDialogSettings.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/OrderNotFoundHeader.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OrderNotFoundHeader.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/OrderNotFoundHeader.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OrderNotFoundHeader.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/OrderNotFoundResponse.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OrderNotFoundResponse.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/OrderNotFoundResponse.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/OrderNotFoundResponse.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorMicroflow.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorMicroflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorMicroflow.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorMicroflow.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorRESTResult.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorRESTResult.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorRESTResult.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorRESTResult.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorResponse.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorResponse.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorResponse.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorResponse.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorResponseHeader.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorResponseHeader.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/ParsingErrorResponseHeader.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/ParsingErrorResponseHeader.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestDetails.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestDetails.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestDetails.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestDetails.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestExecute.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestExecute.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestExecute.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestExecute.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestResponse.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestResponse.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/RESTTestResponse.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RESTTestResponse.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/RetrieveOrder.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RetrieveOrder.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/RetrieveOrder.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/RetrieveOrder.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/SelectSchemaForExport.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/SelectSchemaForExport.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/SelectSchemaForExport.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/SelectSchemaForExport.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/create-object.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/create-object.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/create-object.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/create-object.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/domainmodel.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/domainmodel.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/domainmodel.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/domainmodel.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/httpResponse.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/httpResponse.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/httpResponse.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/httpResponse.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/httpResponseHeader.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/httpResponseHeader.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/httpResponseHeader.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/httpResponseHeader.png
diff --git a/static/attachments/refguide10/modeling/integration/publish-rest-service/order_NewEdit_Page.png b/static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/order_NewEdit_Page.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/publish-rest-service/order_NewEdit_Page.png
rename to static/attachments/refguide10/modeling/integration/rest-services/publish-rest-service/order_NewEdit_Page.png
diff --git a/static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/published-rest-operation/operation-definition.png b/static/attachments/refguide10/modeling/integration/rest-services/published-rest-operation/operation-definition.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/published-rest-operation/operation-definition.png
rename to static/attachments/refguide10/modeling/integration/rest-services/published-rest-operation/operation-definition.png
diff --git a/static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/published-rest-operation/publshed-rest-service.png b/static/attachments/refguide10/modeling/integration/rest-services/published-rest-operation/publshed-rest-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/published-rest-operation/publshed-rest-service.png
rename to static/attachments/refguide10/modeling/integration/rest-services/published-rest-operation/publshed-rest-service.png
diff --git a/static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-technical-details/published-rest-routing/determine-operation.png b/static/attachments/refguide10/modeling/integration/rest-services/published-rest-routing/determine-operation.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-technical-details/published-rest-routing/determine-operation.png
rename to static/attachments/refguide10/modeling/integration/rest-services/published-rest-routing/determine-operation.png
diff --git a/static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/example-location-url.png b/static/attachments/refguide10/modeling/integration/rest-services/published-rest-service/example-location-url.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-rest-services/published-rest-service/example-location-url.png
rename to static/attachments/refguide10/modeling/integration/rest-services/published-rest-service/example-location-url.png
diff --git a/static/attachments/refguide10/modeling/integration/rest-binary/no-export-mapping.png b/static/attachments/refguide10/modeling/integration/rest-services/rest-binary/no-export-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/rest-binary/no-export-mapping.png
rename to static/attachments/refguide10/modeling/integration/rest-services/rest-binary/no-export-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/rest-binary/starting-entity.png b/static/attachments/refguide10/modeling/integration/rest-services/rest-binary/starting-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/rest-binary/starting-entity.png
rename to static/attachments/refguide10/modeling/integration/rest-services/rest-binary/starting-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/add-airport-url.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/add-airport-url.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/add-airport-url.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/add-airport-url.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/appended-template.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/appended-template.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/appended-template.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/appended-template.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/auto-fill.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/auto-fill.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/auto-fill.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/auto-fill.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/call-rest-response.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/call-rest-response.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/call-rest-response.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/call-rest-response.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/call-rest-returned.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/call-rest-returned.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/call-rest-returned.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/call-rest-returned.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/create-nano.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/create-nano.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/create-nano.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/create-nano.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/data-by-name.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/data-by-name.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/data-by-name.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/data-by-name.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/data-source.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/data-source.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/data-source.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/data-source.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/disable-sort.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/disable-sort.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/disable-sort.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/disable-sort.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/edit-call-rest.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/edit-call-rest.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/edit-call-rest.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/edit-call-rest.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/fourth-param.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/fourth-param.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/fourth-param.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/fourth-param.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/header-sorting-smaller2.gif b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/header-sorting-smaller2.gif
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/header-sorting-smaller2.gif
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/header-sorting-smaller2.gif
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/import-mapping.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/import-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/import-mapping.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/import-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/input-entity.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/input-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/input-entity.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/input-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/json-structure.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/json-structure.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/json-structure.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/json-structure.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/name-value.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/name-value.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/name-value.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/name-value.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/page-parameter.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/page-parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/page-parameter.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/page-parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/paging.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/paging.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/paging.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/paging.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/question-dialog.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/question-dialog.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/question-dialog.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/question-dialog.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/response-tab.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/response-tab.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/response-tab.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/response-tab.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/second-param.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/second-param.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/second-param.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/second-param.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/sorting-disabled.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/sorting-disabled.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/sorting-disabled.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/sorting-disabled.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/template-add-search.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/template-add-search.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/template-add-search.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/template-add-search.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/template-param-one.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/template-param-one.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/template-param-one.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/template-param-one.png
diff --git a/static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/third-param.png b/static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/third-param.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consumed-rest-services/server-side-paging/third-param.png
rename to static/attachments/refguide10/modeling/integration/rest-services/server-side-paging/third-param.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/add-data-in-app.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/add-data-in-app.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/add-data-in-app.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/add-data-in-app.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/choose-key.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/choose-key.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/choose-key.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/choose-key.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/customer-odata-service-page.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/customer-odata-service-page.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/customer-odata-service-page.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/customer-odata-service-page.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/data-hub-pane-empty.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/data-hub-pane-empty.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/data-hub-pane-empty.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/data-hub-pane-empty.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/edit-published-resource-box.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/edit-published-resource-box.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/edit-published-resource-box.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/edit-published-resource-box.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/entity-properties-pane.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/entity-properties-pane.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/entity-properties-pane.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/entity-properties-pane.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/filter-box.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/filter-box.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/filter-box.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/filter-box.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/filter-icon.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/filter-icon.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/filter-icon.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/filter-icon.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/landscape-full-screen.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/landscape-full-screen.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/landscape-full-screen.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/landscape-full-screen.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/overview-pages-for-customer-entity.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/overview-pages-for-customer-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/overview-pages-for-customer-entity.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/overview-pages-for-customer-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/publish-in-odata-resource.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/publish-in-odata-resource.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/publish-in-odata-resource.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/publish-in-odata-resource.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/search-details-screen.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/search-details-screen.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/search-details-screen.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/search-details-screen.png
diff --git a/static/attachments/refguide10/modeling/integration/share-data/select-published-odata-service.png b/static/attachments/refguide10/modeling/integration/share-data-sources/share-data/select-published-odata-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/share-data/select-published-odata-service.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/share-data/select-published-odata-service.png
diff --git a/static/attachments/refguide10/modeling/integration/write-data/crud-capabilities.png b/static/attachments/refguide10/modeling/integration/share-data-sources/write-data/crud-capabilities.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/write-data/crud-capabilities.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/write-data/crud-capabilities.png
diff --git a/static/attachments/refguide10/modeling/integration/write-data/validate-data-client-app.png b/static/attachments/refguide10/modeling/integration/share-data-sources/write-data/validate-data-client-app.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/write-data/validate-data-client-app.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/write-data/validate-data-client-app.png
diff --git a/static/attachments/refguide10/modeling/integration/write-data/validate-data-publishing-app.png b/static/attachments/refguide10/modeling/integration/share-data-sources/write-data/validate-data-publishing-app.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/write-data/validate-data-publishing-app.png
rename to static/attachments/refguide10/modeling/integration/share-data-sources/write-data/validate-data-publishing-app.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/associating-objects.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/associating-objects.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/associating-objects.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/associating-objects.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581908.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/create-association.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581908.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/create-association.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/exporter.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/exporter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/exporter.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/exporter.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/java-action.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/java-action.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/java-action.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/java-action.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/microflow-for-generate.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/microflow-for-generate.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/microflow-for-generate.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/microflow-for-generate.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/multiple-sheets.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/multiple-sheets.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/multiple-sheets.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/multiple-sheets.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581166.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/mx-model-reflection.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581166.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/mx-model-reflection.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-excel-template.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-excel-template.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-excel-template.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-excel-template.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581905.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-export-column.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581905.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-export-column.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-menu-item-excel-exporter.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-excel-exporter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-menu-item-excel-exporter.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-excel-exporter.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-menu-item-mxreflection.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-mxreflection.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/new-menu-item-mxreflection.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-menu-item-mxreflection.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581907.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-sheet-template.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581907.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/new-sheet-template.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/retrieve-template.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/retrieve-template.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/retrieve-template.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/retrieve-template.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/security.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/security.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/security.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/security.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581903.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/static-data-tab.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581903.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/static-data-tab.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581900.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/styles.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/18581900.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/styles.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/upload-excel-file.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/upload-excel-file.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/upload-excel-file.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/upload-excel-file.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/worksheet-with-input-object.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/worksheet-with-input-object.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/worksheet-with-input-object.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/worksheet-with-input-object.png
diff --git a/static/attachments/refguide10/modeling/integration/using-the-excel-exporter/worksheet-without-input-object.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/worksheet-without-input-object.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/using-the-excel-exporter/worksheet-without-input-object.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/export-to-excel/worksheet-without-input-object.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/Countries.xlsx b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/Countries.xlsx
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/Countries.xlsx
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/Countries.xlsx
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesTransposed.xlsx b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesTransposed.xlsx
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesTransposed.xlsx
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesTransposed.xlsx
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesWithTags.xlsx b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesWithTags.xlsx
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesWithTags.xlsx
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesWithTags.xlsx
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesWithTagsAndColumnD.xlsx b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesWithTagsAndColumnD.xlsx
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountriesWithTagsAndColumnD.xlsx
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountriesWithTagsAndColumnD.xlsx
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountryImport.xsd b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountryImport.xsd
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/CountryImport.xsd
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/CountryImport.xsd
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/countries-with-tags.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/countries-with-tags.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/countries-with-tags.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/countries-with-tags.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/country-sheet.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/country-sheet.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/country-sheet.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/country-sheet.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-entity-using-excel-input.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-entity-using-excel-input.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-entity-using-excel-input.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-entity-using-excel-input.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-mapping.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-mapping.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-schema.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-schema.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/create-schema.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/create-schema.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/large-file.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/large-file.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/large-file.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/large-file.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/map-automatically.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/map-automatically.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/map-automatically.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/map-automatically.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/new-entity.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/new-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/new-entity.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/new-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/persistable-properties.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/persistable-properties.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/persistable-properties.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/persistable-properties.png
diff --git a/static/attachments/refguide10/modeling/integration/import-a-large-excel-file/transpose.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/transpose.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/import-a-large-excel-file/transpose.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-a-large-excel-file/transpose.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581932.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581932.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581932.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581932.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581933.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581933.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581933.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581933.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581934.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581934.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581934.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581934.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581935.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581935.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581935.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581935.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581936.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581936.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581936.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581936.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581937.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581937.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581937.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581937.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581938.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581938.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581938.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581938.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581947.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581947.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581947.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581947.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581948.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581948.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581948.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581948.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581949.xlsx b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581949.xlsx
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581949.xlsx
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581949.xlsx
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581950.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581950.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581950.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581950.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581951.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581951.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581951.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581951.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581952.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581952.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581952.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581952.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581953.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581953.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581953.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581953.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581956.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581956.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581956.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581956.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581961.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581961.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581961.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581961.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581962.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581962.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581962.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581962.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581963.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581963.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581963.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581963.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581965.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581965.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581965.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581965.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581966.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581966.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581966.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581966.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581968.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581968.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581968.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581968.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581969.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581969.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581969.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581969.png
diff --git a/static/attachments/howto10/integration/importing-excel-documents/18581971.png b/static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581971.png
similarity index 100%
rename from static/attachments/howto10/integration/importing-excel-documents/18581971.png
rename to static/attachments/refguide10/modeling/integration/use-excel-documents/import-excel-documents/18581971.png
diff --git a/static/attachments/refguide10/modeling/integration/business-event-services/consumed-business-event-service.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/consumed-business-event-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/business-event-services/consumed-business-event-service.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/consumed-business-event-service.png
diff --git a/static/attachments/refguide10/modeling/integration/business-event-services/existing-business-event-service.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/existing-business-event-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/business-event-services/existing-business-event-service.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/existing-business-event-service.png
diff --git a/static/attachments/refguide10/modeling/integration/business-event-services/new-business-event-service.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/new-business-event-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/business-event-services/new-business-event-service.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/new-business-event-service.png
diff --git a/static/attachments/refguide10/modeling/integration/business-event-services/published-business-event-service.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/published-business-event-service.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/business-event-services/published-business-event-service.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/business-event-services/published-business-event-service.png
diff --git a/static/attachments/refguide10/modeling/integration/execute-an-sql-statement-on-an-external-database/19399123.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/execute-an-sql-statement-on-an-external-database/19399123.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/execute-an-sql-statement-on-an-external-database/19399123.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/execute-an-sql-statement-on-an-external-database/19399123.png
diff --git a/static/attachments/refguide10/modeling/integration/execute-an-sql-statement-on-an-external-database/19399146.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/execute-an-sql-statement-on-an-external-database/19399146.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/execute-an-sql-statement-on-an-external-database/19399146.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/execute-an-sql-statement-on-an-external-database/19399146.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/add-parameter.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/add-parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/add-parameter.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/add-parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/aggregate-list.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/aggregate-list.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/aggregate-list.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/aggregate-list.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/choose-data-importer-template.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/choose-data-importer-template.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/choose-data-importer-template.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/choose-data-importer-template.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/configured-custom-activity.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/configured-custom-activity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/configured-custom-activity.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/configured-custom-activity.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/custom-activity-params.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/custom-activity-params.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/custom-activity-params.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/custom-activity-params.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/custom-activity.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/custom-activity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/custom-activity.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/custom-activity.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/data-importer-menu.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/data-importer-menu.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/data-importer-menu.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/data-importer-menu.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/data-view-file-manager.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/data-view-file-manager.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/data-view-file-manager.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/data-view-file-manager.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/edit-csv-entity.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/edit-csv-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/edit-csv-entity.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/edit-csv-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/example-microflow.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/example-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/example-microflow.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/example-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/home-page-button.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/home-page-button.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/home-page-button.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/home-page-button.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/integration-activity.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/integration-activity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/integration-activity.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/integration-activity.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/local-app-run.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/local-app-run.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/local-app-run.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/local-app-run.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/preview-csv-data-and-entity.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/preview-csv-data-and-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/preview-csv-data-and-entity.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/preview-csv-data-and-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/preview-data-and-entity.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/preview-data-and-entity.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/preview-data-and-entity.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/preview-data-and-entity.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/select-file-for-preview.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/select-file-for-preview.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/select-file-for-preview.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/select-file-for-preview.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/select-sheet-and-header-data-row.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/select-sheet-and-header-data-row.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/select-sheet-and-header-data-row.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/select-sheet-and-header-data-row.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/show-message-with-list-size.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/show-message-with-list-size.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/show-message-with-list-size.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/show-message-with-list-size.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/source-csv-data.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/source-csv-data.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/source-csv-data.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/source-csv-data.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-data-importer/source-to-target-mapping.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/source-to-target-mapping.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-data-importer/source-to-target-mapping.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-data-importer/source-to-target-mapping.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/1.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/1.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/1.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/1.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/10.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/10.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/10.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/10.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/11.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/11.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/11.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/11.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/12.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/12.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/12.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/12.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/13.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/13.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/13.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/13.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/2.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/2.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/2.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/2.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/3.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/3.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/3.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/3.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/4.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/4.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/4.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/4.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/5.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/5.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/5a.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5a.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/5a.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5a.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/5b.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5b.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/5b.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/5b.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/6.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/6.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/6.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/6.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/7.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/7.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/7.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/7.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/8.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/8.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/8.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/8.png
diff --git a/static/attachments/refguide10/modeling/integration/use-the-external-database-connector/9.png b/static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/9.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/use-the-external-database-connector/9.png
rename to static/attachments/refguide10/modeling/integration/use-platform-supported-content/use-the-external-database-connector/9.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/18581789.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/18581789.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/18581789.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/18581789.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/18581790.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/18581790.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/18581790.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/18581790.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/consumed-web-service-doc.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/consumed-web-service-doc.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/consumed-web-service-doc.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/consumed-web-service-doc.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/custom-request-temp.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/custom-request-temp.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/custom-request-temp.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/custom-request-temp.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/enter-wsdl-url.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/enter-wsdl-url.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/enter-wsdl-url.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/enter-wsdl-url.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/http-authentication.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/http-authentication.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/http-authentication.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/http-authentication.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/import-microflow.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/import-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/import-microflow.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/import-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/select-web-service-op.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/select-web-service-op.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/select-web-service-op.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/select-web-service-op.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/simple-expression-param.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/simple-expression-param.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-complex-web-service/simple-expression-param.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-complex-web-service/simple-expression-param.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/18582079.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/18582079.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/18582079.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/18582079.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/add-microflow.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/add-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/add-microflow.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/add-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/call-web-service-editor.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/call-web-service-editor.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/call-web-service-editor.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/call-web-service-editor.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/call-web-service-soap-response.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/call-web-service-soap-response.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/call-web-service-soap-response.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/call-web-service-soap-response.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/completed-microflow.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/completed-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/completed-microflow.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/completed-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/create-variable.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/create-variable.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/create-variable.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/create-variable.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/empty-microflow.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/empty-microflow.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/empty-microflow.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/empty-microflow.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/microflow-part-2.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/microflow-part-2.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/microflow-part-2.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/microflow-part-2.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/parameter.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/parameter.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/parameter.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/parameter.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/select-ports.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/select-ports.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/select-ports.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/select-ports.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/show-message.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/show-message.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/show-message.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/show-message.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/soap-request-body.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/soap-request-body.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/soap-request-body.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/soap-request-body.png
diff --git a/static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/wsdl-source-dialog-box.png b/static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/wsdl-source-dialog-box.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/consume-a-simple-web-service/wsdl-source-dialog-box.png
rename to static/attachments/refguide10/modeling/integration/web-services/consume-a-simple-web-service/wsdl-source-dialog-box.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581701.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581701.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581701.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581701.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581702.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581702.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581702.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581702.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581703.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581703.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581703.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581703.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581704.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581704.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581704.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581704.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581705.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581705.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581705.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581705.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581706.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581706.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581706.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581706.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581707.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581707.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581707.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581707.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581708.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581708.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581708.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581708.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581709.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581709.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581709.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581709.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581710.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581710.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581710.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581710.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581712.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581712.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581712.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581712.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581713.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581713.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581713.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581713.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581715.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581715.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581715.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581715.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581723.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581723.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581723.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581723.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/18581728.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581728.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/18581728.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/18581728.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/8945665.png b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/8945665.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/8945665.png
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/8945665.png
diff --git a/static/attachments/refguide10/modeling/integration/expose-a-web-service/model.jpg b/static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/model.jpg
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/expose-a-web-service/model.jpg
rename to static/attachments/refguide10/modeling/integration/web-services/expose-a-web-service/model.jpg
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/operations/16843878.png b/static/attachments/refguide10/modeling/integration/web-services/operations/16843878.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/operations/16843878.png
rename to static/attachments/refguide10/modeling/integration/web-services/operations/16843878.png
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/operations/16843879.png b/static/attachments/refguide10/modeling/integration/web-services/operations/16843879.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/operations/16843879.png
rename to static/attachments/refguide10/modeling/integration/web-services/operations/16843879.png
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/operations/16843880.png b/static/attachments/refguide10/modeling/integration/web-services/operations/16843880.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/operations/16843880.png
rename to static/attachments/refguide10/modeling/integration/web-services/operations/16843880.png
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/operations/16843884.png b/static/attachments/refguide10/modeling/integration/web-services/operations/16843884.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/operations/16843884.png
rename to static/attachments/refguide10/modeling/integration/web-services/operations/16843884.png
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/operations/918221.png b/static/attachments/refguide10/modeling/integration/web-services/operations/918221.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/operations/918221.png
rename to static/attachments/refguide10/modeling/integration/web-services/operations/918221.png
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/published-web-service/16843887.png b/static/attachments/refguide10/modeling/integration/web-services/published-web-service/16843887.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/published-web-service/16843887.png
rename to static/attachments/refguide10/modeling/integration/web-services/published-web-service/16843887.png
diff --git a/static/attachments/refguide10/modeling/integration/published-web-services/published-web-service/16843888.png b/static/attachments/refguide10/modeling/integration/web-services/published-web-service/16843888.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/published-web-services/published-web-service/16843888.png
rename to static/attachments/refguide10/modeling/integration/web-services/published-web-service/16843888.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580307.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580307.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580307.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580307.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580309.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580309.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580309.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580309.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580310.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580310.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580310.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580310.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580312.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580312.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580312.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580312.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580313.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580313.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580313.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580313.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580314.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580314.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580314.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580314.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580320.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580320.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580320.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580320.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580322.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580322.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580322.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580322.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580323.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580323.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580323.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580323.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580324.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580324.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580324.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580324.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580326.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580326.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580326.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580326.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580327.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580327.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580327.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580327.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580328.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580328.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580328.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580328.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580329.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580329.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580329.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580329.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580331.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580331.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580331.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580331.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580332.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580332.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580332.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580332.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580334.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580334.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580334.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580334.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580339.png b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580339.png
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/18580339.png
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/18580339.png
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/model1.jpg b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/model1.jpg
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/model1.jpg
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/model1.jpg
diff --git a/static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/model2.jpg b/static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/model2.jpg
similarity index 100%
rename from static/attachments/refguide10/modeling/integration/testing-web-services-using-soapui/model2.jpg
rename to static/attachments/refguide10/modeling/integration/web-services/testing-web-services-using-soapui/model2.jpg