diff options
author | Tobias Oberlies | 2014-09-04 10:42:11 +0000 |
---|---|---|
committer | Tobias Oberlies | 2014-09-04 11:26:56 +0000 |
commit | 0bc7ac7038a4031b65bb464558ce941b805bbfa6 (patch) | |
tree | b19da3f488089a83b41b1a606ab4314695b59e86 | |
parent | d38c7837fde39d9638897fdff6321fae7e2e57ae (diff) | |
download | rt.equinox.p2-0bc7ac7038a4031b65bb464558ce941b805bbfa6.tar.gz rt.equinox.p2-0bc7ac7038a4031b65bb464558ce941b805bbfa6.tar.xz rt.equinox.p2-0bc7ac7038a4031b65bb464558ce941b805bbfa6.zip |
Bug 427123 - Remove copies of profile files from publishers
- Load execution environment profile information from org.eclipse.osgi
bundle instead of keeping own stale copies in o.e.e.publisher.
Bug: 427123
Change-Id: Iaa30bba173151d38fdecd5644fcb2915962f6464
Signed-off-by: Tobias Oberlies <tobias.oberlies@sap.com>
18 files changed, 15 insertions, 1388 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF index c7132dbe6..7de84a73f 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.publisher/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.equinox.p2.publisher;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.publisher.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -24,7 +24,8 @@ Export-Package: org.eclipse.equinox.internal.p2.publisher; org.eclipse.pde.publishing, org.eclipse.equinox.p2.publisher.eclipse", org.eclipse.equinox.spi.p2.publisher;x-friends:="org.eclipse.equinox.p2.updatesite,org.eclipse.equinox.p2.publisher.eclipse" -Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)" +Require-Bundle: org.eclipse.equinox.common;bundle-version="[3.5.0,4.0.0)", + org.eclipse.osgi;bundle-version="3.8.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy Import-Package: org.eclipse.equinox.app;version="1.0.0";resolution:=optional, 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 deleted file mode 100644 index 3cbbc60f6..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.0_Foundation-1.0.profile +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################### -# Copyright (c) 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.microedition.io -org.osgi.framework.bootdelegation = \ - javax.microedition.io -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 -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/CDC-1.1_Foundation-1.1.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.1_Foundation-1.1.profile deleted file mode 100644 index efa83eb80..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/CDC-1.1_Foundation-1.1.profile +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################### -# Copyright (c) 2005, 2008 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.microedition.io,\ - javax.microedition.pki,\ - javax.security.auth.x500 -org.osgi.framework.bootdelegation = \ - javax.microedition.io,\ - javax.microedition.pki,\ - javax.security.auth.x500 -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - 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 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning 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 deleted file mode 100644 index 149b7f1c5..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.2.profile +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - org.omg.CORBA,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextPackage -org.osgi.framework.bootdelegation = \ - sun.*,\ - com.sun.* -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.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 deleted file mode 100644 index 438da5013..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.3.profile +++ /dev/null @@ -1,72 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.rmi,\ - javax.rmi.CORBA,\ - javax.sound.midi,\ - javax.sound.midi.spi,\ - javax.sound.sampled,\ - javax.sound.sampled.spi,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - javax.transaction,\ - org.omg.CORBA,\ - org.omg.CORBA_2_3,\ - org.omg.CORBA_2_3.portable,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextPackage,\ - org.omg.SendingContext,\ - org.omg.stub.java.rmi -org.osgi.framework.bootdelegation = \ - javax.*,\ - org.omg.*,\ - sun.*,\ - com.sun.* -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - 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 -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.4.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.4.profile deleted file mode 100644 index 18c6e9291..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.4.profile +++ /dev/null @@ -1,133 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.crypto,\ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.imageio,\ - javax.imageio.event,\ - javax.imageio.metadata,\ - javax.imageio.plugins.jpeg,\ - javax.imageio.spi,\ - javax.imageio.stream,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.net,\ - javax.net.ssl,\ - javax.print,\ - javax.print.attribute,\ - javax.print.attribute.standard,\ - javax.print.event,\ - javax.rmi,\ - javax.rmi.CORBA,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.kerberos,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.sound.midi,\ - javax.sound.midi.spi,\ - javax.sound.sampled,\ - javax.sound.sampled.spi,\ - javax.sql,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml.parsers,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stream,\ - org.ietf.jgss,\ - org.omg.CORBA,\ - org.omg.CORBA_2_3,\ - org.omg.CORBA_2_3.portable,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextExtPackage,\ - org.omg.CosNaming.NamingContextPackage,\ - org.omg.Dynamic,\ - org.omg.DynamicAny,\ - org.omg.DynamicAny.DynAnyFactoryPackage,\ - org.omg.DynamicAny.DynAnyPackage,\ - org.omg.IOP,\ - org.omg.IOP.CodecFactoryPackage,\ - org.omg.IOP.CodecPackage,\ - org.omg.Messaging,\ - org.omg.PortableInterceptor,\ - org.omg.PortableInterceptor.ORBInitInfoPackage,\ - org.omg.PortableServer,\ - org.omg.PortableServer.CurrentPackage,\ - org.omg.PortableServer.POAManagerPackage,\ - org.omg.PortableServer.POAPackage,\ - org.omg.PortableServer.portable,\ - org.omg.PortableServer.ServantLocatorPackage,\ - org.omg.SendingContext,\ - org.omg.stub.java.rmi,\ - org.w3c.dom,\ - org.w3c.dom.css,\ - org.w3c.dom.events,\ - org.w3c.dom.html,\ - org.w3c.dom.stylesheets,\ - org.w3c.dom.views ,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.bootdelegation = \ - javax.*,\ - org.ietf.jgss,\ - org.omg.*,\ - org.w3c.*,\ - org.xml.*,\ - sun.*,\ - com.sun.* -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JRE-1.1,\ - 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 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning 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 deleted file mode 100644 index a79545d35..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/J2SE-1.5.profile +++ /dev/null @@ -1,161 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.activity,\ - javax.crypto,\ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.imageio,\ - javax.imageio.event,\ - javax.imageio.metadata,\ - javax.imageio.plugins.bmp,\ - javax.imageio.plugins.jpeg,\ - javax.imageio.spi,\ - javax.imageio.stream,\ - javax.management,\ - javax.management.loading,\ - javax.management.modelmbean,\ - javax.management.monitor,\ - javax.management.openmbean,\ - javax.management.relation,\ - javax.management.remote,\ - javax.management.remote.rmi,\ - javax.management.timer,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.net,\ - javax.net.ssl,\ - javax.print,\ - javax.print.attribute,\ - javax.print.attribute.standard,\ - javax.print.event,\ - javax.rmi,\ - javax.rmi.CORBA,\ - javax.rmi.ssl,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.kerberos,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.security.sasl,\ - javax.sound.midi,\ - javax.sound.midi.spi,\ - javax.sound.sampled,\ - javax.sound.sampled.spi,\ - javax.sql,\ - javax.sql.rowset,\ - javax.sql.rowset.serial,\ - javax.sql.rowset.spi,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.plaf.synth,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml,\ - javax.xml.datatype,\ - javax.xml.namespace,\ - javax.xml.parsers,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stream,\ - javax.xml.validation,\ - javax.xml.xpath,\ - org.ietf.jgss,\ - org.omg.CORBA,\ - org.omg.CORBA_2_3,\ - org.omg.CORBA_2_3.portable,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextExtPackage,\ - org.omg.CosNaming.NamingContextPackage,\ - org.omg.Dynamic,\ - org.omg.DynamicAny,\ - org.omg.DynamicAny.DynAnyFactoryPackage,\ - org.omg.DynamicAny.DynAnyPackage,\ - org.omg.IOP,\ - org.omg.IOP.CodecFactoryPackage,\ - org.omg.IOP.CodecPackage,\ - org.omg.Messaging,\ - org.omg.PortableInterceptor,\ - org.omg.PortableInterceptor.ORBInitInfoPackage,\ - org.omg.PortableServer,\ - org.omg.PortableServer.CurrentPackage,\ - org.omg.PortableServer.POAManagerPackage,\ - org.omg.PortableServer.POAPackage,\ - org.omg.PortableServer.portable,\ - org.omg.PortableServer.ServantLocatorPackage,\ - org.omg.SendingContext,\ - org.omg.stub.java.rmi,\ - org.w3c.dom,\ - org.w3c.dom.bootstrap,\ - org.w3c.dom.css,\ - org.w3c.dom.events,\ - org.w3c.dom.html,\ - org.w3c.dom.ls,\ - org.w3c.dom.ranges,\ - org.w3c.dom.stylesheets,\ - org.w3c.dom.traversal,\ - org.w3c.dom.views ,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.bootdelegation = \ - javax.*,\ - org.ietf.jgss,\ - org.omg.*,\ - org.w3c.*,\ - org.xml.*,\ - sun.*,\ - com.sun.* -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JRE-1.1,\ - J2SE-1.2,\ - 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 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 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 deleted file mode 100644 index 8288ad0f0..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JRE-1.1.profile +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = -org.osgi.framework.bootdelegation = \ - sun.*,\ - 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.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 deleted file mode 100644 index d6b1ca959..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.6.profile +++ /dev/null @@ -1,198 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.activation,\ - javax.activity,\ - javax.annotation,\ - javax.annotation.processing,\ - javax.crypto,\ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.imageio,\ - javax.imageio.event,\ - javax.imageio.metadata,\ - javax.imageio.plugins.bmp,\ - javax.imageio.plugins.jpeg,\ - javax.imageio.spi,\ - javax.imageio.stream,\ - javax.jws,\ - javax.jws.soap,\ - javax.lang.model,\ - javax.lang.model.element,\ - javax.lang.model.type,\ - javax.lang.model.util,\ - javax.management,\ - javax.management.loading,\ - javax.management.modelmbean,\ - javax.management.monitor,\ - javax.management.openmbean,\ - javax.management.relation,\ - javax.management.remote,\ - javax.management.remote.rmi,\ - javax.management.timer,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.net,\ - javax.net.ssl,\ - javax.print,\ - javax.print.attribute,\ - javax.print.attribute.standard,\ - javax.print.event,\ - javax.rmi,\ - javax.rmi.CORBA,\ - javax.rmi.ssl,\ - javax.script,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.kerberos,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.security.sasl,\ - javax.sound.midi,\ - javax.sound.midi.spi,\ - javax.sound.sampled,\ - javax.sound.sampled.spi,\ - javax.sql,\ - javax.sql.rowset,\ - javax.sql.rowset.serial,\ - javax.sql.rowset.spi,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.plaf.synth,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - javax.tools,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml,\ - javax.xml.bind,\ - javax.xml.bind.annotation,\ - javax.xml.bind.annotation.adapters,\ - javax.xml.bind.attachment,\ - javax.xml.bind.helpers,\ - javax.xml.bind.util,\ - javax.xml.crypto,\ - javax.xml.crypto.dom,\ - javax.xml.crypto.dsig,\ - javax.xml.crypto.dsig.dom,\ - javax.xml.crypto.dsig.keyinfo,\ - javax.xml.crypto.dsig.spec,\ - javax.xml.datatype,\ - javax.xml.namespace,\ - javax.xml.parsers,\ - javax.xml.soap,\ - javax.xml.stream,\ - javax.xml.stream.events,\ - javax.xml.stream.util,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stax,\ - javax.xml.transform.stream,\ - javax.xml.validation,\ - javax.xml.ws,\ - javax.xml.ws.handler,\ - javax.xml.ws.handler.soap,\ - javax.xml.ws.http,\ - javax.xml.ws.soap,\ - javax.xml.ws.spi,\ - javax.xml.ws.wsaddressing,\ - javax.xml.xpath,\ - org.ietf.jgss,\ - org.omg.CORBA,\ - org.omg.CORBA_2_3,\ - org.omg.CORBA_2_3.portable,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextExtPackage,\ - org.omg.CosNaming.NamingContextPackage,\ - org.omg.Dynamic,\ - org.omg.DynamicAny,\ - org.omg.DynamicAny.DynAnyFactoryPackage,\ - org.omg.DynamicAny.DynAnyPackage,\ - org.omg.IOP,\ - org.omg.IOP.CodecFactoryPackage,\ - org.omg.IOP.CodecPackage,\ - org.omg.Messaging,\ - org.omg.PortableInterceptor,\ - org.omg.PortableInterceptor.ORBInitInfoPackage,\ - org.omg.PortableServer,\ - org.omg.PortableServer.CurrentPackage,\ - org.omg.PortableServer.POAManagerPackage,\ - org.omg.PortableServer.POAPackage,\ - org.omg.PortableServer.portable,\ - org.omg.PortableServer.ServantLocatorPackage,\ - org.omg.SendingContext,\ - org.omg.stub.java.rmi,\ - org.w3c.dom,\ - org.w3c.dom.bootstrap,\ - org.w3c.dom.css,\ - org.w3c.dom.events,\ - org.w3c.dom.html,\ - org.w3c.dom.ls,\ - org.w3c.dom.ranges,\ - org.w3c.dom.stylesheets,\ - org.w3c.dom.traversal,\ - org.w3c.dom.views,\ - org.w3c.dom.xpath,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.bootdelegation = \ - javax.*,\ - org.ietf.jgss,\ - org.omg.*,\ - org.w3c.*,\ - org.xml.*,\ - sun.*,\ - com.sun.* -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JRE-1.1,\ - J2SE-1.2,\ - J2SE-1.3,\ - 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 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error 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 deleted file mode 100644 index 6071cf9e3..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.7.profile +++ /dev/null @@ -1,201 +0,0 @@ -############################################################################### -# 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.activation,\ - javax.activity,\ - javax.annotation,\ - javax.annotation.processing,\ - javax.crypto,\ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.imageio,\ - javax.imageio.event,\ - javax.imageio.metadata,\ - javax.imageio.plugins.bmp,\ - javax.imageio.plugins.jpeg,\ - javax.imageio.spi,\ - javax.imageio.stream,\ - javax.jws,\ - javax.jws.soap,\ - javax.lang.model,\ - javax.lang.model.element,\ - javax.lang.model.type,\ - javax.lang.model.util,\ - javax.management,\ - javax.management.loading,\ - javax.management.modelmbean,\ - javax.management.monitor,\ - javax.management.openmbean,\ - javax.management.relation,\ - javax.management.remote,\ - javax.management.remote.rmi,\ - javax.management.timer,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.net,\ - javax.net.ssl,\ - javax.print,\ - javax.print.attribute,\ - javax.print.attribute.standard,\ - javax.print.event,\ - javax.rmi,\ - javax.rmi.CORBA,\ - javax.rmi.ssl,\ - javax.script,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.kerberos,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.security.sasl,\ - javax.sound.midi,\ - javax.sound.midi.spi,\ - javax.sound.sampled,\ - javax.sound.sampled.spi,\ - javax.sql,\ - javax.sql.rowset,\ - javax.sql.rowset.serial,\ - javax.sql.rowset.spi,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.plaf.nimbus,\ - javax.swing.plaf.synth,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - javax.tools,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml,\ - javax.xml.bind,\ - javax.xml.bind.annotation,\ - javax.xml.bind.annotation.adapters,\ - javax.xml.bind.attachment,\ - javax.xml.bind.helpers,\ - javax.xml.bind.util,\ - javax.xml.crypto,\ - javax.xml.crypto.dom,\ - javax.xml.crypto.dsig,\ - javax.xml.crypto.dsig.dom,\ - javax.xml.crypto.dsig.keyinfo,\ - javax.xml.crypto.dsig.spec,\ - javax.xml.datatype,\ - javax.xml.namespace,\ - javax.xml.parsers,\ - javax.xml.soap,\ - javax.xml.stream,\ - javax.xml.stream.events,\ - javax.xml.stream.util,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stax,\ - javax.xml.transform.stream,\ - javax.xml.validation,\ - javax.xml.ws,\ - javax.xml.ws.handler,\ - javax.xml.ws.handler.soap,\ - javax.xml.ws.http,\ - javax.xml.ws.soap,\ - javax.xml.ws.spi,\ - javax.xml.ws.spi.http,\ - javax.xml.ws.wsaddressing,\ - javax.xml.xpath,\ - org.ietf.jgss,\ - org.omg.CORBA,\ - org.omg.CORBA_2_3,\ - org.omg.CORBA_2_3.portable,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextExtPackage,\ - org.omg.CosNaming.NamingContextPackage,\ - org.omg.Dynamic,\ - org.omg.DynamicAny,\ - org.omg.DynamicAny.DynAnyFactoryPackage,\ - org.omg.DynamicAny.DynAnyPackage,\ - org.omg.IOP,\ - org.omg.IOP.CodecFactoryPackage,\ - org.omg.IOP.CodecPackage,\ - org.omg.Messaging,\ - org.omg.PortableInterceptor,\ - org.omg.PortableInterceptor.ORBInitInfoPackage,\ - org.omg.PortableServer,\ - org.omg.PortableServer.CurrentPackage,\ - org.omg.PortableServer.POAManagerPackage,\ - org.omg.PortableServer.POAPackage,\ - org.omg.PortableServer.portable,\ - org.omg.PortableServer.ServantLocatorPackage,\ - org.omg.SendingContext,\ - org.omg.stub.java.rmi,\ - org.w3c.dom,\ - org.w3c.dom.bootstrap,\ - org.w3c.dom.css,\ - org.w3c.dom.events,\ - org.w3c.dom.html,\ - org.w3c.dom.ls,\ - org.w3c.dom.ranges,\ - org.w3c.dom.stylesheets,\ - org.w3c.dom.traversal,\ - org.w3c.dom.views,\ - org.w3c.dom.xpath,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.bootdelegation = \ - javax.*,\ - org.ietf.jgss,\ - org.omg.*,\ - org.w3c.*,\ - org.xml.*,\ - sun.*,\ - com.sun.* -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JRE-1.1,\ - J2SE-1.2,\ - J2SE-1.3,\ - J2SE-1.4,\ - J2SE-1.5,\ - JavaSE-1.6,\ - 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 -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 diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.8.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.8.profile deleted file mode 100644 index 3db37e8fa..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE-1.8.profile +++ /dev/null @@ -1,208 +0,0 @@ -############################################################################### -# Copyright (c) 2009, 2014 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.accessibility,\ - javax.activation,\ - javax.activity,\ - javax.annotation,\ - javax.annotation.processing,\ - javax.crypto,\ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.imageio,\ - javax.imageio.event,\ - javax.imageio.metadata,\ - javax.imageio.plugins.bmp,\ - javax.imageio.plugins.jpeg,\ - javax.imageio.spi,\ - javax.imageio.stream,\ - javax.jws,\ - javax.jws.soap,\ - javax.lang.model,\ - javax.lang.model.element,\ - javax.lang.model.type,\ - javax.lang.model.util,\ - javax.management,\ - javax.management.loading,\ - javax.management.modelmbean,\ - javax.management.monitor,\ - javax.management.openmbean,\ - javax.management.relation,\ - javax.management.remote,\ - javax.management.remote.rmi,\ - javax.management.timer,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.net,\ - javax.net.ssl,\ - javax.print,\ - javax.print.attribute,\ - javax.print.attribute.standard,\ - javax.print.event,\ - javax.rmi,\ - javax.rmi.CORBA,\ - javax.rmi.ssl,\ - javax.script,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.kerberos,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.security.sasl,\ - javax.sound.midi,\ - javax.sound.midi.spi,\ - javax.sound.sampled,\ - javax.sound.sampled.spi,\ - javax.sql,\ - javax.sql.rowset,\ - javax.sql.rowset.serial,\ - javax.sql.rowset.spi,\ - javax.swing,\ - javax.swing.border,\ - javax.swing.colorchooser,\ - javax.swing.event,\ - javax.swing.filechooser,\ - javax.swing.plaf,\ - javax.swing.plaf.basic,\ - javax.swing.plaf.metal,\ - javax.swing.plaf.multi,\ - javax.swing.plaf.nimbus,\ - javax.swing.plaf.synth,\ - javax.swing.table,\ - javax.swing.text,\ - javax.swing.text.html,\ - javax.swing.text.html.parser,\ - javax.swing.text.rtf,\ - javax.swing.tree,\ - javax.swing.undo,\ - javax.tools,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml,\ - javax.xml.bind,\ - javax.xml.bind.annotation,\ - javax.xml.bind.annotation.adapters,\ - javax.xml.bind.attachment,\ - javax.xml.bind.helpers,\ - javax.xml.bind.util,\ - javax.xml.crypto,\ - javax.xml.crypto.dom,\ - javax.xml.crypto.dsig,\ - javax.xml.crypto.dsig.dom,\ - javax.xml.crypto.dsig.keyinfo,\ - javax.xml.crypto.dsig.spec,\ - javax.xml.datatype,\ - javax.xml.namespace,\ - javax.xml.parsers,\ - javax.xml.soap,\ - javax.xml.stream,\ - javax.xml.stream.events,\ - javax.xml.stream.util,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stax,\ - javax.xml.transform.stream,\ - javax.xml.validation,\ - javax.xml.ws,\ - javax.xml.ws.handler,\ - javax.xml.ws.handler.soap,\ - javax.xml.ws.http,\ - javax.xml.ws.soap,\ - javax.xml.ws.spi,\ - javax.xml.ws.spi.http,\ - javax.xml.ws.wsaddressing,\ - javax.xml.xpath,\ - org.ietf.jgss,\ - org.omg.CORBA,\ - org.omg.CORBA_2_3,\ - org.omg.CORBA_2_3.portable,\ - org.omg.CORBA.DynAnyPackage,\ - org.omg.CORBA.ORBPackage,\ - org.omg.CORBA.portable,\ - org.omg.CORBA.TypeCodePackage,\ - org.omg.CosNaming,\ - org.omg.CosNaming.NamingContextExtPackage,\ - org.omg.CosNaming.NamingContextPackage,\ - org.omg.Dynamic,\ - org.omg.DynamicAny,\ - org.omg.DynamicAny.DynAnyFactoryPackage,\ - org.omg.DynamicAny.DynAnyPackage,\ - org.omg.IOP,\ - org.omg.IOP.CodecFactoryPackage,\ - org.omg.IOP.CodecPackage,\ - org.omg.Messaging,\ - org.omg.PortableInterceptor,\ - org.omg.PortableInterceptor.ORBInitInfoPackage,\ - org.omg.PortableServer,\ - org.omg.PortableServer.CurrentPackage,\ - org.omg.PortableServer.POAManagerPackage,\ - org.omg.PortableServer.POAPackage,\ - org.omg.PortableServer.portable,\ - org.omg.PortableServer.ServantLocatorPackage,\ - org.omg.SendingContext,\ - org.omg.stub.java.rmi,\ - org.w3c.dom,\ - org.w3c.dom.bootstrap,\ - org.w3c.dom.css,\ - org.w3c.dom.events,\ - org.w3c.dom.html,\ - org.w3c.dom.ls,\ - org.w3c.dom.ranges,\ - org.w3c.dom.stylesheets,\ - org.w3c.dom.traversal,\ - org.w3c.dom.views,\ - org.w3c.dom.xpath,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.bootdelegation = \ - javax.*,\ - org.ietf.jgss,\ - org.omg.*,\ - org.w3c.*,\ - org.xml.*,\ - sun.*,\ - com.sun.* -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JavaSE/compact1-1.8,\ - JavaSE/compact2-1.8,\ - JavaSE/compact3-1.8,\ - JRE-1.1,\ - J2SE-1.2,\ - J2SE-1.3,\ - J2SE-1.4,\ - J2SE-1.5,\ - JavaSE-1.6,\ - JavaSE-1.7,\ - JavaSE-1.8 -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, 1.8",\ - osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8",\ - osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8",\ - osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8" -osgi.java.profile.name = JavaSE-1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact1-1.8.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact1-1.8.profile deleted file mode 100644 index 757efcb96..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact1-1.8.profile +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################### -# Copyright (c) 2014 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.net,\ - javax.net.ssl,\ - javax.script,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JavaSE/compact1-1.8 -org.osgi.framework.system.capabilities = \ - osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ - osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8" -osgi.java.profile.name = JavaSE/compact1-1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact2-1.8.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact2-1.8.profile deleted file mode 100644 index bc6044b9c..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact2-1.8.profile +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# Copyright (c) 2014 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.net,\ - javax.net.ssl,\ - javax.rmi.ssl,\ - javax.script,\ - javax.security.auth,\ - javax.security.auth.callback,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.sql,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml,\ - javax.xml.datatype,\ - javax.xml.namespace,\ - javax.xml.parsers,\ - javax.xml.stream,\ - javax.xml.stream.events,\ - javax.xml.stream.util,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stax,\ - javax.xml.transform.stream,\ - javax.xml.validation,\ - javax.xml.xpath,\ - org.w3c.dom,\ - org.w3c.dom.bootstrap,\ - org.w3c.dom.events,\ - org.w3c.dom.ls,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JavaSE/compact1-1.8,\ - JavaSE/compact2-1.8 -org.osgi.framework.system.capabilities = \ - osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ - osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8",\ - osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8" -osgi.java.profile.name = JavaSE/compact2-1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error diff --git a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact3-1.8.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact3-1.8.profile deleted file mode 100644 index 05182dd23..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/JavaSE_compact3-1.8.profile +++ /dev/null @@ -1,98 +0,0 @@ -############################################################################### -# Copyright (c) 2014 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.annotation.processing,\ - javax.crypto.interfaces,\ - javax.crypto.spec,\ - javax.lang.model,\ - javax.lang.model.element,\ - javax.lang.model.type,\ - javax.lang.model.util,\ - javax.management,\ - javax.management.loading,\ - javax.management.modelmbean,\ - javax.management.monitor,\ - javax.management.openmbean,\ - javax.management.relation,\ - javax.management.remote,\ - javax.management.remote.rmi,\ - javax.management.timer,\ - javax.naming,\ - javax.naming.directory,\ - javax.naming.event,\ - javax.naming.ldap,\ - javax.naming.spi,\ - javax.net,\ - javax.net.ssl,\ - javax.rmi.ssl,\ - javax.script,\ - javax.security.auth,\ - javax.security.auth.kerberos,\ - javax.security.auth.callback,\ - javax.security.auth.login,\ - javax.security.auth.spi,\ - javax.security.auth.x500,\ - javax.security.cert,\ - javax.security.sasl,\ - javax.sql,\ - javax.sql.rowset,\ - javax.sql.rowset.serial,\ - javax.sql.rowset.spi,\ - javax.tools,\ - javax.transaction,\ - javax.transaction.xa,\ - javax.xml,\ - javax.xml.crypto,\ - javax.xml.crypto.dom,\ - javax.xml.crypto.dsig,\ - javax.xml.crypto.dsig.dom,\ - javax.xml.crypto.dsig.keyinfo,\ - javax.xml.crypto.dsig.spec,\ - javax.xml.datatype,\ - javax.xml.namespace,\ - javax.xml.parsers,\ - javax.xml.stream,\ - javax.xml.stream.events,\ - javax.xml.stream.util,\ - javax.xml.transform,\ - javax.xml.transform.dom,\ - javax.xml.transform.sax,\ - javax.xml.transform.stax,\ - javax.xml.transform.stream,\ - javax.xml.validation,\ - javax.xml.xpath,\ - org.ieft.jgss,\ - org.w3c.dom,\ - org.w3c.dom.bootstrap,\ - org.w3c.dom.events,\ - org.w3c.dom.ls,\ - org.xml.sax,\ - org.xml.sax.ext,\ - org.xml.sax.helpers -org.osgi.framework.executionenvironment = \ - OSGi/Minimum-1.0,\ - OSGi/Minimum-1.1,\ - OSGi/Minimum-1.2,\ - JavaSE/compact1-1.8,\ - JavaSE/compact2-1.8,\ - JavaSE/compact3-1.8 -org.osgi.framework.system.capabilities = \ - osgi.ee; osgi.ee="OSGi/Minimum"; version:List<Version>="1.0, 1.1, 1.2",\ - osgi.ee; osgi.ee="JavaSE/compact1"; version:List<Version>="1.8",\ - osgi.ee; osgi.ee="JavaSE/compact2"; version:List<Version>="1.8",\ - osgi.ee; osgi.ee="JavaSE/compact3"; version:List<Version>="1.8" -osgi.java.profile.name = JavaSE/compact3-1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.source=1.8 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -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 deleted file mode 100644 index 40da61f85..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.0.profile +++ /dev/null @@ -1,24 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = -org.osgi.framework.bootdelegation = \ - sun.*,\ - 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 -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/OSGi_Minimum-1.1.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.1.profile deleted file mode 100644 index 818bf10c2..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.1.profile +++ /dev/null @@ -1,25 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2005 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = -org.osgi.framework.bootdelegation = \ - sun.*,\ - com.sun.* -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 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -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/OSGi_Minimum-1.2.profile b/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.2.profile deleted file mode 100644 index 95a689631..000000000 --- a/bundles/org.eclipse.equinox.p2.publisher/profiles/OSGi_Minimum-1.2.profile +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################### -# Copyright (c) 2003, 2008 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 -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -org.osgi.framework.system.packages = \ - javax.security.auth.x500 -org.osgi.framework.bootdelegation = \ - javax.security.auth.x500 -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 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java index 9186fb0bc..73bbe8f95 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java @@ -22,18 +22,19 @@ import org.eclipse.equinox.internal.p2.publisher.Messages; import org.eclipse.equinox.p2.metadata.*; import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription; import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitFragmentDescription; +import org.eclipse.equinox.p2.metadata.Version; +import org.eclipse.equinox.p2.metadata.VersionRange; import org.eclipse.equinox.p2.publisher.*; import org.eclipse.equinox.p2.repository.artifact.IArtifactDescriptor; import org.eclipse.equinox.spi.p2.publisher.PublisherHelper; import org.eclipse.osgi.util.ManifestElement; import org.eclipse.osgi.util.NLS; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; +import org.osgi.framework.*; public class JREAction extends AbstractPublisherAction { private static final String DEFAULT_JRE_NAME = "a.jre"; //$NON-NLS-1$ private static final Version DEFAULT_JRE_VERSION = Version.parseVersion("1.6"); //$NON-NLS-1$ - private static final String DEFAULT_PROFILE = "/profiles/JavaSE-1.6.profile"; //$NON-NLS-1$ + private static final String DEFAULT_PROFILE = "JavaSE-1.6"; //$NON-NLS-1$ private static final String PROFILE_LOCATION = "jre.action.profile.location"; //$NON-NLS-1$ private static final String PROFILE_NAME = "osgi.java.profile.name"; //$NON-NLS-1$ private static final String PROFILE_TARGET_VERSION = "org.eclipse.jdt.core.compiler.codegen.targetPlatform"; //$NON-NLS-1$ @@ -316,12 +317,18 @@ public class JREAction extends AbstractPublisherAction { profileProperties = loadProfile(javaProfile); } if (profileProperties == null) { - String entry = environment != null ? "/profiles/" + environment.replace('/', '_') + ".profile" : DEFAULT_PROFILE; //$NON-NLS-1$ //$NON-NLS-2$ - URL profileURL = Activator.getContext().getBundle().getEntry(entry); + String profileFile = (environment != null ? environment : DEFAULT_PROFILE).replace('/', '_') + ".profile"; //$NON-NLS-1$ + URL profileURL = getResouceFromSystemBundle(profileFile); profileProperties = loadProfile(profileURL); } } + private static URL getResouceFromSystemBundle(String entry) { + // get resource from system bundle which is typically on the Java boot classpath + ClassLoader loader = FrameworkUtil.class.getClassLoader(); + return loader == null ? ClassLoader.getSystemResource(entry) : loader.getResource(entry); + } + private Map<String, String> loadProfile(File profileFile) { if (profileFile == null || !profileFile.exists()) return null; |