Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move org.eclipse.equinox.event to use automatic manifest generation #246

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Move org.eclipse.equinox.event to use automatic manifest generation #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions bundles/org.eclipse.equinox.event/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,7 @@
</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.pde.ds.core.builder</name>
<name>org.eclipse.pde.BndBuilder</name>
<arguments>
</arguments>
</buildCommand>
Expand All @@ -32,7 +22,7 @@
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.pde.BndNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
</natures>
Expand Down
1 change: 1 addition & 0 deletions bundles/org.eclipse.equinox.event/.settings/org.eclipse.core.runtime.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
eclipse.preferences.version=1
line.separator=\n
BUNDLE_ROOT_PATH=
28 changes: 0 additions & 28 deletions bundles/org.eclipse.equinox.event/META-INF/MANIFEST.MF
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions bundles/org.eclipse.equinox.event/OSGI-INF/component.xml
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions bundles/org.eclipse.equinox.event/build.properties
View file
Open in desktop

This file was deleted.

20 changes: 20 additions & 0 deletions bundles/org.eclipse.equinox.event/pde.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Bundle-Name: %bundleName
Bundle-Version: 1.6.300.qualifier
Bundle-SymbolicName: org.eclipse.equinox.event
Bundle-Vendor: %bundleVendor
Bundle-Localization: plugin
Bundle-ActivationPolicy: lazy
Automatic-Module-Name: org.eclipse.equinox.event
Export-Package: org.eclipse.equinox.internal.event;x-internal:=true, \
org.eclipse.equinox.internal.event.mapper;x-internal:=true

-dsannotations-options: version;maximum=1.3
-runee: JavaSE-1.8
-includeresource: plugin.properties,\
about.html

-buildpath: org.eclipse.osgi, \
org.osgi.service.event

# pomless configuration options
pom.model.property.tck.artifact = org.osgi.test.cases.event
12 changes: 9 additions & 3 deletions bundles/org.eclipse.equinox.event/src/org/eclipse/equinox/internal/event/EventComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2018 IBM Corporation and others.
* Copyright (c) 2009, 2023 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand All @@ -10,25 +10,31 @@
*
* Contributors:
* IBM Corporation - initial API and implementation
* Christoph Läubrich - switch to annotations
*******************************************************************************/
package org.eclipse.equinox.internal.event;

import org.eclipse.equinox.internal.event.mapper.EventRedeliverer;
import org.osgi.annotation.bundle.Capability;
import org.osgi.framework.BundleContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.component.annotations.*;
import org.osgi.service.event.*;

@Component(service = EventAdmin.class)
laeubi marked this conversation as resolved.
Show resolved Hide resolved
@Capability(namespace = "osgi.implementation", name = EventConstants.EVENT_ADMIN_IMPLEMENTATION, uses = Event.class, version = EventConstants.EVENT_ADMIN_SPECIFICATION_VERSION)
public class EventComponent implements EventAdmin {
private EventRedeliverer eventRedeliverer;
private EventAdminImpl eventAdmin;

@Activate
void activate(BundleContext context) {
eventAdmin = new EventAdminImpl(context);
eventAdmin.start();
eventRedeliverer = new EventRedeliverer(context, eventAdmin);
eventRedeliverer.open();
}

@Deactivate
void deactivate(BundleContext context) {
eventRedeliverer.close();
eventAdmin.stop();
Expand Down
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<!-- required by: org.eclipse.equinox.framework:launcher-binary-parent -->
<rt.equinox.binaries.loc>../../../rt.equinox.binaries</rt.equinox.binaries.loc>
<target-platform.optionalDependencies>require</target-platform.optionalDependencies>
<tycho.version>4.0.4-SNAPSHOT</tycho.version>
</properties>

<!--
Expand Down
Loading