diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf49c8..970305e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog of Expressive RDF Mapper (XRM) + +## Version 1.5.0 (2023-12-18) + +* Fix: empty mapping files crashing the language-server in vscode #147 +* Fix: undefined prefixes from VocabularyElement used as constant #151 +* (R2)RML mapping: Support `rr:parentTriplesMap` with `rr:joinCondition` #31 + +## Version 1.4.0 (2023-12-06) + +* Lifecycle: Upgrade to xtext 2.33 + + ## Version 1.3.0 (2023-02-09) * JSON mapping: Support `ql:JSONPath` in (CA)RML output diff --git a/EULA.md b/EULA.md deleted file mode 100644 index d1c69fa..0000000 --- a/EULA.md +++ /dev/null @@ -1,48 +0,0 @@ -# End-User License Agreement ("Agreement") - -Last updated: 2020-05-08 - -Please read this End-User License Agreement ("Agreement") carefully before downloading or using Expressive RDF Mapper XRM ("Application"). - -By downloading or using the Application, you are agreeing to be bound by the terms and conditions of this Agreement. - -If you do not agree to the terms of this Agreement, do not download or use the Application. - -## License - -Zazuko GmbH grants you a revocable, non-exclusive, non-transferable, limited license to download, install and use the Application solely for your personal, non-commercial purposes strictly in accordance with the terms of this Agreement. - -## Restrictions - -You agree not to, and you will not permit others to: - -a) license, sell, rent, lease, assign, distribute, transmit, host, outsource, disclose or otherwise commercially exploit the Application or make the Application available to any third party. -b) Modify the Application or any of its source codes. - -## Modifications to Application - -Zazuko GmbH reserves the right to modify, suspend or discontinue, temporarily or permanently, the Application or any service to which it connects, with or without notice and without liability to you. - -## Term and Termination - -This Agreement shall remain in effect until terminated by you or Zazuko GmbH. - -Zazuko GmbH may, in its sole discretion, at any time and for any or no reason, suspend or terminate this Agreement with or without prior notice. - -This Agreement will terminate immediately, without prior notice from Zazuko GmbH, in the event that you fail to comply with any provision of this Agreement. You may also terminate this Agreement by deleting the Application and all copies thereof from your desktop or from your servers. - -Upon termination of this Agreement, you shall cease all use of the Application and delete all copies of the Application from your desktop or from your servers. - -## Severability - -If any provision of this Agreement is held to be unenforceable or invalid, such provision will be changed and interpreted to accomplish the objectives of such provision to the greatest extent possible under applicable law and the remaining provisions will continue in full force and effect. - -## Amendments to this Agreement - -Zazuko GmbH reserves the right, at its sole discretion, to modify or replace this Agreement at any time. If a revision is material we will provide at least 30 days' notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion. - -## Contact Information - -If you have any questions about this Agreement, please contact us. - -https://zazuko.com/ diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..7dc46f1 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) Zazuko GmbH + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index 4f265fc..a590e7b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ XRM is available as an Eclipse and Visual Studio Code Plugin. Expressive RDF Mapper allows you to express data mappings to RDF in a friendly domain specific language (DSL) and generates output in [R2RML](http://www.w3.org/TR/r2rml/), [RML](https://rml.io/specs/rml/), [CARML](https://github.com/carml/carml) and [CSV on the Web](https://w3c.github.io/csvw/primer/) format. -Expressive RDF Mapper is a commercial product, see the [End-User License Agreement](EULA.md) and our [product page](https://zazuko.com/products/expressive-rdf-mapper/) at zazuko.com for more details. +Expressive RDF Mapper is free software, see the [MIT License](LICENSE.txt) and our [product page](https://zazuko.com/products/expressive-rdf-mapper/) at zazuko.com for more details. ``` output r2rml @@ -34,8 +34,8 @@ We've tested the plugin with: ### Using Eclipse -1) Download and install Eclipse "Eclipse IDE 2022-03" (or newer): https://www.eclipse.org/downloads/packages/ - * Recommended package: *Eclipse IDE for Java Developers* +1) Download and install Eclipse "Eclipse IDE 2023-12" (or newer): https://www.eclipse.org/downloads/packages/ + * Package: *Eclipse IDE for Java and DSL Developers* * Hint: The Eclipse Installer now also includes a JRE. A Java 11 or newer JRE/JDK is required. 2) Start Eclipse and install the extension: @@ -52,7 +52,7 @@ The plugin will not work properly with older Eclipse releases! Please install th ### Using Visual Studio Code -1. Download the extension: . +1. Download the extension: . 1. Open Visual Studio Code and navigate to the "Extensions" (select View > Extensions from the menu). 1. Top-right corner of the "Extensions" pane, use the `...` button and choose "Install from VSIX…". 1. Select the `.vsix` file you downloaded, click *Install*. @@ -64,13 +64,10 @@ Details of editor issues are shown in the problems view. Use `View > Problems (C ## Mapping examples For complete examples, have a look at the projects in the [mapping-examples](mapping-examples) folder. -Once you installed the extension in Eclipse a good way to start is to start playing with them. +Once you installed the extension a good way to start is to start playing with them. -1. Clone this repository. -2. In Eclipse, click _File > Import_. -3. In the Import wizard: Expand General and then click _Projects from Folder or Archive_ . Click Next . Click _Directory_ and select the cloned repository. Click Finish to add it to your Eclipse. -4. Open one of the samples like `employee-mapping` and try to modify the current mapping. -5. Xtext constantly watches the `.xrm` files in your Eclipse project and validates the syntax (ie. *on save*). When the syntax is valid, it automatically writes the generated mapping file(s) to `./src-gen`. +1. Open one of the samples like `employee-mapping` and try to modify the current mapping. +2. Xtext constantly watches the `.xrm` files in your project and validates the syntax (ie. *on save*). When the syntax is valid, it automatically writes the generated mapping file(s) to `./src-gen`. ## Tutorials & Documentation @@ -86,9 +83,8 @@ Once you installed the extension in Eclipse a good way to start is to start play ## License and Support -The included [End-User License Agreement](EULA.md) covers personal, non-commercial use. +Expressive RDF Mapper is free software, released under the [MIT License](LICENSE.txt) -For commercial use, including commercial support, consult our [product page](https://zazuko.com/products/expressive-rdf-mapper/) at zazuko.com for more details. - -Please report issues and feature requests on the [issue-tracker](https://github.com/zazuko/xrm/issues). If you have other questions please post a message in the [RDF.community discussion forum](https://github.com/rdf-community/discussions/discussions). +For commercial support, consult our [product page](https://zazuko.com/products/expressive-rdf-mapper/) at zazuko.com for more details. +Please report issues and feature requests on Github. If you have other questions please post a message in the [RDF.community discussion forum](https://discuss.rdf.community/).