Skip to content

Commit

Permalink
Merge pull request #107 from marklogic-community/release/v1.2.1
Browse files Browse the repository at this point in the history
Release/v1.2.1
  • Loading branch information
wattsferry authored Nov 13, 2023
2 parents c343407 + 6549509 commit 306e053
Show file tree
Hide file tree
Showing 115 changed files with 1,033 additions and 813 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

### Get the Connector directly from MuleSoft Anypoint Exchange ###

* <a href="https://www.anypoint.mulesoft.com/exchange/com.marklogic/marklogic-mule-connector/">The latest version (1.2.0) is available directly from Anypoint Exchange</a>. See the <a href="doc/release-notes.adoc">release notes</a> and <a href="doc/user-manual.adoc">user manual</a> for more details.
* <a href="https://www.anypoint.mulesoft.com/exchange/com.marklogic/marklogic-mule-connector/">The latest version (1.2.1) is available directly from Anypoint Exchange</a>. See the <a href="doc/release-notes.adoc">release notes</a> and <a href="doc/user-manual.adoc">user manual</a> for more details.

* Both Anypoint Studio and Anypoint Design Center offer ease of access to the Anypoint Exchange for direct import of the Connector for use in your flows.

Expand Down
20 changes: 10 additions & 10 deletions demo/mule-marklogic-connector-exportDocs-demo/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Example: MarkLogic Mule Connector ##

This example demonstrates the query capabilities of MarkLogic Mule Connector version 1.2.0, doing the following:
This example demonstrates the query capabilities of MarkLogic Mule Connector version 1.2.1, doing the following:

* Creating a MuleSoft HTTP listener on port 8081, accepting GET requests at /exportDocs, that returns a custom JSON response payload with custom response header "X-MarKLogic-ResultCount".
* Using the MarkLogic exportDocs operation to perform a consistent snapshot query for documents within the "employees" collection, via a Structured Query. The count of returned documents from exportDocs is limited to 12 documents.
Expand All @@ -9,31 +9,31 @@ This example demonstrates the query capabilities of MarkLogic Mule Connector ver

#### Flow Depiction ####

![Demo Flow](../../images/marklogic-demo-1.2.0.png)
![Demo Flow](../../images/marklogic-demo-1.2.1.png)

### To Configure this Example ###

The MarkLogic exportDocs operation is pre-populated with the needed configuration. However, should you need to tweak any settings, select the exportDocs icon in the flow, and change any necessary settings.
The MarkLogic exportDocs operation is pre-populated with the necessary configuration. However, should you need to tweak any settings, select the exportDocs icon in the flow, and change any necessary settings.

![exportDocs Configuration](../../images/exportDocs-config-demo-1.2.0.png)
![exportDocs Configuration](../../images/exportDocs-config-demo-1.2.1.png)

Also, update the automation-credentials.properties to populate username, password, host, and the file sytem location for the job report file output.

![automation-credentials.properties Configuration](../../images/automation-credentials-demo-1.2.0.png)
![automation-credentials.properties Configuration](../../images/automation-credentials-demo-1.2.1.png)

### To Test the Example ###

* Click File &rarr; Import
* On the next screen, click "Anypoint Studio project from File System" &rarr; Next.
* You can now import the demo from the file system on the next screen. Locate the demo/ directory from the codebase, and find the 1.2.0 demo.
* Provide a project name. Use ""Server Runtime 4.3.0 EE".
* You can now import the demo from the file system on the next screen. Locate the demo/ directory from the codebase, and find the 1.2.1 demo.
* Provide a project name. Use ""Server Runtime 4.4.0 EE". Note that the connector will run on any runtime version 4.1.1 EE or later.
* The project will be imported and begin to build automatically.
* Run the project by right- or Ctrl-clicking the project name at left, the Run As &rarr; Mule Application.
* If you experience any dependency issues, you might need to add the JCenter repository to the demo project pom.xml file, as described above in "Adding Dependencies".

![Import Packaged Mule Application](../../images/import-demo-fs-1.png)

![Import Mule Project](../../images/import-demo-fs-2-1.2.0.png)
![Import Mule Project](../../images/import-demo-fs-2-1.2.1.png)

![Run Mule Application](../../images/run-as-mule-application.png)

