Permalink
Browse files

[#105] Replace libraries with libs from Orbit

Second try with logback from orbit! This time, we use the custom class
in a fragment ... seems like it is working

Url: #105
  • Loading branch information...
RobertHilbrich committed Jun 26, 2018
1 parent 20d0332 commit 1702ce586f857c538e28bbcf17214c3d5cdfdc87
Showing with 152 additions and 90 deletions.
  1. +2 −2 ch.hilbri.assist.dse/META-INF/MANIFEST.MF
  2. +2 −0 ch.hilbri.assist.features.dse/feature.xml
  3. +5 −4 ch.hilbri.assist.features.gui/feature.xml
  4. +0 −6 ch.hilbri.assist.features.libraries/feature.xml
  5. +7 −8 ch.hilbri.assist.features.mapping/feature.xml
  6. +5 −4 ch.hilbri.assist.features.scheduling/feature.xml
  7. +7 −0 ch.hilbri.assist.gui.logging/.classpath
  8. +34 −0 ch.hilbri.assist.gui.logging/.project
  9. +2 −0 ch.hilbri.assist.gui.logging/.settings/org.eclipse.core.resources.prefs
  10. +7 −0 ch.hilbri.assist.gui.logging/.settings/org.eclipse.jdt.core.prefs
  11. +4 −0 ch.hilbri.assist.gui.logging/.settings/org.eclipse.m2e.core.prefs
  12. +12 −0 ch.hilbri.assist.gui.logging/META-INF/MANIFEST.MF
  13. +3 −0 ch.hilbri.assist.gui.logging/build.properties
  14. +22 −0 ch.hilbri.assist.gui.logging/pom.xml
  15. 0 ...t.gui → ch.hilbri.assist.gui.logging}/src/ch/hilbri/assist/gui/logging/AssistConsoleAppender.java
  16. 0 {ch.hilbri.assist.mapping → ch.hilbri.assist.gui.logging}/src/logback.xml
  17. +6 −5 ch.hilbri.assist.gui/META-INF/MANIFEST.MF
  18. +1 −0 ch.hilbri.assist.gui/build.properties
  19. +0 −17 ch.hilbri.assist.gui/src/logback.xml
  20. +5 −5 ch.hilbri.assist.mapping.tests/Mapping Tests.launch
  21. +4 −1 ch.hilbri.assist.mapping.tests/build.properties
  22. BIN ch.hilbri.assist.mapping.tests/logback-classic-1.1.2.jar
  23. BIN ch.hilbri.assist.mapping.tests/logback-core-1.1.2.jar
  24. BIN ch.hilbri.assist.mapping.tests/slf4j-api-1.7.7.jar
  25. +2 −2 ch.hilbri.assist.mapping/META-INF/MANIFEST.MF
  26. +1 −2 ch.hilbri.assist.mapping/build.properties
  27. +2 −2 ch.hilbri.assist.releng.product.gui/ASSIST GUI (OSX).launch
  28. +9 −6 ch.hilbri.assist.releng.targetplatform/ch.hilbri.assist.releng.targetplatform.target
  29. +3 −2 ch.hilbri.assist.releng/pom.xml
  30. +5 −5 ch.hilbri.assist.scheduling.tests/Scheduling Tests.launch
  31. BIN ch.hilbri.assist.scheduling.tests/logback-classic-1.1.2.jar
  32. BIN ch.hilbri.assist.scheduling.tests/logback-core-1.1.2.jar
  33. BIN ch.hilbri.assist.scheduling.tests/slf4j-api-1.7.7.jar
  34. +2 −2 ch.hilbri.assist.scheduling/META-INF/MANIFEST.MF
  35. +0 −17 ch.hilbri.assist.scheduling/src/logback.xml
