Skip to content

Commit 01f8f35

Browse files
wilxwilx
committed
felix.eventadmin: Remove event adapters. They are all in felix.log.
Having felix.eventadmin and felix.log both in runtime causes logged events to be doubled.
1 parent 374fce5 commit 01f8f35

12 files changed

Lines changed: 33 additions & 746 deletions

File tree

‎eventadmin/bridge.configuration/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.felix</groupId>
2222
<artifactId>felix-parent</artifactId>
23-
<version>4</version>
23+
<version>9</version>
2424
<relativePath>../../pom/pom.xml</relativePath>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
@@ -39,14 +39,14 @@
3939
</scm>
4040

4141
<properties>
42-
<felix.java.version>6</felix.java.version>
42+
<felix.java.version>7</felix.java.version>
4343
</properties>
4444

4545
<dependencies>
4646
<dependency>
4747
<groupId>org.osgi</groupId>
48-
<artifactId>org.osgi.core</artifactId>
49-
<version>5.0.0</version>
48+
<artifactId>osgi.core</artifactId>
49+
<version>7.0.0</version>
5050
<scope>provided</scope>
5151
</dependency>
5252
<dependency>
@@ -68,7 +68,7 @@
6868
<plugin>
6969
<groupId>org.apache.felix</groupId>
7070
<artifactId>maven-bundle-plugin</artifactId>
71-
<version>3.2.0</version>
71+
<version>6.0.0</version>
7272
<extensions>true</extensions>
7373
<configuration>
7474
<instructions>

‎eventadmin/bridge.upnp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<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/maven-v4_0_0.xsd">
2020
<parent>
2121
<groupId>org.apache.felix</groupId>
22-
<artifactId>felix</artifactId>
23-
<version>1.0.4</version>
22+
<artifactId>felix-parent</artifactId>
23+
<version>9</version>
2424
<relativePath>../../pom/pom.xml</relativePath>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>

‎eventadmin/bridge.useradmin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<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/maven-v4_0_0.xsd">
2020
<parent>
2121
<groupId>org.apache.felix</groupId>
22-
<artifactId>felix</artifactId>
23-
<version>1.0.4</version>
22+
<artifactId>felix-parent</artifactId>
23+
<version>9</version>
2424
<relativePath>../../pom/pom.xml</relativePath>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>

‎eventadmin/bridge.wireadmin/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<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/maven-v4_0_0.xsd">
2020
<parent>
2121
<groupId>org.apache.felix</groupId>
22-
<artifactId>felix</artifactId>
23-
<version>1.0.4</version>
22+
<artifactId>felix-parent</artifactId>
23+
<version>9</version>
2424
<relativePath>../../pom/pom.xml</relativePath>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>

‎eventadmin/impl/pom.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<parent>
2121
<groupId>org.apache.felix</groupId>
2222
<artifactId>felix-parent</artifactId>
23-
<version>7</version>
23+
<version>9</version>
2424
<relativePath>../../pom/pom.xml</relativePath>
2525
</parent>
2626
<modelVersion>4.0.0</modelVersion>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>org.osgi</groupId>
5555
<artifactId>osgi.core</artifactId>
56-
<version>6.0.0</version>
56+
<version>7.0.0</version>
5757
<scope>provided</scope>
5858
</dependency>
5959
<dependency>
@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>org.osgi</groupId>
7373
<artifactId>org.osgi.service.log</artifactId>
74-
<version>1.3.0</version>
74+
<version>1.4.0</version>
7575
<scope>provided</scope>
7676
</dependency>
7777
<dependency>
@@ -96,38 +96,38 @@
9696
<dependency>
9797
<groupId>org.slf4j</groupId>
9898
<artifactId>slf4j-simple</artifactId>
99-
<version>1.7.5</version>
99+
<version>1.7.36</version>
100100
<scope>test</scope>
101101
</dependency>
102102
<!-- Integration Testing with Pax Exam -->
103103
<dependency>
104104
<groupId>org.ops4j.pax.exam</groupId>
105105
<artifactId>pax-exam-container-forked</artifactId>
106-
<version>4.13.1</version>
106+
<version>4.13.4</version>
107107
<scope>test</scope>
108108
</dependency>
109109
<dependency>
110110
<groupId>org.ops4j.pax.exam</groupId>
111111
<artifactId>pax-exam-junit4</artifactId>
112-
<version>4.13.1</version>
112+
<version>4.13.4</version>
113113
<scope>test</scope>
114114
</dependency>
115115
<dependency>
116116
<groupId>org.ops4j.pax.exam</groupId>
117117
<artifactId>pax-exam-link-mvn</artifactId>
118-
<version>4.13.1</version>
118+
<version>4.13.4</version>
119119
<scope>test</scope>
120120
</dependency>
121121
<dependency>
122122
<groupId>org.ops4j.pax.url</groupId>
123123
<artifactId>pax-url-aether</artifactId>
124-
<version>2.6.2</version>
124+
<version>2.6.14</version>
125125
<scope>test</scope>
126126
</dependency>
127127
<dependency>
128128
<groupId>org.ops4j.pax.url</groupId>
129129
<artifactId>pax-url-wrap</artifactId>
130-
<version>2.6.2</version>
130+
<version>2.6.14</version>
131131
<scope>test</scope>
132132
</dependency>
133133
<dependency>
@@ -139,7 +139,7 @@
139139
<dependency>
140140
<groupId>org.apache.felix</groupId>
141141
<artifactId>org.apache.felix.framework</artifactId>
142-
<version>6.0.3</version>
142+
<version>7.0.5</version>
143143
<scope>test</scope>
144144
</dependency>
145145
</dependencies>
@@ -153,7 +153,7 @@
153153
<plugin>
154154
<groupId>org.apache.felix</groupId>
155155
<artifactId>maven-bundle-plugin</artifactId>
156-
<version>4.2.1</version>
156+
<version>6.0.0</version>
157157
<extensions>true</extensions>
158158
<configuration>
159159
<instructions>
@@ -180,10 +180,10 @@
180180
-->
181181
org.osgi.service.metatype;version="[1.1,2)";resolution:=optional,
182182

