Skip to content

Commit 02b2ded

Browse files
authored
Merge pull request #174 from BillFarber/develop
Merging release/2.0.0 into develop
2 parents 59a16f9 + 55ba27c commit 02b2ded

File tree

68 files changed

+5001
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+5001
-514
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ target
55
*.iml
66
.gradle
77
.vscode
8+
.mule
89
gradle-local.properties
910
docker/marklogic/logs
1011

CONTRIBUTING.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,23 @@ Because the connector needs to be built with Java 8, but SonarQube requires Java
8181
10.3, it will require Java 17 or higher), you must first build and test the code with Java 8 and then use Java 11 or
8282
higher to run SonarQube. Annoying, yes, but there's not yet a way around this.
8383

84-
So with Java 8, run the following:
84+
Also, the MTF tests require artifacts from MuleSoft that are stored in a password protected repository. The use
85+
of that repo is configured in the settings.xml file in the root of the project. To use that settings file, you can add
86+
"--settings ./settings.xml" to the Maven commands that including running the MTF tests. Alternatively, you can add the
87+
information in that settings.xml file to your personal Maven settings.xml file (typically in ~/.m2). Additionally,
88+
access to that repo requires a username and password. We use the MarkLogic account named "marklogic.nexus" (which is in
89+
the settings.xml file). However, since the password is sensitive, you will need to specify the password on the command
90+
line with this switch, "-Dmule.repository.password=XXXXXX".
91+
92+
So with Java 8, run the following to use your personal settings.xml file (that has been updated with the repo
93+
information including username and password):
8594

8695
mvn clean install
8796

97+
Or, to use the settings.xml file in the project and specify the password:
98+
99+
mvn --settings ./settings.xml clean install -Dmule.repository.password=XXXXXX
100+
88101
After that completes, switch to Java 11 and run the following, using the token you obtained above:
89102

