Attachment #82578 for bug #202278

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 22-32 Link Here

(-)src/org/eclipse/equinox/event/mapper/FrameworkEventAdapter.java (-5 / +5 lines)
22	*/	22	*/
23	public class FrameworkEventAdapter extends EventAdapter {	23	public class FrameworkEventAdapter extends EventAdapter {
24	// constants for Event topic substring	24	// constants for Event topic substring
25	public static final String HEADER = "org/osgi/framework/FrameworkEvent";	25	public static final String HEADER = "org/osgi/framework/FrameworkEvent"; //$NON-NLS-1$
26	public static final String STARTLEVEL_CHANGED = "STARTLEVEL_CHANGED";	26	public static final String STARTLEVEL_CHANGED = "STARTLEVEL_CHANGED"; //$NON-NLS-1$
27	public static final String STARTED = "STARTED";	27	public static final String STARTED = "STARTED"; //$NON-NLS-1$
28	public static final String PACKAGES_REFRESHED = "PACKAGES_REFRESHED";	28	public static final String PACKAGES_REFRESHED = "PACKAGES_REFRESHED"; //$NON-NLS-1$
29	public static final String ERROR = "ERROR";	29	public static final String ERROR = "ERROR"; //$NON-NLS-1$
30	protected FrameworkEvent event;	30	protected FrameworkEvent event;
31		31
32	public FrameworkEventAdapter(FrameworkEvent event, EventAdmin eventAdmin) {	32	public FrameworkEventAdapter(FrameworkEvent event, EventAdmin eventAdmin) {




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.event.mapper;

import java.util.Hashtable;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.wireadmin.Wire;
import org.osgi.service.wireadmin.WireAdminEvent;

/**
 * @version $Revision: 1.2 $
 */
public class WireAdminEventAdapter extends EventAdapter {
	// constants for Event topic substring
	public static final String TOPIC = "org/osgi/service/wireadmin/WireAdminEvent";
	public static final String WIRE_CREATED = "WIRE_CREATED";
	public static final String WIRE_CONNECTED_T = "WIRE_CONNECTED";
	public static final String WIRE_UPDATED = "WIRE_UPDATED";
	public static final String WIRE_TRACE = "WIRE_TRACE";
	public static final String WIRE_DISCONNECTED = "WIRE_DISCONNECTED";
	public static final String WIRE_DELETED = "WIRE_DELETED";
	public static final String PRODUCER_EXCEPTION = "PRODUCER_EXCEPTION";
	public static final String CONSUMER_EXCEPTION = "CONSUMER_EXCEPTION";
	// constants for Event properties
	public static final String WIRE = "wire";
	public static final String WIRE_FLAVORS = "wire.flavors";
	public static final String WIRE_SCOPE = "wire.scope";
	public static final String WIRE_CONNECTED_P = "wire.connected";
	public static final String WIRE_VALID = "wire.valid";
	private WireAdminEvent event;

	public WireAdminEventAdapter(WireAdminEvent event, EventAdmin admin) {
		super(admin);
		this.event = event;
	}

	/**
	 * @see org.eclipse.equinox.event.mapper.EventAdapter#convert()
	 */
	public Event convert() {
		String typename = null;
		switch (event.getType()) {
			case WireAdminEvent.WIRE_CONNECTED :
				typename = WIRE_CONNECTED_T;
				break;
			case WireAdminEvent.WIRE_CREATED :
				typename = WIRE_CREATED;
				break;
			case WireAdminEvent.WIRE_UPDATED :
				typename = WIRE_UPDATED;
				break;
			case WireAdminEvent.WIRE_DELETED :
				typename = WIRE_DELETED;
				break;
			case WireAdminEvent.WIRE_DISCONNECTED :
				typename = WIRE_DISCONNECTED;
				break;
			case WireAdminEvent.WIRE_TRACE :
				typename = WIRE_TRACE;
				break;
			case WireAdminEvent.PRODUCER_EXCEPTION :
				typename = PRODUCER_EXCEPTION;
				break;
			case WireAdminEvent.CONSUMER_EXCEPTION :
				typename = CONSUMER_EXCEPTION;
				break;
			default :
				return null;
		}
		String topic = TOPIC + Constants.TOPIC_SEPARATOR + typename;
		Hashtable properties = new Hashtable();
		Throwable t = event.getThrowable();
		if (t != null) {
			putExceptionProperties(properties, t);
		}
		ServiceReference ref = event.getServiceReference();
		if (ref == null) {
			throw new RuntimeException("WireAdminEvent's getServiceReference() returns null.");
		}
		putServiceReferenceProperties(properties, ref);
		Wire wire = event.getWire();
		if (wire != null) {
			properties.put(WIRE, wire);
			if (wire.getFlavors() != null) {
				properties.put(WIRE_FLAVORS, classes2strings(wire.getFlavors()));
			}
			if (wire.getScope() != null) {
				properties.put(WIRE_SCOPE, wire.getScope());
			}
			properties.put(WIRE_CONNECTED_P, new Boolean(wire.isConnected()));
			properties.put(WIRE_VALID, new Boolean(wire.isValid()));
		}
		properties.put(Constants.EVENT, event);
		Event converted = new Event(topic, properties);
		return converted;
	}
}

Lines 77-87 Link Here

(-)src/org/eclipse/equinox/event/mapper/EventAdapter.java (-2 / +2 lines)
77	properties.put(Constants.SERVICE_ID, ref.getProperty(org.osgi.framework.Constants.SERVICE_ID));	77	properties.put(Constants.SERVICE_ID, ref.getProperty(org.osgi.framework.Constants.SERVICE_ID));
78	Object o = ref.getProperty(org.osgi.framework.Constants.SERVICE_PID);	78	Object o = ref.getProperty(org.osgi.framework.Constants.SERVICE_PID);
79	if ((o != null) && (o instanceof String)) {	79	if ((o != null) && (o instanceof String)) {
80	properties.put(Constants.SERVICE_PID, (String) o);	80	properties.put(Constants.SERVICE_PID, o);
81	}	81	}
82	Object o2 = ref.getProperty(org.osgi.framework.Constants.OBJECTCLASS);	82	Object o2 = ref.getProperty(org.osgi.framework.Constants.OBJECTCLASS);
83	if ((o2 != null) && (o2 instanceof String[])) {	83	if ((o2 != null) && (o2 instanceof String[])) {
84	properties.put(Constants.SERVICE_OBJECTCLASS, (String[]) o2);	84	properties.put(Constants.SERVICE_OBJECTCLASS, o2);
85	}	85	}
86	}	86	}
87		87

Lines 22-31 Link Here

(-)src/org/eclipse/equinox/event/mapper/ServiceEventAdapter.java (-4 / +4 lines)
22	*/	22	*/
23	public class ServiceEventAdapter extends EventAdapter {	23	public class ServiceEventAdapter extends EventAdapter {
24	// constants for Event topic substring	24	// constants for Event topic substring
25	public static final String HEADER = "org/osgi/framework/ServiceEvent";	25	public static final String HEADER = "org/osgi/framework/ServiceEvent"; //$NON-NLS-1$
26	public static final String UNREGISTERING = "UNREGISTERING";	26	public static final String UNREGISTERING = "UNREGISTERING"; //$NON-NLS-1$
27	public static final String MODIFIED = "MODIFIED";	27	public static final String MODIFIED = "MODIFIED"; //$NON-NLS-1$
28	public static final String REGISTERED = "REGISTERED";	28	public static final String REGISTERED = "REGISTERED"; //$NON-NLS-1$
29	private ServiceEvent event;	29	private ServiceEvent event;
30		30
31	public ServiceEventAdapter(ServiceEvent event, EventAdmin eventAdmin) {	31	public ServiceEventAdapter(ServiceEvent event, EventAdmin eventAdmin) {




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

public interface Constants {
	// constants for Event common properties; event specific properties are
	// defined in the corresponding event adapter.
	public static final String BUNDLE = "bundle"; //$NON-NLS-1$
	public static final String BUNDLE_ID = "bundle.id"; //$NON-NLS-1$
	public static final String BUNDLE_SYMBOLICNAME = "bundle.symbolicName"; //$NON-NLS-1$
	public static final String EVENT = "event"; //$NON-NLS-1$
	public static final String EXCEPTION = "exception"; //$NON-NLS-1$
	public static final String EXCEPTION_CLASS = "exception.class"; //$NON-NLS-1$
	public static final String EXCEPTION_MESSAGE = "exception.message"; //$NON-NLS-1$
	public static final String MESSAGE = "message"; //$NON-NLS-1$
	public static final String SERVICE = "service"; //$NON-NLS-1$
	public static final String SERVICE_ID = "service.id"; //$NON-NLS-1$
	public static final String SERVICE_OBJECTCLASS = "service.objectClass"; //$NON-NLS-1$
	public static final String SERVICE_PID = "service.pid"; //$NON-NLS-1$
	public static final String TIMESTAMP = "timestamp"; //$NON-NLS-1$
	public static final char TOPIC_SEPARATOR = '/';
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * @version $Revision: 1.1 $
 */
public class LogReaderServiceTracker extends ServiceTracker {
	private final LogReaderServiceListener listener;
	private ServiceReference reference;

	public LogReaderServiceTracker(BundleContext context, LogReaderServiceListener listener) {
			LogReaderServiceListener listener) {
		super(context, LogReaderService.class.getName(), null);
		this.listener = listener;
	}

	public Object addingService(ServiceReference ref) {
		Object object = super.addingService(ref);
		if ((object != null) && (this.reference == null) && (object instanceof LogReaderService)) {
			this.reference = ref;
			listener.logReaderServiceAdding(ref, (LogReaderService) object);
			listener.logReaderServiceAdding(reference,
					(LogReaderService) object);
		}
		return object;
	}

	public void removedService(ServiceReference ref, Object service) {
		if ((service != null) && (this.reference.equals(ref)) && (service instanceof LogReaderService)) {
			listener.logReaderServiceRemoved(ref, (LogReaderService) service);
			listener.logReaderServiceRemoved(reference,
					(LogReaderService) service);
			this.reference = null;
		}
		super.removedService(ref, service);
		//this method calls ungetService()
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.event.mapper;

import java.util.Hashtable;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.useradmin.Role;
import org.osgi.service.useradmin.UserAdminEvent;

/**
 * @version $Revision: 1.2 $
 */
public class UserAdminEventAdapter extends EventAdapter {
	// constants for Event topic substring
	public static final String TOPIC = "org/osgi/service/useradmin/UserAdminEvent";
	public static final String ROLE_CREATED = "ROLE_CREATED";
	public static final String ROLE_CHANGED = "ROLE_CHANGED";
	public static final String ROLE_REMOVED = "ROLE_REMOVED";
	// constants for Event properties
	public static final String ROLE = "role";
	public static final String ROLE_NAME = "role.name";
	public static final String ROLE_TYPE = "role.type";
	private UserAdminEvent event;

	public UserAdminEventAdapter(UserAdminEvent event, EventAdmin eventAdmin) {
		super(eventAdmin);
		this.event = event;
	}

	/**
	 * @see org.eclipse.equinox.event.mapper.EventAdapter#convert()
	 */
	public Event convert() {
		String typename = null;
		switch (event.getType()) {
			case UserAdminEvent.ROLE_CREATED :
				typename = ROLE_CREATED;
				break;
			case UserAdminEvent.ROLE_CHANGED :
				typename = ROLE_CHANGED;
				break;
			case UserAdminEvent.ROLE_REMOVED :
				typename = ROLE_REMOVED;
				break;
			default :
				return null;
		}
		String topic = TOPIC + Constants.TOPIC_SEPARATOR + typename;
		Hashtable properties = new Hashtable();
		ServiceReference ref = event.getServiceReference();
		if (ref == null) {
			throw new RuntimeException("UserAdminEvent's getServiceReference() returns null.");
		}
		putServiceReferenceProperties(properties, ref);
		Role role = event.getRole();
		if (role == null) {
			throw new RuntimeException("UserAdminEvent's getRole() returns null.");
		}
		if (role != null) {
			properties.put(ROLE, role);
			properties.put(ROLE_NAME, role.getName());
			properties.put(ROLE_TYPE, new Integer(role.getType()));
		}
		properties.put(Constants.EVENT, event);
		Event converted = new Event(topic, properties);
		return converted;
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


package org.eclipse.equinox.event.mapper;

import java.util.Dictionary;
import java.util.Hashtable;
import org.osgi.framework.*;
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.cm.ConfigurationListener;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogListener;
import org.osgi.service.log.LogReaderService;
import org.osgi.service.upnp.UPnPDevice;
import org.osgi.service.upnp.UPnPEventListener;
import org.osgi.service.upnp.UPnPService;
import org.osgi.service.useradmin.UserAdminEvent;
import org.osgi.service.useradmin.UserAdminListener;
import org.osgi.service.wireadmin.WireAdminEvent;
import org.osgi.service.wireadmin.WireAdminListener;
import org.osgi.service.wireadmin.WireConstants;
import org.osgi.util.tracker.ServiceTracker;

/**
 * Main class for redeliver special events like FrameworkEvents via EventAdmin.
 * 
 * 
 * @version $Revision: 1.1 $
 */
public class EventRedeliverer implements FrameworkListener, BundleListener, ServiceListener {
	private ServiceTracker eventAdminTracker;
	private final static boolean DEBUG = false;
	private BundleContext bc;
	private ServiceTracker			eventAdminTracker;
	private LogReaderServiceTracker	logTracker;
	private LogReaderService		reader;
	private final static boolean	DEBUG	= false;
	private BundleContext			bc;
	private ServiceRegistration		configurationListenerReg;
	private ServiceRegistration		wireAdminListenerReg;
	private ServiceRegistration		upnpEventListenerReg;
	private ServiceRegistration		userAdminListenerReg;

	public EventRedeliverer(BundleContext bc) {
		this.bc = bc;
	}

	public void close() {
		if (logTracker != null) {
			logTracker.close();
			logTracker = null;
		}
		if (eventAdminTracker != null) {
			eventAdminTracker.close();
			eventAdminTracker = null;
		}
		if (reader != null) {
			reader.removeLogListener(this);
		}
		reader = null;
		bc.removeFrameworkListener(this);
		bc.removeBundleListener(this);
		bc.removeServiceListener(this);
		if (configurationListenerReg != null) {
			configurationListenerReg.unregister();
			configurationListenerReg = null;
		}
		if (wireAdminListenerReg != null) {
			wireAdminListenerReg.unregister();
			wireAdminListenerReg = null;
		}
		if (upnpEventListenerReg != null) {
			upnpEventListenerReg.unregister();
			upnpEventListenerReg = null;
		}
		if (userAdminListenerReg != null) {
			userAdminListenerReg.unregister();
			userAdminListenerReg = null;
		}
	}

	/**

	 */
	public void open() {
		// open ServiceTracker for EventAdmin
		eventAdminTracker = new ServiceTracker(bc, EventAdmin.class.getName(), null);
				null);
		eventAdminTracker.open();

		logTracker = new LogReaderServiceTracker(bc, this);
		logTracker.open();
		// add legacy event listener for framework level event
		bc.addFrameworkListener(this);
		bc.addBundleListener(this);
		bc.addServiceListener(this);
		// register configurationListener
		configurationListenerReg = bc.registerService(
				ConfigurationListener.class.getName(), this, null);
		// register WireAdminListener
		Hashtable ht = new Hashtable();
		// create an event mask to receive all the types of WireAdminEvent
		Integer mask = new Integer(WireAdminEvent.WIRE_CONNECTED
				| WireAdminEvent.WIRE_CREATED | WireAdminEvent.WIRE_DELETED
				| WireAdminEvent.WIRE_DISCONNECTED | WireAdminEvent.WIRE_TRACE
				| WireAdminEvent.WIRE_UPDATED
				| WireAdminEvent.CONSUMER_EXCEPTION
				| WireAdminEvent.PRODUCER_EXCEPTION);
		ht.put(WireConstants.WIREADMIN_EVENTS, mask);
		wireAdminListenerReg = bc.registerService(WireAdminListener.class
				.getName(), this, ht);
		// register UPnPEventListener
		// create a Filter object to receive all the UPnP events
		Hashtable ht2 = new Hashtable();
		Filter filter = null;
		try {
			filter = bc.createFilter("(|(|(" + UPnPDevice.TYPE + "=*)("
					+ UPnPDevice.ID + "=*))(|(" + UPnPService.TYPE + "=*)("
					+ UPnPService.ID + "=*)))");
		}
		catch (InvalidSyntaxException e) {
			System.out
					.println("Exception thrown while trying to create Filter. "
							+ e);
			e.printStackTrace(System.out);
		}
		if (filter != null) {
			ht2.put(UPnPEventListener.UPNP_FILTER, filter);
			upnpEventListenerReg = bc.registerService(UPnPEventListener.class
					.getName(), this, ht2);
		}
		// register usrAdminListener
		userAdminListenerReg = bc.registerService(UserAdminListener.class
				.getName(), this, null);
	}

	private EventAdmin getEventAdmin() {

		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new FrameworkEventAdapter(event, eventAdmin)).redeliver();
		} else {
		else {
			printNoEventAdminError();
		}
	}

	private void printNoEventAdminError() {
		if (DEBUG) {
			System.out.println(this.getClass().getName() + ": Cannot find the EventAdmin."); //$NON-NLS-1$
					+ ": Cannot find the EventAdmin.");
		}
	}


		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new BundleEventAdapter(event, eventAdmin)).redeliver();
		} else {
		else {
			printNoEventAdminError();
		}
	}

		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new ServiceEventAdapter(event, eventAdmin)).redeliver();
		} else {
		else {
			printNoEventAdminError();
		}
	}

	/**
	 * @param entry
	 * @see org.osgi.service.log.LogListener#logged(org.osgi.service.log.LogEntry)
	 */
	public void logged(LogEntry entry) {
		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new LogEntryAdapter(entry, eventAdmin)).redeliver();
		}
		else {
			printNoEventAdminError();
		}
	}

	/**
	 * @param reference
	 * @param service
	 * @see org.eclipse.equinox.event.mapper.LogReaderServiceListener#logReaderServiceAdding(org.osgi.framework.ServiceReference,
	 *      org.osgi.service.log.LogReaderService)
	 */
	public void logReaderServiceAdding(ServiceReference reference,
			LogReaderService service) {
		if (reader != null) {
			return;
		}
		reader = service;
		reader.addLogListener(this);
	}

	/**
	 * @param reference
	 * @param service
	 * @see org.eclipse.equinox.event.mapper.LogReaderServiceListener#logReaderServiceRemoved(org.osgi.framework.ServiceReference,
	 *      org.osgi.service.log.LogReaderService)
	 */
	public void logReaderServiceRemoved(ServiceReference reference,
			LogReaderService service) {
		if ((reader != null) && reader.equals(service)) {
			reader.removeLogListener(this);
			reader = null;
		}
		// ungetService() will be called after returning to
		// LogReaderServiceTracker's removedService() method.
	}

	/**
	 * @param event
	 * @see org.osgi.service.cm.ConfigurationListener#configurationEvent(org.osgi.service.cm.ConfigurationEvent)
	 */
	public void configurationEvent(ConfigurationEvent event) {
		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new ConfigurationEventAdapter(event, eventAdmin)).redeliver();
		}
		else {
			printNoEventAdminError();
		}
	}

	/**
	 * @param event
	 * @see org.osgi.service.wireadmin.WireAdminListener#wireAdminEvent(org.osgi.service.wireadmin.WireAdminEvent)
	 */
	public void wireAdminEvent(WireAdminEvent event) {
		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new WireAdminEventAdapter(event, eventAdmin)).redeliver();
		}
		else {
			printNoEventAdminError();
		}
	}

	/**
	 * @param deviceId
	 * @param serviceId
	 * @param events
	 * @see org.osgi.service.upnp.UPnPEventListener#notifyUPnPEvent(java.lang.String,
	 *      java.lang.String, java.util.Dictionary)
	 */
	public void notifyUPnPEvent(String deviceId, String serviceId,
			Dictionary events) {
		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new UPnPEventAdapter(deviceId, serviceId, events, eventAdmin))
					.redeliver();
		}
		else {
			printNoEventAdminError();
		}
	}

	/**
	 * @param event
	 * @see org.osgi.service.useradmin.UserAdminListener#roleChanged(org.osgi.service.useradmin.UserAdminEvent)
	 */
	public void roleChanged(UserAdminEvent event) {
		EventAdmin eventAdmin = getEventAdmin();
		if (eventAdmin != null) {
			(new UserAdminEventAdapter(event, eventAdmin)).redeliver();
		}
		else {
			printNoEventAdminError();
		}
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.event.mapper;

import java.util.Dictionary;
import java.util.Hashtable;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;

/**
 * @version $Revision: 1.2 $
 */
public class UPnPEventAdapter extends EventAdapter {
	// constants for Event topic substring
	public static final String TOPIC = "org/osgi/service/upnp/UPnPEvent";
	// constants for Event properties
	public static final String UPNP_DEVICEID = "upnp.deviceId";
	public static final String UPNP_SERVICEID = "upnp.serviceId";
	public static final String UPNP_EVENTS = "upnp.events";
	private String deviceId;
	private String serviceId;
	private Dictionary events;

	public UPnPEventAdapter(String deviceId, String serviceId, Dictionary events, EventAdmin eventAdmin) {
		super(eventAdmin);
		this.deviceId = deviceId;
		this.serviceId = serviceId;
		this.events = events;
	}

	/**
	 * @see org.eclipse.equinox.event.mapper.EventAdapter#convert()
	 */
	public Event convert() {
		Hashtable properties = new Hashtable();
		if (deviceId != null) {
			properties.put(UPNP_DEVICEID, deviceId);
		}
		if (serviceId != null) {
			properties.put(UPNP_SERVICEID, serviceId);
		}
		if (events != null) {
			properties.put(UPNP_EVENTS, events);
		}
		Event converted = new Event(TOPIC, properties);
		return converted;
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.equinox.event.mapper;

import java.util.Hashtable;
import org.osgi.framework.ServiceReference;
import org.osgi.service.cm.ConfigurationEvent;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;

/**
 * @version $Revision: 1.2 $
 */
public class ConfigurationEventAdapter extends EventAdapter {
	// constants for Event topic substring
	public static final String HEADER = "org/osgi/service/cm/ConfigurationEvent";
	public static final String CM_UPDATED = "CM_UPDATED";
	public static final String CM_DELETED = "CM_DELETED";
	// constants for Event properties
	public static final String CM_FACTORY_PID = "cm.factoryPid";
	public static final String CM_PID = "cm.pid";
	private ConfigurationEvent event;

	public ConfigurationEventAdapter(ConfigurationEvent event, EventAdmin eventAdmin) {
		super(eventAdmin);
		this.event = event;
	}

	/**
	 * @see org.eclipse.equinox.event.mapper.EventAdapter#convert()
	 */
	public Event convert() {
		String typename = null;
		switch (event.getType()) {
			case ConfigurationEvent.CM_UPDATED :
				typename = CM_UPDATED;
				break;
			case ConfigurationEvent.CM_DELETED :
				typename = CM_DELETED;
				break;
			default :
				return null;
		}
		String topic = HEADER + Constants.TOPIC_SEPARATOR + typename;
		Hashtable properties = new Hashtable();
		ServiceReference ref = event.getReference();
		if (ref == null) {
			throw new RuntimeException("ServiceEvent.getServiceReference() is null");
		}
		properties.put(CM_PID, event.getPid());
		if (event.getFactoryPid() != null) {
			properties.put(CM_FACTORY_PID, event.getFactoryPid());
		}
		putServiceReferenceProperties(properties, ref);
		// assert objectClass includes
		// "org.osgi.service.cm.ConfigurationAdmin"
		Event converted = new Event(topic, properties);
		return converted;
	}
}




/*******************************************************************************
 * Copyright (c) 2005, 2007 IBM Corporation.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/

package org.eclipse.equinox.event.mapper;

import java.util.Hashtable;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.log.LogEntry;
import org.osgi.service.log.LogService;

/**
 * @version $Revision: 1.2 $
 */
public class LogEntryAdapter extends EventAdapter {
	// constants for Event topic substring
	public static final String TOPIC = "org/osgi/service/log/LogEntry";
	// constants for Event properties
	public static final String TIMESTAMP = "timestamp";
	public static final String MESSAGE = "message";
	public static final String LOG_LEVEL = "log.level";
	public static final String LOG_ENTRY = "log.entry";
	private LogEntry entry;

	public LogEntryAdapter(LogEntry entry, EventAdmin eventAdmin) {
		super(eventAdmin);
		this.entry = entry;
	}

	/**
	 * @see org.eclipse.equinox.event.mapper.EventAdapter#convert()
	 */
	public Event convert() {
		String topic = TOPIC;
		int level = entry.getLevel();
		switch (level) {
			case LogService.LOG_ERROR :
			case LogService.LOG_WARNING :
			case LogService.LOG_INFO :
			case LogService.LOG_DEBUG :
				break;
			default :
				// other log levels are represented by their decimal value
				topic += Constants.TOPIC_SEPARATOR + level;
		}
		Hashtable properties = new Hashtable();
		Bundle bundle = entry.getBundle();
		if (bundle == null) {
			throw new RuntimeException("LogEntry.getBundle() returns null");
		}
		putBundleProperties(properties, bundle);
		Throwable t = entry.getException();
		if (t != null) {
			putExceptionProperties(properties, t);
		}
		ServiceReference ref = entry.getServiceReference();
		if (ref != null) {
			putServiceReferenceProperties(properties, ref);
		}
		properties.put(LOG_ENTRY, entry);
		properties.put(LOG_LEVEL, new Integer(entry.getLevel()));
		if (entry.getMessage() != null)
			properties.put(MESSAGE, entry.getMessage());
		properties.put(TIMESTAMP, new Long(entry.getTime()));
		Event converted = new Event(topic, properties);
		return converted;
	}
}




 */
public class BundleEventAdapter extends EventAdapter {
	// constants for Event topic substring
	public static final String HEADER = "org/osgi/framework/BundleEvent"; //$NON-NLS-1$
	public static final String INSTALLED = "INSTALLED"; //$NON-NLS-1$
	public static final String STOPPED = "STOPPED"; //$NON-NLS-1$
	public static final String STARTED = "STARTED"; //$NON-NLS-1$
	public static final String UPDATED = "UPDATED"; //$NON-NLS-1$
	public static final String UNINSTALLED = "UNINSTALLED"; //$NON-NLS-1$
	public static final String RESOLVED = "RESOLVED"; //$NON-NLS-1$
	public static final String UNRESOLVED = "UNRESOLVED"; //$NON-NLS-1$
	private BundleEvent event;

	public BundleEventAdapter(BundleEvent event, EventAdmin eventAdmin) {

				break;
			default :
				// unknown events must be send as their decimal value
				typename = Integer.toString(event.getType());
		}
		String topic = HEADER + Constants.TOPIC_SEPARATOR + typename;
		Hashtable properties = new Hashtable();
		Bundle bundle = event.getBundle();
		if (bundle == null) {
			throw new RuntimeException("BundleEvent.getBundle() returns null"); //$NON-NLS-1$
		} else {
			putBundleProperties(properties, bundle);
		}
		putBundleProperties(properties, bundle);
		properties.put(Constants.EVENT, event);
		Event converted = new Event(topic, properties);
		return converted;




Bundle-ManifestVersion: 2
Bundle-Name: %bundleName
Bundle-Version: 1.1.0.qualifier
Bundle-SymbolicName: org.eclipse.equinox.event
Bundle-Activator: org.eclipse.equinox.event.Activator
Bundle-Copyright: %bundleCopyright
Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.1.0",
 org.eclipse.osgi.util,
 org.osgi.framework,
 org.osgi.service.cm,
 org.osgi.service.event,
 org.osgi.service.log,
 org.osgi.service.upnp,
 org.osgi.service.useradmin,
 org.osgi.service.wireadmin,
 org.osgi.util.tracker
Export-Package: org.eclipse.equinox.event; x-internal:=true,
 org.eclipse.equinox.event.mapper; x-internal:=true

Return to bug 202278

Removed Link Here

(-)src/org/eclipse/equinox/event/mapper/WireAdminEventAdapter.java (-107 lines)
1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.equinox.event.mapper;
12
13	import java.util.Hashtable;
14	import org.osgi.framework.ServiceReference;
15	import org.osgi.service.event.Event;
16	import org.osgi.service.event.EventAdmin;
17	import org.osgi.service.wireadmin.Wire;
18	import org.osgi.service.wireadmin.WireAdminEvent;
19
20	/**
21	* @version $Revision: 1.2 $
22	*/
23	public class WireAdminEventAdapter extends EventAdapter {
24	// constants for Event topic substring
25	public static final String TOPIC = "org/osgi/service/wireadmin/WireAdminEvent";
26	public static final String WIRE_CREATED = "WIRE_CREATED";
27	public static final String WIRE_CONNECTED_T = "WIRE_CONNECTED";
28	public static final String WIRE_UPDATED = "WIRE_UPDATED";
29	public static final String WIRE_TRACE = "WIRE_TRACE";
30	public static final String WIRE_DISCONNECTED = "WIRE_DISCONNECTED";
31	public static final String WIRE_DELETED = "WIRE_DELETED";
32	public static final String PRODUCER_EXCEPTION = "PRODUCER_EXCEPTION";
33	public static final String CONSUMER_EXCEPTION = "CONSUMER_EXCEPTION";
34	// constants for Event properties
35	public static final String WIRE = "wire";
36	public static final String WIRE_FLAVORS = "wire.flavors";
37	public static final String WIRE_SCOPE = "wire.scope";
38	public static final String WIRE_CONNECTED_P = "wire.connected";
39	public static final String WIRE_VALID = "wire.valid";
40	private WireAdminEvent event;
41
42	public WireAdminEventAdapter(WireAdminEvent event, EventAdmin admin) {
43	super(admin);
44	this.event = event;
45	}
46
47	/**
48	* @see org.eclipse.equinox.event.mapper.EventAdapter#convert()
49	*/
50	public Event convert() {
51	String typename = null;
52	switch (event.getType()) {
53	case WireAdminEvent.WIRE_CONNECTED :
54	typename = WIRE_CONNECTED_T;
55	break;
56	case WireAdminEvent.WIRE_CREATED :
57	typename = WIRE_CREATED;
58	break;
59	case WireAdminEvent.WIRE_UPDATED :
60	typename = WIRE_UPDATED;
61	break;
62	case WireAdminEvent.WIRE_DELETED :
63	typename = WIRE_DELETED;
64	break;
65	case WireAdminEvent.WIRE_DISCONNECTED :
66	typename = WIRE_DISCONNECTED;
67	break;
68	case WireAdminEvent.WIRE_TRACE :
69	typename = WIRE_TRACE;
70	break;
71	case WireAdminEvent.PRODUCER_EXCEPTION :
72	typename = PRODUCER_EXCEPTION;
73	break;
74	case WireAdminEvent.CONSUMER_EXCEPTION :
75	typename = CONSUMER_EXCEPTION;
76	break;
77	default :
78	return null;
79	}
80	String topic = TOPIC + Constants.TOPIC_SEPARATOR + typename;
81	Hashtable properties = new Hashtable();
82	Throwable t = event.getThrowable();
83	if (t != null) {
84	putExceptionProperties(properties, t);
85	}
86	ServiceReference ref = event.getServiceReference();
87	if (ref == null) {
88	throw new RuntimeException("WireAdminEvent's getServiceReference() returns null.");
89	}
90	putServiceReferenceProperties(properties, ref);
91	Wire wire = event.getWire();
92	if (wire != null) {
93	properties.put(WIRE, wire);
94	if (wire.getFlavors() != null) {
95	properties.put(WIRE_FLAVORS, classes2strings(wire.getFlavors()));
96	}
97	if (wire.getScope() != null) {
98	properties.put(WIRE_SCOPE, wire.getScope());
99	}
100	properties.put(WIRE_CONNECTED_P, new Boolean(wire.isConnected()));
101	properties.put(WIRE_VALID, new Boolean(wire.isValid()));
102	}
103	properties.put(Constants.EVENT, event);
104	Event converted = new Event(topic, properties);
105	return converted;
106	}
107	}

Lines 21-34 Link Here

(-)src/org/eclipse/equinox/event/mapper/BundleEventAdapter.java (-12 / +11 lines)
21	*/	21	*/
22	public class BundleEventAdapter extends EventAdapter {	22	public class BundleEventAdapter extends EventAdapter {
23	// constants for Event topic substring	23	// constants for Event topic substring
24	public static final String HEADER = "org/osgi/framework/BundleEvent";	24	public static final String HEADER = "org/osgi/framework/BundleEvent"; //$NON-NLS-1$
25	public static final String INSTALLED = "INSTALLED";	25	public static final String INSTALLED = "INSTALLED"; //$NON-NLS-1$
26	public static final String STOPPED = "STOPPED";	26	public static final String STOPPED = "STOPPED"; //$NON-NLS-1$
27	public static final String STARTED = "STARTED";	27	public static final String STARTED = "STARTED"; //$NON-NLS-1$
28	public static final String UPDATED = "UPDATED";	28	public static final String UPDATED = "UPDATED"; //$NON-NLS-1$
29	public static final String UNINSTALLED = "UNINSTALLED";	29	public static final String UNINSTALLED = "UNINSTALLED"; //$NON-NLS-1$
30	public static final String RESOLVED = "RESOLVED";	30	public static final String RESOLVED = "RESOLVED"; //$NON-NLS-1$
31	public static final String UNRESOLVED = "UNRESOLVED";	31	public static final String UNRESOLVED = "UNRESOLVED"; //$NON-NLS-1$
32	private BundleEvent event;	32	private BundleEvent event;
33		33
34	public BundleEventAdapter(BundleEvent event, EventAdmin eventAdmin) {	34	public BundleEventAdapter(BundleEvent event, EventAdmin eventAdmin) {
Lines 66-81 Link Here
66	break;	66	break;
67	default :	67	default :
68	// unknown events must be send as their decimal value	68	// unknown events must be send as their decimal value
69	typename = "" + event.getType();	69	typename = Integer.toString(event.getType());
70	}	70	}
71	String topic = HEADER + Constants.TOPIC_SEPARATOR + typename;	71	String topic = HEADER + Constants.TOPIC_SEPARATOR + typename;
72	Hashtable properties = new Hashtable();	72	Hashtable properties = new Hashtable();
73	Bundle bundle = event.getBundle();	73	Bundle bundle = event.getBundle();
74	if (bundle == null) {	74	if (bundle == null) {
75	throw new RuntimeException("BundleEvent.getBundle() returns null");	75	throw new RuntimeException("BundleEvent.getBundle() returns null"); //$NON-NLS-1$
76	} else {
77	putBundleProperties(properties, bundle);
78	}	76	}
		77	putBundleProperties(properties, bundle);
79	properties.put(Constants.EVENT, event);	78	properties.put(Constants.EVENT, event);
80	Event converted = new Event(topic, properties);	79	Event converted = new Event(topic, properties);
81	return converted;	80	return converted;

Lines 1-18 Link Here

(-)META-INF/MANIFEST.MF (-5 / +1 lines)
1	Bundle-ManifestVersion: 2	1	Bundle-ManifestVersion: 2
2	Bundle-Name: %bundleName	2	Bundle-Name: %bundleName
3	Bundle-Version: 1.0.200.qualifier	3	Bundle-Version: 1.1.0.qualifier
4	Bundle-SymbolicName: org.eclipse.equinox.event	4	Bundle-SymbolicName: org.eclipse.equinox.event
5	Bundle-Activator: org.eclipse.equinox.event.Activator	5	Bundle-Activator: org.eclipse.equinox.event.Activator
6	Bundle-Copyright: %bundleCopyright	6	Bundle-Copyright: %bundleCopyright
7	Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.1.0",	7	Import-Package: org.eclipse.osgi.framework.eventmgr;version="1.1.0",
8	org.eclipse.osgi.util,	8	org.eclipse.osgi.util,
9	org.osgi.framework,	9	org.osgi.framework,
10	org.osgi.service.cm,
11	org.osgi.service.event,	10	org.osgi.service.event,
12	org.osgi.service.log,	11	org.osgi.service.log,
13	org.osgi.service.upnp,
14	org.osgi.service.useradmin,
15	org.osgi.service.wireadmin,
16	org.osgi.util.tracker	12	org.osgi.util.tracker
17	Export-Package: org.eclipse.equinox.event; x-internal:=true,	13	Export-Package: org.eclipse.equinox.event; x-internal:=true,
18	org.eclipse.equinox.event.mapper; x-internal:=true	14	org.eclipse.equinox.event.mapper; x-internal:=true