Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-02-16 20:45:18 +0000
committerThomas Watson2011-02-16 20:45:18 +0000
commitd54505947697088c05bad24a79cf084ec8d18891 (patch)
tree657a7a762b719326233cbce0a503c1ce6ca718d9 /bundles/org.eclipse.osgi/.settings
parent8ce99ab0bf9af45931ce0c1ea04680570d11c3c3 (diff)
downloadrt.equinox.framework-d54505947697088c05bad24a79cf084ec8d18891.tar.gz
rt.equinox.framework-d54505947697088c05bad24a79cf084ec8d18891.tar.xz
rt.equinox.framework-d54505947697088c05bad24a79cf084ec8d18891.zip
Merge wiring branch, fixes for the following bugs:
Bug 334582 - OSGi changes to the wiring API Bug 334574 - OSGi renamed synthetic wiring capabilities to start with osgi.wiring. Bug 334591 - OSGi added AdaptPermission Bug 335673 - No FrameworkEvent generated for exceptions in a WeavingHook
Diffstat (limited to 'bundles/org.eclipse.osgi/.settings')
-rw-r--r--bundles/org.eclipse.osgi/.settings/.api_filters45
1 files changed, 33 insertions, 12 deletions
diff --git a/bundles/org.eclipse.osgi/.settings/.api_filters b/bundles/org.eclipse.osgi/.settings/.api_filters
index a5b74e196..29273de31 100644
--- a/bundles/org.eclipse.osgi/.settings/.api_filters
+++ b/bundles/org.eclipse.osgi/.settings/.api_filters
@@ -419,6 +419,13 @@
</message_arguments>
</filter>
</resource>
+<resource path="osgi/src/org/osgi/framework/AdaptPermission.java" type="org.osgi.framework.AdaptPermission">
+<filter comment="Ignore OSGi API" id="1110441988">
+<message_arguments>
+<message_argument value="org.osgi.framework.AdaptPermission"/>
+</message_arguments>
+</filter>
+</resource>
<resource path="osgi/src/org/osgi/framework/AdminPermission.java" type="org.osgi.framework.AdminPermission">
<filter comment="Ignore OSGi API" id="1141899266">
<message_arguments>
@@ -920,6 +927,13 @@
</message_arguments>
</filter>
</resource>
+<resource path="osgi/src/org/osgi/framework/hooks/service/ListenerHook.java" type="org.osgi.framework.hooks.service.ListenerHook$ListenerInfo">
+<filter comment="Ignore OSGi APIs" id="403853384">
+<message_arguments>
+<message_argument value="org.osgi.framework.hooks.service.ListenerHook.ListenerInfo"/>
+</message_arguments>
+</filter>
+</resource>
<resource path="osgi/src/org/osgi/framework/hooks/weaving/WeavingException.java" type="org.osgi.framework.hooks.weaving.WeavingException">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
@@ -969,45 +983,52 @@
</message_arguments>
</filter>
</resource>
-<resource path="osgi/src/org/osgi/framework/wiring/BundleRevision.java" type="org.osgi.framework.wiring.BundleRevision">
+<resource path="osgi/src/org/osgi/framework/wiring/BundleCapability.java" type="org.osgi.framework.wiring.BundleCapability">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
-<message_argument value="org.osgi.framework.wiring.BundleRevision"/>
+<message_argument value="org.osgi.framework.wiring.BundleCapability"/>
</message_arguments>
</filter>
</resource>
-<resource path="osgi/src/org/osgi/framework/wiring/BundleWiring.java" type="org.osgi.framework.wiring.BundleWiring">
+<resource path="osgi/src/org/osgi/framework/wiring/BundleRequirement.java" type="org.osgi.framework.wiring.BundleRequirement">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
-<message_argument value="org.osgi.framework.wiring.BundleWiring"/>
+<message_argument value="org.osgi.framework.wiring.BundleRequirement"/>
</message_arguments>
</filter>
</resource>
-<resource path="osgi/src/org/osgi/framework/wiring/BundleWirings.java" type="org.osgi.framework.wiring.BundleWirings">
+<resource path="osgi/src/org/osgi/framework/wiring/BundleRevision.java" type="org.osgi.framework.wiring.BundleRevision">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
-<message_argument value="org.osgi.framework.wiring.BundleWirings"/>
+<message_argument value="org.osgi.framework.wiring.BundleRevision"/>
</message_arguments>
</filter>
</resource>
-<resource path="osgi/src/org/osgi/framework/wiring/Capability.java" type="org.osgi.framework.wiring.Capability">
+<resource path="osgi/src/org/osgi/framework/wiring/BundleRevisions.java" type="org.osgi.framework.wiring.BundleRevisions">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
-<message_argument value="org.osgi.framework.wiring.Capability"/>
+<message_argument value="org.osgi.framework.wiring.BundleRevisions"/>
</message_arguments>
</filter>
</resource>
-<resource path="osgi/src/org/osgi/framework/wiring/FrameworkWiring.java" type="org.osgi.framework.wiring.FrameworkWiring">
+<resource path="osgi/src/org/osgi/framework/wiring/BundleWire.java" type="org.osgi.framework.wiring.BundleWire">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
-<message_argument value="org.osgi.framework.wiring.FrameworkWiring"/>
+<message_argument value="org.osgi.framework.wiring.BundleWire"/>
</message_arguments>
</filter>
</resource>
-<resource path="osgi/src/org/osgi/framework/wiring/WiredCapability.java" type="org.osgi.framework.wiring.WiredCapability">
+<resource path="osgi/src/org/osgi/framework/wiring/BundleWiring.java" type="org.osgi.framework.wiring.BundleWiring">
<filter comment="Ignore OSGi API" id="1110441988">
<message_arguments>
-<message_argument value="org.osgi.framework.wiring.WiredCapability"/>
+<message_argument value="org.osgi.framework.wiring.BundleWiring"/>
+</message_arguments>
+</filter>
+</resource>
+<resource path="osgi/src/org/osgi/framework/wiring/FrameworkWiring.java" type="org.osgi.framework.wiring.FrameworkWiring">
+<filter comment="Ignore OSGi API" id="1110441988">
+<message_arguments>
+<message_argument value="org.osgi.framework.wiring.FrameworkWiring"/>
</message_arguments>
</filter>
</resource>

Back to the top