Skip to content

Commit 74f9937

Browse files
authored
#187 Fix logging configuration for JAR product (#229)
- Update log configuration - If file path is given, reconfigure logging based on this configuration - Default case configures console logging to level INFO, no file logging - Add ExampleServerLauncher.launch configuration that uses the example log configuration (console and file logging at level info) - Remove log configuration files from classpath to avoid unwanted configuration aggregation - Fix performance warning that causes log42j logging issue if executed in bundled jar - Switch to import instead of require plugin bundles for log4j dependencies - Update lib dependencies - Do not exclude source libs to improve debugging experiences in p2 use case - Update README - Update logging section - Format via markdownlint and remove markdownlint warnings - Update import project section and remove outdated information - targetplatform project - Include targetplatform as module of releng parent project to be able to import all projects as maven projects without exception - Remove unused targetplatform profile - Update wso2 mirror for a small set of org.eclipse.emf dependencies - Previous mirror seems to be out of maintenance since 2017 (see also #232) Part of #187
1 parent e491b7a commit 74f9937

31 files changed

Lines changed: 519 additions & 491 deletions

File tree

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ local.properties
1717
# External tool builders
1818
.externalToolBuilders/
1919

20-
# Locally stored "Eclipse launch configurations"
21-
*.launch
22-
2320
# PyDev specific (Python IDE for Eclipse)
2421
*.pydevproject
2522

.mvn/custom-settings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<id>wso2-mirror</id>
55
<mirrorOf>wso2</mirrorOf>
66
<name>WSO2 mirror to unblock.</name>
7-
<url>http://dist.wso2.org/maven2/</url>
7+
<url>http://maven.wso2.org/nexus/content/groups/wso2-public/</url>
88
<blocked>false</blocked>
99
</mirror>
1010
</mirrors>

README.md

Lines changed: 311 additions & 294 deletions
Large diffs are not rendered by default.

bundles/org.eclipse.emfcloud.modelserver.client/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Require-Bundle: com.fasterxml.jackson.core.jackson-core;bundle-version="[2.9.0,3.0.0)",
99
com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.9.0,3.0.0)",
1010
com.google.guava;bundle-version="[27.1.0,31.0.0)",
11-
org.apache.logging.log4j;bundle-version="[2.17.1,3.0.0)",
1211
org.eclipse.emf.common;bundle-version="[2.17.0,3.0.0)",
1312
org.eclipse.emf.ecore;bundle-version="[2.20.0,3.0.0)",
1413
org.eclipse.emfcloud.modelserver.common;bundle-version="[0.7.0,1.0.0)",
@@ -21,3 +20,4 @@ Export-Package: org.eclipse.emfcloud.modelserver.client,
2120
org.eclipse.emfcloud.modelserver.client.v2,
2221
org.eclipse.emfcloud.modelserver.internal.client;x-internal:=true
2322
Bundle-Vendor: EclipseSource
23+
Import-Package: org.apache.logging.log4j;version="[2.17.1,3.0.0)"

bundles/org.eclipse.emfcloud.modelserver.common/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
88
Require-Bundle: com.fasterxml.jackson.core.jackson-core;bundle-version="[2.9.0,3.0.0)",
99
com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.9.0,3.0.0)",
1010
com.google.inject;bundle-version="[5.0.0,6.0.0)",
11-
org.apache.logging.log4j;bundle-version="[2.17.1,3.0.0)",
1211
org.eclipse.emf.ecore;bundle-version="[2.20.0,3.0.0)",
1312
org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
1413
org.eclipse.emfcloud.emfjson-jackson;bundle-version="[2.0.0,3.0.0)",
@@ -20,4 +19,5 @@ Export-Package: org.eclipse.emfcloud.modelserver.common,
2019
org.eclipse.emfcloud.modelserver.common.utils,
2120
org.eclipse.emfcloud.modelserver.jsonschema
2221
Bundle-Vendor: EclipseSource
23-
Import-Package: com.google.inject.multibindings;version="1.3.0"
22+
Import-Package: com.google.inject.multibindings;version="1.3.0",
23+
org.apache.logging.log4j;version="2.17.1"

bundles/org.eclipse.emfcloud.modelserver.emf/.classpath

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,5 @@
77
</classpathentry>
88
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
99
<classpathentry kind="src" path="src"/>
10-
<classpathentry kind="src" path="resources"/>
1110
<classpathentry kind="output" path="target/classes"/>
1211
</classpath>