90103
mvn sonar:sonar -Dsonar.token=your-token-pasted-here
@@ -164,7 +177,7 @@ project name, then choose Mule->Add Maven Dependency
164177
<dependency>
165178
<groupId>com.marklogic</groupId>
166179
<artifactId>marklogic-mule-connector</artifactId>
167-
<version>2.0.0-SNAPSHOT</version>
180+
<version>2.0.0</version>
168181
<classifier>mule-plugin</classifier>
169182
</dependency>
170183
```
@@ -230,7 +243,7 @@ General->Config id: MarkLogic_Config
230243

231244
### Anypoint - Debugging
232245
Steps to debug a flow
233-
1. Change the Anypoint Studio perspeective to the Mule Debug perspective using the top-level menus. Choose Window -> Perspective -> Open Perspective -> Mule Debug. Alternatively, click the "Mule Debug" icon in the top-right corner of the studio.
246+
1. Change the Anypoint Studio perspective to the Mule Debug perspective using the top-level menus. Choose Window -> Perspective -> Open Perspective -> Mule Debug. Alternatively, click the "Mule Debug" icon in the top-right corner of the studio.
234247
2. Run the application in debug mode using the top-level menus. Choose Run -> Debug As -> Mule Application. Alternatively, click the "Debug" icon in the toolbar.
235248
3. In the "Message Flow" tab, right-click an operation and choose "Add breakpoint" to stop execution on that operation.
236249
4. Initiate the flow.

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pipeline{
1818
stage('tests'){
1919
steps{
2020
withSonarQubeEnv('SONAR_Progress') {
21-
withCredentials([string(credentialsId: 'mule-connector-repo-password', variable: 'mule-repository-password')]) {
21+
withCredentials([string(credentialsId: 'mule-connector-repo-password', variable: 'MULE_REPOSITORY_PASSWORD')]) {
2222
copyRPM 'Release','11.1.0'
2323
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
2424
sh label:'runtests', script: '''#!/bin/bash
@@ -29,7 +29,7 @@ pipeline{
2929
echo "mlPassword=admin" > gradle-local.properties
3030
./gradlew -i mlDeploy
3131
cd $WORKSPACE/marklogic-mule-connector/
32-
mvn clean install -Dmule.repository.password=$mule-repository-password
32+
mvn --settings ./settings.xml clean install -Dmule.repository.password=$MULE_REPOSITORY_PASSWORD
3333
export JAVA_HOME=$JAVA11_HOME_DIR
3434
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
3535
export PATH=$JAVA_HOME/bin:$MVN_HOME/bin:$GRADLE_USER_HOME:$PATH

LICENSE.md

Lines changed: 212 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
### About MuleSoft Certified Connectors ###
2+
3+
MuleSoft Certified Connectors are developed by MuleSoft’s partners and developer community. These connectors have been reviewed and certified by MuleSoft. To purchase the MarkLogic Mulesoft Connector or to receive assistance or support for it, contact MarkLogic directly at [email protected]. MuleSoft disclaims any support obligation for MuleSoft Certified Connectors.
4+
5+
By installing this connector, you consent to MuleSoft sharing your contact information with the developer of this connector so that you can receive more information about it directly from the developer.
6+
7+
8+
### MarkLogic License Terms ###
9+
10+
Copyright © 2024 MarkLogic Corporation.
11+
12+
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
13+
14+
http://www.apache.org/licenses/LICENSE-2.0
15+
16+
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
17+
18+
19+
Apache License
20+
==============
21+
22+
_Version 2.0, January 2004_
23+
_&lt;<http://www.apache.org/licenses/>&gt;_
24+
25+
### Terms and Conditions for use, reproduction, and distribution
26+
27+
#### 1. Definitions
28+
29+
“License” shall mean the terms and conditions for use, reproduction, and
30+
distribution as defined by Sections 1 through 9 of this document.
31+
32+
“Licensor” shall mean the copyright owner or entity authorized by the copyright
33+
owner that is granting the License.
34+
35+
“Legal Entity” shall mean the union of the acting entity and all other entities
36+
that control, are controlled by, or are under common control with that entity.
37+
For the purposes of this definition, “control” means **(i)** the power, direct or
38+
indirect, to cause the direction or management of such entity, whether by
39+
contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
40+
outstanding shares, or **(iii)** beneficial ownership of such entity.
41+
42+
“You” (or “Your”) shall mean an individual or Legal Entity exercising
43+
permissions granted by this License.
44+
45+
“Source” form shall mean the preferred form for making modifications, including
46+
but not limited to software source code, documentation source, and configuration
47+
files.
48+
49+
“Object” form shall mean any form resulting from mechanical transformation or
50+
translation of a Source form, including but not limited to compiled object code,
51+
generated documentation, and conversions to other media types.
52+
53+
“Work” shall mean the work of authorship, whether in Source or Object form, made
54+
available under the License, as indicated by a copyright notice that is included
55+
in or attached to the work (an example is provided in the Appendix below).
56+
57+
“Derivative Works” shall mean any work, whether in Source or Object form, that
58+
is based on (or derived from) the Work and for which the editorial revisions,
59+
annotations, elaborations, or other modifications represent, as a whole, an
60+
original work of authorship. For the purposes of this License, Derivative Works
61+
shall not include works that remain separable from, or merely link (or bind by
62+
name) to the interfaces of, the Work and Derivative Works thereof.
63+
64+
“Contribution” shall mean any work of authorship, including the original version
65+
of the Work and any modifications or additions to that Work or Derivative Works
66+
thereof, that is intentionally submitted to Licensor for inclusion in the Work
67+
by the copyright owner or by an individual or Legal Entity authorized to submit
68+
on behalf of the copyright owner. For the purposes of this definition,
69+
“submitted” means any form of electronic, verbal, or written communication sent
70+
to the Licensor or its representatives, including but not limited to
71+
communication on electronic mailing lists, source code control systems, and
72+
issue tracking systems that are managed by, or on behalf of, the Licensor for
73+
the purpose of discussing and improving the Work, but excluding communication
74+
that is conspicuously marked or otherwise designated in writing by the copyright
75+
owner as “Not a Contribution.”
76+
77+
“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
78+
of whom a Contribution has been received by Licensor and subsequently
79+
incorporated within the Work.
80+
81+
#### 2. Grant of Copyright License
82+
83+
Subject to the terms and conditions of this License, each Contributor hereby
84+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
85+
irrevocable copyright license to reproduce, prepare Derivative Works of,
86+
publicly display, publicly perform, sublicense, and distribute the Work and such
87+
Derivative Works in Source or Object form.
88+
89+
#### 3. Grant of Patent License
90+
91+
Subject to the terms and conditions of this License, each Contributor hereby
92+
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
93+
irrevocable (except as stated in this section) patent license to make, have
94+
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
95+
such license applies only to those patent claims licensable by such Contributor
96+
that are necessarily infringed by their Contribution(s) alone or by combination
97+
of their Contribution(s) with the Work to which such Contribution(s) was
98+
submitted. If You institute patent litigation against any entity (including a
99+
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
100+
Contribution incorporated within the Work constitutes direct or contributory
101+
patent infringement, then any patent licenses granted to You under this License
102+
for that Work shall terminate as of the date such litigation is filed.
103+
104+
#### 4. Redistribution
105+
106+
You may reproduce and distribute copies of the Work or Derivative Works thereof
107+
in any medium, with or without modifications, and in Source or Object form,
108+
provided that You meet the following conditions:
109+
110+
* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
111+
this License; and
112+
* **(b)** You must cause any modified files to carry prominent notices stating that You
113+
changed the files; and
114+
* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
115+
all copyright, patent, trademark, and attribution notices from the Source form
116+
of the Work, excluding those notices that do not pertain to any part of the
117+
Derivative Works; and
118+
* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
119+
Derivative Works that You distribute must include a readable copy of the
120+
attribution notices contained within such NOTICE file, excluding those notices
121+
that do not pertain to any part of the Derivative Works, in at least one of the
122+
following places: within a NOTICE text file distributed as part of the
123+
Derivative Works; within the Source form or documentation, if provided along
124+
with the Derivative Works; or, within a display generated by the Derivative
125+
Works, if and wherever such third-party notices normally appear. The contents of
126+
the NOTICE file are for informational purposes only and do not modify the
127+
License. You may add Your own attribution notices within Derivative Works that
128+
You distribute, alongside or as an addendum to the NOTICE text from the Work,
129+
provided that such additional attribution notices cannot be construed as
130+
modifying the License.
131+
132+
You may add Your own copyright statement to Your modifications and may provide
133+
additional or different license terms and conditions for use, reproduction, or
134+
distribution of Your modifications, or for any such Derivative Works as a whole,
135+
provided Your use, reproduction, and distribution of the Work otherwise complies
136+
with the conditions stated in this License.
137+
138+
#### 5. Submission of Contributions
139+
140+
Unless You explicitly state otherwise, any Contribution intentionally submitted
141+
for inclusion in the Work by You to the Licensor shall be under the terms and
142+
conditions of this License, without any additional terms or conditions.
143+
Notwithstanding the above, nothing herein shall supersede or modify the terms of
144+
any separate license agreement you may have executed with Licensor regarding
145+
such Contributions.
146+
147+
#### 6. Trademarks
148+
149+
This License does not grant permission to use the trade names, trademarks,
150+
service marks, or product names of the Licensor, except as required for
151+
reasonable and customary use in describing the origin of the Work and
152+
reproducing the content of the NOTICE file.
153+
154+
#### 7. Disclaimer of Warranty
155+
156+
Unless required by applicable law or agreed to in writing, Licensor provides the
157+
Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
158+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
159+
including, without limitation, any warranties or conditions of TITLE,
160+
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
161+
solely responsible for determining the appropriateness of using or
162+
redistributing the Work and assume any risks associated with Your exercise of
163+
permissions under this License.
164+
165+
#### 8. Limitation of Liability
166+
167+
In no event and under no legal theory, whether in tort (including negligence),
168+
contract, or otherwise, unless required by applicable law (such as deliberate
169+
and grossly negligent acts) or agreed to in writing, shall any Contributor be
170+
liable to You for damages, including any direct, indirect, special, incidental,
171+
or consequential damages of any character arising as a result of this License or
172+
out of the use or inability to use the Work (including but not limited to
173+
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
174+
any and all other commercial damages or losses), even if such Contributor has
175+
been advised of the possibility of such damages.
176+
177+
#### 9. Accepting Warranty or Additional Liability
178+
179+
While redistributing the Work or Derivative Works thereof, You may choose to
180+
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
181+
other liability obligations and/or rights consistent with this License. However,
182+
in accepting such obligations, You may act only on Your own behalf and on Your
183+
sole responsibility, not on behalf of any other Contributor, and only if You
184+
agree to indemnify, defend, and hold each Contributor harmless for any liability
185+
incurred by, or claims asserted against, such Contributor by reason of your
186+
accepting any such warranty or additional liability.
187+
188+
_END OF TERMS AND CONDITIONS_
189+
190+
### APPENDIX: How to apply the Apache License to your work
191+
192+
To apply the Apache License to your work, attach the following boilerplate
193+
notice, with the fields enclosed by brackets `[]` replaced with your own
194+
identifying information. (Don't include the brackets!) The text should be
195+
enclosed in the appropriate comment syntax for the file format. We also
196+
recommend that a file or class name and description of purpose be included on
197+
the same “printed page” as the copyright notice for easier identification within
198+
third-party archives.
199+
200+
Copyright [yyyy] [name of copyright owner]
201+
202+
Licensed under the Apache License, Version 2.0 (the "License");
203+
you may not use this file except in compliance with the License.
204+
You may obtain a copy of the License at
205+
206+
http://www.apache.org/licenses/LICENSE-2.0
207+
208+
Unless required by applicable law or agreed to in writing, software
209+
distributed under the License is distributed on an "AS IS" BASIS,
210+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
211+
See the License for the specific language governing permissions and
212+
limitations under the License.

LICENSE_HEADER.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MarkLogic Mule Connector
2+
3+
Copyright © 2024 MarkLogic Corporation.
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.

README.md

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,27 @@
11
# MarkLogic Connector for Mulesoft
22

3-
The MarkLogic Connector for Mulesoft is a [reusable extension](https://docs.mulesoft.com/connectors/)
4-
for integrating a Mule application with MarkLogic. The connector supports reading data from and writing data to
5-
MarkLogic.
3+
The MarkLogic Connector for Mulesoft is a [reusable extension](https://docs.mulesoft.com/connectors/) for
4+
integrating a Mule application with MarkLogic. The connector supports reading data from and writing data to MarkLogic.
65

6+
The MarkLogic MuleSoft connector supports reading data from and writing data to MarkLogic
7+
[in a Mule application](https://docs.mulesoft.com/connectors/introduction/introduction-to-anypoint-connectors).
8+
MuleSoft flows can leverage the full power of [MarkLogic's search indexes](https://docs.marklogic.com/guide/concepts/indexing)
9+
to retrieve documents and can efficiently write large quantities of any kind of data to MarkLogic's schema-agnostic databases.
710

8-
Add this dependency to your application pom.xml:
11+
The connector has the following system requirements:
912

10-
```
11-
<groupId>com.marklogic.mule.extension</groupId>
12-
<artifactId>mule-marklogic-extension</artifactId>
13-
<version>1.0.0-SNAPSHOT</version>
14-
<classifier>mule-plugin</classifier>
15-
```
13+
* Mule 4.3 or higher.
14+
* Anypoint Studio 7.x or higher.
15+
* MarkLogic 9 or higher.
16+
17+
For more information, please see [the User Guide](https://marklogic.github.io/marklogic-mule-connector/) or
18+
[the installation guide](https://marklogic.github.io/marklogic-mule-connector/installation.html) to get started.
19+
20+
For users with experience with the 1.x version of this connector, please note that the 2.0.0 release has intentionally
21+
combined previous operations related to querying for documents into a single
22+
["Read documents"](https://marklogic.github.io/marklogic-mule-connector/reading.html)
23+
operation that supports any type of MarkLogic search query. Deprecated operations have also been removed. Finally,
24+
the "Delete docs" operation found in the 1.x connector is not yet supported due to the approach used in the 1.x
25+
connector not being consistent with the guidelines for a Mule connector. If you find yourself in need of this operation,
26+
please [submit an issue](https://github.com/marklogic/marklogic-mule-connector/issues) to describe your use case so we
27+
can provide the optimal solution for it.

0 commit comments

Comments
 (0)