Skip to content

Commit

Permalink
move icos runtimes to separate bundles
Browse files Browse the repository at this point in the history
Signed-off-by: Guido Grune <[email protected]>
  • Loading branch information
gg-dim committed Sep 25, 2024
1 parent 53174c5 commit 238cfd5
Show file tree
Hide file tree
Showing 23 changed files with 219 additions and 59 deletions.
102 changes: 51 additions & 51 deletions cnf/local/index.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,55 @@
<?xml version='1.0' encoding='UTF-8'?>
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1727167467032">
<repository xmlns="http://www.osgi.org/xmlns/repository/v1.0.0" name="Local" increment="1678799345915">
<resource>
<capability namespace="osgi.identity">
<attribute name="license" value="Eclipse Public License 1.0"/>
<attribute name="copyright" value="Data In Motion GmbH all rights reserved"/>
<attribute name="osgi.identity" value="de.dim.trafficos.simulator.api"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" value="1.1.1.SNAPSHOT" type="Version"/>
</capability>
<capability namespace="osgi.wiring.package">
<directive name="uses" value="de.dim.trafficos.model.device"/>
<attribute name="bundle-symbolic-name" value="de.dim.trafficos.simulator.api"/>
<attribute name="bundle-version" value="1.1.1.SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.package" value="de.dim.trafficos.simulator.api"/>
<attribute name="version" value="1.0.0" type="Version"/>
<attribute name="bnd.hashes" value="-1625443176,164544046,-180972947,178692262,-1523597364,-1926349250,-1078860956,-1923478059" type="List&lt;Long&gt;"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="bundle-version" value="1.1.1.SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.bundle" value="de.dim.trafficos.simulator.api"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="bundle-version" value="1.1.1.SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.host" value="de.dim.trafficos.simulator.api"/>
</capability>
<capability namespace="osgi.content">
<attribute name="size" value="27483" type="Long"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
<attribute name="url" value="de.dim.trafficos.simulator.api/de.dim.trafficos.simulator.api-1.1.1.jar"/>
<attribute name="osgi.content" value="EED06DBE94D1AE28F2D04B406A0035A05F0708EC59E36D0360A1A9B2E1DADEED"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=de.dim.trafficos.model.device)(version&gt;=2.0.0)(!(version&gt;=3.0.0)))"/>
<attribute name="osgi.wiring.package" value="de.dim.trafficos.model.device"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.eclipse.emf.common.util)"/>
<attribute name="osgi.wiring.package" value="org.eclipse.emf.common.util"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.eclipse.emf.ecore)"/>
<attribute name="osgi.wiring.package" value="org.eclipse.emf.ecore"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.eclipse.emf.ecore.util)"/>
<attribute name="osgi.wiring.package" value="org.eclipse.emf.ecore.util"/>
</requirement>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="license" value="Eclipse Public License 1.0"/>
Expand Down Expand Up @@ -77,54 +127,4 @@
<directive name="effective" value="active"/>
</requirement>
</resource>
<resource>
<capability namespace="osgi.identity">
<attribute name="license" value="Eclipse Public License 1.0"/>
<attribute name="copyright" value="Data In Motion GmbH all rights reserved"/>
<attribute name="osgi.identity" value="de.dim.trafficos.simulator.api"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" value="1.1.1.SNAPSHOT" type="Version"/>
</capability>
<capability namespace="osgi.wiring.package">
<directive name="uses" value="de.dim.trafficos.model.device"/>
<attribute name="bundle-symbolic-name" value="de.dim.trafficos.simulator.api"/>
<attribute name="bundle-version" value="1.1.1.SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.package" value="de.dim.trafficos.simulator.api"/>
<attribute name="version" value="1.0.0" type="Version"/>
<attribute name="bnd.hashes" value="-1625443176,164544046,-180972947,178692262,-1523597364,-1926349250,-1078860956,-1923478059" type="List&lt;Long&gt;"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="bundle-version" value="1.1.1.SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.bundle" value="de.dim.trafficos.simulator.api"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="bundle-version" value="1.1.1.SNAPSHOT" type="Version"/>
<attribute name="osgi.wiring.host" value="de.dim.trafficos.simulator.api"/>
</capability>
<capability namespace="osgi.content">
<attribute name="size" value="27483" type="Long"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
<attribute name="url" value="de.dim.trafficos.simulator.api/de.dim.trafficos.simulator.api-1.1.1.jar"/>
<attribute name="osgi.content" value="EED06DBE94D1AE28F2D04B406A0035A05F0708EC59E36D0360A1A9B2E1DADEED"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=de.dim.trafficos.model.device)(version&gt;=2.0.0)(!(version&gt;=3.0.0)))"/>
<attribute name="osgi.wiring.package" value="de.dim.trafficos.model.device"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.eclipse.emf.common.util)"/>
<attribute name="osgi.wiring.package" value="org.eclipse.emf.common.util"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.eclipse.emf.ecore)"/>
<attribute name="osgi.wiring.package" value="org.eclipse.emf.ecore"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=org.eclipse.emf.ecore.util)"/>
<attribute name="osgi.wiring.package" value="org.eclipse.emf.ecore.util"/>
</requirement>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.8))"/>
</requirement>
</resource>
</repository>
1 change: 1 addition & 0 deletions cnf/local/index.xml.sha
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
337a964d2438688773787abedff646f268820d292f4f7824f43a022f87d55032
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
Expand Down
File renamed without changes.
23 changes: 23 additions & 0 deletions de.jena.sensinact.icos.ilsa.runtime/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.jena.sensinact.icos.ilsa.runtime</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
delimiter: \" },\n\t{ \"id\": \"
bundles: ${sjoin;${delimiter}; ${template;-maven-dependencies;${@}}}