bundles/org.eclipse.emfcloud.modelserver.emf/META-INF/MANIFEST.MF

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Require-Bundle: com.fasterxml.jackson.core.jackson-core;bundle-version="[2.9.0,3
1010
com.fasterxml.jackson.core.jackson-databind;bundle-version="[2.9.0,3.0.0)",
1111
com.google.guava;bundle-version="[27.1.0,31.0.0)",
1212
com.google.inject;bundle-version="[5.0.0,6.0.0)",
13-
org.apache.logging.log4j;bundle-version="[2.17.1,3.0.0)",
1413
org.eclipse.emf.common;bundle-version="[2.17.0,3.0.0)",
1514
org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
1615
org.eclipse.emf.edit;bundle-version="[2.16.0,3.0.0)",
@@ -19,7 +18,8 @@ Require-Bundle: com.fasterxml.jackson.core.jackson-core;bundle-version="[2.9.0,3
1918
org.eclipse.emfcloud.modelserver.lib;bundle-version="[0.7.0,1.0.0)",
2019
org.eclipse.emfcloud.emfjson-jackson;bundle-version="[2.0.0,3.0.0)",
2120
org.eclipse.emf.transaction;bundle-version="[1.1.0,2.0.0)",
22-
org.aopalliance;bundle-version="1.0.0"
21+
org.aopalliance;bundle-version="1.0.0",
22+
org.eclipse.jetty.util;bundle-version="[9.4.44,10.0.0)"
2323
Export-Package: org.eclipse.emfcloud.modelserver.emf.common,
2424
org.eclipse.emfcloud.modelserver.emf.common.codecs,
2525
org.eclipse.emfcloud.modelserver.emf.common.codecs.jackson,
@@ -33,4 +33,8 @@ Export-Package: org.eclipse.emfcloud.modelserver.emf.common,
3333
Import-Package: com.fasterxml.jackson.annotation;version="2.9.9",
3434
com.github.fge.jsonpatch.diff;version="1.3.0",
3535
com.google.inject.multibindings;version="1.3.0",
36-
javax.inject;version="1.0.0"
36+
javax.inject;version="1.0.0",
37+
org.apache.logging.log4j;version="[2.17.1,3.0.0)",
38+
org.apache.logging.log4j.core;version="[2.17.1,3.0.0)",
39+
org.apache.logging.log4j.core.config;version="[2.17.1,3.0.0)",
40+
org.apache.logging.log4j.spi;version="[2.17.1,3.0.0)"
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
source.. = src/,\
2-
resources
1+
source.. = src/
32
output.. = target/classes
43
bin.includes = META-INF/,\
54
.

bundles/org.eclipse.emfcloud.modelserver.emf/resources/log4j2.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

bundles/org.eclipse.emfcloud.modelserver.emf/src/org/eclipse/emfcloud/modelserver/emf/launch/CLIBasedModelServerLauncher.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.apache.logging.log4j.Logger;
1717
import org.eclipse.emfcloud.modelserver.emf.configuration.ServerConfiguration;
1818
import org.eclipse.emfcloud.modelserver.emf.di.ModelServerModule;
19-
import org.eclipse.emfcloud.modelserver.emf.di.ProviderDefaults;
2019

2120
import com.google.inject.Injector;
2221

@@ -38,12 +37,8 @@ public void run() {
3837
parser.printHelp();
3938
return;
4039
}
41-
if (parser.optionExists(CLIParser.OPTION_LOG_CONFIGURATION)) {
42-
parser.parseLogConfigurationPath().ifPresent(ModelServerLauncher::configureLogger);
43-
}
44-
if (parser.optionExists(CLIParser.OPTION_ENABLE_DEV_LOGGING)) {
45-
ProviderDefaults.enableDevLogging();
46-
}
40+
super.run(parser.parseLogConfigurationPath().orElse(null),
41+
parser.optionExists(CLIParser.OPTION_ENABLE_DEV_LOGGING));
4742
} catch (UnrecognizedOptionException e) {
4843
LOG.error("Unrecognized command line argument(s) used!\n");
4944
parser.printHelp();
@@ -53,8 +48,6 @@ public void run() {
5348
parser.printHelp();
5449
return;
5550
}
56-
57-
super.run();
5851
}
5952

6053
@Override

0 commit comments

Comments
 (0)