Expand All @@ -45,7 +45,7 @@ Create a new Mule Project and install the MarkLogic Mule Connector dependency in
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-mule-connector</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<classifier>mule-plugin</classifier>
</dependency>
```
Expand Down Expand Up @@ -81,7 +81,7 @@ Also, update the automation-credentials.properties to populate username, and pas
<marklogic:config name="MarkLogic_Config" doc:name="MarkLogic Config" doc:id="70508ab1-c787-485a-9b35-970bbfbf9208" configId="testConfig" threadCount="4" batchSize="100" secondsBeforeFlush="2" jobName="myJobName" >
<marklogic:connection hostname="${config.hostName}" port="8010" username="${config.username}" password="${config.password}" authenticationType="digest" connectionId="testConfig" marklogicConnectionType="DIRECT"/>
</marklogic:config>
<flow name="marklogic-demo-1.2.0Flow" doc:id="ee6da7e5-0aa3-4208-9b29-876a30707dab" >
<flow name="marklogic-demo-1.2.1Flow" doc:id="ee6da7e5-0aa3-4208-9b29-876a30707dab" >
<http:listener doc:name="/exportDocs Listener" doc:id="e4850d1f-0bbe-41ea-97f4-ad98042690a8" config-ref="HTTP_Listener_config" path="/exportDocs">
<http:response>
<http:headers>
Expand Down
4 changes: 2 additions & 2 deletions demo/mule-marklogic-connector-exportDocs-demo/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mulesoft.connectors.examples</groupId>
<artifactId>mule-marklogic-connector-exportDocs-demo</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<packaging>mule-application</packaging>

<name>mule-marklogic-connector-exportDocs-demo</name>
Expand Down Expand Up @@ -48,7 +48,7 @@
<dependency>
<groupId>com.marklogic</groupId>
<artifactId>marklogic-mule-connector</artifactId>
<version>1.2.0</version>
<version>1.2.1</version>
<classifier>mule-plugin</classifier>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ http://www.mulesoft.org/schema/mule/ee/core http://www.mulesoft.org/schema/mule/
<marklogic:config name="MarkLogic_Config" doc:name="MarkLogic Config" doc:id="12d46d4c-7b06-466a-af3e-d62affcbba37" configId="testConfig" threadCount="4" batchSize="100" secondsBeforeFlush="2" jobName="myJobName">
<marklogic:connection hostname="${config.hostName}" port="8010" username="${config.username}" password="${config.password}" authenticationType="digest" connectionId="testConfig" marklogicConnectionType="DIRECT"/>
</marklogic:config>
<flow name="marklogic-demo-1.2.0Flow" doc:id="a5033397-e46a-4181-bfe2-0f2af0fe5299" >
<flow name="marklogic-demo-1.2.1Flow" doc:id="a5033397-e46a-4181-bfe2-0f2af0fe5299" >
<http:listener doc:name="/exportDocs Listener" doc:id="dade09c3-6db5-499b-88ae-99e3c58e702d" config-ref="HTTP_Listener_config" path="/exportDocs">
<http:response >
<http:headers ><![CDATA[#[output application/java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
see them in the mule_ee.log file. -->

<Appenders>
<RollingFile name="file" fileName="${sys:mule.home}${sys:file.separator}logs${sys:file.separator}marklogic-demo-1.2.0.log"
filePattern="${sys:mule.home}${sys:file.separator}logs${sys:file.separator}marklogic-demo-1.2.0-%i.log">
<RollingFile name="file" fileName="${sys:mule.home}${sys:file.separator}logs${sys:file.separator}marklogic-demo-1.2.1.log"
filePattern="${sys:mule.home}${sys:file.separator}logs${sys:file.separator}marklogic-demo-1.2.1-%i.log">
<PatternLayout pattern="%-5p %d [%t] [processor: %X{processorPath}; event: %X{correlationId}] %c: %m%n" />
<SizeBasedTriggeringPolicy size="10 MB" />
<DefaultRolloverStrategy max="10"/>
Expand Down
15 changes: 8 additions & 7 deletions doc/apidocs/allclasses-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.14.1) on Tue Feb 28 13:12:52 EST 2023 -->
<title>All Classes (MarkLogic Connector - Mule 4 1.2.0 API)</title>
<!-- Generated by javadoc (11.0.19) on Thu Jul 27 16:08:49 EDT 2023 -->
<title>All Classes (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-02-28">
<meta name="dc.created" content="2023-07-27">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
<script type="text/javascript" src="jquery/jquery-3.6.1.min.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.min.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="All Classes (MarkLogic Connector - Mule 4 1.2.0 API)";
parent.document.title="All Classes (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)";
}
}
catch(err) {
Expand Down
17 changes: 10 additions & 7 deletions doc/apidocs/allclasses.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,26 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.14.1) on Tue Feb 28 13:12:52 EST 2023 -->
<title>All Classes (MarkLogic Connector - Mule 4 1.2.0 API)</title>
<!-- Generated by javadoc (11.0.19) on Thu Jul 27 16:08:49 EDT 2023 -->
<title>All Classes (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-02-28">
<meta name="dc.created" content="2023-07-27">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
<script type="text/javascript" src="jquery/jquery-3.6.1.min.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.min.js"></script>
</head>
<body>
<main role="main">
<h1 class="bar">All&nbsp;Classes</h1>
<main role="main" class="indexContainer">
<div class="indexContainer">
<ul>
<li><a href="com/marklogic/mule/extension/connector/api/connection/AuthenticationType.html" title="enum in com.marklogic.mule.extension.connector.api.connection">AuthenticationType</a></li>
<li><a href="com/marklogic/mule/extension/connector/internal/operation/InsertionBatcherContext.html" title="class in com.marklogic.mule.extension.connector.internal.operation">InsertionBatcherContext</a></li>
Expand All @@ -44,6 +46,7 @@ <h1 class="bar">All&nbsp;Classes</h1>
<li><a href="com/marklogic/mule/extension/connector/internal/metadata/MarkLogicSelectMetadataResolver.html" title="class in com.marklogic.mule.extension.connector.internal.metadata">MarkLogicSelectMetadataResolver</a></li>
<li><a href="com/marklogic/mule/extension/connector/internal/result/resultset/RecordExtractor.html" title="class in com.marklogic.mule.extension.connector.internal.result.resultset">RecordExtractor</a></li>
</ul>
</div>
</main>
</body>
</html>
15 changes: 8 additions & 7 deletions doc/apidocs/allpackages-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.14.1) on Tue Feb 28 13:12:52 EST 2023 -->
<title>All Packages (MarkLogic Connector - Mule 4 1.2.0 API)</title>
<!-- Generated by javadoc (11.0.19) on Thu Jul 27 16:08:49 EDT 2023 -->
<title>All Packages (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-02-28">
<meta name="dc.created" content="2023-07-27">
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery/jquery-ui.min.css" title="Style">
<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
<script type="text/javascript" src="script.js"></script>
<script type="text/javascript" src="jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.js"></script>
<script type="text/javascript" src="jquery/jquery-3.6.1.min.js"></script>
<script type="text/javascript" src="jquery/jquery-ui.min.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="All Packages (MarkLogic Connector - Mule 4 1.2.0 API)";
parent.document.title="All Packages (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)";
}
}
catch(err) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,27 @@
<!-- NewPage -->
<html lang="en">
<head>
<!-- Generated by javadoc (11.0.14.1) on Tue Feb 28 13:12:52 EST 2023 -->
<title>AuthenticationType (MarkLogic Connector - Mule 4 1.2.0 API)</title>
<!-- Generated by javadoc (11.0.19) on Thu Jul 27 16:08:49 EDT 2023 -->
<title>AuthenticationType (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-02-28">
<meta name="dc.created" content="2023-07-27">
<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../../../../../jquery/jquery-ui.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../../../../../jquery/jquery-ui.min.css" title="Style">
<link rel="stylesheet" type="text/css" href="../../../../../../../jquery-ui.overrides.css" title="Style">
<script type="text/javascript" src="../../../../../../../script.js"></script>
<script type="text/javascript" src="../../../../../../../jquery/jszip/dist/jszip.min.js"></script>
<script type="text/javascript" src="../../../../../../../jquery/jszip-utils/dist/jszip-utils.min.js"></script>
<!--[if IE]>
<script type="text/javascript" src="../../../../../../../jquery/jszip-utils/dist/jszip-utils-ie.min.js"></script>
<![endif]-->
<script type="text/javascript" src="../../../../../../../jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="../../../../../../../jquery/jquery-ui.js"></script>
<script type="text/javascript" src="../../../../../../../jquery/jquery-3.6.1.min.js"></script>
<script type="text/javascript" src="../../../../../../../jquery/jquery-ui.min.js"></script>
</head>
<body>
<script type="text/javascript"><!--
try {
if (location.href.indexOf('is-external=true') == -1) {
parent.document.title="AuthenticationType (MarkLogic Connector - Mule 4 1.2.0 API)";
parent.document.title="AuthenticationType (MarkLogic Connector - Mule 4 1.2.1-SNAPSHOT API)";
}
}
catch(err) {
Expand Down Expand Up @@ -150,7 +151,7 @@ <h2 title="Enum AuthenticationType" class="title">Enum AuthenticationType</h2>
<ul class="blockList">
<li class="blockList">
<!-- =========== ENUM CONSTANT SUMMARY =========== -->
<section role="region">
<section>
<ul class="blockList">
<li class="blockList"><a id="enum.constant.summary">
<!-- -->
Expand Down Expand Up @@ -179,7 +180,7 @@ <h3>Enum Constant Summary</h3>
</ul>
</section>
<!-- ========== METHOD SUMMARY =========== -->
<section role="region">
<section>
<ul class="blockList">
<li class="blockList"><a id="method.summary">
<!-- -->
Expand Down Expand Up @@ -232,7 +233,7 @@ <h3>Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com
<ul class="blockList">
<li class="blockList">
<!-- ============ ENUM CONSTANT DETAIL =========== -->
<section role="region">
<section>
<ul class="blockList">
<li class="blockList"><a id="enum.constant.detail">
<!-- -->
Expand Down Expand Up @@ -269,7 +270,7 @@ <h4>basic</h4>
</ul>
</section>
<!-- ============ METHOD DETAIL ========== -->
<section role="region">
<section>
<ul class="blockList">
<li class="blockList"><a id="method.detail">
<!-- -->
Expand Down
Loading

0 comments on commit 306e053

Please sign in to comment.