From: jsimomaa Date: Fri, 23 Sep 2016 08:47:02 +0000 (+0300) Subject: Enhance logging for Simantics platform with SLF4J and Logback X-Git-Tag: v1.25.0~100 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=598b8d5cb8c813e75563aee4df097c91f8268d0d;p=simantics%2Fplatform.git Enhance logging for Simantics platform with SLF4J and Logback Include the new logging bundles in org.simantics.rcp.feature. refs #6705 Change-Id: I0711950cbb858a1bbcf0b3a14f648b98707dc1ca --- diff --git a/features/org.simantics.rcp.feature/feature.xml b/features/org.simantics.rcp.feature/feature.xml index a19e2c230..40a9bdb68 100644 --- a/features/org.simantics.rcp.feature/feature.xml +++ b/features/org.simantics.rcp.feature/feature.xml @@ -1,4 +1,4 @@ - + - - - + --> + + + Briefly put, includes Eclipse RCP feature along with other basic framework parts often required by applications with a workbench UI. @@ -29,15 +29,15 @@ To be more precise, the additions to Eclipse RCP are: <li>Apache Commons HTTPClient + dependencies</li> <li>Apache Xerces XML parser + dependencies</li> <li>JUnit 4</li> -</ul> - - - +</ul> + + + Copyright (c) 2007, 2010 Association for Decentralized Information Management in Industry THTH ry.<br/> -All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - - - +All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> + + + Eclipse Public License - v 1.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. @@ -107,573 +107,587 @@ All Recipient's rights under this Agreement shall terminate if it fails to 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. -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.sdk.build.p2.site/pom.xml b/releng/org.simantics.sdk.build.p2.site/pom.xml index 361c0cdcd..89340d872 100644 --- a/releng/org.simantics.sdk.build.p2.site/pom.xml +++ b/releng/org.simantics.sdk.build.p2.site/pom.xml @@ -1,339 +1,352 @@ - - - 4.0.0 - - org.simantics - org.simantics.sdk.build.p2.site - pom - 1.25.0 - - - 2.1.7.b1 - 4.9.0 - 4.9.0.b0003 - org.apache.lucene4 - - - - - - - - - - - org.eclipse.tycho.extras - tycho-p2-extras-plugin - 0.25.0 - - - org.reficio - p2-maven-plugin - 1.2.0-SNAPSHOT - - - default-cli - - - - - - org.antlr:antlr-runtime:3.5.2 - true - - - org.apache.poi:poi:3.14 - true - - - org.apache.poi:poi-ooxml:3.14 - true - - - org.apache.lucene:lucene-core:${lucene.version} - true - - ${lucene.prefix}.core - ${lucene.version.actual} - *;version="${lucene.version}" - - - - org.apache.lucene:lucene-queries:${lucene.version} - true - - ${lucene.prefix}.queries - ${lucene.version.actual} - ${lucene.prefix}.core;bundle-version="${lucene.version}" - *;version="${lucene.version}" - !org.apache.lucene.*,*;resolution:=optional - - - - org.apache.lucene:lucene-sandbox:${lucene.version} - true - - ${lucene.prefix}.sandbox - ${lucene.version.actual} - ${lucene.prefix}.core;bundle-version="${lucene.version}" - *;version="${lucene.version}" - !org.apache.lucene.*,*;resolution:=optional - - - - org.apache.lucene:lucene-analyzers-common:${lucene.version} - true - - ${lucene.prefix}.analyzers-common - ${lucene.version.actual} - ${lucene.prefix}.core;bundle-version="${lucene.version}" - *;version="${lucene.version}" - !org.apache.lucene.*,*;resolution:=optional - - - - org.apache.lucene:lucene-queryparser:${lucene.version} - true - - ${lucene.prefix}.queryparser - ${lucene.version.actual} - ${lucene.prefix}.core;bundle-version="${lucene.version}",${lucene.prefix}.queries;bundle-version="${lucene.version}",${lucene.prefix}.sandbox;bundle-version="${lucene.version}" - *;version="${lucene.version}" - !org.apache.lucene.*,*;resolution:=optional - - - - org.jdom:jdom2:2.0.6 - true - - org.jdom2 - - - - org.jfree:jfreechart:1.0.19 - true - - org.jfree.jchart - - - - - net.sf.supercsv:super-csv:2.4.0 - true - true - - org.supercsv - - - - org.ini4j:ini4j:0.5.4 - true - - - commons-collections:commons-collections:3.2.2 - true - - - org.apache.commons:commons-compress:1.12 - true - - - commons-lang:commons-lang:2.6 - true - - - commons-io:commons-io:1.4 - true - - - org.apache.pdfbox:pdfbox:2.0.2 - true - - - org.apache.pdfbox:fontbox:2.0.2 - true - - - org.apache.pdfbox:xmpbox:2.0.2 - true - - - log4j:log4j:1.2.17 - true - true - - org.apache.log4j - - - - net.sf.ucanaccess:ucanaccess:3.0.6 - true - - net.ucanaccess - - - - it.unimi.dsi:fastutil:7.0.12 - true - - - org.eclipse.collections:eclipse-collections-api:7.1.0 - true - true - - org.eclipse.collections.* - - - - org.eclipse.collections:eclipse-collections:7.1.0 - true - - - net.sf.trove4j:trove4j:2.1.0 - true - - GNU Trove 2 - gnu.trove2 - - - - net.sf.trove4j:trove4j:3.0.3 - true - - GNU Trove 3 - gnu.trove3 - - - - org.freemarker:freemarker:2.3.23 - true - true - - freemarker - - - - com.lowagie:itext:2.1.7 - true - - com.lowagie.text - ${itext.version.actual} - - - - javax.vecmath:vecmath:1.5.2 - false - true - - javax.vecmath - - - - org.mozilla:rhino:1.7.7.1 - true - - - net.java.dev.jna:jna:4.2.2 - true - - - net.java.dev.jna:jna-platform:4.2.2 - true - - - com.fasterxml.jackson.core:jackson-core:2.8.2 - true - - - - - - - - - org.mortbay.jetty - jetty-maven-plugin - 8.1.5.v20120716 - - 10 - ${basedir}/target/repository/ - - /site - - - - - - - - - reficio - http://repo.reficio.org/maven/ - - - - + + + 4.0.0 + + org.simantics + org.simantics.sdk.build.p2.site + pom + 1.25.0 + + + 2.1.7.b1 + 4.9.0 + 4.9.0.b0003 + org.apache.lucene4 + + + + + + + + + + + org.eclipse.tycho.extras + tycho-p2-extras-plugin + 0.25.0 + + + org.reficio + p2-maven-plugin + 1.2.0-SNAPSHOT + + + default-cli + + + + + + org.antlr:antlr-runtime:3.5.2 + true + + + org.apache.poi:poi:3.14 + true + + + org.apache.poi:poi-ooxml:3.14 + true + + + org.apache.lucene:lucene-core:${lucene.version} + true + + ${lucene.prefix}.core + ${lucene.version.actual} + *;version="${lucene.version}" + + + + org.apache.lucene:lucene-queries:${lucene.version} + true + + ${lucene.prefix}.queries + ${lucene.version.actual} + ${lucene.prefix}.core;bundle-version="${lucene.version}" + *;version="${lucene.version}" + !org.apache.lucene.*,*;resolution:=optional + + + + org.apache.lucene:lucene-sandbox:${lucene.version} + true + + ${lucene.prefix}.sandbox + ${lucene.version.actual} + ${lucene.prefix}.core;bundle-version="${lucene.version}" + *;version="${lucene.version}" + !org.apache.lucene.*,*;resolution:=optional + + + + org.apache.lucene:lucene-analyzers-common:${lucene.version} + true + + ${lucene.prefix}.analyzers-common + ${lucene.version.actual} + ${lucene.prefix}.core;bundle-version="${lucene.version}" + *;version="${lucene.version}" + !org.apache.lucene.*,*;resolution:=optional + + + + org.apache.lucene:lucene-queryparser:${lucene.version} + true + + ${lucene.prefix}.queryparser + ${lucene.version.actual} + ${lucene.prefix}.core;bundle-version="${lucene.version}",${lucene.prefix}.queries;bundle-version="${lucene.version}",${lucene.prefix}.sandbox;bundle-version="${lucene.version}" + *;version="${lucene.version}" + !org.apache.lucene.*,*;resolution:=optional + + + + org.jdom:jdom2:2.0.6 + true + + org.jdom2 + + + + org.jfree:jfreechart:1.0.19 + true + + org.jfree.jchart + + + + + net.sf.supercsv:super-csv:2.4.0 + true + true + + org.supercsv + + + + org.ini4j:ini4j:0.5.4 + true + + + commons-collections:commons-collections:3.2.2 + true + + + org.apache.commons:commons-compress:1.12 + true + + + commons-lang:commons-lang:2.6 + true + + + commons-io:commons-io:1.4 + true + + + org.apache.pdfbox:pdfbox:2.0.2 + true + + + org.apache.pdfbox:fontbox:2.0.2 + true + + + org.apache.pdfbox:xmpbox:2.0.2 + true + + + log4j:log4j:1.2.17 + true + true + + org.apache.log4j + + + + net.sf.ucanaccess:ucanaccess:3.0.6 + true + + net.ucanaccess + + + + it.unimi.dsi:fastutil:7.0.12 + true + + + org.eclipse.collections:eclipse-collections-api:7.1.0 + true + true + + org.eclipse.collections.* + + + + org.eclipse.collections:eclipse-collections:7.1.0 + true + + + net.sf.trove4j:trove4j:2.1.0 + true + + GNU Trove 2 + gnu.trove2 + + + + net.sf.trove4j:trove4j:3.0.3 + true + + GNU Trove 3 + gnu.trove3 + + + + org.freemarker:freemarker:2.3.23 + true + true + + freemarker + + + + com.lowagie:itext:2.1.7 + true + + com.lowagie.text + ${itext.version.actual} + + + + javax.vecmath:vecmath:1.5.2 + false + true + + javax.vecmath + + + + org.mozilla:rhino:1.7.7.1 + true + + + net.java.dev.jna:jna:4.2.2 + true + + + net.java.dev.jna:jna-platform:4.2.2 + true + + + com.fasterxml.jackson.core:jackson-core:2.8.2 + true + + + org.slf4j:slf4j-api:1.7.20 + true + true + + SLF4J API Module + org.slf4j.api + + + + ch.qos.logback:logback-classic:1.1.7 + true + + + + + + + + + org.mortbay.jetty + jetty-maven-plugin + 8.1.5.v20120716 + + 10 + ${basedir}/target/repository/ + + /site + + + + + + + + + reficio + http://repo.reficio.org/maven/ + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target index aba69b350..30877826a 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition-semantum.target @@ -1,194 +1,200 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target index 4975bea17..b40350e28 100644 --- a/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target +++ b/releng/org.simantics.sdk.build.targetdefinition/org.simantics.sdk.build.targetdefinition.target @@ -1,194 +1,200 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +