Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-06-16 11:50:48 -0400
committerThomas Watson2017-06-16 11:50:48 -0400
commit436f783a93cbe6440ceef7ad71c06e22c53d3af8 (patch)
treef42f7b0e8b1bf0b67df6ae80994c912346a34e02 /bundles
parent8c4c57fc16567b50b21a2e3764514f00cab86346 (diff)
downloadrt.equinox.framework-I20170618-2355.tar.gz
rt.equinox.framework-I20170618-2355.tar.xz
rt.equinox.framework-I20170618-2355.zip
Change-Id: I542dd7195b4156d856997d81780acd06006cc346 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.osgi/.settings/.api_filters220
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java3
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java3
3 files changed, 224 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/.settings/.api_filters b/bundles/org.eclipse.osgi/.settings/.api_filters
new file mode 100644
index 000000000..b7fb09582
--- /dev/null
+++ b/bundles/org.eclipse.osgi/.settings/.api_filters
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.osgi" version="2">
+ <resource path="osgi/src/org/osgi/framework/Constants.java" type="org.osgi.framework.Constants">
+ <filter id="403767336">
+ <message_arguments>
+ <message_argument value="org.osgi.framework.Constants"/>
+ <message_argument value="BUNDLE_DEVELOPERS"/>
+ </message_arguments>
+ </filter>
+ <filter id="403767336">
+ <message_arguments>
+ <message_argument value="org.osgi.framework.Constants"/>
+ <message_argument value="BUNDLE_SCM"/>
+ </message_arguments>
+ </filter>
+ <filter id="403767336">
+ <message_arguments>
+ <message_argument value="org.osgi.framework.Constants"/>
+ <message_argument value="SERVICE_CHANGECOUNT"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.9"/>
+ <message_argument value="3.13"/>
+ <message_argument value="BUNDLE_DEVELOPERS"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.9"/>
+ <message_argument value="3.13"/>
+ <message_argument value="BUNDLE_SCM"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.9"/>
+ <message_argument value="3.13"/>
+ <message_argument value="SERVICE_CHANGECOUNT"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/framework/FrameworkEvent.java" type="org.osgi.framework.FrameworkEvent">
+ <filter id="336658481">
+ <message_arguments>
+ <message_argument value="org.osgi.framework.FrameworkEvent"/>
+ <message_argument value="STOPPED_SYSTEM_REFRESHED"/>
+ </message_arguments>
+ </filter>
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="1.9"/>
+ <message_argument value="3.13"/>
+ <message_argument value="STOPPED_SYSTEM_REFRESHED"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/framework/ServiceReference.java" type="org.osgi.framework.ServiceReference">
+ <filter id="403804204">
+ <message_arguments>
+ <message_argument value="org.osgi.framework.ServiceReference"/>
+ <message_argument value="getProperties()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.9"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getProperties()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/framework/wiring/dto/FrameworkWiringDTO.java" type="org.osgi.framework.wiring.dto.FrameworkWiringDTO">
+ <filter id="1108344834">
+ <message_arguments>
+ <message_argument value="1.3"/>
+ <message_argument value="3.13"/>
+ <message_argument value="org.osgi.framework.wiring.dto.FrameworkWiringDTO"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/FormatterLogger.java" type="org.osgi.service.log.FormatterLogger">
+ <filter id="1108344834">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="org.osgi.service.log.FormatterLogger"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/LogEntry.java" type="org.osgi.service.log.LogEntry">
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getLocation()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getLogLevel()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getLoggerName()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getSequence()"/>
+ </message_arguments>
+ </filter>
+ <filter id="1209008130">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getThreadInfo()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/LogLevel.java" type="org.osgi.service.log.LogLevel">
+ <filter id="1108344834">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="org.osgi.service.log.LogLevel"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/Logger.java" type="org.osgi.service.log.Logger">
+ <filter id="1108344834">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="org.osgi.service.log.Logger"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/LoggerFactory.java" type="org.osgi.service.log.LoggerFactory">
+ <filter id="1108344834">
+ <message_arguments>
+ <message_argument value="1.4"/>
+ <message_argument value="3.13"/>
+ <message_argument value="org.osgi.service.log.LoggerFactory"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/admin/LoggerAdmin.java" type="org.osgi.service.log.admin.LoggerAdmin">
+ <filter id="1110441988">
+ <message_arguments>
+ <message_argument value="org.osgi.service.log.admin.LoggerAdmin"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/log/admin/LoggerContext.java" type="org.osgi.service.log.admin.LoggerContext">
+ <filter id="1110441988">
+ <message_arguments>
+ <message_argument value="org.osgi.service.log.admin.LoggerContext"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/resolver/ResolveContext.java" type="org.osgi.service.resolver.ResolveContext">
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="1.1"/>
+ <message_argument value="3.13"/>
+ <message_argument value="findRelatedResources(Resource)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="1.1"/>
+ <message_argument value="3.13"/>
+ <message_argument value="getSubstitutionWires(Wiring)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1141899266">
+ <message_arguments>
+ <message_argument value="1.1"/>
+ <message_argument value="3.13"/>
+ <message_argument value="onCancel(Runnable)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="osgi/src/org/osgi/service/resolver/Resolver.java" type="org.osgi.service.resolver.Resolver">
+ <filter id="403804204">
+ <message_arguments>
+ <message_argument value="org.osgi.service.resolver.Resolver"/>
+ <message_argument value="resolveDynamic(ResolveContext, Wiring, Requirement)"/>
+ </message_arguments>
+ </filter>
+ <filter id="1211105284">
+ <message_arguments>
+ <message_argument value="resolveDynamic(ResolveContext, Wiring, Requirement)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="supplement/src/org/eclipse/equinox/log/ExtendedLogService.java" type="org.eclipse.equinox.log.ExtendedLogService">
+ <filter id="403853384">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.log.ExtendedLogService"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="supplement/src/org/eclipse/equinox/log/Logger.java" type="org.eclipse.equinox.log.Logger">
+ <filter id="403853384">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.log.Logger"/>
+ </message_arguments>
+ </filter>
+ </resource>
+</component>
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java
index 9b9b8f764..b208f80fb 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/ExtendedLogService.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others
+ * Copyright (c) 2006, 2017 IBM Corporation and others
* 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
@@ -16,6 +16,7 @@ import org.osgi.service.log.LogService;
* @ThreadSafe
* @see Logger
* @since 3.7
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface ExtendedLogService extends LogService, Logger {
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java
index cb2954612..6ae08a4eb 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/equinox/log/Logger.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2011 IBM Corporation and others
+ * Copyright (c) 2006, 2017 IBM Corporation and others
* 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
@@ -15,6 +15,7 @@ import org.osgi.service.log.LogService;
* @ThreadSafe
* @see LogService
* @since 3.7
+ * @noimplement This interface is not intended to be implemented by clients.
*/
public interface Logger extends org.osgi.service.log.Logger {
/**

Back to the top