Skip to content

Commit

Permalink
Update to Eclipse 2023-09 and pepper 3.7.x
Browse files Browse the repository at this point in the history 
This introduces several changes regarding the logging implementation.

See eclipse-platform/eclipse.platform.releng.aggregator#588 for more details.
  • Loading branch information
@thomaskrause
thomaskrause committed Nov 26, 2024
1 parent 613075e commit fa73b68
Show file tree
Hide file tree
Showing 13 changed files with 137 additions and 185 deletions.
12 changes: 6 additions & 6 deletions bundles/org.corpus_tools.hexatomic.core/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,14 @@ Export-Package: org.corpus_tools.hexatomic.core,
org.corpus_tools.hexatomic.core.update,
org.corpus_tools.hexatomic.styles,
org.eclipse.wb.swt
Import-Package: org.slf4j
Require-Bundle: javax.inject,
org.eclipse.core.runtime,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.ui.workbench,
org.eclipse.e4.core.di,
org.eclipse.e4.ui.di,
org.eclipse.e4.core.contexts,
org.eclipse.emf.common,
org.eclipse.e4.core.services,
ch.qos.logback.classic,
ch.qos.logback.core,
javax.annotation,
org.eclipse.ui,
org.eclipse.equinox.p2.core,
Expand All @@ -33,6 +29,10 @@ Require-Bundle: javax.inject,
org.corpus-tools.salt-api;bundle-version="3.4.3",
org.eclipse.equinox.p2.engine;bundle-version="2.7.500",
org.eclipse.equinox.p2.metadata.repository;bundle-version="1.4.100",
org.eclipse.e4.core.di.extensions;bundle-version="0.17.200"
org.eclipse.e4.core.di.extensions;bundle-version="0.17.200",
slf4j.api;bundle-version="2.0.7",
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5",
ch.qos.logback.classic;bundle-version="1.4.11",
ch.qos.logback.core;bundle-version="1.4.11"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.corpus_tools.hexatomic.core
44 changes: 24 additions & 20 deletions ...ls.hexatomic.core/src/main/java/org/corpus_tools/hexatomic/core/ApplicationLifecycle.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
import org.eclipse.wb.swt.SwtResourceManager;
import org.osgi.framework.Bundle;
import org.osgi.framework.FrameworkUtil;
import org.slf4j.ILoggerFactory;
import org.slf4j.LoggerFactory;


