Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2016-02-02 12:02:56 -0500
committerThomas Watson2017-06-16 08:38:08 -0400
commit7b23ce8d04850e284d6c690671a02ea3c5df7655 (patch)
treecaa44f1c9f05ba1e2ab892c602ed1755344ea3a9
parenta5083a05d9fbc19d8281009b4a3006f9625e0246 (diff)
downloadrt.equinox.framework-7b23ce8d04850e284d6c690671a02ea3c5df7655.tar.gz
rt.equinox.framework-7b23ce8d04850e284d6c690671a02ea3c5df7655.tar.xz
rt.equinox.framework-7b23ce8d04850e284d6c690671a02ea3c5df7655.zip
Bug 486941 - [osgi R7] Framework extensions may require capabilities
from host or other attached fragments - deleted the wrong test bundle. restoring back ext.framework.osgiee.b Change-Id: Iff1a10f1f7c46def27bfc134d58dd8defd2e2296 Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
-rw-r--r--bundles/org.eclipse.osgi.tests/.classpath2
-rw-r--r--bundles/org.eclipse.osgi.tests/build.properties6
-rwxr-xr-xbundles/org.eclipse.osgi.tests/bundles_src/ext.framework.osgiee.b/META-INF/MANIFEST.MF (renamed from bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.osgiee.a/META-INF/MANIFEST.MF)6
3 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.osgi.tests/.classpath b/bundles/org.eclipse.osgi.tests/.classpath
index 776247a23..3fda40040 100644
--- a/bundles/org.eclipse.osgi.tests/.classpath
+++ b/bundles/org.eclipse.osgi.tests/.classpath
@@ -122,7 +122,7 @@
<classpathentry kind="src" output="bundle_tests/test.bug412228" path="bundles_src/test.bug412228"/>
<classpathentry kind="src" output="bundle_tests/test.uninstall.start1" path="bundles_src/test.uninstall.start1"/>
<classpathentry kind="src" output="bundle_tests/test.uninstall.start2" path="bundles_src/test.uninstall.start2"/>
- <classpathentry kind="src" output="bundle_tests/ext.framework.osgiee.a.jar" path="bundles_src/ext.framework.osgiee.a"/>
+ <classpathentry kind="src" output="bundle_tests/ext.framework.osgiee.b.jar" path="bundles_src/ext.framework.osgiee.b"/>
<classpathentry kind="src" output="bundle_tests/classloader.hooks.a" path="bundles_src/classloader.hooks.a"/>
<classpathentry kind="src" output="bundle_tests/test.bug438904.host" path="bundles_src/test.bug438904.host"/>
<classpathentry kind="src" output="bundle_tests/test.bug438904.frag" path="bundles_src/test.bug438904.frag"/>
diff --git a/bundles/org.eclipse.osgi.tests/build.properties b/bundles/org.eclipse.osgi.tests/build.properties
index 3e6da70e7..a98d02072 100644
--- a/bundles/org.eclipse.osgi.tests/build.properties
+++ b/bundles/org.eclipse.osgi.tests/build.properties
@@ -248,8 +248,8 @@ source.bundle_tests/test.uninstall.start1.jar = bundles_src/test.uninstall.start
manifest.bundle_tests/test.uninstall.start1.jar = META-INF/MANIFEST.MF
source.bundle_tests/test.uninstall.start2.jar = bundles_src/test.uninstall.start2/
manifest.bundle_tests/test.uninstall.start2.jar = META-INF/MANIFEST.MF
-source.bundle_tests/ext.framework.osgiee.a.jar = bundles_src/ext.framework.osgiee.a/
-manifest.bundle_tests/ext.framework.osgiee.a.jar = META-INF/MANIFEST.MF
+source.bundle_tests/ext.framework.osgiee.b.jar = bundles_src/ext.framework.osgiee.b/
+manifest.bundle_tests/ext.framework.osgiee.b.jar = META-INF/MANIFEST.MF
source.bundle_tests/classloader.hooks.a.jar = bundles_src/classloader.hooks.a/
manifest.bundle_tests/classloader.hooks.a.jar = META-INF/MANIFEST.MF
source.bundle_tests/test.bug438904.host.jar = bundles_src/test.bug438904.host/
@@ -395,7 +395,7 @@ jars.compile.order = bundle_tests/ext.framework.b.jar,\
bundle_tests/test.bug412228.jar,\
bundle_tests/test.uninstall.start1.jar,\
bundle_tests/test.uninstall.start2.jar,\
- bundle_tests/ext.framework.osgiee.a.jar,\
+ bundle_tests/ext.framework.osgiee.b.jar,\
bundle_tests/classloader.hooks.a.jar,\
bundle_tests/test.bug438904.host.jar,\
bundle_tests/test.bug438904.frag.jar,\
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.osgiee.a/META-INF/MANIFEST.MF b/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.osgiee.b/META-INF/MANIFEST.MF
index 5e4ac0b53..f37b98167 100755
--- a/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.osgiee.a/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.osgi.tests/bundles_src/ext.framework.osgiee.b/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: ext.framework.osgiee.a
+Bundle-SymbolicName: ext.framework.osgiee.b
Fragment-Host: system.bundle; extension:=framework
-Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.2))",
- osgi.wiring.package;filter:="(osgi.wiring.package=org.osgi.framework)"
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.2))"
+

Back to the top