Skip to content

Commit 1916b8d

Browse files
committed
fix: missing OSGI-INF files
Signed-off-by: SimoneFiorani <simone.fiorani@abinsula.com>
1 parent df822d3 commit 1916b8d

File tree

8 files changed

+115
-6
lines changed

8 files changed

+115
-6
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,3 @@ RemoteSystemsTempFiles
1010
.project
1111
.settings
1212
.vscode
13-
OSGI-INF

bundles/org.eclipse.kura.libsocket-can-osgi/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Manifest-Version: 1.0
2-
Bnd-LastModified: 1769603589912
2+
Bnd-LastModified: 1769680896592
33
Build-Jdk-Spec: 17
44
Bundle-ClassPath: .,libsocket-can-java.jar
55
Bundle-Description: Eclipse Kura wrapper for libsocket-can

bundles/org.eclipse.kura.protocol.can/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Import-Package: de.entropia.can;version="1.0",
1313
org.osgi.service.event;version="1.3.0",
1414
org.osgi.service.io,
1515
org.slf4j;version="1.6.4"
16-
Export-Package: org.eclipse.kura.protocol.can;version="2.0.0"
16+
Export-Package: org.eclipse.kura.protocol.can;version="4.0.0"
1717
Service-Component: OSGI-INF/*.xml
1818
Bundle-ActivationPolicy: lazy
1919
Bundle-ClassPath: .
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2011, 2026 Eurotech and/or its affiliates and others
5+
6+
This program and the accompanying materials are made
7+
available under the terms of the Eclipse Public License 2.0
8+
which is available at https://www.eclipse.org/legal/epl-2.0/
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
Eurotech
14+
15+
-->
16+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="activate"
17+
deactivate="deactivate" enabled="true" immediate="true"
18+
name="org.eclipse.kura.protocol.can.CanConnectionServiceImpl">
19+
<implementation class="org.eclipse.kura.protocol.can.CanConnectionServiceImpl" />
20+
<service>
21+
<provide interface="org.eclipse.kura.protocol.can.CanConnectionService" />
22+
</service>
23+
<property name="service.pid" value="org.eclipse.kura.protocol.can.CanConnectionService" />
24+
</scr:component>

bundles/org.eclipse.kura.protocol.can/build.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2011, 2022 Eurotech and/or its affiliates and others
2+
# Copyright (c) 2011, 2026 Eurotech and/or its affiliates and others
33
#
44
# This program and the accompanying materials are made
55
# available under the terms of the Eclipse Public License 2.0
@@ -15,6 +15,7 @@ source.. = src/main/java/
1515
output.. = target/classes/
1616
bin.includes = META-INF/,\
1717
.,\
18+
OSGI-INF/,\
1819
about.html
1920
additional.bundles = slf4j.api,\
2021
org.eclipse.equinox.io,\
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others
5+
6+
This program and the accompanying materials are made
7+
available under the terms of the Eclipse Public License 2.0
8+
which is available at https://www.eclipse.org/legal/epl-2.0/
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
Eurotech
14+
Red Hat Inc
15+
16+
-->
17+
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
18+
name="org.eclipse.kura.protocol.can.test.CanSocketTest"
19+
enabled="true"
20+
immediate="true"
21+
modified="updated">
22+
<implementation class="org.eclipse.kura.protocol.can.test.CanSocketTest"/>
23+
<service>
24+
<provide interface="org.eclipse.kura.configuration.ConfigurableComponent"/>
25+
</service>
26+
<property name="service.pid" value="org.eclipse.kura.protocol.can.test.CanSocketTest"/>
27+
28+
<reference name="CanConnectionService"
29+
bind="setCanConnectionService"
30+
unbind="unsetCanConnectionService"
31+
cardinality="1..1"
32+
policy="static"
33+
interface="org.eclipse.kura.protocol.can.CanConnectionService"/>
34+
</scr:component>
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Copyright (c) 2011, 2020 Eurotech and/or its affiliates and others
5+
6+
This program and the accompanying materials are made
7+
available under the terms of the Eclipse Public License 2.0
8+
which is available at https://www.eclipse.org/legal/epl-2.0/
9+
10+
SPDX-License-Identifier: EPL-2.0
11+
12+
Contributors:
13+
Eurotech
14+
15+
-->
16+
<MetaData xmlns="http://www.osgi.org/xmlns/metatype/v1.2.0" localization="en_us">
17+
<OCD id="org.eclipse.kura.protocol.can.test.CanSocketTest"
18+
name="Can network test"
19+
description="Can network example application.">
20+
21+
<AD id="can.name"
22+
name="can.name"
23+
type="String"
24+
cardinality="0"
25+
required="true"
26+
default="can0"
27+
description="CAN socket Name."/>
28+
29+
<AD id="can.identifier"
30+
name="can.identifier"
31+
type="Integer"
32+
cardinality="0"
33+
required="false"
34+
default="0"
35+
description="Can device identifier."/>
36+
37+
<AD id="master"
38+
name="master"
39+
type="Boolean"
40+
cardinality="0"
41+
required="true"
42+
default="true"
43+
description="Whether this device will act as a master or a slave"/>
44+
45+
</OCD>
46+
<Designate pid="org.eclipse.kura.protocol.can.test.CanSocketTest">
47+
<Object ocdref="org.eclipse.kura.protocol.can.test.CanSocketTest"/>
48+
</Designate>
49+
</MetaData>

tests/org.eclipse.kura.protocol.can.test/build.properties

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@
1111
# Eurotech
1212
#
1313

14-
bin.includes = .,\
15-
META-INF/
14+
bin.includes = META-INF/,\
15+
.,\
16+
OSGI-INF/,\
17+
about.html
1618
source.. = src/main/java/,\
1719
src/test/java
1820
output.. = target/classes/

0 commit comments

Comments
 (0)