@@ -6,7 +6,6 @@ Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: Robert Hilbrich
Require-Bundle: ch.hilbri.assist.mapping,
ch.hilbri.assist.dse.dsl.ui,
ch.hilbri.assist.libraries.logback,
ch.hilbri.assist.model,
org.eclipse.e4.ui.model.workbench,
org.eclipse.ui,
@@ -21,6 +20,7 @@ Require-Bundle: ch.hilbri.assist.mapping,
org.eclipse.jdt.core,
org.eclipse.jdt.ui,
org.eclipse.ui.forms,
org.eclipse.xtext.ui
org.eclipse.xtext.ui,
org.slf4j.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: ch.hilbri.assist.dse
@@ -50,6 +50,8 @@
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.ui.forms"/>
<import plugin="ch.hilbri.assist.mapping"/>
<import plugin="org.slf4j.api"/>
</requires>
<plugin
@@ -33,18 +33,19 @@
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.jdt.launching"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="ch.hilbri.assist.libraries.logback"/>
<import plugin="org.eclipse.e4.ui.model.workbench"/>
<import plugin="org.eclipse.ui.browser"/>
<import plugin="javax.inject"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="javax.annotation"/>
<import plugin="ch.hilbri.assist.model"/>
<import plugin="com.google.guava"/>
<import plugin="org.eclipse.xtext.xbase.lib"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.xtend.lib.macro"/>
<import plugin="org.eclipse.emf.mwe2.runtime"/>
<import plugin="ch.qos.logback.core" version="1.1.2" match="greaterOrEqual"/>
<import plugin="javax.inject"/>
<import plugin="org.eclipse.osgi"/>
<import plugin="javax.annotation"/>
<import plugin="ch.qos.logback.classic"/>
</requires>
<plugin
@@ -24,12 +24,6 @@
install-size="0"
version="0.0.0"/>
<plugin
id="ch.hilbri.assist.libraries.logback"
download-size="0"
install-size="0"
version="0.0.0"/>
<plugin
id="ch.hilbri.assist.libraries.choco-solver"
download-size="0"
@@ -13,9 +13,10 @@
<requires>
<import plugin="ch.hilbri.assist.gui"/>
<import plugin="ch.hilbri.assist.libraries.logback"/>
<import plugin="ch.hilbri.assist.libraries.choco-solver"/>
<import plugin="ch.hilbri.assist.model"/>
<import plugin="ch.hilbri.assist.scheduling.dsl"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.e4.core.commands"/>
<import plugin="org.eclipse.ui.ide" version="3.12.2" match="greaterOrEqual"/>
@@ -29,11 +30,11 @@
<import plugin="org.eclipse.jdt.ui" version="3.12.2" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.forms" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.10.0" match="greaterOrEqual"/>
<import plugin="ch.hilbri.assist.scheduling.dsl"/>
<import plugin="ch.hilbri.assist.scheduling.dsl.ide"/>
<import plugin="ch.hilbri.assist.scheduling.dsl.ui"/>
<import plugin="org.eclipse.zest.core" version="1.5.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.zest.layouts" version="1.1.300" match="greaterOrEqual"/>
<import plugin="org.eclipse.emf.ecore"/>
<import plugin="org.apache.commons.math3" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.swtchart" version="0.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext"/>
<import plugin="org.eclipse.xtext.xbase"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
@@ -60,10 +61,8 @@
<import plugin="org.eclipse.xtend.lib.macro"/>
<import plugin="ch.hilbri.assist.model.edit"/>
<import plugin="ch.hilbri.assist.model.editor"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.emf.ecore"/>
<import plugin="org.apache.commons.math3" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.swtchart" version="0.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.app4mc.amalthea.model" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.slf4j.api"/>
</requires>
<plugin
@@ -17,7 +17,6 @@
<import plugin="ch.hilbri.assist.model"/>
<import plugin="ch.hilbri.assist.model.edit"/>
<import plugin="ch.hilbri.assist.model.editor"/>
<import plugin="ch.hilbri.assist.libraries.logback"/>
<import plugin="ch.hilbri.assist.libraries.choco-solver"/>
<import plugin="org.eclipse.xtend.lib"/>
<import plugin="org.eclipse.e4.core.commands"/>
@@ -32,6 +31,9 @@
<import plugin="org.eclipse.ui.forms" version="3.7.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext.ui" version="2.10.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.nebula.widgets.ganttchart"/>
<import plugin="org.eclipse.e4.core.contexts"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.apache.commons.math3" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.xtext"/>
<import plugin="org.eclipse.xtext.xbase"/>
<import plugin="org.eclipse.equinox.common" version="3.5.0" match="greaterOrEqual"/>
@@ -55,9 +57,8 @@
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.xtext.junit4"/>
<import plugin="org.eclipse.xtext.xbase.junit"/>
<import plugin="org.eclipse.e4.core.contexts"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.apache.commons.math3" version="3.5.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.app4mc.amalthea.model" version="0.9.0" match="greaterOrEqual"/>
<import plugin="org.slf4j.api"/>
</requires>
<plugin
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>ch.hilbri.assist.gui.logging</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
@@ -0,0 +1,7 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.8
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
@@ -0,0 +1,12 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: ch.hilbri.assist.gui.logging
Bundle-SymbolicName: ch.hilbri.assist.gui.logging
Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: Robert Hilbrich
Fragment-Host: ch.qos.logback.classic;bundle-version="1.1.2"
Automatic-Module-Name: ch.hilbri.assist.gui.logging
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: ch.hilbri.assist.gui.logging
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.console
@@ -0,0 +1,3 @@
source.. = src/
bin.includes = META-INF/,\
.
@@ -0,0 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>ch.hilbri.assist.gui.logging</artifactId>
<packaging>eclipse-plugin</packaging>
<parent>
<groupId>assist</groupId>
<artifactId>ch.hilbri.assist.releng</artifactId>
<version>2.5.0-SNAPSHOT</version>
<relativePath>../ch.hilbri.assist.releng</relativePath>
</parent>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.xtend</groupId>
<artifactId>xtend-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
@@ -4,8 +4,7 @@ Bundle-Name: ASSIST
Bundle-SymbolicName: ch.hilbri.assist.gui;singleton:=true
Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: Robert Hilbrich
Export-Package: ch.hilbri.assist.gui.logging,
ch.hilbri.assist.gui.misc,
Export-Package: ch.hilbri.assist.gui.misc,
ch.hilbri.assist.gui.splash
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
@@ -23,18 +22,20 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jdt.core,
org.eclipse.jdt.launching,
org.eclipse.jdt.ui,
ch.hilbri.assist.libraries.logback,
org.eclipse.e4.ui.model.workbench,
org.eclipse.ui.browser,
ch.hilbri.assist.model,
com.google.guava,
org.eclipse.xtext.xbase.lib,
org.eclipse.xtend.lib,
org.eclipse.xtend.lib.macro,
org.eclipse.emf.mwe2.runtime
org.eclipse.emf.mwe2.runtime,
ch.qos.logback.core,
ch.qos.logback.classic
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
javax.inject;version="1.0.0",
org.osgi.framework,
org.osgi.service.component
org.osgi.service.component,
org.slf4j;version="1.7.10"
Automatic-Module-Name: ch.hilbri.assist.gui
@@ -3,6 +3,7 @@ bin.includes = META-INF/,\
Application.e4xmi,\
plugin.xml,\
icons/,\
src/logback.xml,\
src/logback.xml
source.. = src/,\
xtend-gen/

