From 13bcc04ba4e2617655a55e9c40c6cceded8f4dda Mon Sep 17 00:00:00 2001 From: joszamama Date: Mon, 6 Feb 2023 23:20:52 +0100 Subject: [PATCH 01/22] fix: project setup --- .gitmodules | 3 +++ .vscode/settings.json | 3 +++ pom.xml | 33 +++++++++++++++++++++++++++++++++ xatkit-spl-parser | 1 + 4 files changed, 40 insertions(+) create mode 100644 .vscode/settings.json create mode 160000 xatkit-spl-parser diff --git a/.gitmodules b/.gitmodules index 89fbdaf..cfec965 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "monitoring/xatkit-logs-postgres"] path = monitoring/xatkit-logs-postgres url = https://github.com/xatkit-bot-platform/xatkit-logs-postgres.git +[submodule "xatkit-spl-parser"] + path = xatkit-spl-parser + url = https://github.com/joszamama/xatkit-spl-parser.git diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..0e14d8e --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "disabled" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 6d79013..1f8ffab 100644 --- a/pom.xml +++ b/pom.xml @@ -84,6 +84,15 @@ +2 + + José Antonio Zamudio + jose.zamudio + joszamama@gmail.com + + developer + + +2 + @@ -166,6 +175,30 @@ ${log4j.version} + + com.jayway.jsonpath + json-path + 2.7.0 + + + + org.slf4j + slf4j-api + 1.7.25 + + + + org.slf4j + slf4j-simple + 1.7.25 + + + + com.googlecode.json-simple + json-simple + 1.1.1 + + diff --git a/xatkit-spl-parser b/xatkit-spl-parser new file mode 160000 index 0000000..7e9668b --- /dev/null +++ b/xatkit-spl-parser @@ -0,0 +1 @@ +Subproject commit 7e9668b1ddebf6456b055785c132da53e99e697e From 7e19bd88608931ce8b2d1b0bb3242c0aa41abf56 Mon Sep 17 00:00:00 2001 From: joszamama Date: Tue, 7 Feb 2023 00:06:39 +0100 Subject: [PATCH 02/22] fix: correct chatbot creation --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0e14d8e..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "disabled" -} \ No newline at end of file From e29e64d18a65491da00d34e93259356f144e851d Mon Sep 17 00:00:00 2001 From: joszamama Date: Tue, 7 Feb 2023 00:18:27 +0100 Subject: [PATCH 03/22] Removed submodule --- .gitmodules | 3 --- xatkit-spl-parser | 1 - 2 files changed, 4 deletions(-) delete mode 160000 xatkit-spl-parser diff --git a/.gitmodules b/.gitmodules index cfec965..89fbdaf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,6 +37,3 @@ [submodule "monitoring/xatkit-logs-postgres"] path = monitoring/xatkit-logs-postgres url = https://github.com/xatkit-bot-platform/xatkit-logs-postgres.git -[submodule "xatkit-spl-parser"] - path = xatkit-spl-parser - url = https://github.com/joszamama/xatkit-spl-parser.git diff --git a/xatkit-spl-parser b/xatkit-spl-parser deleted file mode 160000 index 7e9668b..0000000 --- a/xatkit-spl-parser +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7e9668b1ddebf6456b055785c132da53e99e697e From 47b0280558c2bffc4a3f59c751c29f0a0c880f84 Mon Sep 17 00:00:00 2001 From: joszamama Date: Tue, 7 Feb 2023 00:20:12 +0100 Subject: [PATCH 04/22] fix: added submodule parser --- .gitmodules | 3 +++ xatkit-spl-parser | 1 + 2 files changed, 4 insertions(+) create mode 160000 xatkit-spl-parser diff --git a/.gitmodules b/.gitmodules index 89fbdaf..cfec965 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "monitoring/xatkit-logs-postgres"] path = monitoring/xatkit-logs-postgres url = https://github.com/xatkit-bot-platform/xatkit-logs-postgres.git +[submodule "xatkit-spl-parser"] + path = xatkit-spl-parser + url = https://github.com/joszamama/xatkit-spl-parser.git diff --git a/xatkit-spl-parser b/xatkit-spl-parser new file mode 160000 index 0000000..82ed2b0 --- /dev/null +++ b/xatkit-spl-parser @@ -0,0 +1 @@ +Subproject commit 82ed2b0857b084431d52d1a102218617ebb64d20 From 21dd175c70dddaa7dba06b6f9d2b2dccdbe78ff0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Zamudio=20Amaya?= Date: Tue, 7 Feb 2023 18:13:45 +0100 Subject: [PATCH 05/22] Create LICENSE.md --- LICENSE.md | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 0000000..e48e096 --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,277 @@ +Eclipse Public License - v 2.0 + + THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE + PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION + OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. + +1. DEFINITIONS + +"Contribution" means: + + a) in the case of the initial Contributor, the initial content + Distributed under this Agreement, and + + b) in the case of each subsequent Contributor: + i) changes to the Program, and + ii) additions to the Program; + where such changes and/or additions to the Program originate from + and are Distributed by that particular Contributor. A Contribution + "originates" from a Contributor if it was added to the Program by + such Contributor itself or anyone acting on such Contributor's behalf. + Contributions do not include changes or additions to the Program that + are not Modified Works. + +"Contributor" means any person or entity that Distributes the Program. + +"Licensed Patents" mean patent claims licensable by a Contributor which +are necessarily infringed by the use or sale of its Contribution alone +or when combined with the Program. + +"Program" means the Contributions Distributed in accordance with this +Agreement. + +"Recipient" means anyone who receives the Program under this Agreement +or any Secondary License (as applicable), including Contributors. + +"Derivative Works" shall mean any work, whether in Source Code or other +form, that is based on (or derived from) the Program and for which the +editorial revisions, annotations, elaborations, or other modifications +represent, as a whole, an original work of authorship. + +"Modified Works" shall mean any work in Source Code or other form that +results from an addition to, deletion from, or modification of the +contents of the Program, including, for purposes of clarity any new file +in Source Code form that contains any contents of the Program. Modified +Works shall not include works that contain only declarations, +interfaces, types, classes, structures, or files of the Program solely +in each case in order to link to, bind by name, or subclass the Program +or Modified Works thereof. + +"Distribute" means the acts of a) distributing or b) making available +in any manner that enables the transfer of a copy. + +"Source Code" means the form of a Program preferred for making +modifications, including but not limited to software source code, +documentation source, and configuration files. + +"Secondary License" means either the GNU General Public License, +Version 2.0, or any later versions of that license, including any +exceptions or additional permissions as identified by the initial +Contributor. + +2. GRANT OF RIGHTS + + a) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free copyright + license to reproduce, prepare Derivative Works of, publicly display, + publicly perform, Distribute and sublicense the Contribution of such + Contributor, if any, and such Derivative Works. + + b) Subject to the terms of this Agreement, each Contributor hereby + grants Recipient a non-exclusive, worldwide, royalty-free patent + license under Licensed Patents to make, use, sell, offer to sell, + import and otherwise transfer the Contribution of such Contributor, + if any, in Source Code or other form. This patent license shall + apply to the combination of the Contribution and the Program if, at + the time the Contribution is added by the Contributor, such addition + of the Contribution causes such combination to be covered by the + Licensed Patents. The patent license shall not apply to any other + combinations which include the Contribution. No hardware per se is + licensed hereunder. + + c) Recipient understands that although each Contributor grants the + licenses to its Contributions set forth herein, no assurances are + provided by any Contributor that the Program does not infringe the + patent or other intellectual property rights of any other entity. + Each Contributor disclaims any liability to Recipient for claims + brought by any other entity based on infringement of intellectual + property rights or otherwise. As a condition to exercising the + rights and licenses granted hereunder, each Recipient hereby + assumes sole responsibility to secure any other intellectual + property rights needed, if any. For example, if a third party + patent license is required to allow Recipient to Distribute the + Program, it is Recipient's responsibility to acquire that license + before distributing the Program. + + d) Each Contributor represents that to its knowledge it has + sufficient copyright rights in its Contribution, if any, to grant + the copyright license set forth in this Agreement. + + e) Notwithstanding the terms of any Secondary License, no + Contributor makes additional grants to any Recipient (other than + those set forth in this Agreement) as a result of such Recipient's + receipt of the Program under the terms of a Secondary License + (if permitted under the terms of Section 3). + +3. REQUIREMENTS + +3.1 If a Contributor Distributes the Program in any form, then: + + a) the Program must also be made available as Source Code, in + accordance with section 3.2, and the Contributor must accompany + the Program with a statement that the Source Code for the Program + is available under this Agreement, and informs Recipients how to + obtain it in a reasonable manner on or through a medium customarily + used for software exchange; and + + b) the Contributor may Distribute the Program under a license + different than this Agreement, provided that such license: + i) effectively disclaims on behalf of all other Contributors all + warranties and conditions, express and implied, including + warranties or conditions of title and non-infringement, and + implied warranties or conditions of merchantability and fitness + for a particular purpose; + + ii) effectively excludes on behalf of all other Contributors all + liability for damages, including direct, indirect, special, + incidental and consequential damages, such as lost profits; + + iii) does not attempt to limit or alter the recipients' rights + in the Source Code under section 3.2; and + + iv) requires any subsequent distribution of the Program by any + party to be under a license that satisfies the requirements + of this section 3. + +3.2 When the Program is Distributed as Source Code: + + a) it must be made available under this Agreement, or if the + Program (i) is combined with other material in a separate file or + files made available under a Secondary License, and (ii) the initial + Contributor attached to the Source Code the notice described in + Exhibit A of this Agreement, then the Program may be made available + under the terms of such Secondary Licenses, and + + b) a copy of this Agreement must be included with each copy of + the Program. + +3.3 Contributors may not remove or alter any copyright, patent, +trademark, attribution notices, disclaimers of warranty, or limitations +of liability ("notices") contained within the Program from any copy of +the Program which they Distribute, provided that Contributors may add +their own appropriate notices. + +4. COMMERCIAL DISTRIBUTION + +Commercial distributors of software may accept certain responsibilities +with respect to end users, business partners and the like. While this +license is intended to facilitate the commercial use of the Program, +the Contributor who includes the Program in a commercial product +offering should do so in a manner which does not create potential +liability for other Contributors. Therefore, if a Contributor includes +the Program in a commercial product offering, such Contributor +("Commercial Contributor") hereby agrees to defend and indemnify every +other Contributor ("Indemnified Contributor") against any losses, +damages and costs (collectively "Losses") arising from claims, lawsuits +and other legal actions brought by a third party against the Indemnified +Contributor to the extent caused by the acts or omissions of such +Commercial Contributor in connection with its distribution of the Program +in a commercial product offering. The obligations in this section do not +apply to any claims or Losses relating to any actual or alleged +intellectual property infringement. In order to qualify, an Indemnified +Contributor must: a) promptly notify the Commercial Contributor in +writing of such claim, and b) allow the Commercial Contributor to control, +and cooperate with the Commercial Contributor in, the defense and any +related settlement negotiations. The Indemnified Contributor may +participate in any such claim at its own expense. + +For example, a Contributor might include the Program in a commercial +product offering, Product X. That Contributor is then a Commercial +Contributor. If that Commercial Contributor then makes performance +claims, or offers warranties related to Product X, those performance +claims and warranties are such Commercial Contributor's responsibility +alone. Under this section, the Commercial Contributor would have to +defend claims against the other Contributors related to those performance +claims and warranties, and if a court requires any other Contributor to +pay any damages as a result, the Commercial Contributor must pay +those damages. + +5. NO WARRANTY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" +BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR +IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF +TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR +PURPOSE. Each Recipient is solely responsible for determining the +appropriateness of using and distributing the Program and assumes all +risks associated with its exercise of rights under this Agreement, +including but not limited to the risks and costs of program errors, +compliance with applicable laws, damage to or loss of data, programs +or equipment, and unavailability or interruption of operations. + +6. DISCLAIMER OF LIABILITY + +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT +PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS +SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST +PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE +EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + +7. GENERAL + +If any provision of this Agreement is invalid or unenforceable under +applicable law, it shall not affect the validity or enforceability of +the remainder of the terms of this Agreement, and without further +action by the parties hereto, such provision shall be reformed to the +minimum extent necessary to make such provision valid and enforceable. + +If Recipient institutes patent litigation against any entity +(including a cross-claim or counterclaim in a lawsuit) alleging that the +Program itself (excluding combinations of the Program with other software +or hardware) infringes such Recipient's patent(s), then such Recipient's +rights granted under Section 2(b) shall terminate as of the date such +litigation is filed. + +All Recipient's rights under this Agreement shall terminate if it +fails to comply with any of the material terms or conditions of this +Agreement and does not cure such failure in a reasonable period of +time after becoming aware of such noncompliance. If all Recipient's +rights under this Agreement terminate, Recipient agrees to cease use +and distribution of the Program as soon as reasonably practicable. +However, Recipient's obligations under this Agreement and any licenses +granted by Recipient relating to the Program shall continue and survive. + +Everyone is permitted to copy and distribute copies of this Agreement, +but in order to avoid inconsistency the Agreement is copyrighted and +may only be modified in the following manner. The Agreement Steward +reserves the right to publish new versions (including revisions) of +this Agreement from time to time. No one other than the Agreement +Steward has the right to modify this Agreement. The Eclipse Foundation +is the initial Agreement Steward. The Eclipse Foundation may assign the +responsibility to serve as the Agreement Steward to a suitable separate +entity. Each new version of the Agreement will be given a distinguishing +version number. The Program (including Contributions) may always be +Distributed subject to the version of the Agreement under which it was +received. In addition, after a new version of the Agreement is published, +Contributor may elect to Distribute the Program (including its +Contributions) under the new version. + +Except as expressly stated in Sections 2(a) and 2(b) above, Recipient +receives no rights or licenses to the intellectual property of any +Contributor under this Agreement, whether expressly, by implication, +estoppel or otherwise. All rights in the Program not expressly granted +under this Agreement are reserved. Nothing in this Agreement is intended +to be enforceable by any entity that is not a Contributor or Recipient. +No third-party beneficiary rights are created under this Agreement. + +Exhibit A - Form of Secondary Licenses Notice + +"This Source Code may also be made available under the following +Secondary Licenses when the conditions for such availability set forth +in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), +version(s), and exceptions or additional permissions here}." + + Simply including a copy of this Agreement, including this Exhibit A + is not sufficient to license the Source Code under Secondary Licenses. + + If it is not possible or desirable to put the notice in a particular + file, then You may include the notice in a location (such as a LICENSE + file in a relevant directory) where a recipient would be likely to + look for such a notice. + + You may add additional accurate notices of copyright ownership. From fec9fb7bdacaa0a3797fac9952ab8bafe19bfee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Zamudio=20Amaya?= Date: Tue, 7 Feb 2023 18:14:38 +0100 Subject: [PATCH 06/22] Delete LICENSE.md --- LICENSE.md | 277 ----------------------------------------------------- 1 file changed, 277 deletions(-) delete mode 100644 LICENSE.md diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index e48e096..0000000 --- a/LICENSE.md +++ /dev/null @@ -1,277 +0,0 @@ -Eclipse Public License - v 2.0 - - THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE - PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION - OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - - a) in the case of the initial Contributor, the initial content - Distributed under this Agreement, and - - b) in the case of each subsequent Contributor: - i) changes to the Program, and - ii) additions to the Program; - where such changes and/or additions to the Program originate from - and are Distributed by that particular Contributor. A Contribution - "originates" from a Contributor if it was added to the Program by - such Contributor itself or anyone acting on such Contributor's behalf. - Contributions do not include changes or additions to the Program that - are not Modified Works. - -"Contributor" means any person or entity that Distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which -are necessarily infringed by the use or sale of its Contribution alone -or when combined with the Program. - -"Program" means the Contributions Distributed in accordance with this -Agreement. - -"Recipient" means anyone who receives the Program under this Agreement -or any Secondary License (as applicable), including Contributors. - -"Derivative Works" shall mean any work, whether in Source Code or other -form, that is based on (or derived from) the Program and for which the -editorial revisions, annotations, elaborations, or other modifications -represent, as a whole, an original work of authorship. - -"Modified Works" shall mean any work in Source Code or other form that -results from an addition to, deletion from, or modification of the -contents of the Program, including, for purposes of clarity any new file -in Source Code form that contains any contents of the Program. Modified -Works shall not include works that contain only declarations, -interfaces, types, classes, structures, or files of the Program solely -in each case in order to link to, bind by name, or subclass the Program -or Modified Works thereof. - -"Distribute" means the acts of a) distributing or b) making available -in any manner that enables the transfer of a copy. - -"Source Code" means the form of a Program preferred for making -modifications, including but not limited to software source code, -documentation source, and configuration files. - -"Secondary License" means either the GNU General Public License, -Version 2.0, or any later versions of that license, including any -exceptions or additional permissions as identified by the initial -Contributor. - -2. GRANT OF RIGHTS - - a) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free copyright - license to reproduce, prepare Derivative Works of, publicly display, - publicly perform, Distribute and sublicense the Contribution of such - Contributor, if any, and such Derivative Works. - - b) Subject to the terms of this Agreement, each Contributor hereby - grants Recipient a non-exclusive, worldwide, royalty-free patent - license under Licensed Patents to make, use, sell, offer to sell, - import and otherwise transfer the Contribution of such Contributor, - if any, in Source Code or other form. This patent license shall - apply to the combination of the Contribution and the Program if, at - the time the Contribution is added by the Contributor, such addition - of the Contribution causes such combination to be covered by the - Licensed Patents. The patent license shall not apply to any other - combinations which include the Contribution. No hardware per se is - licensed hereunder. - - c) Recipient understands that although each Contributor grants the - licenses to its Contributions set forth herein, no assurances are - provided by any Contributor that the Program does not infringe the - patent or other intellectual property rights of any other entity. - Each Contributor disclaims any liability to Recipient for claims - brought by any other entity based on infringement of intellectual - property rights or otherwise. As a condition to exercising the - rights and licenses granted hereunder, each Recipient hereby - assumes sole responsibility to secure any other intellectual - property rights needed, if any. For example, if a third party - patent license is required to allow Recipient to Distribute the - Program, it is Recipient's responsibility to acquire that license - before distributing the Program. - - d) Each Contributor represents that to its knowledge it has - sufficient copyright rights in its Contribution, if any, to grant - the copyright license set forth in this Agreement. - - e) Notwithstanding the terms of any Secondary License, no - Contributor makes additional grants to any Recipient (other than - those set forth in this Agreement) as a result of such Recipient's - receipt of the Program under the terms of a Secondary License - (if permitted under the terms of Section 3). - -3. REQUIREMENTS - -3.1 If a Contributor Distributes the Program in any form, then: - - a) the Program must also be made available as Source Code, in - accordance with section 3.2, and the Contributor must accompany - the Program with a statement that the Source Code for the Program - is available under this Agreement, and informs Recipients how to - obtain it in a reasonable manner on or through a medium customarily - used for software exchange; and - - b) the Contributor may Distribute the Program under a license - different than this Agreement, provided that such license: - i) effectively disclaims on behalf of all other Contributors all - warranties and conditions, express and implied, including - warranties or conditions of title and non-infringement, and - implied warranties or conditions of merchantability and fitness - for a particular purpose; - - ii) effectively excludes on behalf of all other Contributors all - liability for damages, including direct, indirect, special, - incidental and consequential damages, such as lost profits; - - iii) does not attempt to limit or alter the recipients' rights - in the Source Code under section 3.2; and - - iv) requires any subsequent distribution of the Program by any - party to be under a license that satisfies the requirements - of this section 3. - -3.2 When the Program is Distributed as Source Code: - - a) it must be made available under this Agreement, or if the - Program (i) is combined with other material in a separate file or - files made available under a Secondary License, and (ii) the initial - Contributor attached to the Source Code the notice described in - Exhibit A of this Agreement, then the Program may be made available - under the terms of such Secondary Licenses, and - - b) a copy of this Agreement must be included with each copy of - the Program. - -3.3 Contributors may not remove or alter any copyright, patent, -trademark, attribution notices, disclaimers of warranty, or limitations -of liability ("notices") contained within the Program from any copy of -the Program which they Distribute, provided that Contributors may add -their own appropriate notices. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities -with respect to end users, business partners and the like. While this -license is intended to facilitate the commercial use of the Program, -the Contributor who includes the Program in a commercial product -offering should do so in a manner which does not create potential -liability for other Contributors. Therefore, if a Contributor includes -the Program in a commercial product offering, such Contributor -("Commercial Contributor") hereby agrees to defend and indemnify every -other Contributor ("Indemnified Contributor") against any losses, -damages and costs (collectively "Losses") arising from claims, lawsuits -and other legal actions brought by a third party against the Indemnified -Contributor to the extent caused by the acts or omissions of such -Commercial Contributor in connection with its distribution of the Program -in a commercial product offering. The obligations in this section do not -apply to any claims or Losses relating to any actual or alleged -intellectual property infringement. In order to qualify, an Indemnified -Contributor must: a) promptly notify the Commercial Contributor in -writing of such claim, and b) allow the Commercial Contributor to control, -and cooperate with the Commercial Contributor in, the defense and any -related settlement negotiations. The Indemnified Contributor may -participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial -product offering, Product X. That Contributor is then a Commercial -Contributor. If that Commercial Contributor then makes performance -claims, or offers warranties related to Product X, those performance -claims and warranties are such Commercial Contributor's responsibility -alone. Under this section, the Commercial Contributor would have to -defend claims against the other Contributors related to those performance -claims and warranties, and if a court requires any other Contributor to -pay any damages as a result, the Commercial Contributor must pay -those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN "AS IS" -BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR -IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF -TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR -PURPOSE. Each Recipient is solely responsible for determining the -appropriateness of using and distributing the Program and assumes all -risks associated with its exercise of rights under this Agreement, -including but not limited to the risks and costs of program errors, -compliance with applicable laws, damage to or loss of data, programs -or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT -PERMITTED BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS -SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST -PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE -EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under -applicable law, it shall not affect the validity or enforceability of -the remainder of the terms of this Agreement, and without further -action by the parties hereto, such provision shall be reformed to the -minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity -(including a cross-claim or counterclaim in a lawsuit) alleging that the -Program itself (excluding combinations of the Program with other software -or hardware) infringes such Recipient's patent(s), then such Recipient's -rights granted under Section 2(b) shall terminate as of the date such -litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it -fails to comply with any of the material terms or conditions of this -Agreement and does not cure such failure in a reasonable period of -time after becoming aware of such noncompliance. If all Recipient's -rights under this Agreement terminate, Recipient agrees to cease use -and distribution of the Program as soon as reasonably practicable. -However, Recipient's obligations under this Agreement and any licenses -granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, -but in order to avoid inconsistency the Agreement is copyrighted and -may only be modified in the following manner. The Agreement Steward -reserves the right to publish new versions (including revisions) of -this Agreement from time to time. No one other than the Agreement -Steward has the right to modify this Agreement. The Eclipse Foundation -is the initial Agreement Steward. The Eclipse Foundation may assign the -responsibility to serve as the Agreement Steward to a suitable separate -entity. Each new version of the Agreement will be given a distinguishing -version number. The Program (including Contributions) may always be -Distributed subject to the version of the Agreement under which it was -received. In addition, after a new version of the Agreement is published, -Contributor may elect to Distribute the Program (including its -Contributions) under the new version. - -Except as expressly stated in Sections 2(a) and 2(b) above, Recipient -receives no rights or licenses to the intellectual property of any -Contributor under this Agreement, whether expressly, by implication, -estoppel or otherwise. All rights in the Program not expressly granted -under this Agreement are reserved. Nothing in this Agreement is intended -to be enforceable by any entity that is not a Contributor or Recipient. -No third-party beneficiary rights are created under this Agreement. - -Exhibit A - Form of Secondary Licenses Notice - -"This Source Code may also be made available under the following -Secondary Licenses when the conditions for such availability set forth -in the Eclipse Public License, v. 2.0 are satisfied: {name license(s), -version(s), and exceptions or additional permissions here}." - - Simply including a copy of this Agreement, including this Exhibit A - is not sufficient to license the Source Code under Secondary Licenses. - - If it is not possible or desirable to put the notice in a particular - file, then You may include the notice in a location (such as a LICENSE - file in a relevant directory) where a recipient would be likely to - look for such a notice. - - You may add additional accurate notices of copyright ownership. From a1d8efc1b6f7febb95e358bbc3b1b77445a5d64e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Zamudio=20Amaya?= Date: Tue, 7 Feb 2023 18:15:45 +0100 Subject: [PATCH 07/22] Update pom.xml --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 1f8ffab..4cfdfd7 100644 --- a/pom.xml +++ b/pom.xml @@ -84,15 +84,6 @@ +2 - - José Antonio Zamudio - jose.zamudio - joszamama@gmail.com - - developer - - +2 - From 97d5121c069fe8a78bbcb8eafedb0fdc50f8d24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Antonio=20Zamudio=20Amaya?= Date: Tue, 7 Feb 2023 21:43:18 +0100 Subject: [PATCH 08/22] fix: delete old dependencies from pom --- pom.xml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/pom.xml b/pom.xml index 4cfdfd7..6d79013 100644 --- a/pom.xml +++ b/pom.xml @@ -166,30 +166,6 @@ ${log4j.version} - - com.jayway.jsonpath - json-path - 2.7.0 - - - - org.slf4j - slf4j-api - 1.7.25 - - - - org.slf4j - slf4j-simple - 1.7.25 - - - - com.googlecode.json-simple - json-simple - 1.1.1 - - From 6cbeba75486ee9871f6c2813eb9dcfa30c7bf4c7 Mon Sep 17 00:00:00 2001 From: joszamama Date: Tue, 7 Feb 2023 21:52:04 +0100 Subject: [PATCH 09/22] fix: add vscode entry in gitignore --- .gitignore | 1 + .vscode/settings.json | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 567609b..10561bd 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ build/ +.vscode \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0e14d8e..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "disabled" -} \ No newline at end of file From 63c654a96589dd53bd9bc74b5e25da50d176710f Mon Sep 17 00:00:00 2001 From: joszamama Date: Tue, 7 Feb 2023 22:49:32 +0100 Subject: [PATCH 10/22] feat: create GreetingsBot dockerfile with commands 'docker build -t greetingsbot .' then 'docker run -p 5000:5000 -p 5001:5001' you can simply deploy the GreetingsBot --- Dockerfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..1b01057 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +# Use an official Java image as the base image +FROM openjdk:14-jdk-alpine + +# Install Git +RUN apk add git maven + +# Set the working directory in the image +WORKDIR /app + +# Copy the project files to the image +COPY . . + +# Build the project using Maven +RUN git submodule update --init --recursive +RUN mvn clean install -DskipTests + +# Set the working directory to the example project +WORKDIR /app/xatkit-examples/GreetingsBots/GreetingsBot +RUN mvn clean compile + +# Specify the command to run the compiled application +CMD ["/bin/sh", "-c", "mvn exec:java -e -Dexec.mainClass=\"com.xatkit.example.GreetingsBot\""] \ No newline at end of file From 87ae9f9bcad3ab2196f4e65decf95a84b1b95386 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 8 Feb 2023 09:21:22 +0100 Subject: [PATCH 11/22] parametrizacion del nombre del bot en dockerfile --- Dockerfile | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1b01057..164c50f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,29 @@ # Use an official Java image as the base image FROM openjdk:14-jdk-alpine +# Set the environment variables +ENV CHATBOT_NAME=GreetingsBot +ENV CHATBOT_DEFINITION= + # Install Git RUN apk add git maven # Set the working directory in the image WORKDIR /app -# Copy the project files to the image -COPY . . +# Clone your repository +RUN git clone https://github.com/joszamama/xatkit-main.git + +# Set the working directory to the cloned repository +WORKDIR /app/xatkit-main # Build the project using Maven RUN git submodule update --init --recursive RUN mvn clean install -DskipTests # Set the working directory to the example project -WORKDIR /app/xatkit-examples/GreetingsBots/GreetingsBot +WORKDIR /app/xatkit-main/xatkit-examples/GreetingsBots/GreetingsBot RUN mvn clean compile # Specify the command to run the compiled application -CMD ["/bin/sh", "-c", "mvn exec:java -e -Dexec.mainClass=\"com.xatkit.example.GreetingsBot\""] \ No newline at end of file +CMD ["sh", "-c", "mvn exec:java -e -Dexec.mainClass=\"com.xatkit.example.${CHATBOT_NAME}\""] \ No newline at end of file From 14503dfd9cede9e75aa0049f2623a04c4bdaca5c Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 8 Feb 2023 11:27:11 +0100 Subject: [PATCH 12/22] fix: updated submodule refs --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 82ed2b0..423c822 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 82ed2b0857b084431d52d1a102218617ebb64d20 +Subproject commit 423c82235d586471781e723b69d74924f097f27c From fc7d50c751eb63de6348ae622ecff0edb5cc11c1 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 8 Feb 2023 12:34:18 +0100 Subject: [PATCH 13/22] fix: new parser version --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 423c822..b1a9fd6 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 423c82235d586471781e723b69d74924f097f27c +Subproject commit b1a9fd67fa184f39008de5f55ad54f9410f57b6f From 5d7c634781c8a075d45a77c3a9c1d8cc8de34ca4 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 8 Feb 2023 17:14:30 +0100 Subject: [PATCH 14/22] feat: repo refactor, delete old unused files --- Dockerfile | 29 ----------------------------- xatkit-spl-parser | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 164c50f..0000000 --- a/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -# Use an official Java image as the base image -FROM openjdk:14-jdk-alpine - -# Set the environment variables -ENV CHATBOT_NAME=GreetingsBot -ENV CHATBOT_DEFINITION= - -# Install Git -RUN apk add git maven - -# Set the working directory in the image -WORKDIR /app - -# Clone your repository -RUN git clone https://github.com/joszamama/xatkit-main.git - -# Set the working directory to the cloned repository -WORKDIR /app/xatkit-main - -# Build the project using Maven -RUN git submodule update --init --recursive -RUN mvn clean install -DskipTests - -# Set the working directory to the example project -WORKDIR /app/xatkit-main/xatkit-examples/GreetingsBots/GreetingsBot -RUN mvn clean compile - -# Specify the command to run the compiled application -CMD ["sh", "-c", "mvn exec:java -e -Dexec.mainClass=\"com.xatkit.example.${CHATBOT_NAME}\""] \ No newline at end of file diff --git a/xatkit-spl-parser b/xatkit-spl-parser index b1a9fd6..82ed2b0 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit b1a9fd67fa184f39008de5f55ad54f9410f57b6f +Subproject commit 82ed2b0857b084431d52d1a102218617ebb64d20 From a395ce15eba6400467498583e8486f10fdd13931 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 8 Feb 2023 18:10:28 +0100 Subject: [PATCH 15/22] fix: new docs for parser repo --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 82ed2b0..7e139ca 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 82ed2b0857b084431d52d1a102218617ebb64d20 +Subproject commit 7e139ca112841447e0cfb7cff1673fbc4f23bea9 From c15e3bd1a5e0b6226c9641c1cb1fee61e8146120 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 8 Feb 2023 18:14:11 +0100 Subject: [PATCH 16/22] feat: add EPL-2.0 license --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 7e139ca..0b849aa 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 7e139ca112841447e0cfb7cff1673fbc4f23bea9 +Subproject commit 0b849aaae051b5ca403f8853c197d86476f99621 From d00229d7086471bc7f50bf84f09bcc828997390e Mon Sep 17 00:00:00 2001 From: joszamama Date: Fri, 10 Feb 2023 11:41:39 +0100 Subject: [PATCH 17/22] fix: edit typo in readme --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 0b849aa..563fd65 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 0b849aaae051b5ca403f8853c197d86476f99621 +Subproject commit 563fd6583f7423823a46b08befb29893370c8f91 From 4aeee1eceab241c5e4904ec9cf90badd9e0d93c3 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 29 Mar 2023 12:47:08 +0200 Subject: [PATCH 18/22] feat: update parser to NLP new version --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 563fd65..1a71fe8 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 563fd6583f7423823a46b08befb29893370c8f91 +Subproject commit 1a71fe83c2a56248455367177050e8d552c84304 From c9cb2488ca362b840b8d144c2d71d6960b82b625 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 29 Mar 2023 13:17:42 +0200 Subject: [PATCH 19/22] fix: remove old example submodule --- .gitmodules | 3 --- xatkit-examples | 1 - 2 files changed, 4 deletions(-) delete mode 160000 xatkit-examples diff --git a/.gitmodules b/.gitmodules index cfec965..a89b360 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "xatkit-metamodels"] path = xatkit-metamodels url = https://github.com/xatkit-bot-platform/xatkit-metamodels.git -[submodule "xatkit-examples"] - path = xatkit-examples - url = https://github.com/xatkit-bot-platform/xatkit-examples.git [submodule "platforms/xatkit-chat-platform"] path = platforms/xatkit-chat-platform url = https://github.com/xatkit-bot-platform/xatkit-chat-platform.git diff --git a/xatkit-examples b/xatkit-examples deleted file mode 160000 index fd65495..0000000 --- a/xatkit-examples +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fd65495246351403107ebc09a9a0eaba4f235781 From d195fa2325b0ae617cf2d3497978c6aa124baa45 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 29 Mar 2023 13:19:16 +0200 Subject: [PATCH 20/22] feat: add new example submodule --- .gitmodules | 3 +++ xatkit-examples | 1 + 2 files changed, 4 insertions(+) create mode 160000 xatkit-examples diff --git a/.gitmodules b/.gitmodules index a89b360..fac067f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -37,3 +37,6 @@ [submodule "xatkit-spl-parser"] path = xatkit-spl-parser url = https://github.com/joszamama/xatkit-spl-parser.git +[submodule "xatkit-examples"] + path = xatkit-examples + url = https://github.com/joszamama/xatkit-examples diff --git a/xatkit-examples b/xatkit-examples new file mode 160000 index 0000000..09f6eca --- /dev/null +++ b/xatkit-examples @@ -0,0 +1 @@ +Subproject commit 09f6ecadde879380baf789a53b5ef62ac0d79705 From 37e61fb3fe8ceeb9d880bce352d8a075c63d534a Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 29 Mar 2023 14:06:28 +0200 Subject: [PATCH 21/22] feat: add network to docker --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index 1a71fe8..dcf3f0e 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit 1a71fe83c2a56248455367177050e8d552c84304 +Subproject commit dcf3f0e29588771d958132c85be0327e14e1728f From 927a60b0d63a8255f936daf84ac4535047588809 Mon Sep 17 00:00:00 2001 From: joszamama Date: Wed, 29 Mar 2023 14:13:07 +0200 Subject: [PATCH 22/22] fix: add schema validation --- xatkit-spl-parser | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xatkit-spl-parser b/xatkit-spl-parser index dcf3f0e..ce8aeb9 160000 --- a/xatkit-spl-parser +++ b/xatkit-spl-parser @@ -1 +1 @@ -Subproject commit dcf3f0e29588771d958132c85be0327e14e1728f +Subproject commit ce8aeb92f66012699f8dc914662b2ae8dda64365