183-
<!--
184-
Optional import to back the dynamic import on org.osgi.service.log
185-
-->
186-
org.osgi.service.log;version="[1.3,2)";resolution:=optional,
183+
<!--
184+
Optional import to back the dynamic import on org.osgi.service.log
185+
-->
186+
org.osgi.service.log;version="[1.3,2)";resolution:=optional,
187187

188188
<!-- default -->
189189
*

‎eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/Configuration.java‎

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@
2525
import java.util.Hashtable;
2626
import java.util.StringTokenizer;
2727

28-
import org.apache.felix.eventadmin.impl.adapter.AbstractAdapter;
29-
import org.apache.felix.eventadmin.impl.adapter.BundleEventAdapter;
30-
import org.apache.felix.eventadmin.impl.adapter.FrameworkEventAdapter;
31-
import org.apache.felix.eventadmin.impl.adapter.LogEventAdapter;
32-
import org.apache.felix.eventadmin.impl.adapter.ServiceEventAdapter;
3328
import org.apache.felix.eventadmin.impl.handler.EventAdminImpl;
3429
import org.apache.felix.eventadmin.impl.security.SecureEventAdminFactory;
3530
import org.apache.felix.eventadmin.impl.tasks.DefaultThreadPool;
@@ -172,9 +167,6 @@ public class Configuration
172167
// The registration of the mbean
173168
private volatile ServiceRegistration<Object> m_mbeanreg;
174169

175-
// all adapters
176-
private AbstractAdapter[] m_adapters;
177-
178170
private ServiceRegistration<?> m_managedServiceReg;
179171

180172
// the access control context
@@ -431,9 +423,6 @@ private void startOrUpdate()
431423
m_requireTopic,
432424
m_ignoreTopics);
433425

434-
// Finally, adapt the outside events to our kind of events as per spec
435-
adaptEvents(m_admin);
436-
437426
// register the admin wrapped in a service factory (SecureEventAdminFactory)
438427
// that hands-out the m_admin object wrapped in a decorator that checks
439428
// appropriated permissions of each calling bundle
@@ -463,14 +452,6 @@ public void destroy()
463452
{
464453
synchronized ( this )
465454
{
466-
if ( m_adapters != null )
467-
{
468-
for(int i=0;i<m_adapters.length;i++)
469-
{
470-
m_adapters[i].destroy(m_bundleContext);
471-
}
472-
m_adapters = null;
473-
}
474455
if ( m_managedServiceReg != null )
475456
{
476457
m_managedServiceReg.unregister();
@@ -504,18 +485,6 @@ public void destroy()
504485
}
505486
}
506487

507-
/**
508-
* Init the adapters in org.apache.felix.eventadmin.impl.adapter
509-
*/
510-
private void adaptEvents(final EventAdmin admin)
511-
{
512-
m_adapters = new AbstractAdapter[4];
513-
m_adapters[0] = new FrameworkEventAdapter(m_bundleContext, admin);
514-
m_adapters[1] = new BundleEventAdapter(m_bundleContext, admin);
515-
m_adapters[2] = new ServiceEventAdapter(m_bundleContext, admin);
516-
m_adapters[3] = new LogEventAdapter(m_bundleContext, admin);
517-
}
518-
519488
private Object tryToCreateMetaTypeProvider(final Object managedService)
520489
{
521490
try
@@ -565,7 +534,7 @@ private int getIntProperty(final String key, final Object value,
565534
final int result;
566535
if ( value instanceof Integer )
567536
{
568-
result = ((Integer)value).intValue();
537+
result = (Integer) value;
569538
}
570539
else
571540
{
@@ -606,7 +575,7 @@ private double getDoubleProperty(final String key, final Object value,
606575
final double result;
607576
if ( value instanceof Double )
608577
{
609-
result = ((Double)value).doubleValue();
578+
result = (Double) value;
610579
}
611580
else
612581
{
@@ -645,17 +614,17 @@ private boolean getBooleanProperty(final Object obj,
645614
{
646615
if ( obj instanceof Boolean )
647616
{
648-
return ((Boolean)obj).booleanValue();
617+
return (Boolean) obj;
649618
}
650619
String value = obj.toString().trim().toLowerCase();
651620

652-
if(0 < value.length() && ("0".equals(value) || "false".equals(value)
621+
if(!value.isEmpty() && ("0".equals(value) || "false".equals(value)
653622
|| "no".equals(value)))
654623
{
655624
return false;
656625
}
657626

658-
if(0 < value.length() && ("1".equals(value) || "true".equals(value)
627+
if(!value.isEmpty() && ("1".equals(value) || "true".equals(value)
659628
|| "yes".equals(value)))
660629
{
661630
return true;

‎eventadmin/impl/src/main/java/org/apache/felix/eventadmin/impl/adapter/AbstractAdapter.java‎

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

0 commit comments

Comments
 (0)