Expand All @@ -66,29 +67,32 @@ public class ApplicationLifecycle {
*/
@ProcessAdditions
private void processAdditions() {
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
JoranConfigurator jc = new JoranConfigurator();
jc.setContext(context);
context.reset();
ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
if (loggerFactory instanceof LoggerContext) {
LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory();
JoranConfigurator jc = new JoranConfigurator();
jc.setContext(context);
context.reset();

Location installationLocation = Platform.getInstallLocation();
File productionConfig = new File(installationLocation.getURL().getPath(), "logback.xml");
try {
if (productionConfig.isFile()) {
// use the customized logging configuration
jc.doConfigure(productionConfig);
log.info("Logging configured from logback.xml in the Hexatomic root folder");
} else {
Bundle bundle = FrameworkUtil.getBundle(ApplicationLifecycle.class);
URL url = FileLocator.find(bundle, new Path("logback-test.xml"), null);
if (url != null) {
// use the default configuration from the classpath for tests
jc.doConfigure(url);
log.info("Logging configured from internal configuration");
Location installationLocation = Platform.getInstallLocation();
File productionConfig = new File(installationLocation.getURL().getPath(), "logback.xml");
try {
if (productionConfig.isFile()) {
// use the customized logging configuration
jc.doConfigure(productionConfig);
log.info("Logging configured from logback.xml in the Hexatomic root folder");
} else {
Bundle bundle = FrameworkUtil.getBundle(ApplicationLifecycle.class);
URL url = FileLocator.find(bundle, new Path("logback-test.xml"), null);
if (url != null) {
// use the default configuration from the classpath for tests
jc.doConfigure(url);
log.info("Logging configured from internal configuration");
}
}
} catch (JoranException ex) {
log.error("Could not configure logging", ex);
}
} catch (JoranException ex) {
log.error("Could not configure logging", ex);
}
}

Expand Down
8 changes: 4 additions & 4 deletions bundles/org.corpus_tools.hexatomic.corpusedit/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Corpus Structure Editor
Bundle-SymbolicName: org.corpus_tools.hexatomic.corpusstructureeditor;singleton:=true
Bundle-Version: 1.5.0.qualifier
Require-Bundle: javax.inject,
org.eclipse.osgi,
Require-Bundle: org.eclipse.osgi,
org.eclipse.jface,
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.ui.di,
Expand All @@ -13,10 +12,11 @@ Require-Bundle: javax.inject,
org.corpus-tools.salt-api,
org.eclipse.core.runtime,
org.corpus_tools.hexatomic.core,
org.slf4j.api,
org.eclipse.emf.common,
org.eclipse.e4.ui.workbench,
javax.annotation
javax.annotation,
slf4j.api;bundle-version="2.0.7",
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.corpus_tools.hexatomic.corpusedit
Bundle-ClassPath: .
Expand Down
6 changes: 3 additions & 3 deletions bundles/org.corpus_tools.hexatomic.formats/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ Require-Bundle: org.eclipse.e4.ui.model.workbench,
org.corpus_tools.hexatomic.core,
org.eclipse.emf.common,
org.eclipse.core.runtime,
org.slf4j.api,
org.corpus-tools.salt-api,
org.eclipse.e4.core.commands,
org.eclipse.e4.ui.di,
javax.inject,
com.google.guava,
org.eclipse.e4.ui.workbench
org.eclipse.e4.ui.workbench,
slf4j.api;bundle-version="2.0.7",
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5"
Automatic-Module-Name: org.corpus.tools.hexatomic.formats
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Activator: org.corpus_tools.hexatomic.formats.Activator
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.corpus_tools.hexatomic.graph/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@ Bundle-ManifestVersion: 2
Bundle-Name: Graph Editor
Bundle-SymbolicName: org.corpus_tools.hexatomic.graph;singleton:=true
Bundle-Version: 1.5.0.qualifier
Require-Bundle: javax.inject,
org.eclipse.jface,
Require-Bundle: org.eclipse.jface,
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.ui.di,
org.eclipse.e4.core.di.annotations,
org.corpus-tools.salt-api,
org.corpus_tools.hexatomic.core,
org.slf4j.api,
org.eclipse.zest.core,
org.eclipse.zest.layouts,
com.google.guava,
org.eclipse.jface.text,
org.eclipse.e4.core.services,
javax.annotation,
org.eclipse.nebula.widgets.chips,
org.antlr.runtime;bundle-version="4.7.2"
org.antlr.runtime;bundle-version="4.7.2",
slf4j.api;bundle-version="2.0.7",
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5"
Automatic-Module-Name: org.corpus_tools.hexatomic.edit.graph
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.corpus_tools.hexatomic.console,
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.corpus_tools.hexatomic.grid/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@ Bundle-Name: Hexatomic Grid Editor
Bundle-SymbolicName: org.corpus_tools.hexatomic.grid;singleton:=true
Bundle-Version: 1.5.0.qualifier
Bundle-Vendor: Hexatomic Research Project
Require-Bundle: javax.inject,
org.corpus_tools.hexatomic.core,
org.slf4j.api,
Require-Bundle: org.corpus_tools.hexatomic.core,
org.eclipse.jface,
org.corpus-tools.salt-api,
org.eclipse.e4.ui.model.workbench,
Expand All @@ -18,7 +16,9 @@ Require-Bundle: javax.inject,
org.eclipse.e4.core.services,
org.eclipse.swt,
org.apache.commons.lang3,
org.corpus-tools.salt-extensions;bundle-version="3.4.2"
org.corpus-tools.salt-extensions;bundle-version="3.4.2",
slf4j.api;bundle-version="2.0.7",
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5"
Automatic-Module-Name: org.corpus_tools.hexatomic.grid
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.corpus_tools.hexatomic.grid,
Expand Down
8 changes: 4 additions & 4 deletions bundles/org.corpus_tools.hexatomic.textviewer/META-INF/MANIFEST.MF
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: org.corpus_tools.hexatomic.textviewer
Bundle-SymbolicName: org.corpus_tools.hexatomic.textviewer;singleton:=true
Bundle-Version: 1.5.0.qualifier
Require-Bundle: javax.inject,
org.eclipse.osgi,
Require-Bundle: org.eclipse.osgi,
org.eclipse.jface,
org.eclipse.e4.ui.model.workbench,
org.eclipse.e4.ui.di,
Expand All @@ -13,10 +12,11 @@ Require-Bundle: javax.inject,
org.corpus-tools.salt-api,
org.eclipse.core.runtime,
org.corpus_tools.hexatomic.core,
org.slf4j.api,
org.eclipse.emf.common,
org.eclipse.e4.core.services,
javax.annotation
javax.annotation,
slf4j.api;bundle-version="2.0.7",
jakarta.inject.jakarta.inject-api;bundle-version="1.0.5"
Automatic-Module-Name: org.corpus_tools.hexatomic.textview
Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: org.corpus_tools.hexatomic.textviewer
46 changes: 10 additions & 36 deletions features/org.corpus_tools.hexatomic/feature.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<import plugin="org.eclipse.e4.core.di.annotations"/>
<import plugin="org.corpus-tools.salt-api"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.slf4j.api"/>
<import plugin="org.eclipse.emf.common"/>
<import plugin="org.eclipse.e4.ui.workbench"/>
<import plugin="javax.annotation"/>
Expand Down Expand Up @@ -64,59 +63,34 @@

<plugin
id="org.corpus_tools.hexatomic.corpusstructureeditor"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.corpus_tools.hexatomic.textviewer"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.corpus_tools.hexatomic.grid"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.corpus_tools.hexatomic.graph"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.corpus_tools.hexatomic.formats"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="org.corpus_tools.hexatomic.core"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
version="0.0.0"/>

<plugin
id="ch.qos.logback.classic"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
id="org.apache.aries.spifly.dynamic.bundle"
version="0.0.0"/>

<plugin
id="ch.qos.logback.slf4j"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
id="jakarta.servlet-api"
version="0.0.0"/>

</feature>
Loading

0 comments on commit fa73b68

Please sign in to comment.