diff options
Diffstat (limited to 'bundles/org.eclipse.osgi.services')
6 files changed, 64 insertions, 22 deletions
diff --git a/bundles/org.eclipse.osgi.services/.settings/.api_filters b/bundles/org.eclipse.osgi.services/.settings/.api_filters index ae6aa31ae..4398895df 100644 --- a/bundles/org.eclipse.osgi.services/.settings/.api_filters +++ b/bundles/org.eclipse.osgi.services/.settings/.api_filters @@ -1,5 +1,33 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <component id="org.eclipse.osgi.services" version="2"> + <resource path="src/org/osgi/service/event/EventConstants.java" type="org.osgi.service.event.EventConstants"> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.service.event.EventConstants"/> + <message_argument value="EVENT_ADMIN_IMPLEMENTATION"/> + </message_arguments> + </filter> + <filter id="403767336"> + <message_arguments> + <message_argument value="org.osgi.service.event.EventConstants"/> + <message_argument value="EVENT_ADMIN_SPECIFICATION_VERSION"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.4"/> + <message_argument value="3.7"/> + <message_argument value="EVENT_ADMIN_IMPLEMENTATION"/> + </message_arguments> + </filter> + <filter id="1209008130"> + <message_arguments> + <message_argument value="1.4"/> + <message_argument value="3.7"/> + <message_argument value="EVENT_ADMIN_SPECIFICATION_VERSION"/> + </message_arguments> + </filter> + </resource> <resource path="src/org/osgi/service/log/FormatterLogger.java" type="org.osgi.service.log.FormatterLogger"> <filter id="1108344834"> <message_arguments> diff --git a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF index 81843c325..4b7d8c50d 100644 --- a/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.osgi.services/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Export-Package: org.osgi.service.cm;version="1.5";uses:="org.osgi.framework", org.osgi.service.component.runtime;version="1.3";uses:="org.osgi.framework,org.osgi.util.promise,org.osgi.service.component.runtime.dto", org.osgi.service.component.runtime.dto;version="1.3";uses:="org.osgi.dto,org.osgi.framework.dto", org.osgi.service.device;version="1.1";uses:="org.osgi.framework", - org.osgi.service.event;version="1.3.1";uses:="org.osgi.framework", + org.osgi.service.event;version="1.4";uses:="org.osgi.framework", org.osgi.service.http;version="1.2.1";uses:="javax.servlet,javax.servlet.http", org.osgi.service.http.context;version="1.0";uses:="org.osgi.framework,javax.servlet.http", org.osgi.service.http.runtime;version="1.0";uses:="org.osgi.service.http.runtime.dto", @@ -37,7 +37,7 @@ Import-Package: javax.servlet;resolution:=optional, org.osgi.service.component.runtime; version="[1.3,1.4)", org.osgi.service.component.runtime.dto; version="[1.3,1.4)", org.osgi.service.device;version="[1.1,1.2)", - org.osgi.service.event;version="[1.3,1.4)", + org.osgi.service.event;version="[1.4,1.5)", org.osgi.service.http;version="[1.2,1.3)", org.osgi.service.log;version="[1.4,1.5)", org.osgi.service.metatype;version="[1.4,1.5)", diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/EventConstants.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/EventConstants.java index b9345200f..b478c6745 100644 --- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/EventConstants.java +++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/EventConstants.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2005, 2014). All Rights Reserved. + * Copyright (c) OSGi Alliance (2005, 2018). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -234,6 +234,21 @@ public interface EventConstants { public static final String TIMESTAMP = "timestamp"; /** + * The name of the implementation capability for the Event Admin + * specification + * + * @since 1.4 + */ + public static final String EVENT_ADMIN_IMPLEMENTATION = "osgi.event"; + /** + * The version of the implementation capability for the Event Admin + * specification + * + * @since 1.4 + */ + public static final String EVENT_ADMIN_SPECIFICATION_VERSION = "1.4.0"; + + /** * This constant was released with an incorrectly spelled name. It has been * replaced by {@link #EXCEPTION_CLASS} * diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/package-info.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/package-info.java index 90332d68d..a3f50f169 100644 --- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/package-info.java +++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/event/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2010, 2014). All Rights Reserved. + * Copyright (c) OSGi Alliance (2010, 2018). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,28 +15,28 @@ */ /** - * Event Admin Package Version 1.3. - * + * Event Admin Package Version 1.4. * <p> * Bundles wishing to use this package must list the package in the * Import-Package header of the bundle's manifest. This package has two types of * users: the consumers that use the API in this package and the providers that * implement the API in this package. - * * <p> * Example import for consumers using the API in this package: * <p> - * {@code Import-Package: org.osgi.service.event; version="[1.3,2.0)"} + * {@code Import-Package: org.osgi.service.event; version="[1.4,2.0)"} * <p> * Example import for providers implementing the API in this package: * <p> - * {@code Import-Package: org.osgi.service.event; version="[1.3,1.4)"} + * {@code Import-Package: org.osgi.service.event; version="[1.4,1.5)"} * * @author $Id$ */ -@Version("1.3.1") +@Version(EVENT_ADMIN_SPECIFICATION_VERSION) package org.osgi.service.event; +import static org.osgi.service.event.EventConstants.EVENT_ADMIN_SPECIFICATION_VERSION; + import org.osgi.annotation.versioning.Version; diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/AttributeDefinition.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/AttributeDefinition.java index 057587a3c..615bc535a 100644 --- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/AttributeDefinition.java +++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/AttributeDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2001, 2015). All Rights Reserved. + * Copyright (c) OSGi Alliance (2001, 2017). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -260,11 +260,10 @@ public interface AttributeDefinition { String[] getOptionLabels(); /** - * Validate an attribute in {@code String} form. - * - * An attribute might be further constrained in value. This method will - * attempt to validate the attribute according to these constraints. It can - * return three different values: + * Validate an attribute in {@code String} form. An attribute might be + * further constrained in value. This method will attempt to validate the + * attribute according to these constraints. It can return three different + * values: * * <pre> * null No validation present @@ -280,12 +279,12 @@ public interface AttributeDefinition { * backslash. Escaped spaces must not be trimmed. For example: * * <pre> - * value=" a\,b,b\,c,\ c\\,d " => [ "a,b", "b,c", " c\", "d" ] + * value=" a\,b,b\,c,\ c\\,d " => [ "a,b", "b,c", " c\", "d" ] * </pre> * * @param value The value before turning it into the basic data type. If the - * cardinality indicates a multi-valued attribute then the given - * string must be escaped. + * cardinality indicates a multi-valued attribute then the given + * string must be escaped. * @return {@code null}, "", or another string */ String validate(String value); diff --git a/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/ObjectClassDefinition.java b/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/ObjectClassDefinition.java index 0db886aca..baadcea21 100644 --- a/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/ObjectClassDefinition.java +++ b/bundles/org.eclipse.osgi.services/src/org/osgi/service/metatype/ObjectClassDefinition.java @@ -1,5 +1,5 @@ /* - * Copyright (c) OSGi Alliance (2001, 2015). All Rights Reserved. + * Copyright (c) OSGi Alliance (2001, 2018). All Rights Reserved. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package org.osgi.service.metatype; import java.io.IOException; import java.io.InputStream; + import org.osgi.annotation.versioning.ConsumerType; /** @@ -61,7 +62,6 @@ public interface ObjectClassDefinition { /** * Return the id of this object class. - * * <p> * {@code ObjectDefintion} objects share a global namespace in the registry. * They share this aspect with LDAP/X.500 attributes. In these standards the @@ -69,7 +69,7 @@ public interface ObjectClassDefinition { * If such an OID exists, (which can be requested at several standard * organizations and many companies already have a node in the tree) it can * be returned here. Otherwise, a unique id should be returned which can be - * a java class name (reverse domain name) or generated with a GUID + * a Java class name (reverse domain name) or generated with a GUID * algorithm. Note that all LDAP defined object classes already have an OID * associated. It is strongly advised to define the object classes from * existing LDAP schemes which will give the OID for free. Many such schemes |