This file was deleted.

Oops, something went wrong.
@@ -15,11 +15,11 @@
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;ch.hilbri.assist.mapping.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ch.hilbri.assist.libraries.logback/slf4j-api-1.7.7.jar&quot; path=&quot;2&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ch.hilbri.assist.libraries.logback/logback-core-1.1.2.jar&quot; path=&quot;2&quot; sourceAttachmentPath=&quot;/ch.hilbri.assist.libraries.logback/logback-core-1.1.2-sources.jar&quot; sourceRootPath=&quot;&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ch.hilbri.assist.libraries.logback/logback-classic-1.1.2.jar&quot; path=&quot;2&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#13;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;ch.hilbri.assist.mapping.tests&quot;/&gt;&#13;&#10;&lt;/runtimeClasspathEntry&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ch.hilbri.assist.mapping.tests/logback-classic-1.1.2.jar&quot; path=&quot;2&quot; type=&quot;2&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ch.hilbri.assist.mapping.tests/logback-core-1.1.2.jar&quot; path=&quot;2&quot; type=&quot;2&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/ch.hilbri.assist.mapping.tests/slf4j-api-1.7.7.jar&quot; path=&quot;2&quot; type=&quot;2&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8&quot; javaProject=&quot;ch.hilbri.assist.mapping.tests&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;ch.hilbri.assist.mapping.tests&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
@@ -3,5 +3,8 @@ source.. = src/,\
bin.includes = META-INF/,\
.,\
src/logback-test.xml,\
resources/
resources/,\
slf4j-api-1.7.7.jar,\
logback-core-1.1.2.jar,\
logback-classic-1.1.2.jar
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -6,7 +6,6 @@ Bundle-SymbolicName: ch.hilbri.assist.mapping;singleton:=true
Bundle-Version: 2.5.0.qualifier
Bundle-Vendor: Robert Hilbrich
Require-Bundle: ch.hilbri.assist.gui,
ch.hilbri.assist.libraries.logback,
ch.hilbri.assist.libraries.choco-solver,
ch.hilbri.assist.model,
ch.hilbri.assist.mapping.dsl,
@@ -31,7 +30,8 @@ Require-Bundle: ch.hilbri.assist.gui,
org.eclipse.emf.ecore,
org.apache.commons.math3;bundle-version="3.5.0",
org.swtchart;bundle-version="0.10.0",
org.eclipse.app4mc.amalthea.model;bundle-version="0.9.0"
org.eclipse.app4mc.amalthea.model;bundle-version="0.9.0",
org.slf4j.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: ch.hilbri.assist.mapping.analysis,
ch.hilbri.assist.mapping.analysis.metrics.builtin,
@@ -5,5 +5,4 @@ bin.includes = META-INF/,\
fragment.e4xmi,\
plugin.xml,\
icons/,\
resources/,\
src/logback.xml
resources/
Oops, something went wrong.

0 comments on commit 1702ce5

Please sign in to comment.