-includeresource: {resources}
-includeresource: {${bsn}-feature.json=resources/feature.json}

-maven-release: extra;path=@${repo;${bsn}}!icos-feature.json;class=feature
-maven-release: archive;path=@${repo;${bsn}}!${bsn}-feature.json;classifier=feature
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,6 @@ slf4j.runpath: \
bnd.identity;id='org.apache.felix.configadmin',\
bnd.identity;id='org.apache.felix.configadmin.plugin.interpolation',\
bnd.identity;id='de.jena.sensinact.icos.runtime.config'
-runbundles+: \
de.jena.sensinact.mqtt.5g.topic.bridge;startlevel=50000

-runbundles: \
com.fasterxml.jackson.core.jackson-annotations;version='[2.16.0,2.16.1)';startlevel=100,\
Expand All @@ -85,7 +83,7 @@ slf4j.runpath: \
de.jena.ilsa.sensinact.mmt;version=snapshot;startlevel=260,\
de.jena.ilsa.sensinact.model;version=snapshot;startlevel=270,\
de.jena.publictransport.rest;version=snapshot;startlevel=280,\
de.jena.sensinact.icos.runtime;version=snapshot;startlevel=290,\
de.jena.sensinact.icos.runtime.config;version=snapshot;startlevel=290,\
de.jena.sensinact.mqtt.generic.bridge;version=snapshot;startlevel=300,\
de.jena.sensinact.mqtt.generic.message;version=snapshot;startlevel=310,\
de.jena.sensinact.rest.log;version=snapshot;startlevel=320,\
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
encoding/traficam.bnd=UTF-8
11 changes: 11 additions & 0 deletions de.jena.sensinact.icos.traficam.runtime/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
<attributes>
<attribute name="module" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1 change: 1 addition & 0 deletions de.jena.sensinact.icos.traficam.runtime/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/secrets.bndrun
23 changes: 23 additions & 0 deletions de.jena.sensinact.icos.traficam.runtime/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.jena.sensinact.icos.traficam.runtime</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
eclipse.preferences.version=1
encoding/<project>=UTF-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=17
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=17
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
delimiter: \" },\n\t{ \"id\": \"
bundles: ${sjoin;${delimiter}; ${template;-maven-dependencies;${@}}}

-includeresource: {resources}
-includeresource: {${bsn}-feature.json=resources/feature.json}

-maven-release: extra;path=@${repo;${bsn}}!icos-feature.json;class=feature
-maven-release: archive;path=@${repo;${bsn}}!${bsn}-feature.json;classifier=feature
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"id":" ${bsn} ",
"bundles":[
{ "id": "${bundles}" }
]
}
1 change: 1 addition & 0 deletions de.jena.sensinact.icos.traficam.runtime/runtime/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/logs/
78 changes: 78 additions & 0 deletions de.jena.sensinact.icos.traficam.runtime/runtime/etc/logback.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<configuration>
<appender name="FILE"
class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy
class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${gecko.log.dir}/log-%d{yyyy-MM-dd}.log
</fileNamePattern>
<maxHistory>30</maxHistory>
<totalSizeCap>3GB</totalSizeCap>
</rollingPolicy>
<triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<maxFileSize>10MB</maxFileSize>
</triggeringPolicy>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<contextListener class="ch.qos.logback.classic.jul.LevelChangePropagator">
<resetJUL>true</resetJUL>
</contextListener>

<appender name="CONSOLE"
class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
</encoder>
</appender>

<logger name="de.jena" id="de.jena" level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="de.dim.trafficos" id="de.dim.trafficos" level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="o.e.e.m.eObjectBuilder" id="o.e.e.m.eObjectBuilder" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="org.gecko" id="org.gecko" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="jersey.dispatcher" id="jersey.dispatcher" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="Jakartars.serviceRuntime" id="Jakartars.serviceRuntime" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="pac4jLogger" id="org.pac4j" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>

<!-- log OSGi events; see https://felix.apache.org/documentation/subprojects/apache-felix-logback.html#_mapping_of_osgi_events -->
<logger name="Events.Bundle" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="Events.Service.org.gecko" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>
<logger name="LogService" level="ERROR">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</logger>

<root level="INFO">
<appender-ref ref="CONSOLE" />
<appender-ref ref="FILE" />
</root>
</configuration>

0 comments on commit 238cfd5

Please sign in to comment.