diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..5601d3bbb232b817dddb815531d4697e507721ab --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +.project +.classpath +/.settings diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000000000000000000000000000000000000..3d872f628da12898f872b41465d9794dfc5c0684 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,35 @@ +include: + - project: osl/code/org.etsi.osl.main + ref: main + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_NAME == "main"' + + - project: osl/code/org.etsi.osl.main + ref: develop + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_NAME == "develop"' + + - project: osl/code/org.etsi.osl.main + ref: $CI_COMMIT_REF_NAME + file: + - ci-templates/default.yml + - ci-templates/build.yml + rules: + - if: '$CI_COMMIT_REF_PROTECTED && $CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop"' + + - project: osl/code/org.etsi.osl.main + ref: develop + file: + - ci-templates/default.yml + - ci-templates/build_unprotected.yml + rules: + - if: '$CI_COMMIT_REF_NAME != "main" && $CI_COMMIT_REF_NAME != "develop" && !$CI_COMMIT_REF_PROTECTED' + +maven_build: + extends: .maven_build diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..261eeb9e9f8b2b4b0d119366dda99c6fd7d35c64 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) 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. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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 + + http://www.apache.org/licenses/LICENSE-2.0 + + 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. diff --git a/ci_settings.xml b/ci_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..69ad06ed6c63795d191555afde6ea2d1da4e133d --- /dev/null +++ b/ci_settings.xml @@ -0,0 +1,16 @@ + + + + gitlab-maven + + + + Job-Token + ${CI_JOB_TOKEN} + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..e59e6ef43f4f97b921375525b17dbf9af6081a6c --- /dev/null +++ b/pom.xml @@ -0,0 +1,88 @@ + + 4.0.0 + + org.etsi.osl + org.etsi.osl.main + 1.0.0 + ../org.etsi.osl.main + + + org.etsi.osl.centrallog.client + org.etsi.osl.centrallog.client + + + + gitlab-maven + https://labs.etsi.org/rep/api/v4/groups/260/-/packages/maven + + + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + gitlab-maven + ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven + + + + + + + + org.apache.camel.springboot + camel-spring-boot-dependencies + ${camel.version} + pom + import + + + + + + + + + + + org.apache.camel.springboot + camel-spring-boot-starter + + + + + org.apache.camel.springboot + camel-http-starter + + + org.apache.camel + camel-activemq + + + org.apache.activemq + activemq-broker + + + + + org.apache.camel.springboot + camel-service-starter + + + org.apache.camel + camel-jackson + + + com.fasterxml.jackson.core + jackson-databind + + + org.apache.camel + camel-stream + + + + + + \ No newline at end of file diff --git a/src/main/java/org/etsi/osl/centrallog/client/CLevel.java b/src/main/java/org/etsi/osl/centrallog/client/CLevel.java new file mode 100644 index 0000000000000000000000000000000000000000..67afd6e4b8d21c97b73ca389ba9954aee5bfcc08 --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/client/CLevel.java @@ -0,0 +1,34 @@ +/*- + * ========================LICENSE_START================================= + * CentralLoggerClient + * %% + * Copyright (C) 2019 - 2020 openslice.io + * %% + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * =========================LICENSE_END================================== + */ +package org.etsi.osl.centrallog.client; + + + + + +/** + * @author ctranoris + * + */ +public enum CLevel { + INFO, + WARN, + ERROR +} diff --git a/src/main/java/org/etsi/osl/centrallog/client/CentralLogMessage.java b/src/main/java/org/etsi/osl/centrallog/client/CentralLogMessage.java new file mode 100644 index 0000000000000000000000000000000000000000..aba9cd288346cbf099ca8e04905fe9a8da9653a4 --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/client/CentralLogMessage.java @@ -0,0 +1,104 @@ +/*- + * ========================LICENSE_START================================= + * CentralLoggerClient + * %% + * Copyright (C) 2019 - 2020 openslice.io + * %% + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * =========================LICENSE_END================================== + */ +package org.etsi.osl.centrallog.client; + +import java.time.Instant; + +/** + * @author ctranoris + * + */ +public class CentralLogMessage { + + private CLevel clevel; + + private String message; + + private String time; + + private String component; + + /** + * + */ + public CentralLogMessage() { + this.clevel=CLevel.WARN; + this.message="This is the default CentralLogger message"; + this.time = Instant.now().toString(); + } + + /** + * @param cLevel + * @param message + */ + public CentralLogMessage(CLevel cLevel, String message) { + super(); + this.clevel = cLevel; + this.message = message; + this.time = Instant.now().toString(); + } + + + /** + * @return the cLevel + */ + public CLevel getclevel() { + return clevel; + } + + /** + * @param cLevel the cLevel to set + */ + public void setclevel(CLevel cLevel) { + this.clevel = cLevel; + } + + /** + * @return the message + */ + public String getMessage() { + return message; + } + + /** + * @param message the message to set + */ + public void setMessage(String message) { + this.message = message; + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public String getComponent() { + return component; + } + + public void setComponent(String component) { + this.component = component; + } + + +} diff --git a/src/main/java/org/etsi/osl/centrallog/client/CentralLogPackage.java b/src/main/java/org/etsi/osl/centrallog/client/CentralLogPackage.java new file mode 100644 index 0000000000000000000000000000000000000000..5ef24feecea17e90ee229f85398ea3f2ce6ab823 --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/client/CentralLogPackage.java @@ -0,0 +1,51 @@ +/*- + * ========================LICENSE_START================================= + * CentralLoggerClient + * %% + * Copyright (C) 2019 - 2020 openslice.io + * %% + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * =========================LICENSE_END================================== + */ +package org.etsi.osl.centrallog.client; + + +public class CentralLogPackage { + String endpoint; + CentralLogMessage centrallogmsg; + + /** + * + */ + public CentralLogPackage() { + this.endpoint = ""; + this.centrallogmsg = new CentralLogMessage(); + } + + public String getEndpoint() { + return endpoint; + } + + public void setEndpoint(String endpoint) { + this.endpoint = endpoint; + } + + public CentralLogMessage getCentralLogMessage() + { + return this.centrallogmsg; + } + public void setCentralLogMessage(CentralLogMessage clm) + { + this.centrallogmsg=clm; + } +} diff --git a/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java b/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java new file mode 100644 index 0000000000000000000000000000000000000000..d700e76ac6ccf4e8d22a9d97eee426afad34387b --- /dev/null +++ b/src/main/java/org/etsi/osl/centrallog/client/CentralLogger.java @@ -0,0 +1,166 @@ +package org.etsi.osl.centrallog.client; +/*- + * ========================LICENSE_START================================= + * org.etsi.osl.portal.api + * %% + * Copyright (C) 2019 openslice.io + * %% + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + * =========================LICENSE_END================================== + */ + +import java.util.concurrent.Future; + +import org.apache.camel.Exchange; +import org.apache.camel.FluentProducerTemplate; +import org.apache.camel.ProducerTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import com.fasterxml.jackson.databind.ObjectMapper; + +/** + * @author ctranoris + * + * + */ +@Configuration +@Component +public class CentralLogger { + + /** the Camel Context configure via Spring. See bean.xml*/ +// private static CamelContext actx; + + + @Autowired + private ProducerTemplate template; + +// private static String centralloggerurl = null; +// +// public static String getCentralLoggerUrl() +// { +// return centralloggerurl; +// } +// +// public CentralLogger(String centralloggerurl_tmp) { +// super(); +// centralloggerurl = centralloggerurl_tmp; +// } +// +// public static void setCentralLoggerUrl(String centralLoggerUrl) +// { +// centralloggerurl=centralLoggerUrl; +// } + +// public void setActx(CamelContext actx) { +// CentralLogger.actx = actx; +// } + + + /** + * @param cl + * @param amessage + * @param componentName + */ +// public void log(CLevel cl, String amessage) { +// Map map = new HashMap(); +// map.put("endpoint", this.centralloggerurl ); +// map.put("clevel", cl.toString() ); +// map.put("message", amessage ); +// log(map); +// } + +// public static void log(Map map) +// { +// String json; +// try { +// json = new ObjectMapper().writeValueAsString(map); +// //System.out.println(json); +// FluentProducerTemplate template = actx.createFluentProducerTemplate().to("seda:centralLog?multipleConsumers=true"); +// Future result = template.withBody( json ).asyncSend(); +// waitAndStopForTemplate( result, template); +// +// } catch (JsonProcessingException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } +// } + + public void log(CLevel cl, String amessage, String component) { + +// CentralLogPackage clp = new CentralLogPackage(); +// clp.setEndpoint(centralloggerurl); + CentralLogMessage clm = new CentralLogMessage(); + clm.setclevel(cl); + clm.setMessage(amessage); + clm.setComponent(component); +// clp.setCentralLogMessage(clm); + try { + log(clm); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + public void log(CentralLogMessage clm) throws Exception + { +// if ( actx==null) { +// throw new Exception("actx is null"); +// } + if ( template==null) { + throw new Exception("template is null"); + } + String json; + json = new ObjectMapper().writeValueAsString(clm); +// FluentProducerTemplate template = actx.createFluentProducerTemplate() +// .to("activemq:queue:centrallogger.log"); + //Future result = template.withBody( json ).asyncSend(); + //waitAndStopForTemplate( result, template); + template.sendBody("jms:topic:centrallogger.log", json); + + } + + /** + * + * utility function to stop ProducerTemplate + * @param result + * @param template + */ + private void waitAndStopForTemplate(Future result, FluentProducerTemplate template) { + while (true) { + if (result.isDone()) { + //logger.info( "waitAndStopForTemplate: " + template.toString() + " [STOPPED]"); + try { + template.stop(); + //template.clearAll(); + template.cleanUp(); + break; + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + try { + //logger.info( "waitAndStopForTemplate: " + template.toString() + " [WAITING...]"); + Thread.sleep( 5000 ); + } catch (InterruptedException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + } +}