diff options
author | Tobias Oberlies | 2012-10-01 10:27:01 +0000 |
---|---|---|
committer | Tobias Oberlies | 2012-10-01 11:55:25 +0000 |
commit | aa6e786cd25e59f8f36e22099f3239a553b0bc2f (patch) | |
tree | bbaa5da159a94e9c82aa49bc826c07fbd32c6ab8 | |
parent | fee334517cb619dc480b8122ea2bb789b3cf5c20 (diff) | |
download | rt.equinox.p2-aa6e786cd25e59f8f36e22099f3239a553b0bc2f.tar.gz rt.equinox.p2-aa6e786cd25e59f8f36e22099f3239a553b0bc2f.tar.xz rt.equinox.p2-aa6e786cd25e59f8f36e22099f3239a553b0bc2f.zip |
388566 Copy EE profile files from org.eclipse.osgi
- Reset profile files included in o.e.e.p2.publisher to current state
in org.eclipse.osge bundle. (Last change to these files was
rt.equinox.framework commit d2f8703.) This adds the
org.osgi.framework.system.capabilities property to all profiles,
and fixes bug 386013.
- Adapted tests that check for the total number of provided
capabilities.
Bug: 388566 JREAction: Publish osgi.ee capabilities in 'a.jre' IUs
Bug: 386013 EE profile JavaSE-1.7 declares system packages that don't exist
13 files changed, 53 insertions, 21 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.0_Foundation-1.0.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.0_Foundation-1.0.profile index dde120a4d..3cbbc60f6 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.0_Foundation-1.0.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.0_Foundation-1.0.profile @@ -16,6 +16,9 @@ org.osgi.framework.executionenvironment = \ OSGi/Minimum-1.0,\ OSGi/Minimum-1.1,\ CDC-1.0/Foundation-1.0 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1",\ + osgi.ee; osgi.ee="CDC/Foundation"; version:Version="1.0" osgi.java.profile.name = CDC-1.0/Foundation-1.0 org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.1_Foundation-1.1.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.1_Foundation-1.1.profile index 67b20c7ef..efa83eb80 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.1_Foundation-1.1.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.1_Foundation-1.1.profile @@ -22,6 +22,9 @@ org.osgi.framework.executionenvironment = \ OSGi/Minimum-1.2,\ CDC-1.0/Foundation-1.0,\ CDC-1.1/Foundation-1.1 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ + osgi.ee; osgi.ee="CDC/Foundation"; version:List<Version>="1.0, 1.1" osgi.java.profile.name = CDC-1.1/Foundation-1.1 org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.2.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.2.profile index ab98b6707..149b7f1c5 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.2.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.2.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2005 IBM Corporation and others. +# Copyright (c) 2003, 2012 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 @@ -39,9 +39,12 @@ org.osgi.framework.bootdelegation = \ org.osgi.framework.executionenvironment = \ JRE-1.1,\ J2SE-1.2 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2",\ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1" osgi.java.profile.name = J2SE-1.2 -org.eclipse.jdt.core.compiler.compliance=1.2 -org.eclipse.jdt.core.compiler.source=1.2 +org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.source=1.3 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.3.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.3.profile index da3538e6e..438da5013 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.3.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.3.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2005 IBM Corporation and others. +# Copyright (c) 2003, 2012 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 @@ -60,6 +60,10 @@ org.osgi.framework.executionenvironment = \ JRE-1.1,\ J2SE-1.2,\ J2SE-1.3 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1",\ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3" osgi.java.profile.name = J2SE-1.3 org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.4.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.4.profile index abaa0c3d6..18c6e9291 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.4.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.4.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2008 IBM Corporation and others. +# Copyright (c) 2003, 2012 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 @@ -121,6 +121,10 @@ org.osgi.framework.executionenvironment = \ J2SE-1.2,\ J2SE-1.3,\ J2SE-1.4 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4" osgi.java.profile.name = J2SE-1.4 org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.5.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.5.profile index e56a9293d..a79545d35 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.5.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.5.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2008 IBM Corporation and others. +# Copyright (c) 2003, 2012 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 @@ -148,6 +148,10 @@ org.osgi.framework.executionenvironment = \ J2SE-1.3,\ J2SE-1.4,\ J2SE-1.5 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5" osgi.java.profile.name = J2SE-1.5 org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.source=1.5 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JRE-1.1.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JRE-1.1.profile index 7bb8b46de..8288ad0f0 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JRE-1.1.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/JRE-1.1.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2005 IBM Corporation and others. +# Copyright (c) 2003, 2012 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 @@ -14,9 +14,11 @@ org.osgi.framework.bootdelegation = \ com.sun.* org.osgi.framework.executionenvironment = \ JRE-1.1 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1" osgi.java.profile.name = JRE-1.1 -org.eclipse.jdt.core.compiler.compliance=1.1 -org.eclipse.jdt.core.compiler.source=1.1 +org.eclipse.jdt.core.compiler.compliance=1.3 +org.eclipse.jdt.core.compiler.source=1.3 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1 org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.6.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.6.profile index 68e811f69..d6b1ca959 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.6.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.6.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2003, 2008 IBM Corporation and others. +# Copyright (c) 2003, 2012 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 @@ -185,6 +185,10 @@ org.osgi.framework.executionenvironment = \ J2SE-1.4,\ J2SE-1.5,\ JavaSE-1.6 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\ + osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6" osgi.java.profile.name = JavaSE-1.6 org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.source=1.6 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.7.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.7.profile index 019b3d77d..6071cf9e3 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.7.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.7.profile @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2009, 2011 IBM Corporation and others. +# Copyright (c) 2009, 2012 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 @@ -31,11 +31,9 @@ org.osgi.framework.system.packages = \ javax.lang.model.type,\ javax.lang.model.util,\ javax.management,\ - javax.management.event,\ javax.management.loading,\ javax.management.modelmbean,\ javax.management.monitor,\ - javax.management.namespace,\ javax.management.openmbean,\ javax.management.relation,\ javax.management.remote,\ @@ -192,6 +190,7 @@ org.osgi.framework.executionenvironment = \ JavaSE-1.7 org.osgi.framework.system.capabilities = \ osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ + osgi.ee; osgi.ee="JRE"; version:List<Version>="1.0, 1.1",\ osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7" osgi.java.profile.name = JavaSE-1.7 org.eclipse.jdt.core.compiler.compliance=1.7 @@ -199,4 +198,4 @@ org.eclipse.jdt.core.compiler.source=1.7 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
\ No newline at end of file +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.0.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.0.profile index 773501a52..40da61f85 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.0.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.0.profile @@ -14,6 +14,8 @@ org.osgi.framework.bootdelegation = \ com.sun.* org.osgi.framework.executionenvironment = \ OSGi/Minimum-1.0 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:Version="1.0" osgi.java.profile.name = OSGi/Minimum-1.0 org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.1.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.1.profile index 5031392b7..818bf10c2 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.1.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.1.profile @@ -15,6 +15,8 @@ org.osgi.framework.bootdelegation = \ org.osgi.framework.executionenvironment = \ OSGi/Minimum-1.0,\ OSGi/Minimum-1.1 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1" osgi.java.profile.name = OSGi/Minimum-1.1 org.eclipse.jdt.core.compiler.compliance=1.3 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.2.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.2.profile index 601b37379..95a689631 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.2.profile +++ b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.2.profile @@ -16,6 +16,8 @@ org.osgi.framework.executionenvironment = \ OSGi/Minimum-1.0,\ OSGi/Minimum-1.1,\ OSGi/Minimum-1.2 +org.osgi.framework.system.capabilities = \ + osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2" osgi.java.profile.name = OSGi/Minimum-1.2 org.eclipse.jdt.core.compiler.compliance=1.4 org.eclipse.jdt.core.compiler.source=1.3 diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java index 6cd65c48a..af32ef859 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/JREActionTest.java @@ -57,7 +57,7 @@ public class JREActionTest extends ActionTest { performAction(new JREAction(J14)); Version jreVersion = Version.create("1.4.0"); - verifyMetadataIU("a.jre.j2se", 91, jreVersion); + verifyMetadataIU("a.jre.j2se", 91, 0, jreVersion); verifyConfigIU("a.jre.j2se", jreVersion); //$NON-NLS-1$ verifyArtifactRepository(ArtifactKey.parse("binary,a.jre.j2se,1.4.0"), J14, "J2SE-1.4.profile"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -66,7 +66,7 @@ public class JREActionTest extends ActionTest { performAction(new JREAction(J15)); Version jreVersion = Version.create("1.5.0"); - verifyMetadataIU("a.jre.j2se", 118, jreVersion); + verifyMetadataIU("a.jre.j2se", 118, 0, jreVersion); verifyConfigIU("a.jre.j2se", jreVersion); //$NON-NLS-1$ verifyArtifactRepository(ArtifactKey.parse("binary,a.jre.j2se,1.5.0"), J15, "J2SE-1.5.profile"); //$NON-NLS-1$ //$NON-NLS-2$ } @@ -75,7 +75,7 @@ public class JREActionTest extends ActionTest { performAction(new JREAction(J16)); Version jreVersion = Version.create("1.6.0"); - verifyMetadataIU("a.jre.javase", 116, jreVersion); + verifyMetadataIU("a.jre.javase", 116, 0, jreVersion); verifyConfigIU("a.jre.javase", jreVersion); //$NON-NLS-1$ verifyArtifactRepository(ArtifactKey.parse("binary,a.jre.javase,1.6.0"), J16, "JavaSE-1.6.profile"); //$NON-NLS-1$//$NON-NLS-2$ } @@ -84,7 +84,7 @@ public class JREActionTest extends ActionTest { performAction(new JREAction("OSGi/Minimum-1.2")); Version jreVersion = Version.create("1.2.0"); - verifyMetadataIU("a.jre.osgi.minimum", 1, jreVersion); + verifyMetadataIU("a.jre.osgi.minimum", 1, 3, jreVersion); // verifyConfigIU("a.jre.osgi.minimum", jreVersion); // TODO config IU is not needed!? } @@ -111,7 +111,7 @@ public class JREActionTest extends ActionTest { performAction(new JREAction((String) null)); // these assertions need to be changed each time the default java profile, hardcoded in o.e.e.p2.publisher.actions.JREAction, is changed; - verifyMetadataIU("a.jre.javase", 158, Version.parseVersion("1.6")); + verifyMetadataIU("a.jre.javase", 158, 12, Version.parseVersion("1.6")); // verifyConfigIU(DEFAULT_JRE_NAME, DEFAULT_JRE_VERSION); // TODO config IU is not needed!? } @@ -158,7 +158,7 @@ public class JREActionTest extends ActionTest { assertThat(status, is(okStatus())); } - private void verifyMetadataIU(String id, int expectedProvidedPackages, Version jreVersion) { + private void verifyMetadataIU(String id, int expectedProvidedPackages, int expectedProvidedEEs, Version jreVersion) { IInstallableUnit foo = getPublishedUnit(id); // check version @@ -170,7 +170,7 @@ public class JREActionTest extends ActionTest { // check provided capabilities Collection<IProvidedCapability> fooProvidedCapabilities = foo.getProvidedCapabilities(); - assertThat(fooProvidedCapabilities.size(), is(1 + expectedProvidedPackages)); + assertThat(fooProvidedCapabilities.size(), is(1 + expectedProvidedPackages + expectedProvidedEEs)); } private void verifyConfigIU(String id, Version jreVersion) { |