Attachment #198272 for bug #349618

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 403-408 Link Here

(-)src/org/eclipse/equinox/internal/region/hook/RegionResolverHookTests.java (+32 lines)
403	}	403	}
404		404
405	@Override	405	@Override
		406	public BundleRevision getResource() {
		407	return getRevision();
		408	}
		409
		410	@Override
406	public BundleRevision getRevision() {	411	public BundleRevision getRevision() {
407	return new StubBundleRevision(bundle(this.bundleSymbolicName));	412	return new StubBundleRevision(bundle(this.bundleSymbolicName));
408	}	413	}
Lines 481-486 Link Here
481	}	486	}
482		487
483	@Override	488	@Override
		489	public BundleRevision getResource() {
		490	return getRevision();
		491	}
		492
		493	@Override
484	public BundleRevision getRevision() {	494	public BundleRevision getRevision() {
485	return new StubBundleRevision(bundle(this.bundleSymbolicName));	495	return new StubBundleRevision(bundle(this.bundleSymbolicName));
486	}	496	}
Lines 543-548 Link Here
543	}	553	}
544		554
545	@Override	555	@Override
		556	public BundleRevision getResource() {
		557	return getRevision();
		558	}
		559
		560	@Override
546	public BundleRevision getRevision() {	561	public BundleRevision getRevision() {
547	return this.bundleRevision;	562	return this.bundleRevision;
548	}	563	}
Lines 552-557 Link Here
552	throw new UnsupportedOperationException();	567	throw new UnsupportedOperationException();
553	}	568	}
554		569
		570	@Override
		571	public boolean matches(Capability capability) {
		572	if (!(capability instanceof BundleCapability))
		573	return false;
		574	return matches((BundleCapability) capability);
		575	}
555	}	576	}
556		577
557	final class StubBundleRevision implements BundleRevision {	578	final class StubBundleRevision implements BundleRevision {
Lines 597-602 Link Here
597	throw new UnsupportedOperationException();	618	throw new UnsupportedOperationException();
598	}	619	}
599		620
		621	@SuppressWarnings({"cast", "unchecked", "rawtypes"})
		622	@Override
		623	public List<Capability> getCapabilities(String namespace) {
		624	return (List<Capability>) (List) getDeclaredCapabilities(namespace);
		625	}
		626
		627	@SuppressWarnings({"cast", "unchecked", "rawtypes"})
		628	@Override
		629	public List<Requirement> getRequirements(String namespace) {
		630	return (List<Requirement>) (List) getDeclaredRequirements(namespace);
		631	}
600	}	632	}
601		633
602	}	634	}

Lines 989-994 Link Here

(-).settings/.api_filters (+55 lines)
989	<message_argument value="org.osgi.framework.wiring.BundleCapability"/>	989	<message_argument value="org.osgi.framework.wiring.BundleCapability"/>
990	</message_arguments>	990	</message_arguments>
991	</filter>	991	</filter>
		992	<filter comment="Ignore osgi API." id="1211105284">
		993	<message_arguments>
		994	<message_argument value="getResource()"/>
		995	</message_arguments>
		996	</filter>
992	</resource>	997	</resource>
993	<resource path="osgi/src/org/osgi/framework/wiring/BundleRequirement.java" type="org.osgi.framework.wiring.BundleRequirement">	998	<resource path="osgi/src/org/osgi/framework/wiring/BundleRequirement.java" type="org.osgi.framework.wiring.BundleRequirement">
994	<filter comment="Ignore OSGi API" id="1110441988">	999	<filter comment="Ignore OSGi API" id="1110441988">
Lines 996-1001 Link Here
996	<message_argument value="org.osgi.framework.wiring.BundleRequirement"/>	1001	<message_argument value="org.osgi.framework.wiring.BundleRequirement"/>
997	</message_arguments>	1002	</message_arguments>
998	</filter>	1003	</filter>
		1004	<filter comment="Ignore osgi API." id="1211105284">
		1005	<message_arguments>
		1006	<message_argument value="getResource()"/>
		1007	</message_arguments>
		1008	</filter>
999	</resource>	1009	</resource>
1000	<resource path="osgi/src/org/osgi/framework/wiring/BundleRevision.java" type="org.osgi.framework.wiring.BundleRevision">	1010	<resource path="osgi/src/org/osgi/framework/wiring/BundleRevision.java" type="org.osgi.framework.wiring.BundleRevision">
1001	<filter comment="Ignore OSGi API" id="1110441988">	1011	<filter comment="Ignore OSGi API" id="1110441988">
Lines 1017-1022 Link Here
1017	<message_argument value="org.osgi.framework.wiring.BundleWire"/>	1027	<message_argument value="org.osgi.framework.wiring.BundleWire"/>
1018	</message_arguments>	1028	</message_arguments>
1019	</filter>	1029	</filter>
		1030	<filter comment="Ignore osgi API." id="1211105284">
		1031	<message_arguments>
		1032	<message_argument value="getProvider()"/>
		1033	</message_arguments>
		1034	</filter>
		1035	<filter comment="Ignore osgi API." id="1211105284">
		1036	<message_arguments>
		1037	<message_argument value="getRequirer()"/>
		1038	</message_arguments>
		1039	</filter>
1020	</resource>	1040	</resource>
1021	<resource path="osgi/src/org/osgi/framework/wiring/BundleWiring.java" type="org.osgi.framework.wiring.BundleWiring">	1041	<resource path="osgi/src/org/osgi/framework/wiring/BundleWiring.java" type="org.osgi.framework.wiring.BundleWiring">
1022	<filter comment="Ignore OSGi API" id="1110441988">	1042	<filter comment="Ignore OSGi API" id="1110441988">
Lines 1025-1030 Link Here
1025	</message_arguments>	1045	</message_arguments>
1026	</filter>	1046	</filter>
1027	</resource>	1047	</resource>
		1048	<resource path="osgi/src/org/osgi/framework/wiring/Capability.java" type="org.osgi.framework.wiring.Capability">
		1049	<filter comment="Ignore osgi API." id="1110441988">
		1050	<message_arguments>
		1051	<message_argument value="org.osgi.framework.wiring.Capability"/>
		1052	</message_arguments>
		1053	</filter>
		1054	</resource>
1028	<resource path="osgi/src/org/osgi/framework/wiring/FrameworkWiring.java" type="org.osgi.framework.wiring.FrameworkWiring">	1055	<resource path="osgi/src/org/osgi/framework/wiring/FrameworkWiring.java" type="org.osgi.framework.wiring.FrameworkWiring">
1029	<filter comment="Ignore OSGi API" id="1110441988">	1056	<filter comment="Ignore OSGi API" id="1110441988">
1030	<message_arguments>	1057	<message_arguments>
Lines 1032-1037 Link Here
1032	</message_arguments>	1059	</message_arguments>
1033	</filter>	1060	</filter>
1034	</resource>	1061	</resource>
		1062	<resource path="osgi/src/org/osgi/framework/wiring/Requirement.java" type="org.osgi.framework.wiring.Requirement">
		1063	<filter comment="Ignore osgi API." id="1110441988">
		1064	<message_arguments>
		1065	<message_argument value="org.osgi.framework.wiring.Requirement"/>
		1066	</message_arguments>
		1067	</filter>
		1068	</resource>
		1069	<resource path="osgi/src/org/osgi/framework/wiring/Resource.java" type="org.osgi.framework.wiring.Resource">
		1070	<filter comment="Ignore osgi API." id="1110441988">
		1071	<message_arguments>
		1072	<message_argument value="org.osgi.framework.wiring.Resource"/>
		1073	</message_arguments>
		1074	</filter>
		1075	</resource>
		1076	<resource path="osgi/src/org/osgi/framework/wiring/ResourceConstants.java" type="org.osgi.framework.wiring.ResourceConstants">
		1077	<filter comment="Ignore osgi API." id="1110441988">
		1078	<message_arguments>
		1079	<message_argument value="org.osgi.framework.wiring.ResourceConstants"/>
		1080	</message_arguments>
		1081	</filter>
		1082	</resource>
		1083	<resource path="osgi/src/org/osgi/framework/wiring/Wire.java" type="org.osgi.framework.wiring.Wire">
		1084	<filter comment="Ignore osgi API." id="1110441988">
		1085	<message_arguments>
		1086	<message_argument value="org.osgi.framework.wiring.Wire"/>
		1087	</message_arguments>
		1088	</filter>
		1089	</resource>
1035	<resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java" type="org.osgi.service.condpermadmin.ConditionalPermissionAdmin">	1090	<resource path="osgi/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java" type="org.osgi.service.condpermadmin.ConditionalPermissionAdmin">
1036	<filter comment="Ignore OSGi API" id="403853384">	1091	<filter comment="Ignore OSGi API" id="403853384">
1037	<message_arguments>	1092	<message_arguments>

Lines 25-31 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
25	org.osgi.framework.hooks.service; version="1.1",	25	org.osgi.framework.hooks.service; version="1.1",
26	org.osgi.framework.hooks.weaving; version="1.0",	26	org.osgi.framework.hooks.weaving; version="1.0",
27	org.osgi.framework.startlevel; version="1.0",	27	org.osgi.framework.startlevel; version="1.0",
28	org.osgi.framework.wiring; version="1.0",	28	org.osgi.framework.wiring; version="1.1",
29	org.osgi.service.condpermadmin;version="1.1.1",	29	org.osgi.service.condpermadmin;version="1.1.1",
30	org.osgi.service.framework; version="1.0"; x-internal:=true,	30	org.osgi.service.framework; version="1.0"; x-internal:=true,
31	org.osgi.service.log; version="1.3",	31	org.osgi.service.log; version="1.3",
Lines 75-81 Link Here
75	Bundle-Description: %systemBundle	75	Bundle-Description: %systemBundle
76	Bundle-Copyright: %copyright	76	Bundle-Copyright: %copyright
77	Bundle-Vendor: %eclipse.org	77	Bundle-Vendor: %eclipse.org
78	Bundle-Version: 3.7.100.qualifier	78	Bundle-Version: 3.8.0.qualifier
79	Bundle-Localization: systembundle	79	Bundle-Localization: systembundle
80	Bundle-DocUrl: http://www.eclipse.org	80	Bundle-DocUrl: http://www.eclipse.org
81	Eclipse-ExtensibleAPI: true	81	Eclipse-ExtensibleAPI: true





import java.util.Map;


/**
 * A capability that has been declared from a {@link BundleRevision bundle
 * revision}.
 * 
 * @ThreadSafe
 * @noimplement
 * @version $Id: 6bbc1e645f927531d40fb245c95f5d26ad189db3 $
 */
public interface BundleCapability extends Capability{
	/**
	 * Returns the name space of this capability.
	 * 

	 * @return The bundle revision declaring this capability.
	 */
	BundleRevision getRevision();

	BundleRevision getResource();
}





import java.util.Map;


/**
 * A requirement that has been declared from a {@link BundleRevision bundle
 * revision}.
 * 
 * @ThreadSafe
 * @noimplement
 * @version $Id: 3ee254a3c0d5516b56affaa66544c892f3d522cb $
 */
public interface BundleRequirement extends Requirement{
	/**
	 * Returns the name space of this requirement.
	 * 

	BundleRevision getRevision();

	/**
	 * {@inheritDoc}
	 */
	BundleRevision getResource();

	/**
	 * Returns whether the specified capability matches this requirement.
	 * 
	 * @param capability The capability to match to this requirement.




 * 
 * @ThreadSafe
 * @noimplement
 * @version $Id: 2eb450f15fc9d4fe1b611dc55e2238b972b4c486 $
 */
public interface BundleRevision extends BundleReference, Resource {
	/**
	 * Returns the symbolic name for this bundle revision.
	 * 

	 * package wires required by a bundle wiring may change as the bundle wiring
	 * may dynamically import additional packages.
	 */
	String	PACKAGE_NAMESPACE	= ResourceConstants.WIRING_PACKAGE_NAMESPACE;

	/**
	 * Name space for bundle capabilities and requirements.

	 * {@link Constants#BUNDLE_MANIFESTVERSION Bundle-ManifestVersion}
	 * {@literal <} 2) must not provide a bundle capability.
	 */
	String	BUNDLE_NAMESPACE	= ResourceConstants.WIRING_BUNDLE_NAMESPACE;

	/**
	 * Name space for host capabilities and requirements.

	 * {@link Constants#BUNDLE_MANIFESTVERSION Bundle-ManifestVersion}
	 * {@literal <} 2) must not provide a host capability.
	 */
	String	HOST_NAMESPACE		= ResourceConstants.WIRING_HOST_NAMESPACE;

	/**
	 * Returns the special types of this bundle revision. The bundle revision





package org.osgi.framework.wiring;


/**
 * A wire connecting a {@link BundleCapability} to a {@link BundleRequirement}.
 * 
 * @ThreadSafe
 * @noimplement
 * @version $Id: aca8642cea91995d0b178129cba1131ed327c7e7 $
 */
public interface BundleWire extends Wire {
	/**
	 * Returns the {@link BundleCapability} for this wire.
	 * 

	 *         returned.
	 */
	BundleWiring getRequirerWiring();

	/**
	 * {@inheritDoc}
	 */
	BundleRevision getProvider();

	/**
	 * {@inheritDoc}
	 */
	BundleRevision getRequirer();
}




/*
 * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.osgi.framework.wiring;

import java.util.Map;

/**
 * A capability that has been declared from a {@link Resource}.
 * 
 * @ThreadSafe
 * @version $Id: f8bd10002691537806e4bc3cf08f3fce37510121 $
 */
public interface Capability {

	/**
	 * Returns the name space of this capability.
	 * 
	 * @return The name space of this capability.
	 */
	String getNamespace();

	/**
	 * Returns the directives of this capability. Only the following list of
	 * directives have semantic meaning in the returned {@link Map map} of
	 * directives:
	 * <ul>
	 * <li> {@link ResourceConstants#CAPABILITY_EFFECTIVE_DIRECTIVE effective}
	 * <li> {@link ResourceConstants#CAPABILITY_USES_DIRECTIVE uses}
	 * <li> {@link ResourceConstants#CAPABILITY_MANDATORY_DIRECTIVE mandatory} -
	 * only recognized for the
	 * {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE osgi.wiring.bundle} and
	 * {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package}
	 * name spaces.
	 * <li> {@link ResourceConstants#CAPABILITY_EXCLUDE_DIRECTIVE exclude} -
	 * only recognized for the
	 * {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package}
	 * name space.
	 * <li> {@link ResourceConstants#CAPABILITY_INCLUDE_DIRECTIVE include} -
	 * only recognized for the
	 * {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package}
	 * name space.
	 * </ul>
	 * All other directive are considered extra user defined information that
	 * has no semantic meaning. OSGi Alliance reserves the right to extend the
	 * set of directives which have semantic meaning.
	 * 
	 * @return An unmodifiable map of directive names to directive values for
	 *         this capability, or an empty map if this capability has no
	 *         directives.
	 */
	Map<String, String> getDirectives();

	/**
	 * Returns the attributes of this capability.
	 * 
	 * @return An unmodifiable map of attribute names to attribute values for
	 *         this capability, or an empty map if this capability has no
	 *         attributes.
	 */
	Map<String, Object> getAttributes();

	/**
	 * The resource that declares this capability.
	 * 
	 * @return the resource
	 */
	Resource getResource();
}




/*
 * Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.osgi.framework.wiring;

import java.util.Map;

import org.osgi.framework.Constants;

/**
 * A requirement that has been declared from a {@link Resource} .
 * 
 * @ThreadSafe
 * @version $Id: 6a5c3253e257d6f503a39d94563d7d656ce05e1d $
 */
public interface Requirement {
	/**
	 * Returns the name space of this requirement.
	 * 
	 * @return The name space of this requirement.
	 */
	String getNamespace();

	/**
	 * Returns the directives of this requirement. Only the following list of
	 * directives have semantic meaning in the returned {@link Map map} of
	 * directives:
	 * <ul>
	 * <li> {@link ResourceConstants#REQUIREMENT_EFFECTIVE_DIRECTIVE effective}
	 * <li> {@link ResourceConstants#REQUIREMENT_FILTER_DIRECTIVE filter}
	 * <li> {@link ResourceConstants#REQUIREMENT_CARDINALITY_DIRECTIVE
	 * cardinality}
	 * <li> {@link ResourceConstants#REQUIREMENT_RESOLUTION_DIRECTIVE resolution}
	 * <li> {@link ResourceConstants#REQUIREMENT_VISIBILITY_DIRECTIVE visibility}
	 * - only recognized for the
	 * {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE osgi.wiring.bundle} name
	 * space.
	 * </ul>
	 * All other directive are considered extra user defined information that
	 * has no semantic meaning. OSGi Alliance reserves the right to extend the
	 * set of directives which have semantic meaning.
	 * 
	 * @return An unmodifiable map of directive names to directive values for
	 *         this requirement, or an empty map if this requirement has no
	 *         directives.
	 */
	Map<String, String> getDirectives();

	/**
	 * Returns the attributes of this requirement. Requirement attributes have
	 * no semantic meaning and are considered extra user defined information.
	 * 
	 * @return An unmodifiable map of attribute names to attribute values for
	 *         this requirement, or an empty map if this requirement has no
	 *         attributes.
	 */
	Map<String, Object> getAttributes();

	/**
	 * Returns the resource declaring this requirement.
	 * 
	 * @return The resource declaring this requirement.
	 */
	Resource getResource();

	/**
	 * Returns whether the specified capability matches this requirement. A
	 * capability matches this requirement when all of the following are true:
	 * <ul>
	 * <li>The specified capability has the same {@link #getNamespace() name
	 * space} as this requirement.
	 * <li>The filter specified by the {@link Constants#FILTER_DIRECTIVE filter}
	 * directive of this requirement matches the
	 * {@link Capability#getAttributes() attributes of the specified capability}.
	 * <li>The {@link #getDirectives() requirement directives} and the
	 * {@link Capability#getDirectives() capability directives} that apply to
	 * the name space are satisfied.
	 * </ul>
	 * 
	 * 
	 * @param capability
	 *            The capability to match to this requirement.
	 * @return {@code true} if the specified capability matches this this
	 *         requirement. {@link #getNamespace() name space} as this
	 *         requirement and the filter for this requirement matches the
	 *         {@link BundleCapability#getAttributes() attributes of the
	 *         specified capability}; {@code false} otherwise.
	 */
	// TODO much debate on the placement and need for this method.
	boolean matches(Capability capability);
}




package org.osgi.framework.wiring;

import java.util.List;


/**
 * A resource is the representation of a uniquely identified and typed data.
 * 
 * A resources can be wired together via capabilities and requirements.
 * 
 * TODO decide on identity characteristics of a revision. Given in OSGi multiple
 * bundles can be installed with same bsn/version this cannot be used as a key.
 * 
 * What then is identity of a resource? Object identity? URI (needs getter
 * method?)
 * 
 * @ThreadSafe
 * @version $Id: 0d09cf5655002b7b2f1d37d413788892ad2dfedf $
 */
public interface Resource {
	/**
	 * Returns the capabilities declared by this resource.
	 * 
	 * @param namespace
	 *            The name space of the declared capabilities to return or
	 *            {@code null} to return the declared capabilities from all name
	 *            spaces.
	 * @return A list containing a snapshot of the declared {@link Capability}s,
	 *         or an empty list if this resource declares no capabilities in the
	 *         specified name space.
	 */
	List<Capability> getCapabilities(String namespace);

	/**
	 * Returns the requirements declared by this bundle resource.
	 * 
	 * @param namespace
	 *            The name space of the declared requirements to return or
	 *            {@code null} to return the declared requirements from all name
	 *            spaces.
	 * @return A list containing a snapshot of the declared {@link Requirement}
	 *         s, or an empty list if this resource declares no requirements in
	 *         the specified name space.
	 */
	List<Requirement> getRequirements(String namespace);
}




/*
 * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.osgi.framework.wiring;

import org.osgi.framework.Constants;
import org.osgi.framework.Version;

/**
 * Defines standard names for the attributes, directives and name spaces for
 * resources, capabilities and requirements.
 * 
 * <p>
 * The values associated with these keys are of type {@code String}, unless
 * otherwise indicated.
 * 
 * @version $Id: 6a0df41f82a587eb72c0c513fdd0411f18564586 $
 */
public final class ResourceConstants {

	private ResourceConstants() {
		// keep others from creating objects of this type.
	}

	/**
	 * Name space for the identity capability.  Each {@link Resource resource} 
	 * should provide an identity capability that can be used to identify the
	 * resource.
	 * 
	 * For identity capability attributes the following applies:
	 * <ul>
	 * <li>The
	 * <q>osgi.identity</q> attribute contains the symbolic name of the
	 * resource.
	 * <li>The {@link #IDENTITY_VERSION_ATTRIBUTE version} attribute contains
	 * the {@link Version} of the resource.
	 * <li>The {@link #IDENTITY_TYPE_ATTRIBUTE type} attribute contains the
	 * resource type.
	 * </ul>
	 * <p>
	 * A resource with a symbolic name provides exactly one <sup>&#8224;</sup> identity
	 * {@link Resource#getCapabilities(String) capability}.
	 * <p>
	 * &#8224; A resource with no symbolic name must not provide an identity
	 * capability.
	 */
	public static final String IDENTITY_NAMESPACE = "osgi.identity";

	/**
	 * An {@link #IDENTITY_NAMESPACE identity} capability attribute identifying the
	 * {@link Version version} of the resource.  This attribute must be set to a value of
	 * type {@link Version}.  If the resource has no version then the value 
	 * {@link Version#emptyVersion 0.0.0} must be used for the attribute.
	 */
	public static final String IDENTITY_VERSION_ATTRIBUTE = Constants.VERSION_ATTRIBUTE;

	/**
	 * An {@link #IDENTITY_NAMESPACE identity} capability attribute identifying the
	 * resource type.  This attribute must be set to a value of type {@link String}.
	 * if the resource has no type then the value 
	 * {@link ResourceConstants#IDENTITY_TYPE_UNKNOWN unknown} must be used for the
	 * attribute.
	 */
	public static final String IDENTITY_TYPE_ATTRIBUTE = "type";

	/**
	 * An {@link #IDENTITY_NAMESPACE identity} capability {@link #IDENTITY_TYPE_ATTRIBUTE type}
	 * attribute value identifying the resource type as an OSGi bundle.
	 */
	public static final String IDENTITY_TYPE_BUNDLE = "osgi.bundle";

	/**
	 * An {@link #IDENTITY_NAMESPACE identity} capability {@link #IDENTITY_TYPE_ATTRIBUTE type}
	 * attribute value identifying the resource type as an OSGi fragment.
	 */
	public static final String IDENTITY_TYPE_FRAGMENT = "osgi.fragment";

	/**
	 * An {@link #IDENTITY_NAMESPACE identity} capability {@link #IDENTITY_TYPE_ATTRIBUTE type}
	 * attribute value identifying the resource type as unknown.
	 */
	public static final String IDENTITY_TYPE_UNKNOWN = "unknown";

	/**
	 * An {@link #IDENTITY_NAMESPACE identity} capability {@link Requirement#getDirectives() directive}
	 * identifying if the resource is a singleton.  A {@link String} value of &quot;true&quot; indicates
	 * the resource is a singleton; any other value or <code>null</code> indicates the resource is not a 
	 * singleton.
	 */
	public static final String IDENTITY_SINGLETON_DIRECTIVE = Constants.SINGLETON_DIRECTIVE;

	/**
	 * Name space for package capabilities and requirements.
	 * 
	 * For capability attributes the following applies:
	 * <ul>
	 * <li>The
	 * <q>osgi.wiring.package</q> attribute contains the name of the package.
	 * <li>The {@link Constants#VERSION_ATTRIBUTE version} attribute contains
	 * the the {@link Version} of the package if one is specified or
	 * {@link Version#emptyVersion} if not specified.
	 * <li>The {@link Constants#BUNDLE_SYMBOLICNAME_ATTRIBUTE
	 * bundle-symbolic-name} attribute contains the symbolic name of the
	 * resource providing the package if one is specified.
	 * <li>The {@link Constants#BUNDLE_VERSION_ATTRIBUTE bundle-version}
	 * attribute contains the {@link Version} of resource providing the package
	 * if one is specified or {@link Version#emptyVersion} if not specified.
	 * <li>All other attributes are of type {@link String} and are used as
	 * arbitrary matching attributes for the capability.
	 * </ul>
	 * <p>
	 * A resource provides zero or more package
	 * {@link Resource#getCapabilities(String) capabilities} (this is, exported
	 * packages) and requires zero or more package
	 * {@link Resource#getRequirements(String) requirements} (that is, imported
	 * packages).
	 */
	public static final String WIRING_PACKAGE_NAMESPACE = "osgi.wiring.package";

	/**
	 * Name space for bundle capabilities and requirements.
	 * 
	 * For capability attributes the following applies:
	 * <ul>
	 * <li>The
	 * <q>osgi.wiring.bundle</q> attribute contains the symbolic name of the
	 * bundle.
	 * <li>The {@link Constants#BUNDLE_VERSION_ATTRIBUTE bundle-version}
	 * attribute contains the {@link Version} of the bundle if one is specified
	 * or {@link Version#emptyVersion} if not specified.
	 * <li>All other attributes are of type {@link String} and are used as
	 * arbitrary matching attributes for the capability.
	 * </ul>
	 * <p>
	 * A non-fragment resource with the {@link #IDENTITY_TYPE_BUNDLE
	 * osgi.bundle} type {@link #IDENTITY_TYPE_ATTRIBUTE identity} provides 
	 * exactly one <sup>&#8224;</sup> bundle
	 * {@link Resource#getCapabilities(String) capability} (that is, the bundle
	 * can be required by another bundle). A fragment resource with the 
	 * {@link #IDENTITY_TYPE_FRAGMENT osgi.fragment} type 
	 * {@link #IDENTITY_TYPE_ATTRIBUTE identity} must not declare
	 * a bundle capability. A resource requires zero or more bundle
	 * {@link Resource#getRequirements(String) requirements} (that is, required
	 * bundles).
	 * <p>
	 * &#8224; A resource with no symbolic name must not provide a bundle
	 * capability.
	 */
	public static final String WIRING_BUNDLE_NAMESPACE = "osgi.wiring.bundle";

	/**
	 * Name space for host capabilities and requirements.
	 * 
	 * For capability attributes the following applies:
	 * <ul>
	 * <li>The
	 * <q>osgi.wiring.host</q> attribute contains the symbolic name of the
	 * bundle.
	 * <li>The {@link Constants#BUNDLE_VERSION_ATTRIBUTE bundle-version}
	 * attribute contains the {@link Version} of the bundle if one is specified
	 * or {@link Version#emptyVersion} if not specified.
	 * <li>All other attributes are of type {@link String} and are used as
	 * arbitrary matching attributes for the capability.
	 * </ul>
	 * <p>
	 * <p>
	 * A non-fragment resource with the with the {@link #IDENTITY_TYPE_BUNDLE
	 * osgi.bundle} type {@link #IDENTITY_TYPE_ATTRIBUTE identity} provides 
	 * zero or one <sup>&#8224;</sup> host
	 * {@link Resource#getCapabilities(String) capabilities}. 
	 * A fragment resource with the 
	 * {@link #IDENTITY_TYPE_FRAGMENT osgi.fragment} type 
	 * {@link #IDENTITY_TYPE_ATTRIBUTE identity} must not declare
	 * a host capability and must 
	 * {@link Resource#getRequirements(String) declare} exactly one host
	 * requirement.
	 * <p>
	 * &#8224; A resource with no bundle symbolic name must not provide a host
	 * capability.
	 */
	public static final String WIRING_HOST_NAMESPACE = "osgi.wiring.host";

	/**
	 * A requirement {@link Requirement#getDirectives() directive} used to
	 * specify a capability filter. This filter is used to match against a
	 * capability's {@link Capability#getAttributes() attributes}.
	 */
	public final static String REQUIREMENT_FILTER_DIRECTIVE = Constants.FILTER_DIRECTIVE;

	/**
	 * A requirement {@link Requirement#getDirectives() directive} used to
	 * specify the resolution type for a requirement. The default value is
	 * {@link #REQUIREMENT_RESOLUTION_MANDATORY mandatory}.
	 * 
	 * @see #REQUIREMENT_RESOLUTION_MANDATORY mandatory
	 * @see #REQUIREMENT_RESOLUTION_OPTIONAL optional
	 */
	public final static String REQUIREMENT_RESOLUTION_DIRECTIVE = Constants.RESOLUTION_DIRECTIVE;
	/**
	 * A directive value identifying a mandatory
	 * {@link Resource#getRequirements(String) requirement} resolution type. A
	 * mandatory resolution type indicates that the requirement must be resolved
	 * when the {@link Resource resource} is resolved. If such requirement
	 * cannot be resolved, the resource fails to resolve.
	 * 
	 * @see #REQUIREMENT_RESOLUTION_DIRECTIVE
	 */
	public final static String REQUIREMENT_RESOLUTION_MANDATORY = Constants.RESOLUTION_MANDATORY;

	/**
	 * A directive value identifying an optional
	 * {@link Resource#getRequirements(String) requirement} resolution type. An
	 * optional resolution type indicates that the requirement is optional and
	 * the {@link Resource resource} may be resolved without requirement being
	 * resolved.
	 * 
	 * @see #REQUIREMENT_RESOLUTION_DIRECTIVE
	 */
	public final static String REQUIREMENT_RESOLUTION_OPTIONAL = Constants.RESOLUTION_OPTIONAL;

	/**
	 * A requirement {@link Requirement#getDirectives() directive} used to
	 * specify the effective time for the requirement. The default value is
	 * {@link #EFFECTIVE_RESOLVE resolve}.
	 * 
	 * @see #EFFECTIVE_RESOLVE resolve
	 * @see #EFFECTIVE_ACTIVE active
	 */
	public final static String REQUIREMENT_EFFECTIVE_DIRECTIVE = Constants.EFFECTIVE_DIRECTIVE;

	/**
	 * A directive value identifying a {@link #CAPABILITY_EFFECTIVE_DIRECTIVE
	 * capability} or {@link #REQUIREMENT_EFFECTIVE_DIRECTIVE requirement} that
	 * is effective at resolve time. Capabilities and requirements with an
	 * effective time of resolve are the only capabilities which are processed
	 * while resolving a resource.
	 * 
	 * @see #REQUIREMENT_EFFECTIVE_DIRECTIVE
	 * @see #CAPABILITY_EFFECTIVE_DIRECTIVE
	 */
	public final static String EFFECTIVE_RESOLVE = Constants.EFFECTIVE_RESOLVE;

	/**
	 * A directive value identifying a {@link #CAPABILITY_EFFECTIVE_DIRECTIVE
	 * capability} or {@link #REQUIREMENT_EFFECTIVE_DIRECTIVE requirement} that
	 * is effective at active time. Capabilities and requirements with an
	 * effective time of active are ignored while resolving a resource.
	 * 
	 * @see #REQUIREMENT_EFFECTIVE_DIRECTIVE
	 * @see #CAPABILITY_EFFECTIVE_DIRECTIVE
	 */
	public final static String EFFECTIVE_ACTIVE = Constants.EFFECTIVE_ACTIVE;

	/**
	 * A requirement {@link Requirement#getDirectives() directive} used to
	 * specify the visibility type for a requirement. The default value is
	 * {@link #REQUIREMENT_VISIBILITY_PRIVATE private}. This directive must only
	 * be used for requirements with the require
	 * {@link #WIRING_BUNDLE_NAMESPACE bundle} name space.
	 * 
	 * @see #REQUIREMENT_VISIBILITY_PRIVATE private
	 * @see #REQUIREMENT_VISIBILITY_REEXPORT reexport
	 */
	public final static String REQUIREMENT_VISIBILITY_DIRECTIVE = Constants.VISIBILITY_DIRECTIVE;

	/**
	 * A directive value identifying a private
	 * {@link #REQUIREMENT_VISIBILITY_DIRECTIVE visibility} type. A private
	 * visibility type indicates that any {@link #WIRING_PACKAGE_NAMESPACE
	 * packages} that are exported by the required
	 * {@link #WIRING_BUNDLE_NAMESPACE bundle} are not made visible on the
	 * export signature of the requiring {@link #WIRING_BUNDLE_NAMESPACE bundle}
	 * .
	 * 
	 * @see #REQUIREMENT_VISIBILITY_DIRECTIVE
	 */
	public final static String REQUIREMENT_VISIBILITY_PRIVATE = Constants.VISIBILITY_PRIVATE;

	/**
	 * A directive value identifying a reexport
	 * {@link #REQUIREMENT_VISIBILITY_DIRECTIVE visibility} type. A reexport
	 * visibility type indicates any {@link #WIRING_PACKAGE_NAMESPACE packages}
	 * that are exported by the required {@link #WIRING_BUNDLE_NAMESPACE bundle}
	 * are re-exported by the requiring {@link #WIRING_BUNDLE_NAMESPACE bundle}.
	 */
	public final static String REQUIREMENT_VISIBILITY_REEXPORT = Constants.VISIBILITY_REEXPORT;

	/**
	 * A requirement {@link Requirement#getDirectives() directive} used to
	 * specify the cardinality for a requirement. The default value is
	 * {@link #REQUIREMENT_CARDINALITY_SINGULAR singular}.
	 * 
	 * @see #REQUIREMENT_CARDINALITY_MULTIPLE multiple
	 * @see #REQUIREMENT_CARDINALITY_SINGULAR singular
	 */
	public final static String REQUIREMENT_CARDINALITY_DIRECTIVE = "cardinality";

	/**
	 * A directive value identifying a multiple
	 * {@link #REQUIREMENT_CARDINALITY_DIRECTIVE cardinality} type.
	 */
	public final static String REQUIREMENT_CARDINALITY_MULTIPLE = "multiple";

	/**
	 * A directive value identifying a singular
	 * {@link #REQUIREMENT_CARDINALITY_DIRECTIVE cardinality} type.
	 */
	public final static String REQUIREMENT_CARDINALITY_SINGULAR = "singular";

	/**
	 * A capability {@link Capability#getDirectives() directive} used to specify
	 * the comma separated list of {@link #WIRING_PACKAGE_NAMESPACE package}
	 * names a capability uses.
	 */
	public final static String CAPABILITY_USES_DIRECTIVE = Constants.USES_DIRECTIVE;

	/**
	 * A capability {@link Capability#getDirectives() directive} used to specify
	 * the effective time for the capability. The default value is
	 * {@link #EFFECTIVE_RESOLVE resolve}.
	 * 
	 * @see #EFFECTIVE_RESOLVE resolve
	 * @see #EFFECTIVE_ACTIVE active
	 */
	public final static String CAPABILITY_EFFECTIVE_DIRECTIVE = Constants.EFFECTIVE_DIRECTIVE;

	/**
	 * A capability {@link Capability#getDirectives() directive} used to specify
	 * the comma separated list of mandatory attributes which must be specified
	 * in the {@link #REQUIREMENT_FILTER_DIRECTIVE filter} of a requirement in
	 * order for the capability to match the requirement. This directive must
	 * only be used for capabilities with the {@link #WIRING_PACKAGE_NAMESPACE
	 * package} name space.
	 */
	public final static String CAPABILITY_MANDATORY_DIRECTIVE = "mandatory";

	/**
	 * A capability {@link Capability#getDirectives() directive} used to specify
	 * the comma separated list of classes which must be allowed to be exported.
	 * This directive must only be used for capabilities with the
	 * {@link #WIRING_PACKAGE_NAMESPACE package} name space.
	 */
	public final static String CAPABILITY_INCLUDE_DIRECTIVE = "include";

	/**
	 * A capability {@link Capability#getDirectives() directive} used to specify
	 * the comma separated list of classes which must not be allowed to be
	 * exported. This directive must only be used for capabilities with the
	 * {@link #WIRING_PACKAGE_NAMESPACE package} name space.
	 */
	public final static String CAPABILITY_EXCLUDE_DIRECTIVE = "exclude";
}




/*
 * Copyright (c) OSGi Alliance (2011). All Rights Reserved.
 * 
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package org.osgi.framework.wiring;

/**
 * A wire connecting a {@link Capability} to a {@link Requirement}.
 * 
 * @ThreadSafe
 * @version $Id: 328ede0f8ddf3795594a8e0fc2cb11bbe7fa38fc $
 */
public interface Wire {
	/**
	 * Returns the {@link Capability} for this wire.
	 * 
	 * @return The {@link Capability} for this wire.
	 */
	Capability getCapability();

	/**
	 * Return the {@link Requirement} for this wire.
	 * 
	 * @return The {@link Requirement} for this wire.
	 */
	Requirement getRequirement();

	/**
	 * Return the providing {@link Resource resource} of the {@link #getCapability() capability}.
	 * <p>
	 * The resource returned may differ from the resource referenced by the {@link #getCapability()
	 * capability}.
	 * @return the providing {@link Resource resource}.
	 */
	Resource getProvider();

	/**
	 * Return the requiring {@link Resource resource} of the {@link #getRequirement() requirement}.
	 * <p>
	 * The resource returned my differ from the resource referenced by the {@link #getRequirement()
	 * requirement}
	 * @return the requiring {@link Resource resource}.
	 */
	Resource getRequirer();
}

Lines 1333-1339 Link Here

(-)resolver/src/org/eclipse/osgi/internal/module/ResolverImpl.java (-1 / +1 lines)
1333	if (namespace == null)	1333	if (namespace == null)
1334	capabilities = Collections.EMPTY_LIST;	1334	capabilities = Collections.EMPTY_LIST;
1335	else	1335	else
1336	capabilities = name == null \|\| "*".equals(name) ? namespace.getAllValues() : namespace.get(name); //$NON-NLS-1$	1336	capabilities = name == null \|\| name.indexOf('*') >= 0 ? namespace.getAllValues() : namespace.get(name);
1337	List<GenericCapability> candidates = new ArrayList<GenericCapability>(capabilities);	1337	List<GenericCapability> candidates = new ArrayList<GenericCapability>(capabilities);
1338	List<BundleCapability> genCapabilities = new ArrayList<BundleCapability>(candidates.size());	1338	List<BundleCapability> genCapabilities = new ArrayList<BundleCapability>(candidates.size());
1339	// Must remove candidates that do not match before calling hooks.	1339	// Must remove candidates that do not match before calling hooks.

Lines 156-160 Link Here

(-)resolver/src/org/eclipse/osgi/internal/resolver/BaseDescriptionImpl.java (+4 lines)
156	public String toString() {	156	public String toString() {
157	return getNamespace() + BaseDescriptionImpl.toString(getAttributes(), false) + BaseDescriptionImpl.toString(getDirectives(), true);	157	return getNamespace() + BaseDescriptionImpl.toString(getAttributes(), false) + BaseDescriptionImpl.toString(getDirectives(), true);
158	}	158	}
		159
		160	public BundleRevision getResource() {
		161	return getRevision();
		162	}
159	}	163	}
160	}	164	}

Lines 1031-1036 Link Here

(-)resolver/src/org/eclipse/osgi/internal/resolver/BundleDescriptionImpl.java (+18 lines)
1031	public String toString() {	1031	public String toString() {
1032	return getRequirement() + " -> " + getCapability(); //$NON-NLS-1$	1032	return getRequirement() + " -> " + getCapability(); //$NON-NLS-1$
1033	}	1033	}
		1034
		1035	public BundleRevision getProvider() {
		1036	return getCapability().getRevision();
		1037	}
		1038
		1039	public BundleRevision getRequirer() {
		1040	return getRequirement().getRevision();
		1041	}
1034	}	1042	}
1035		1043
1036	// Note that description wiring are identity equality based	1044	// Note that description wiring are identity equality based
Lines 1230-1233 Link Here
1230	return BundleDescriptionImpl.this.toString();	1238	return BundleDescriptionImpl.this.toString();
1231	}	1239	}
1232	}	1240	}
		1241
		1242	@SuppressWarnings({"cast", "unchecked", "rawtypes"})
		1243	public List<Capability> getCapabilities(String namespace) {
		1244	return (List<Capability>) (List) getDeclaredCapabilities(namespace);
		1245	}
		1246
		1247	@SuppressWarnings({"cast", "unchecked", "rawtypes"})
		1248	public List<Requirement> getRequirements(String namespace) {
		1249	return (List<Requirement>) (List) getDeclaredRequirements(namespace);
		1250	}
1233	}	1251	}




import org.eclipse.osgi.util.ManifestElement;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.*;
import org.osgi.framework.wiring.ResourceConstants;

/**
 * This class builds bundle description objects from manifests

		result.setGenericRequires(createGenericRequires(genericRequires, osgiRequires));
		ManifestElement[] genericCapabilities = getGenericCapabilities(manifest, genericAliases);
		ManifestElement[] osgiCapabilities = ManifestElement.parseHeader(Constants.PROVIDE_CAPABILITY, manifest.get(Constants.PROVIDE_CAPABILITY));
		result.setGenericCapabilities(createGenericCapabilities(genericCapabilities, osgiCapabilities, result));
		ManifestElement[] nativeCode = ManifestElement.parseHeader(Constants.BUNDLE_NATIVECODE, manifest.get(Constants.BUNDLE_NATIVECODE));
		result.setNativeCodeSpecification(createNativeCode(nativeCode));
		return result;

		return results;
	}

	private static GenericDescription[] createGenericCapabilities(ManifestElement[] equinoxCapabilities, ManifestElement[] osgiCapabilities, BundleDescription description) throws BundleException {
		List<GenericDescription> result = createEquinoxCapabilities(equinoxCapabilities);
		result = createOSGiCapabilities(osgiCapabilities, result, description);
		return result == null ? null : result.toArray(new GenericDescription[result.size()]);
	}

	private static List<GenericDescription> createOSGiCapabilities(ManifestElement[] osgiCapabilities, List<GenericDescription> result, BundleDescription description) throws BundleException {
		if (result == null)
			result = new ArrayList<GenericDescription>(osgiCapabilities == null ? 1 : osgiCapabilities.length + 1);
		// Always have an osgi.identity capability if there is a symbolic name.
		GenericDescription osgiIdentity = createOsgiIdentityCapability(description);
		if (osgiIdentity != null)
			// always add the capability to the front
			result.add(0, osgiIdentity);
		return createOSGiCapabilities(osgiCapabilities, result);
	}

	static List<GenericDescription> createOSGiCapabilities(ManifestElement[] osgiCapabilities, List<GenericDescription> result) throws BundleException {
		if (osgiCapabilities == null)
			return result;
		if (result == null)

			String[] namespaces = element.getValueComponents();
			types: for (String namespace : namespaces) {
				String effective = element.getDirective(Constants.EFFECTIVE_DIRECTIVE);
				// Any declared osgi.identity capability with an effective directive value of "resolve" will be overridden.
				if (effective != null && !Constants.EFFECTIVE_RESOLVE.equals(effective))
					break types; // ignore any namespace that is not effective at resolve time.
				if (ResourceConstants.IDENTITY_NAMESPACE.equals(namespace))
					throw new BundleException("A bundle is not allowed to define a capability in the " + ResourceConstants.IDENTITY_NAMESPACE + " name space."); //$NON-NLS-1$ //$NON-NLS-2$

				GenericDescriptionImpl desc = new GenericDescriptionImpl();
				desc.setType(namespace);
				Map<String, Object> mapAttrs = getAttributes(element, new String[0]);

		return result;
	}

	private static List<GenericDescription> createEquinoxCapabilities(ManifestElement[] equinoxCapabilities) throws BundleException {
		if (equinoxCapabilities == null)
			return null;
		ArrayList<GenericDescription> results = new ArrayList<GenericDescription>(equinoxCapabilities.length);

				if (colonIdx > 0) {
					name = genericNames[j].substring(0, colonIdx);
					desc.setType(genericNames[j].substring(colonIdx + 1));
					if (ResourceConstants.IDENTITY_NAMESPACE.equals(desc.getType()))
						throw new BundleException("A bundle is not allowed to define a capability in the " + ResourceConstants.IDENTITY_NAMESPACE + " name space."); //$NON-NLS-1$ //$NON-NLS-2$
				}
				Map<String, Object> mapAttrs = getAttributes(equinoxCapabilities[i], new String[] {Constants.VERSION_ATTRIBUTE});
				Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<String, Object>() : new Hashtable<String, Object>(mapAttrs);

			throw new BundleException(message + " : " + NLS.bind(StateMsg.HEADER_EXTENSION_ERROR, hostName), BundleException.MANIFEST_ERROR); //$NON-NLS-1$
		}
	}

	private static GenericDescription createOsgiIdentityCapability(BundleDescription description) {
		if (description.getSymbolicName() == null)
			return null;
		GenericDescriptionImpl result = new GenericDescriptionImpl();
		result.setType(ResourceConstants.IDENTITY_NAMESPACE);
		Dictionary<String, Object> attributes = new Hashtable<String, Object>();
		attributes.put(ResourceConstants.IDENTITY_NAMESPACE, description.getSymbolicName());
		attributes.put(ResourceConstants.IDENTITY_TYPE_ATTRIBUTE, description.getHost() == null ? ResourceConstants.IDENTITY_TYPE_BUNDLE : ResourceConstants.IDENTITY_TYPE_FRAGMENT);
		attributes.put(ResourceConstants.IDENTITY_VERSION_ATTRIBUTE, description.getVersion());
		result.setAttributes(attributes);
		Map<String, String> directives = new HashMap<String, String>();
		directives.put(ResourceConstants.IDENTITY_SINGLETON_DIRECTIVE, String.valueOf(description.isSingleton()));
		// The effective directive should be resolve
		directives.put(ResourceConstants.CAPABILITY_EFFECTIVE_DIRECTIVE, ResourceConstants.EFFECTIVE_RESOLVE);
		result.setDirectives(directives);
		return result;
	}
}

Lines 871-877 Link Here

(-)resolver/src/org/eclipse/osgi/internal/resolver/StateImpl.java (-1 / +5 lines)
871	}	871	}
872		872
873	private void addSystemCapabilities(List<GenericDescription> capabilities, ManifestElement[] elements) {	873	private void addSystemCapabilities(List<GenericDescription> capabilities, ManifestElement[] elements) {
874	StateBuilder.createOSGiCapabilities(elements, capabilities);	874	try {
		875	StateBuilder.createOSGiCapabilities(elements, capabilities);
		876	} catch (BundleException e) {
		877	throw new RuntimeException("Unexpected exception adding system capabilities.", e); //$NON-NLS-1$
		878	}
875	}	879	}
876		880
877	@SuppressWarnings("rawtypes")	881	@SuppressWarnings("rawtypes")




		public String toString() {
			return getNamespace() + BaseDescriptionImpl.toString(getAttributes(), false) + BaseDescriptionImpl.toString(getDirectives(), true);
		}

		public boolean matches(Capability capability) {
			if (!(capability instanceof BundleCapability))
				return false;
			return matches((BundleCapability) capability);
		}

		public BundleRevision getResource() {
			return getRevision();
		}
	}

	static StringBuffer addFilterAttributes(StringBuffer filter, Map<String, ?> attributes) {




/*******************************************************************************
 * Copyright (c) 2003, 2011 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

 *******************************************************************************/
package org.eclipse.osgi.tests.services.resolver;

import java.util.*;
import java.util.Hashtable;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.osgi.service.resolver.*;

import org.osgi.framework.Constants;

public class GenericCapabilityTest extends AbstractStateTest {
	static final String GENERIC_REQUIRE = "Eclipse-GenericRequire"; //$NON-NLS-1$
	static final String GENERIC_CAPABILITY = "Eclipse-GenericCapability"; //$NON-NLS-1$

	public static Test suite() {
		return new TestSuite(GenericCapabilityTest.class);

		Hashtable manifest = new Hashtable();
		long bundleID = 0;
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer capabililty = new StringBuffer();
		capabililty.append("foo; version=\"1.3.1\"; attr1=\"value1\"; attr2=\"value2\",");

		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericRequire");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer required = new StringBuffer();
		required.append("genericCapability:osgi.identity; selection-filter=\"(version=1.0)\",");
		required.append("foo; selection-filter=\"(version>=1.3.0)\",");
		required.append("bar:bartype; selection-filter=\"(attr1=value1)\",");
		required.append("test.types:testtype; selection-filter=\"(&(aVersion>=2.0.0)(aLong>=5555)(aDouble>=1.00)(aUri=file:/test)(aSet=c)(aString=someString))\"");

		assertTrue("1.0", genCap.isResolved());
		assertTrue("1.1", genReq.isResolved());
		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		assertTrue("2.0", genSpecs.length == 4);
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), genCap.getGenericCapabilities()[0]);
		assertTrue("2.2", genSpecs[1].isResolved());
		assertEquals("2.2.1", genSpecs[1].getSupplier(), genCap.getGenericCapabilities()[1]);
		assertTrue("2.3", genSpecs[2].isResolved());
		assertEquals("2.3.1", genSpecs[2].getSupplier(), genCap.getGenericCapabilities()[2]);
		assertTrue("2.4", genSpecs[3].isResolved());
		assertEquals("2.4.1", genSpecs[3].getSupplier(), genCap.getGenericCapabilities()[3]);
	}

	public void testGenericsUpdate() throws BundleException {

		Hashtable manifest = new Hashtable();
		long bundleID = 0;
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer capabililty = new StringBuffer();
		capabililty.append("foo; version=\"1.3.1\"; attr1=\"value1\"; attr2=\"value2\",");

		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericRequire");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer required = new StringBuffer();
		required.append("genericCapability:osgi.identity; selection-filter=\"(version>=1.0)\",");
		required.append("foo; selection-filter=\"(version>=1.3.0)\",");
		required.append("bar:bartype; selection-filter=\"(attr1=value1)\",");
		required.append("test.types:testtype; selection-filter=\"(&(aVersion>=2.0.0)(aLong>=5555)(aDouble>=1.00)(aUri=file:/test)(aSet=c)(aString=someString))\"");

		assertTrue("1.0", genCap.isResolved());
		assertTrue("1.1", genReq.isResolved());
		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		assertTrue("2.0", genSpecs.length == 4);
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), genCap.getGenericCapabilities()[0]);
		assertTrue("2.2", genSpecs[1].isResolved());
		assertEquals("2.2.1", genSpecs[1].getSupplier(), genCap.getGenericCapabilities()[1]);
		assertTrue("2.3", genSpecs[2].isResolved());
		assertEquals("2.3.1", genSpecs[2].getSupplier(), genCap.getGenericCapabilities()[2]);
		assertTrue("2.4", genSpecs[3].isResolved());
		assertEquals("2.4.1", genSpecs[3].getSupplier(), genCap.getGenericCapabilities()[3]);

		manifest.clear();
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "2.0.0");
		capabililty = new StringBuffer();
		capabililty.append("foo; version=\"1.3.2\"; attr1=\"value1\"; attr2=\"value2\",");

		assertTrue("3.0", genCap2.isResolved());
		assertTrue("3.1", genReq.isResolved());
		genSpecs = genReq.getGenericRequires();
		assertTrue("4.0", genSpecs.length == 4);
		assertTrue("4.1", genSpecs[0].isResolved());
		assertEquals("4.1.1", genSpecs[0].getSupplier(), genCap2.getGenericCapabilities()[0]);
		assertTrue("4.2", genSpecs[1].isResolved());
		assertEquals("4.2.1", genSpecs[1].getSupplier(), genCap2.getGenericCapabilities()[1]);
		assertTrue("4.3", genSpecs[2].isResolved());
		assertEquals("4.3.1", genSpecs[2].getSupplier(), genCap2.getGenericCapabilities()[2]);
		assertTrue("4.4", genSpecs[3].isResolved());
		assertEquals("4.4.1", genSpecs[3].getSupplier(), genCap2.getGenericCapabilities()[3]);

	}


		Hashtable manifest = new Hashtable();
		long bundleID = 0;
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer capabililty = new StringBuffer();
		capabililty.append("foo; version=\"1.3.1\"; attr1=\"value1\"; attr2=\"value2\",");

		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericRequire");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer required = new StringBuffer();
		required.append("genericCapability:osgi.identity; selection-filter=\"(version>=1.0)\",");
		required.append("foo; selection-filter=\"(version>=1.3.0)\",");
		required.append("bar:bartype; selection-filter=\"(attr1=value1)\",");
		required.append("test.types:testtype; selection-filter=\"(&(aVersion>=2.0.0)(aLong>=5555)(aDouble>=1.00)(aUri=file:/test)(aSet=c)(aString=someString))\"");

		assertTrue("1.0", genCap.isResolved());
		assertTrue("1.1", genReq.isResolved());
		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		assertTrue("2.0", genSpecs.length == 4);
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), genCap.getGenericCapabilities()[0]);
		assertTrue("2.2", genSpecs[1].isResolved());
		assertEquals("2.2.1", genSpecs[1].getSupplier(), genCap.getGenericCapabilities()[1]);
		assertTrue("2.3", genSpecs[2].isResolved());
		assertEquals("2.3.1", genSpecs[2].getSupplier(), genCap.getGenericCapabilities()[2]);
		assertTrue("2.4", genSpecs[3].isResolved());
		assertEquals("2.4.1", genSpecs[3].getSupplier(), genCap.getGenericCapabilities()[3]);

		state.resolve(new BundleDescription[] {genCap});

		assertTrue("3.0", genCap.isResolved());
		assertTrue("3.1", genReq.isResolved());
		genSpecs = genReq.getGenericRequires();
		assertTrue("4.0", genSpecs.length == 4);
		assertTrue("4.1", genSpecs[0].isResolved());
		assertEquals("4.1.1", genSpecs[0].getSupplier(), genCap.getGenericCapabilities()[0]);
		assertTrue("4.2", genSpecs[1].isResolved());
		assertEquals("4.2.1", genSpecs[1].getSupplier(), genCap.getGenericCapabilities()[1]);
		assertTrue("4.3", genSpecs[2].isResolved());
		assertEquals("4.3.1", genSpecs[2].getSupplier(), genCap.getGenericCapabilities()[2]);
		assertTrue("4.4", genSpecs[3].isResolved());
		assertEquals("4.4.1", genSpecs[3].getSupplier(), genCap.getGenericCapabilities()[3]);

	}


		long bundleID = 0;

		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer capabililty = new StringBuffer();
		capabililty.append("foo; version=\"1.3.1\"; attr1=\"value1\"; attr2=\"value2\",");

		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability.frag1");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		manifest.put(Constants.FRAGMENT_HOST, "genericCapability;bundle-version=\"[1.0.0,2.0.0)\"");
		capabililty = new StringBuffer();
		capabililty.append("fragmentStuff");
		manifest.put(GENERIC_CAPABILITY, capabililty.toString());

		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericRequire");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer required = new StringBuffer();
		required.append("genericCapability:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.bundle))\",");
		required.append("foo; selection-filter=\"(version>=1.3.0)\",");
		required.append("bar:bartype; selection-filter=\"(attr1=value1)\",");
		required.append("test.types:testtype; selection-filter=\"(&(aVersion>=2.0.0)(aLong>=5555)(aDouble>=1.00)(aUri=file:/test)(aSet=c)(aString=someString))\",");
		required.append("genericCapability.frag1:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.fragment))\",");
		required.append("fragmentStuff");
		manifest.put(GENERIC_REQUIRE, required.toString());
		BundleDescription genReq = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);

		assertTrue("1.2", genCapFrag.isResolved());
		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		GenericDescription[] selectedCapabilities = genCap.getSelectedGenericCapabilities();
		assertTrue("2.0", genSpecs.length == 6);
		assertEquals("Wrong number of selected capabilities", 6, selectedCapabilities.length);
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), selectedCapabilities[0]);
		assertTrue("2.2", genSpecs[1].isResolved());

		assertEquals("2.3.1", genSpecs[2].getSupplier(), selectedCapabilities[2]);
		assertTrue("2.4", genSpecs[3].isResolved());
		assertEquals("2.4.1", genSpecs[3].getSupplier(), selectedCapabilities[3]);
		assertTrue("2.5", genSpecs[4].isResolved());
		assertEquals("2.5.1", genSpecs[4].getSupplier(), selectedCapabilities[4]);
		assertTrue("2.6", genSpecs[5].isResolved());
		assertEquals("2.6.1", genSpecs[5].getSupplier(), selectedCapabilities[5]);
	}

	public void testGenericsIntraFrags() throws BundleException {

		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "org.eclipse.equinox.generic.frag.b");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		manifest.put(Constants.FRAGMENT_HOST, "org.eclipse.equinox.generic.host;bundle-version=\"1.0.0\"");
		StringBuffer required = new StringBuffer();
		required.append("org.eclipse.equinox.generic.host:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.bundle))\",");
		required.append("frag.a,");
		required.append("org.eclipse.equinox.generic.frag.a:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.fragment))\",");
		required.append("org.eclipse.equinox.generic.frag.b:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.fragment))\"");
		manifest.put(GENERIC_REQUIRE, required.toString());
		BundleDescription genFragB = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);

		state.addBundle(genHost);

		assertTrue("1.2", genFragB.isResolved());
		GenericSpecification[] genSpecs = genFragB.getGenericRequires();
		GenericDescription[] selected = genHost.getSelectedGenericCapabilities();
		assertEquals("Wrong number of selected", 1 + 3, selected.length); // + 3 for host frabA and fragB osgi.identity cap
		assertTrue("2.0", genSpecs.length == 4);
		Collection providedCollection = new ArrayList(Arrays.asList(selected));
		for (int i = 0; i < genSpecs.length; i++) {
			assertTrue("2.1." + i, genSpecs[i].isResolved());
			assertTrue("Wrong provider for requirement: " + genSpecs[i], providedCollection.remove(genSpecs[i].getSupplier()));
		}
	}

	public void testGenericsAliases() throws BundleException {

		Hashtable manifest = new Hashtable();
		long bundleID = 0;
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		manifest.put(Constants.EXPORT_SERVICE, "org.osgi.service.log.LogService; version=1.2");
		manifest.put("TJW-Export", "my.great.stuff; aLong:long=5150; aDouble:double=3.14; aVersion:version=1.2.0");

		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		manifest.put(Constants.IMPORT_SERVICE, "org.osgi.service.log.LogService; selection-filter=(version>=1.0.0)");
		manifest.put("TJW-Import", "my.great.stuff; selection-filter=(&(aLong<=10000)(aLong>=5000))");
		manifest.put(GENERIC_REQUIRE, "genericCapability:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.bundle))\"");
		BundleDescription genReq = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);

		state.addBundle(genCap);

		assertTrue("1.0", genCap.isResolved());
		assertTrue("1.1", genReq.isResolved());
		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		assertTrue("2.0", genSpecs.length == 3);
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), genCap.getGenericCapabilities()[1]);
		assertTrue("2.2", genSpecs[1].isResolved());
		assertEquals("2.2.1", genSpecs[1].getSupplier(), genCap.getGenericCapabilities()[2]);
		assertTrue("2.3", genSpecs[2].isResolved());
		assertEquals("2.3.1", genSpecs[2].getSupplier(), genCap.getGenericCapabilities()[0]);
	}

	public void testGenericsOptionalMultiple() throws BundleException {

		Hashtable manifest = new Hashtable();
		long bundleID = 0;
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer capabililty = new StringBuffer();
		capabililty.append("foo; version=\"1.3.1\"; attr1=\"value1\"; attr2=\"value2\",");

		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericRequire");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer required = new StringBuffer();
		required.append("genericCapability:osgi.identity; selection-filter=\"(&(version=1.0.0)(type=osgi.bundle))\",");
		required.append("foo; selection-filter=\"(version>=1.3.0)\",");
		required.append("bar:bartype; selection-filter=\"(attr1=value1)\",");
		required.append("test.types:testtype; selection-filter=\"(&(aVersion>=2.0.0)(aLong>=5555)(aDouble>=1.00)(aUri=file:/test)(aSet=c)(aString=someString))\",");

		assertTrue("1.0", genCap.isResolved());
		assertTrue("1.1", genReq.isResolved());
		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		assertTrue("2.0", genSpecs.length == 7);
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), genCap.getGenericCapabilities()[0]);
		assertTrue("2.2", genSpecs[1].isResolved());
		assertEquals("2.2.1", genSpecs[1].getSupplier(), genCap.getGenericCapabilities()[1]);
		assertTrue("2.3", genSpecs[2].isResolved());
		assertEquals("2.3.1", genSpecs[2].getSupplier(), genCap.getGenericCapabilities()[2]);
		assertTrue("2.3", genSpecs[3].isResolved());
		assertEquals("2.3.1", genSpecs[3].getSupplier(), genCap.getGenericCapabilities()[3]);
		assertFalse("2.4", genSpecs[4].isResolved());
		assertTrue("2.5", genSpecs[5].isResolved());
		assertEquals("2.5.1", genSpecs[5].getSupplier(), genCap.getGenericCapabilities()[4]);
		assertTrue("2.6", genSpecs[6].isResolved());
		GenericDescription[] suppliers = genSpecs[6].getSuppliers();
		assertTrue("2.6.1", suppliers != null && suppliers.length == 2);
		assertEquals("2.6.2", suppliers[0], genCap.getGenericCapabilities()[6]);
		assertEquals("2.6.3", suppliers[1], genCap.getGenericCapabilities()[5]);
	}

	public void testGenericsCycles() throws BundleException {

		GenericSpecification[] genSpecs = genReq.getGenericRequires();
		GenericDescription[] selected = genCap.getSelectedGenericCapabilities();
		assertTrue("2.0", genSpecs.length == 4);
		assertEquals("Wrong number of selected", 4 + 2, selected.length); // + 2 for host and frag osgi.identity caps
		assertTrue("2.1", genSpecs[0].isResolved());
		assertEquals("2.1.1", genSpecs[0].getSupplier(), selected[1]);
		assertTrue("2.2", genSpecs[1].isResolved());
		assertEquals("2.2.1", genSpecs[1].getSupplier(), selected[2]);
		assertTrue("2.3", genSpecs[2].isResolved());
		assertEquals("2.3.1", genSpecs[2].getSupplier(), selected[3]);
		assertTrue("2.4", genSpecs[3].isResolved());
		assertEquals("2.4.1", genSpecs[3].getSupplier(), selected[5]);
		genSpecs = genCap.getGenericRequires();
		assertTrue("3.0", genSpecs.length == 1);
		assertTrue("3.1", genSpecs[0].isResolved());
		assertEquals("3.1.1", genSpecs[0].getSupplier(), genReq.getGenericCapabilities()[1]);
	}
}




/*******************************************************************************
 * Copyright (c) 2010, 2011 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

import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.*;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.osgi.framework.util.Headers;

		assertTrue("c2", c2.isResolved());
		assertTrue("c3", c3.isResolved());

		checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
		checkGenericBasics(4, c2.getResolvedGenericRequires(), p2.getSelectedGenericCapabilities());
		checkGenericBasics(4, c3.getResolvedGenericRequires(), p3.getSelectedGenericCapabilities());

		File stateDir = getContext().getDataFile(getName()); //$NON-NLS-1$
		stateDir.mkdirs();

		assertTrue("c2", c2.isResolved());
		assertTrue("c3", c3.isResolved());

		checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
		checkGenericBasics(4, c2.getResolvedGenericRequires(), p2.getSelectedGenericCapabilities());
		checkGenericBasics(4, c3.getResolvedGenericRequires(), p3.getSelectedGenericCapabilities());
	}

	private void checkGenericBasics(int expectedCnt, GenericDescription[] genRequired, GenericDescription[] genProvided) {
		assertEquals("Expected number of capabilities do not match", expectedCnt, genRequired.length);
		assertEquals("Specs do not match Descs", genRequired.length, genProvided.length);
		Collection providedCollection = new ArrayList(Arrays.asList(genProvided));
		for (int i = 0; i < genRequired.length; i++) {
			assertTrue("Wrong provider for requirement: " + genRequired[i], providedCollection.remove(genRequired[i]));
		}
	}


		assertTrue("c1Frag", c1Frag.isResolved());
		assertTrue("p4", p4.isResolved());

		checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());

		File stateDir = getContext().getDataFile(getName()); //$NON-NLS-1$
		stateDir.mkdirs();

		assertTrue("c1Frag", c1Frag.isResolved());
		assertTrue("p4", p4.isResolved());

		checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());

		state.setResolver(platformAdmin.createResolver());
		state.resolve(new BundleDescription[] {p1});

		assertTrue("c1Frag", c1Frag.isResolved());
		assertTrue("p4", p4.isResolved());

		checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
	}

	public void testGenericFragments02() throws BundleException {

		assertTrue("c1", c1.isResolved());
		assertFalse("c1Frag", c1Frag.isResolved());

		checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());

		File stateDir = getContext().getDataFile(getName() + 1); //$NON-NLS-1$
		stateDir.mkdirs();

		assertTrue("c1", c1.isResolved());
		assertFalse("c1Frag", c1Frag.isResolved());

		checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());

		manifest = loadManifest("p4.osgi.MF");
		BundleDescription p4 = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);

		assertTrue("c1Frag", c1Frag.isResolved());
		assertTrue("p4", p4.isResolved());

		checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());

		stateDir = getContext().getDataFile(getName() + 2); //$NON-NLS-1$
		stateDir.mkdirs();

		assertTrue("c1Frag", c1Frag.isResolved());
		assertTrue("p4", p4.isResolved());

		checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
	}

	public void testGenericUses() throws BundleException {

		checkUsedCapability(c4v130, p5v100Capability);
	}

	public void testDeclaringIdentityCapability() throws BundleException {
		State state = buildEmptyState();
		Hashtable manifest = new Hashtable();
		long bundleID = 0;
		manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		StringBuffer capabililty = new StringBuffer();
		capabililty.append("testFailure:osgi.identity; test=failure");
		manifest.put(GenericCapabilityTest.GENERIC_CAPABILITY, capabililty.toString());

		try {
			state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
			fail("Expected failure to create description that specifies osgi.identity capability");
		} catch (BundleException e) {
			// expected
		}

		manifest.remove(GenericCapabilityTest.GENERIC_CAPABILITY);
		manifest.put(Constants.PROVIDE_CAPABILITY, "osgi.identity; osgi.identity=testFailure; test=failure");
		try {
			state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
			fail("Expected failure to create description that specifies osgi.identity capability");
		} catch (BundleException e) {
			// expected
		}
	}

	private void checkUsedImports(BundleDescription importer, ExportPackageDescription[] expectedPackages) {
		ExportPackageDescription[] imported = importer.getResolvedImports();
		assertEquals("Wrong number of imports for bundle: " + importer, expectedPackages.length, imported.length);

	private void checkUsedCapability(BundleDescription requirer, GenericDescription[] expectedCapabilities) {
		GenericDescription[] required = requirer.getResolvedGenericRequires();
		assertEquals("Wrong number of capabilities for bundle: " + requirer, expectedCapabilities.length, required.length);
		Collection providedCollection = new ArrayList(Arrays.asList(expectedCapabilities));
		for (int i = 0; i < required.length; i++) {
			assertTrue("Wrong provider for requirement: " + required[i], providedCollection.remove(required[i]));
		}
	}
}

Lines 17-20 Link Here

(-)test_files/genericCapability/c1.equinox.MF (-1 / +3 lines)
17	selection-filter="(&(rank>=100)(!(rank>=200))	17	selection-filter="(&(rank>=100)(!(rank>=200))
18	(percent>=0.1)(!(percent>=0.2))	18	(percent>=0.1)(!(percent>=0.2))
19	(test.version>=1.0)(!(test.version>=2.0))	19	(test.version>=1.0)(!(test.version>=2.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	*:osgi.identity;
		22	selection-filter="(&(osgi.identity=p1.*)(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c1.equinox.name.MF (-1 / +3 lines)
17	selection-filter="(&(rank>=100)(!(rank>=200))	17	selection-filter="(&(rank>=100)(!(rank>=200))
18	(percent>=0.1)(!(percent>=0.2))	18	(percent>=0.1)(!(percent>=0.2))
19	(test.version>=1.0)(!(test.version>=2.0))	19	(test.version>=1.0)(!(test.version>=2.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	p1.*:osgi.identity;
		22	selection-filter="(&(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c1.osgi.MF (-1 / +3 lines)
17	filter:="(&(rank>=100)(!(rank>=200))	17	filter:="(&(rank>=100)(!(rank>=200))
18	(percent>=0.1)(!(percent>=0.2))	18	(percent>=0.1)(!(percent>=0.2))
19	(test.version>=1.0)(!(test.version>=2.0))	19	(test.version>=1.0)(!(test.version>=2.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	osgi.identity;
		22	filter:="(&(osgi.identity=p1.*)(version=1.0)(type=osgi.bundle))"

Lines 8-11 Link Here

(-)test_files/genericCapability/c1.osgi.frag.MF (-1 / +3 lines)
8	filter:="(&(rank>=100)(!(rank>=200))	8	filter:="(&(rank>=100)(!(rank>=200))
9	(percent>=0.1)(!(percent>=0.2))	9	(percent>=0.1)(!(percent>=0.2))
10	(test.version>=1.0)(!(test.version>=2.0))	10	(test.version>=1.0)(!(test.version>=2.0))
11	(test.string~=abc))"	11	(test.string~=abc))",
		12	osgi.identity;
		13	filter:="(&(osgi.identity=p1.*.frag)(version=1.0)(type=osgi.fragment))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c2.equinox.MF (-1 / +3 lines)
17	selection-filter="(&(rank>=200)(!(rank>=300))	17	selection-filter="(&(rank>=200)(!(rank>=300))
18	(percent>=0.2)(!(percent>=0.3))	18	(percent>=0.2)(!(percent>=0.3))
19	(test.version>=2.0)(!(test.version>=3.0))	19	(test.version>=2.0)(!(test.version>=3.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	*:osgi.identity;
		22	selection-filter="(&(osgi.identity=p2.*)(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c2.equinox.name.MF (-1 / +3 lines)
17	selection-filter="(&(rank>=200)(!(rank>=300))	17	selection-filter="(&(rank>=200)(!(rank>=300))
18	(percent>=0.2)(!(percent>=0.3))	18	(percent>=0.2)(!(percent>=0.3))
19	(test.version>=2.0)(!(test.version>=3.0))	19	(test.version>=2.0)(!(test.version>=3.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	p2.*:osgi.identity;
		22	selection-filter="(&(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c2.osgi.MF (-1 / +3 lines)
17	filter:="(&(rank>=200)(!(rank>=300))	17	filter:="(&(rank>=200)(!(rank>=300))
18	(percent>=0.2)(!(percent>=0.3))	18	(percent>=0.2)(!(percent>=0.3))
19	(test.version>=2.0)(!(test.version>=3.0))	19	(test.version>=2.0)(!(test.version>=3.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	osgi.identity;
		22	filter:="(&(osgi.identity=p2.*)(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c3.equinox.MF (-1 / +3 lines)
17	selection-filter="(&(rank>=300)(!(rank>=400))	17	selection-filter="(&(rank>=300)(!(rank>=400))
18	(percent>=0.3)(!(percent>=0.4))	18	(percent>=0.3)(!(percent>=0.4))
19	(test.version>=3.0)(!(test.version>=4.0))	19	(test.version>=3.0)(!(test.version>=4.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	*:osgi.identity;
		22	selection-filter="(&(osgi.identity=p3.*)(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c3.equinox.name.MF (-1 / +3 lines)
17	selection-filter="(&(rank>=300)(!(rank>=400))	17	selection-filter="(&(rank>=300)(!(rank>=400))
18	(percent>=0.3)(!(percent>=0.4))	18	(percent>=0.3)(!(percent>=0.4))
19	(test.version>=3.0)(!(test.version>=4.0))	19	(test.version>=3.0)(!(test.version>=4.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	p3.*:osgi.identity;
		22	selection-filter="(&(version=1.0)(type=osgi.bundle))"

Lines 17-20 Link Here

(-)test_files/genericCapability/c3.osgi.MF (-1 / +3 lines)
17	filter:="(&(rank>=300)(!(rank>=400))	17	filter:="(&(rank>=300)(!(rank>=400))
18	(percent>=0.3)(!(percent>=0.4))	18	(percent>=0.3)(!(percent>=0.4))
19	(test.version>=3.0)(!(test.version>=4.0))	19	(test.version>=3.0)(!(test.version>=4.0))
20	(test.string~=abc))"	20	(test.string~=abc))",
		21	osgi.identity;
		22	filter:="(&(osgi.identity=p3.*)(version=1.0)(type=osgi.bundle))"

Lines 3-7 Link Here

(-)test_files/genericCapability/c4.v100.osgi.MF (-1 / +2 lines)
3	Bundle-SymbolicName: c4.osgi	3	Bundle-SymbolicName: c4.osgi
4	Bundle-Version: 1.0	4	Bundle-Version: 1.0
5	Require-Capability:	5	Require-Capability:
6	namespace.5; filter:="(version=1.0)"	6	namespace.5; filter:="(version=1.0)",
		7	osgi.identity; filter:="(&(osgi.identity=p5.osgi)(version=1.0)(type=osgi.bundle))"
7	Import-Package: p6, p7	8	Import-Package: p6, p7

Lines 3-7 Link Here

(-)test_files/genericCapability/c4.v110.osgi.MF (-1 / +2 lines)
3	Bundle-SymbolicName: c4.osgi	3	Bundle-SymbolicName: c4.osgi
4	Bundle-Version: 1.1	4	Bundle-Version: 1.1
5	Require-Capability:	5	Require-Capability:
6	namespace.5; filter:="(namespace.5=test)"	6	namespace.5; filter:="(namespace.5=test)",
		7	osgi.identity; filter:="(&(osgi.identity=p5.osgi)(version=1.0)(type=osgi.bundle))"
7	Import-Package: p6; p7; version="[1.0,1.1)"	8	Import-Package: p6; p7; version="[1.0,1.1)"

Lines 3-7 Link Here

(-)test_files/genericCapability/c4.v120.osgi.MF (-1 / +2 lines)
3	Bundle-SymbolicName: c4.osgi	3	Bundle-SymbolicName: c4.osgi
4	Bundle-Version: 1.2	4	Bundle-Version: 1.2
5	Require-Capability:	5	Require-Capability:
6	namespace.5; filter:="(version=1.0)"	6	namespace.5; filter:="(version=1.0)",
		7	osgi.identity; filter:="(&(osgi.identity=p5.osgi)(version=1.0)(type=osgi.bundle))"
7	DynamicImport-Package: p6, p7	8	DynamicImport-Package: p6, p7

Lines 3-7 Link Here

(-)test_files/genericCapability/c4.v130.osgi.MF (-1 / +2 lines)
3	Bundle-SymbolicName: c4.osgi	3	Bundle-SymbolicName: c4.osgi
4	Bundle-Version: 1.3	4	Bundle-Version: 1.3
5	Require-Capability:	5	Require-Capability:
6	namespace.5; filter:="(version=1.0)"	6	namespace.5; filter:="(version=1.0)",
		7	osgi.identity; filter:="(&(osgi.identity=p5.osgi)(version=1.0)(type=osgi.bundle))"
7	Require-Bundle: p6.osgi, p7.osgi	8	Require-Bundle: p6.osgi, p7.osgi

Return to bug 349618

Lines 18-32 Link Here

(-)osgi/src/org/osgi/framework/wiring/BundleCapability.java (-2 / +5 lines)
18		18
19	import java.util.Map;	19	import java.util.Map;
20		20
		21
21	/**	22	/**
22	* A capability that has been declared from a {@link BundleRevision bundle	23	* A capability that has been declared from a {@link BundleRevision bundle
23	* revision}.	24	* revision}.
24	*	25	*
25	* @ThreadSafe	26	* @ThreadSafe
26	* @noimplement	27	* @noimplement
27	* @version $Id: 0fde13c3228af1aa97872b37ccf0aa6e23123b11 $	28	* @version $Id: 6bbc1e645f927531d40fb245c95f5d26ad189db3 $
28	*/	29	*/
29	public interface BundleCapability {	30	public interface BundleCapability extends Capability{
30	/**	31	/**
31	* Returns the name space of this capability.	32	* Returns the name space of this capability.
32	*	33	*
Lines 58-61 Link Here
58	* @return The bundle revision declaring this capability.	59	* @return The bundle revision declaring this capability.
59	*/	60	*/
60	BundleRevision getRevision();	61	BundleRevision getRevision();
		62
		63	BundleRevision getResource();
61	}	64	}

Lines 16-29 Link Here

(-)osgi/src/org/osgi/framework/wiring/BundleWire.java (-2 / +13 lines)
16		16
17	package org.osgi.framework.wiring;	17	package org.osgi.framework.wiring;
18		18
		19
19	/**	20	/**
20	* A wire connecting a {@link BundleCapability} to a {@link BundleRequirement}.	21	* A wire connecting a {@link BundleCapability} to a {@link BundleRequirement}.
21	*	22	*
22	* @ThreadSafe	23	* @ThreadSafe
23	* @noimplement	24	* @noimplement
24	* @version $Id: 4f936a84065762ec3267a44f86ae01b0150e44ce $	25	* @version $Id: aca8642cea91995d0b178129cba1131ed327c7e7 $
25	*/	26	*/
26	public interface BundleWire {	27	public interface BundleWire extends Wire {
27	/**	28	/**
28	* Returns the {@link BundleCapability} for this wire.	29	* Returns the {@link BundleCapability} for this wire.
29	*	30	*
Lines 69-72 Link Here
69	* returned.	70	* returned.
70	*/	71	*/
71	BundleWiring getRequirerWiring();	72	BundleWiring getRequirerWiring();
		73
		74	/**
		75	* {@inheritDoc}
		76	*/
		77	BundleRevision getProvider();
		78
		79	/**
		80	* {@inheritDoc}
		81	*/
		82	BundleRevision getRequirer();
72	}	83	}

Added Link Here

(-)osgi/src/org/osgi/framework/wiring/Capability.java (+82 lines)
1	/*
2	* Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16
17	package org.osgi.framework.wiring;
18
19	import java.util.Map;
20
21	/**
22	* A capability that has been declared from a {@link Resource}.
23	*
24	* @ThreadSafe
25	* @version $Id: f8bd10002691537806e4bc3cf08f3fce37510121 $
26	*/
27	public interface Capability {
28
29	/**
30	* Returns the name space of this capability.
31	*
32	* @return The name space of this capability.
33	*/
34	String getNamespace();
35
36	/**
37	* Returns the directives of this capability. Only the following list of
38	* directives have semantic meaning in the returned {@link Map map} of
39	* directives:
40	* <ul>
41	* <li> {@link ResourceConstants#CAPABILITY_EFFECTIVE_DIRECTIVE effective}
42	* <li> {@link ResourceConstants#CAPABILITY_USES_DIRECTIVE uses}
43	* <li> {@link ResourceConstants#CAPABILITY_MANDATORY_DIRECTIVE mandatory} -
44	* only recognized for the
45	* {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE osgi.wiring.bundle} and
46	* {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package}
47	* name spaces.
48	* <li> {@link ResourceConstants#CAPABILITY_EXCLUDE_DIRECTIVE exclude} -
49	* only recognized for the
50	* {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package}
51	* name space.
52	* <li> {@link ResourceConstants#CAPABILITY_INCLUDE_DIRECTIVE include} -
53	* only recognized for the
54	* {@link ResourceConstants#WIRING_PACKAGE_NAMESPACE osgi.wiring.package}
55	* name space.
56	* </ul>
57	* All other directive are considered extra user defined information that
58	* has no semantic meaning. OSGi Alliance reserves the right to extend the
59	* set of directives which have semantic meaning.
60	*
61	* @return An unmodifiable map of directive names to directive values for
62	* this capability, or an empty map if this capability has no
63	* directives.
64	*/
65	Map<String, String> getDirectives();
66
67	/**
68	* Returns the attributes of this capability.
69	*
70	* @return An unmodifiable map of attribute names to attribute values for
71	* this capability, or an empty map if this capability has no
72	* attributes.
73	*/
74	Map<String, Object> getAttributes();
75
76	/**
77	* The resource that declares this capability.
78	*
79	* @return the resource
80	*/
81	Resource getResource();
82	}

Added Link Here

(-)osgi/src/org/osgi/framework/wiring/Requirement.java (+104 lines)
1	/*
2	* Copyright (c) OSGi Alliance (2010, 2011). All Rights Reserved.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16
17	package org.osgi.framework.wiring;
18
19	import java.util.Map;
20
21	import org.osgi.framework.Constants;
22
23	/**
24	* A requirement that has been declared from a {@link Resource} .
25	*
26	* @ThreadSafe
27	* @version $Id: 6a5c3253e257d6f503a39d94563d7d656ce05e1d $
28	*/
29	public interface Requirement {
30	/**
31	* Returns the name space of this requirement.
32	*
33	* @return The name space of this requirement.
34	*/
35	String getNamespace();
36
37	/**
38	* Returns the directives of this requirement. Only the following list of
39	* directives have semantic meaning in the returned {@link Map map} of
40	* directives:
41	* <ul>
42	* <li> {@link ResourceConstants#REQUIREMENT_EFFECTIVE_DIRECTIVE effective}
43	* <li> {@link ResourceConstants#REQUIREMENT_FILTER_DIRECTIVE filter}
44	* <li> {@link ResourceConstants#REQUIREMENT_CARDINALITY_DIRECTIVE
45	* cardinality}
46	* <li> {@link ResourceConstants#REQUIREMENT_RESOLUTION_DIRECTIVE resolution}
47	* <li> {@link ResourceConstants#REQUIREMENT_VISIBILITY_DIRECTIVE visibility}
48	* - only recognized for the
49	* {@link ResourceConstants#WIRING_BUNDLE_NAMESPACE osgi.wiring.bundle} name
50	* space.
51	* </ul>
52	* All other directive are considered extra user defined information that
53	* has no semantic meaning. OSGi Alliance reserves the right to extend the
54	* set of directives which have semantic meaning.
55	*
56	* @return An unmodifiable map of directive names to directive values for
57	* this requirement, or an empty map if this requirement has no
58	* directives.
59	*/
60	Map<String, String> getDirectives();
61
62	/**
63	* Returns the attributes of this requirement. Requirement attributes have
64	* no semantic meaning and are considered extra user defined information.
65	*
66	* @return An unmodifiable map of attribute names to attribute values for
67	* this requirement, or an empty map if this requirement has no
68	* attributes.
69	*/
70	Map<String, Object> getAttributes();
71
72	/**
73	* Returns the resource declaring this requirement.
74	*
75	* @return The resource declaring this requirement.
76	*/
77	Resource getResource();
78
79	/**
80	* Returns whether the specified capability matches this requirement. A
81	* capability matches this requirement when all of the following are true:
82	* <ul>
83	* <li>The specified capability has the same {@link #getNamespace() name
84	* space} as this requirement.
85	* <li>The filter specified by the {@link Constants#FILTER_DIRECTIVE filter}
86	* directive of this requirement matches the
87	* {@link Capability#getAttributes() attributes of the specified capability}.
88	* <li>The {@link #getDirectives() requirement directives} and the
89	* {@link Capability#getDirectives() capability directives} that apply to
90	* the name space are satisfied.
91	* </ul>
92	*
93	*
94	* @param capability
95	* The capability to match to this requirement.
96	* @return {@code true} if the specified capability matches this this
97	* requirement. {@link #getNamespace() name space} as this
98	* requirement and the filter for this requirement matches the
99	* {@link BundleCapability#getAttributes() attributes of the
100	* specified capability}; {@code false} otherwise.
101	*/
102	// TODO much debate on the placement and need for this method.
103	boolean matches(Capability capability);
104	}

Added Link Here

(-)osgi/src/org/osgi/framework/wiring/Resource.java (+46 lines)
1	package org.osgi.framework.wiring;
2
3	import java.util.List;
4
5
6	/**
7	* A resource is the representation of a uniquely identified and typed data.
8	*
9	* A resources can be wired together via capabilities and requirements.
10	*
11	* TODO decide on identity characteristics of a revision. Given in OSGi multiple
12	* bundles can be installed with same bsn/version this cannot be used as a key.
13	*
14	* What then is identity of a resource? Object identity? URI (needs getter
15	* method?)
16	*
17	* @ThreadSafe
18	* @version $Id: 0d09cf5655002b7b2f1d37d413788892ad2dfedf $
19	*/
20	public interface Resource {
21	/**
22	* Returns the capabilities declared by this resource.
23	*
24	* @param namespace
25	* The name space of the declared capabilities to return or
26	* {@code null} to return the declared capabilities from all name
27	* spaces.
28	* @return A list containing a snapshot of the declared {@link Capability}s,
29	* or an empty list if this resource declares no capabilities in the
30	* specified name space.
31	*/
32	List<Capability> getCapabilities(String namespace);
33
34	/**
35	* Returns the requirements declared by this bundle resource.
36	*
37	* @param namespace
38	* The name space of the declared requirements to return or
39	* {@code null} to return the declared requirements from all name
40	* spaces.
41	* @return A list containing a snapshot of the declared {@link Requirement}
42	* s, or an empty list if this resource declares no requirements in
43	* the specified name space.
44	*/
45	List<Requirement> getRequirements(String namespace);
46	}

Added Link Here

(-)osgi/src/org/osgi/framework/wiring/ResourceConstants.java (+364 lines)
1	/*
2	* Copyright (c) OSGi Alliance (2011). All Rights Reserved.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16	package org.osgi.framework.wiring;
17
18	import org.osgi.framework.Constants;
19	import org.osgi.framework.Version;
20
21	/**
22	* Defines standard names for the attributes, directives and name spaces for
23	* resources, capabilities and requirements.
24	*
25	* <p>
26	* The values associated with these keys are of type {@code String}, unless
27	* otherwise indicated.
28	*
29	* @version $Id: 6a0df41f82a587eb72c0c513fdd0411f18564586 $
30	*/
31	public final class ResourceConstants {
32
33	private ResourceConstants() {
34	// keep others from creating objects of this type.
35	}
36
37	/**
38	* Name space for the identity capability. Each {@link Resource resource}
39	* should provide an identity capability that can be used to identify the
40	* resource.
41	*
42	* For identity capability attributes the following applies:
43	* <ul>
44	* <li>The
45	* <q>osgi.identity</q> attribute contains the symbolic name of the
46	* resource.
47	* <li>The {@link #IDENTITY_VERSION_ATTRIBUTE version} attribute contains
48	* the {@link Version} of the resource.
49	* <li>The {@link #IDENTITY_TYPE_ATTRIBUTE type} attribute contains the
50	* resource type.
51	* </ul>
52	* <p>
53	* A resource with a symbolic name provides exactly one <sup>†</sup> identity
54	* {@link Resource#getCapabilities(String) capability}.
55	* <p>
56	* † A resource with no symbolic name must not provide an identity
57	* capability.
58	*/
59	public static final String IDENTITY_NAMESPACE = "osgi.identity";
60
61	/**
62	* An {@link #IDENTITY_NAMESPACE identity} capability attribute identifying the
63	* {@link Version version} of the resource. This attribute must be set to a value of
64	* type {@link Version}. If the resource has no version then the value
65	* {@link Version#emptyVersion 0.0.0} must be used for the attribute.
66	*/
67	public static final String IDENTITY_VERSION_ATTRIBUTE = Constants.VERSION_ATTRIBUTE;
68
69	/**
70	* An {@link #IDENTITY_NAMESPACE identity} capability attribute identifying the
71	* resource type. This attribute must be set to a value of type {@link String}.
72	* if the resource has no type then the value
73	* {@link ResourceConstants#IDENTITY_TYPE_UNKNOWN unknown} must be used for the
74	* attribute.
75	*/
76	public static final String IDENTITY_TYPE_ATTRIBUTE = "type";
77
78	/**
79	* An {@link #IDENTITY_NAMESPACE identity} capability {@link #IDENTITY_TYPE_ATTRIBUTE type}
80	* attribute value identifying the resource type as an OSGi bundle.
81	*/
82	public static final String IDENTITY_TYPE_BUNDLE = "osgi.bundle";
83
84	/**
85	* An {@link #IDENTITY_NAMESPACE identity} capability {@link #IDENTITY_TYPE_ATTRIBUTE type}
86	* attribute value identifying the resource type as an OSGi fragment.
87	*/
88	public static final String IDENTITY_TYPE_FRAGMENT = "osgi.fragment";
89
90	/**
91	* An {@link #IDENTITY_NAMESPACE identity} capability {@link #IDENTITY_TYPE_ATTRIBUTE type}
92	* attribute value identifying the resource type as unknown.
93	*/
94	public static final String IDENTITY_TYPE_UNKNOWN = "unknown";
95
96	/**
97	* An {@link #IDENTITY_NAMESPACE identity} capability {@link Requirement#getDirectives() directive}
98	* identifying if the resource is a singleton. A {@link String} value of "true" indicates
99	* the resource is a singleton; any other value or <code>null</code> indicates the resource is not a
100	* singleton.
101	*/
102	public static final String IDENTITY_SINGLETON_DIRECTIVE = Constants.SINGLETON_DIRECTIVE;
103
104	/**
105	* Name space for package capabilities and requirements.
106	*
107	* For capability attributes the following applies:
108	* <ul>
109	* <li>The
110	* <q>osgi.wiring.package</q> attribute contains the name of the package.
111	* <li>The {@link Constants#VERSION_ATTRIBUTE version} attribute contains
112	* the the {@link Version} of the package if one is specified or
113	* {@link Version#emptyVersion} if not specified.
114	* <li>The {@link Constants#BUNDLE_SYMBOLICNAME_ATTRIBUTE
115	* bundle-symbolic-name} attribute contains the symbolic name of the
116	* resource providing the package if one is specified.
117	* <li>The {@link Constants#BUNDLE_VERSION_ATTRIBUTE bundle-version}
118	* attribute contains the {@link Version} of resource providing the package
119	* if one is specified or {@link Version#emptyVersion} if not specified.
120	* <li>All other attributes are of type {@link String} and are used as
121	* arbitrary matching attributes for the capability.
122	* </ul>
123	* <p>
124	* A resource provides zero or more package
125	* {@link Resource#getCapabilities(String) capabilities} (this is, exported
126	* packages) and requires zero or more package
127	* {@link Resource#getRequirements(String) requirements} (that is, imported
128	* packages).
129	*/
130	public static final String WIRING_PACKAGE_NAMESPACE = "osgi.wiring.package";
131
132	/**
133	* Name space for bundle capabilities and requirements.
134	*
135	* For capability attributes the following applies:
136	* <ul>
137	* <li>The
138	* <q>osgi.wiring.bundle</q> attribute contains the symbolic name of the
139	* bundle.
140	* <li>The {@link Constants#BUNDLE_VERSION_ATTRIBUTE bundle-version}
141	* attribute contains the {@link Version} of the bundle if one is specified
142	* or {@link Version#emptyVersion} if not specified.
143	* <li>All other attributes are of type {@link String} and are used as
144	* arbitrary matching attributes for the capability.
145	* </ul>
146	* <p>
147	* A non-fragment resource with the {@link #IDENTITY_TYPE_BUNDLE
148	* osgi.bundle} type {@link #IDENTITY_TYPE_ATTRIBUTE identity} provides
149	* exactly one <sup>†</sup> bundle
150	* {@link Resource#getCapabilities(String) capability} (that is, the bundle
151	* can be required by another bundle). A fragment resource with the
152	* {@link #IDENTITY_TYPE_FRAGMENT osgi.fragment} type
153	* {@link #IDENTITY_TYPE_ATTRIBUTE identity} must not declare
154	* a bundle capability. A resource requires zero or more bundle
155	* {@link Resource#getRequirements(String) requirements} (that is, required
156	* bundles).
157	* <p>
158	* † A resource with no symbolic name must not provide a bundle
159	* capability.
160	*/
161	public static final String WIRING_BUNDLE_NAMESPACE = "osgi.wiring.bundle";
162
163	/**
164	* Name space for host capabilities and requirements.
165	*
166	* For capability attributes the following applies:
167	* <ul>
168	* <li>The
169	* <q>osgi.wiring.host</q> attribute contains the symbolic name of the
170	* bundle.
171	* <li>The {@link Constants#BUNDLE_VERSION_ATTRIBUTE bundle-version}
172	* attribute contains the {@link Version} of the bundle if one is specified
173	* or {@link Version#emptyVersion} if not specified.
174	* <li>All other attributes are of type {@link String} and are used as
175	* arbitrary matching attributes for the capability.
176	* </ul>
177	* <p>
178	* <p>
179	* A non-fragment resource with the with the {@link #IDENTITY_TYPE_BUNDLE
180	* osgi.bundle} type {@link #IDENTITY_TYPE_ATTRIBUTE identity} provides
181	* zero or one <sup>†</sup> host
182	* {@link Resource#getCapabilities(String) capabilities}.
183	* A fragment resource with the
184	* {@link #IDENTITY_TYPE_FRAGMENT osgi.fragment} type
185	* {@link #IDENTITY_TYPE_ATTRIBUTE identity} must not declare
186	* a host capability and must
187	* {@link Resource#getRequirements(String) declare} exactly one host
188	* requirement.
189	* <p>
190	* † A resource with no bundle symbolic name must not provide a host
191	* capability.
192	*/
193	public static final String WIRING_HOST_NAMESPACE = "osgi.wiring.host";
194
195	/**
196	* A requirement {@link Requirement#getDirectives() directive} used to
197	* specify a capability filter. This filter is used to match against a
198	* capability's {@link Capability#getAttributes() attributes}.
199	*/
200	public final static String REQUIREMENT_FILTER_DIRECTIVE = Constants.FILTER_DIRECTIVE;
201
202	/**
203	* A requirement {@link Requirement#getDirectives() directive} used to
204	* specify the resolution type for a requirement. The default value is
205	* {@link #REQUIREMENT_RESOLUTION_MANDATORY mandatory}.
206	*
207	* @see #REQUIREMENT_RESOLUTION_MANDATORY mandatory
208	* @see #REQUIREMENT_RESOLUTION_OPTIONAL optional
209	*/
210	public final static String REQUIREMENT_RESOLUTION_DIRECTIVE = Constants.RESOLUTION_DIRECTIVE;
211	/**
212	* A directive value identifying a mandatory
213	* {@link Resource#getRequirements(String) requirement} resolution type. A
214	* mandatory resolution type indicates that the requirement must be resolved
215	* when the {@link Resource resource} is resolved. If such requirement
216	* cannot be resolved, the resource fails to resolve.
217	*
218	* @see #REQUIREMENT_RESOLUTION_DIRECTIVE
219	*/
220	public final static String REQUIREMENT_RESOLUTION_MANDATORY = Constants.RESOLUTION_MANDATORY;
221
222	/**
223	* A directive value identifying an optional
224	* {@link Resource#getRequirements(String) requirement} resolution type. An
225	* optional resolution type indicates that the requirement is optional and
226	* the {@link Resource resource} may be resolved without requirement being
227	* resolved.
228	*
229	* @see #REQUIREMENT_RESOLUTION_DIRECTIVE
230	*/
231	public final static String REQUIREMENT_RESOLUTION_OPTIONAL = Constants.RESOLUTION_OPTIONAL;
232
233	/**
234	* A requirement {@link Requirement#getDirectives() directive} used to
235	* specify the effective time for the requirement. The default value is
236	* {@link #EFFECTIVE_RESOLVE resolve}.
237	*
238	* @see #EFFECTIVE_RESOLVE resolve
239	* @see #EFFECTIVE_ACTIVE active
240	*/
241	public final static String REQUIREMENT_EFFECTIVE_DIRECTIVE = Constants.EFFECTIVE_DIRECTIVE;
242
243	/**
244	* A directive value identifying a {@link #CAPABILITY_EFFECTIVE_DIRECTIVE
245	* capability} or {@link #REQUIREMENT_EFFECTIVE_DIRECTIVE requirement} that
246	* is effective at resolve time. Capabilities and requirements with an
247	* effective time of resolve are the only capabilities which are processed
248	* while resolving a resource.
249	*
250	* @see #REQUIREMENT_EFFECTIVE_DIRECTIVE
251	* @see #CAPABILITY_EFFECTIVE_DIRECTIVE
252	*/
253	public final static String EFFECTIVE_RESOLVE = Constants.EFFECTIVE_RESOLVE;
254
255	/**
256	* A directive value identifying a {@link #CAPABILITY_EFFECTIVE_DIRECTIVE
257	* capability} or {@link #REQUIREMENT_EFFECTIVE_DIRECTIVE requirement} that
258	* is effective at active time. Capabilities and requirements with an
259	* effective time of active are ignored while resolving a resource.
260	*
261	* @see #REQUIREMENT_EFFECTIVE_DIRECTIVE
262	* @see #CAPABILITY_EFFECTIVE_DIRECTIVE
263	*/
264	public final static String EFFECTIVE_ACTIVE = Constants.EFFECTIVE_ACTIVE;
265
266	/**
267	* A requirement {@link Requirement#getDirectives() directive} used to
268	* specify the visibility type for a requirement. The default value is
269	* {@link #REQUIREMENT_VISIBILITY_PRIVATE private}. This directive must only
270	* be used for requirements with the require
271	* {@link #WIRING_BUNDLE_NAMESPACE bundle} name space.
272	*
273	* @see #REQUIREMENT_VISIBILITY_PRIVATE private
274	* @see #REQUIREMENT_VISIBILITY_REEXPORT reexport
275	*/
276	public final static String REQUIREMENT_VISIBILITY_DIRECTIVE = Constants.VISIBILITY_DIRECTIVE;
277
278	/**
279	* A directive value identifying a private
280	* {@link #REQUIREMENT_VISIBILITY_DIRECTIVE visibility} type. A private
281	* visibility type indicates that any {@link #WIRING_PACKAGE_NAMESPACE
282	* packages} that are exported by the required
283	* {@link #WIRING_BUNDLE_NAMESPACE bundle} are not made visible on the
284	* export signature of the requiring {@link #WIRING_BUNDLE_NAMESPACE bundle}
285	* .
286	*
287	* @see #REQUIREMENT_VISIBILITY_DIRECTIVE
288	*/
289	public final static String REQUIREMENT_VISIBILITY_PRIVATE = Constants.VISIBILITY_PRIVATE;
290
291	/**
292	* A directive value identifying a reexport
293	* {@link #REQUIREMENT_VISIBILITY_DIRECTIVE visibility} type. A reexport
294	* visibility type indicates any {@link #WIRING_PACKAGE_NAMESPACE packages}
295	* that are exported by the required {@link #WIRING_BUNDLE_NAMESPACE bundle}
296	* are re-exported by the requiring {@link #WIRING_BUNDLE_NAMESPACE bundle}.
297	*/
298	public final static String REQUIREMENT_VISIBILITY_REEXPORT = Constants.VISIBILITY_REEXPORT;
299
300	/**
301	* A requirement {@link Requirement#getDirectives() directive} used to
302	* specify the cardinality for a requirement. The default value is
303	* {@link #REQUIREMENT_CARDINALITY_SINGULAR singular}.
304	*
305	* @see #REQUIREMENT_CARDINALITY_MULTIPLE multiple
306	* @see #REQUIREMENT_CARDINALITY_SINGULAR singular
307	*/
308	public final static String REQUIREMENT_CARDINALITY_DIRECTIVE = "cardinality";
309
310	/**
311	* A directive value identifying a multiple
312	* {@link #REQUIREMENT_CARDINALITY_DIRECTIVE cardinality} type.
313	*/
314	public final static String REQUIREMENT_CARDINALITY_MULTIPLE = "multiple";
315
316	/**
317	* A directive value identifying a singular
318	* {@link #REQUIREMENT_CARDINALITY_DIRECTIVE cardinality} type.
319	*/
320	public final static String REQUIREMENT_CARDINALITY_SINGULAR = "singular";
321
322	/**
323	* A capability {@link Capability#getDirectives() directive} used to specify
324	* the comma separated list of {@link #WIRING_PACKAGE_NAMESPACE package}
325	* names a capability uses.
326	*/
327	public final static String CAPABILITY_USES_DIRECTIVE = Constants.USES_DIRECTIVE;
328
329	/**
330	* A capability {@link Capability#getDirectives() directive} used to specify
331	* the effective time for the capability. The default value is
332	* {@link #EFFECTIVE_RESOLVE resolve}.
333	*
334	* @see #EFFECTIVE_RESOLVE resolve
335	* @see #EFFECTIVE_ACTIVE active
336	*/
337	public final static String CAPABILITY_EFFECTIVE_DIRECTIVE = Constants.EFFECTIVE_DIRECTIVE;
338
339	/**
340	* A capability {@link Capability#getDirectives() directive} used to specify
341	* the comma separated list of mandatory attributes which must be specified
342	* in the {@link #REQUIREMENT_FILTER_DIRECTIVE filter} of a requirement in
343	* order for the capability to match the requirement. This directive must
344	* only be used for capabilities with the {@link #WIRING_PACKAGE_NAMESPACE
345	* package} name space.
346	*/
347	public final static String CAPABILITY_MANDATORY_DIRECTIVE = "mandatory";
348
349	/**
350	* A capability {@link Capability#getDirectives() directive} used to specify
351	* the comma separated list of classes which must be allowed to be exported.
352	* This directive must only be used for capabilities with the
353	* {@link #WIRING_PACKAGE_NAMESPACE package} name space.
354	*/
355	public final static String CAPABILITY_INCLUDE_DIRECTIVE = "include";
356
357	/**
358	* A capability {@link Capability#getDirectives() directive} used to specify
359	* the comma separated list of classes which must not be allowed to be
360	* exported. This directive must only be used for capabilities with the
361	* {@link #WIRING_PACKAGE_NAMESPACE package} name space.
362	*/
363	public final static String CAPABILITY_EXCLUDE_DIRECTIVE = "exclude";
364	}

Added Link Here

(-)osgi/src/org/osgi/framework/wiring/Wire.java (+57 lines)
1	/*
2	* Copyright (c) OSGi Alliance (2011). All Rights Reserved.
3	*
4	* Licensed under the Apache License, Version 2.0 (the "License");
5	* you may not use this file except in compliance with the License.
6	* You may obtain a copy of the License at
7	*
8	* http://www.apache.org/licenses/LICENSE-2.0
9	*
10	* Unless required by applicable law or agreed to in writing, software
11	* distributed under the License is distributed on an "AS IS" BASIS,
12	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13	* See the License for the specific language governing permissions and
14	* limitations under the License.
15	*/
16
17	package org.osgi.framework.wiring;
18
19	/**
20	* A wire connecting a {@link Capability} to a {@link Requirement}.
21	*
22	* @ThreadSafe
23	* @version $Id: 328ede0f8ddf3795594a8e0fc2cb11bbe7fa38fc $
24	*/
25	public interface Wire {
26	/**
27	* Returns the {@link Capability} for this wire.
28	*
29	* @return The {@link Capability} for this wire.
30	*/
31	Capability getCapability();
32
33	/**
34	* Return the {@link Requirement} for this wire.
35	*
36	* @return The {@link Requirement} for this wire.
37	*/
38	Requirement getRequirement();
39
40	/**
41	* Return the providing {@link Resource resource} of the {@link #getCapability() capability}.
42	* <p>
43	* The resource returned may differ from the resource referenced by the {@link #getCapability()
44	* capability}.
45	* @return the providing {@link Resource resource}.
46	*/
47	Resource getProvider();
48
49	/**
50	* Return the requiring {@link Resource resource} of the {@link #getRequirement() requirement}.
51	* <p>
52	* The resource returned my differ from the resource referenced by the {@link #getRequirement()
53	* requirement}
54	* @return the requiring {@link Resource resource}.
55	*/
56	Resource getRequirer();
57	}

Lines 19-24 Link Here

(-)resolver/src/org/eclipse/osgi/internal/resolver/StateBuilder.java (-5 / +41 lines)
19	import org.eclipse.osgi.util.ManifestElement;	19	import org.eclipse.osgi.util.ManifestElement;
20	import org.eclipse.osgi.util.NLS;	20	import org.eclipse.osgi.util.NLS;
21	import org.osgi.framework.*;	21	import org.osgi.framework.*;
		22	import org.osgi.framework.wiring.ResourceConstants;
22		23
23	/**	24	/**
24	* This class builds bundle description objects from manifests	25	* This class builds bundle description objects from manifests
Lines 118-124 Link Here
118	result.setGenericRequires(createGenericRequires(genericRequires, osgiRequires));	119	result.setGenericRequires(createGenericRequires(genericRequires, osgiRequires));
119	ManifestElement[] genericCapabilities = getGenericCapabilities(manifest, genericAliases);	120	ManifestElement[] genericCapabilities = getGenericCapabilities(manifest, genericAliases);
120	ManifestElement[] osgiCapabilities = ManifestElement.parseHeader(Constants.PROVIDE_CAPABILITY, manifest.get(Constants.PROVIDE_CAPABILITY));	121	ManifestElement[] osgiCapabilities = ManifestElement.parseHeader(Constants.PROVIDE_CAPABILITY, manifest.get(Constants.PROVIDE_CAPABILITY));
121	result.setGenericCapabilities(createGenericCapabilities(genericCapabilities, osgiCapabilities));	122	result.setGenericCapabilities(createGenericCapabilities(genericCapabilities, osgiCapabilities, result));
122	ManifestElement[] nativeCode = ManifestElement.parseHeader(Constants.BUNDLE_NATIVECODE, manifest.get(Constants.BUNDLE_NATIVECODE));	123	ManifestElement[] nativeCode = ManifestElement.parseHeader(Constants.BUNDLE_NATIVECODE, manifest.get(Constants.BUNDLE_NATIVECODE));
123	result.setNativeCodeSpecification(createNativeCode(nativeCode));	124	result.setNativeCodeSpecification(createNativeCode(nativeCode));
124	return result;	125	return result;
Lines 554-566 Link Here
554	return results;	555	return results;
555	}	556	}
556		557
557	private static GenericDescription[] createGenericCapabilities(ManifestElement[] equinoxCapabilities, ManifestElement[] osgiCapabilities) {	558	private static GenericDescription[] createGenericCapabilities(ManifestElement[] equinoxCapabilities, ManifestElement[] osgiCapabilities, BundleDescription description) throws BundleException {
558	List<GenericDescription> result = createEquinoxCapabilities(equinoxCapabilities);	559	List<GenericDescription> result = createEquinoxCapabilities(equinoxCapabilities);
559	result = createOSGiCapabilities(osgiCapabilities, result);	560	result = createOSGiCapabilities(osgiCapabilities, result, description);
560	return result == null ? null : result.toArray(new GenericDescription[result.size()]);	561	return result == null ? null : result.toArray(new GenericDescription[result.size()]);
561	}	562	}
562		563
563	static List<GenericDescription> createOSGiCapabilities(ManifestElement[] osgiCapabilities, List<GenericDescription> result) {	564	private static List<GenericDescription> createOSGiCapabilities(ManifestElement[] osgiCapabilities, List<GenericDescription> result, BundleDescription description) throws BundleException {
		565	if (result == null)
		566	result = new ArrayList<GenericDescription>(osgiCapabilities == null ? 1 : osgiCapabilities.length + 1);
		567	// Always have an osgi.identity capability if there is a symbolic name.
		568	GenericDescription osgiIdentity = createOsgiIdentityCapability(description);
		569	if (osgiIdentity != null)
		570	// always add the capability to the front
		571	result.add(0, osgiIdentity);
		572	return createOSGiCapabilities(osgiCapabilities, result);
		573	}
		574
		575	static List<GenericDescription> createOSGiCapabilities(ManifestElement[] osgiCapabilities, List<GenericDescription> result) throws BundleException {
564	if (osgiCapabilities == null)	576	if (osgiCapabilities == null)
565	return result;	577	return result;
566	if (result == null)	578	if (result == null)
Lines 570-577 Link Here
570	String[] namespaces = element.getValueComponents();	582	String[] namespaces = element.getValueComponents();
571	types: for (String namespace : namespaces) {	583	types: for (String namespace : namespaces) {
572	String effective = element.getDirective(Constants.EFFECTIVE_DIRECTIVE);	584	String effective = element.getDirective(Constants.EFFECTIVE_DIRECTIVE);
		585	// Any declared osgi.identity capability with an effective directive value of "resolve" will be overridden.
573	if (effective != null && !Constants.EFFECTIVE_RESOLVE.equals(effective))	586	if (effective != null && !Constants.EFFECTIVE_RESOLVE.equals(effective))
574	break types; // ignore any namespace that is not effective at resolve time.	587	break types; // ignore any namespace that is not effective at resolve time.
		588	if (ResourceConstants.IDENTITY_NAMESPACE.equals(namespace))
		589	throw new BundleException("A bundle is not allowed to define a capability in the " + ResourceConstants.IDENTITY_NAMESPACE + " name space."); //$NON-NLS-1$ //$NON-NLS-2$
		590
575	GenericDescriptionImpl desc = new GenericDescriptionImpl();	591	GenericDescriptionImpl desc = new GenericDescriptionImpl();
576	desc.setType(namespace);	592	desc.setType(namespace);
577	Map<String, Object> mapAttrs = getAttributes(element, new String[0]);	593	Map<String, Object> mapAttrs = getAttributes(element, new String[0]);
Lines 591-597 Link Here
591	return result;	607	return result;
592	}	608	}
593		609
594	private static List<GenericDescription> createEquinoxCapabilities(ManifestElement[] equinoxCapabilities) {	610	private static List<GenericDescription> createEquinoxCapabilities(ManifestElement[] equinoxCapabilities) throws BundleException {
595	if (equinoxCapabilities == null)	611	if (equinoxCapabilities == null)
596	return null;	612	return null;
597	ArrayList<GenericDescription> results = new ArrayList<GenericDescription>(equinoxCapabilities.length);	613	ArrayList<GenericDescription> results = new ArrayList<GenericDescription>(equinoxCapabilities.length);
Lines 604-609 Link Here
604	if (colonIdx > 0) {	620	if (colonIdx > 0) {
605	name = genericNames[j].substring(0, colonIdx);	621	name = genericNames[j].substring(0, colonIdx);
606	desc.setType(genericNames[j].substring(colonIdx + 1));	622	desc.setType(genericNames[j].substring(colonIdx + 1));
		623	if (ResourceConstants.IDENTITY_NAMESPACE.equals(desc.getType()))
		624	throw new BundleException("A bundle is not allowed to define a capability in the " + ResourceConstants.IDENTITY_NAMESPACE + " name space."); //$NON-NLS-1$ //$NON-NLS-2$
607	}	625	}
608	Map<String, Object> mapAttrs = getAttributes(equinoxCapabilities[i], new String[] {Constants.VERSION_ATTRIBUTE});	626	Map<String, Object> mapAttrs = getAttributes(equinoxCapabilities[i], new String[] {Constants.VERSION_ATTRIBUTE});
609	Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<String, Object>() : new Hashtable<String, Object>(mapAttrs);	627	Dictionary<String, Object> attrs = mapAttrs == null ? new Hashtable<String, Object>() : new Hashtable<String, Object>(mapAttrs);
Lines 748-751 Link Here
748	throw new BundleException(message + " : " + NLS.bind(StateMsg.HEADER_EXTENSION_ERROR, hostName), BundleException.MANIFEST_ERROR); //$NON-NLS-1$	766	throw new BundleException(message + " : " + NLS.bind(StateMsg.HEADER_EXTENSION_ERROR, hostName), BundleException.MANIFEST_ERROR); //$NON-NLS-1$
749	}	767	}
750	}	768	}
		769
		770	private static GenericDescription createOsgiIdentityCapability(BundleDescription description) {
		771	if (description.getSymbolicName() == null)
		772	return null;
		773	GenericDescriptionImpl result = new GenericDescriptionImpl();
		774	result.setType(ResourceConstants.IDENTITY_NAMESPACE);
		775	Dictionary<String, Object> attributes = new Hashtable<String, Object>();
		776	attributes.put(ResourceConstants.IDENTITY_NAMESPACE, description.getSymbolicName());
		777	attributes.put(ResourceConstants.IDENTITY_TYPE_ATTRIBUTE, description.getHost() == null ? ResourceConstants.IDENTITY_TYPE_BUNDLE : ResourceConstants.IDENTITY_TYPE_FRAGMENT);
		778	attributes.put(ResourceConstants.IDENTITY_VERSION_ATTRIBUTE, description.getVersion());
		779	result.setAttributes(attributes);
		780	Map<String, String> directives = new HashMap<String, String>();
		781	directives.put(ResourceConstants.IDENTITY_SINGLETON_DIRECTIVE, String.valueOf(description.isSingleton()));
		782	// The effective directive should be resolve
		783	directives.put(ResourceConstants.CAPABILITY_EFFECTIVE_DIRECTIVE, ResourceConstants.EFFECTIVE_RESOLVE);
		784	result.setDirectives(directives);
		785	return result;
		786	}
751	}	787	}

Lines 1-5 Link Here

(-)src/org/eclipse/osgi/tests/services/resolver/OSGiCapabilityTest.java (-17 / +47 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.	2	* Copyright (c) 2010, 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 13-19 Link Here
13	import java.io.File;	13	import java.io.File;
14	import java.io.IOException;	14	import java.io.IOException;
15	import java.net.URL;	15	import java.net.URL;
16	import java.util.Dictionary;	16	import java.util.*;
17	import junit.framework.Test;	17	import junit.framework.Test;
18	import junit.framework.TestSuite;	18	import junit.framework.TestSuite;
19	import org.eclipse.osgi.framework.util.Headers;	19	import org.eclipse.osgi.framework.util.Headers;
Lines 105-113 Link Here
105	assertTrue("c2", c2.isResolved());	105	assertTrue("c2", c2.isResolved());
106	assertTrue("c3", c3.isResolved());	106	assertTrue("c3", c3.isResolved());
107		107
108	checkGenericBasics(3, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	108	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
109	checkGenericBasics(3, c2.getResolvedGenericRequires(), p2.getSelectedGenericCapabilities());	109	checkGenericBasics(4, c2.getResolvedGenericRequires(), p2.getSelectedGenericCapabilities());
110	checkGenericBasics(3, c3.getResolvedGenericRequires(), p3.getSelectedGenericCapabilities());	110	checkGenericBasics(4, c3.getResolvedGenericRequires(), p3.getSelectedGenericCapabilities());
111		111
112	File stateDir = getContext().getDataFile(getName()); //$NON-NLS-1$	112	File stateDir = getContext().getDataFile(getName()); //$NON-NLS-1$
113	stateDir.mkdirs();	113	stateDir.mkdirs();
Lines 130-145 Link Here
130	assertTrue("c2", c2.isResolved());	130	assertTrue("c2", c2.isResolved());
131	assertTrue("c3", c3.isResolved());	131	assertTrue("c3", c3.isResolved());
132		132
133	checkGenericBasics(3, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	133	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
134	checkGenericBasics(3, c2.getResolvedGenericRequires(), p2.getSelectedGenericCapabilities());	134	checkGenericBasics(4, c2.getResolvedGenericRequires(), p2.getSelectedGenericCapabilities());
135	checkGenericBasics(3, c3.getResolvedGenericRequires(), p3.getSelectedGenericCapabilities());	135	checkGenericBasics(4, c3.getResolvedGenericRequires(), p3.getSelectedGenericCapabilities());
136	}	136	}
137		137
138	private void checkGenericBasics(int expectedCnt, GenericDescription[] genRequired, GenericDescription[] genProvided) {	138	private void checkGenericBasics(int expectedCnt, GenericDescription[] genRequired, GenericDescription[] genProvided) {
139	assertEquals("Expected number of capabilities do not match", expectedCnt, genRequired.length);	139	assertEquals("Expected number of capabilities do not match", expectedCnt, genRequired.length);
140	assertEquals("Specs do not match Descs", genRequired.length, genProvided.length);	140	assertEquals("Specs do not match Descs", genRequired.length, genProvided.length);
		141	Collection providedCollection = new ArrayList(Arrays.asList(genProvided));
141	for (int i = 0; i < genRequired.length; i++) {	142	for (int i = 0; i < genRequired.length; i++) {
142	assertEquals("Wrong provider for requirement.", genProvided[i], genRequired[i]);	143	assertTrue("Wrong provider for requirement: " + genRequired[i], providedCollection.remove(genRequired[i]));
143	}	144	}
144	}	145	}
145		146
Lines 172-178 Link Here
172	assertTrue("c1Frag", c1Frag.isResolved());	173	assertTrue("c1Frag", c1Frag.isResolved());
173	assertTrue("p4", p4.isResolved());	174	assertTrue("p4", p4.isResolved());
174		175
175	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	176	checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
176		177
177	File stateDir = getContext().getDataFile(getName()); //$NON-NLS-1$	178	File stateDir = getContext().getDataFile(getName()); //$NON-NLS-1$
178	stateDir.mkdirs();	179	stateDir.mkdirs();
Lines 194-200 Link Here
194	assertTrue("c1Frag", c1Frag.isResolved());	195	assertTrue("c1Frag", c1Frag.isResolved());
195	assertTrue("p4", p4.isResolved());	196	assertTrue("p4", p4.isResolved());
196		197
197	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	198	checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
198		199
199	state.setResolver(platformAdmin.createResolver());	200	state.setResolver(platformAdmin.createResolver());
200	state.resolve(new BundleDescription[] {p1});	201	state.resolve(new BundleDescription[] {p1});
Lines 205-211 Link Here
205	assertTrue("c1Frag", c1Frag.isResolved());	206	assertTrue("c1Frag", c1Frag.isResolved());
206	assertTrue("p4", p4.isResolved());	207	assertTrue("p4", p4.isResolved());
207		208
208	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	209	checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
209	}	210	}
210		211
211	public void testGenericFragments02() throws BundleException {	212	public void testGenericFragments02() throws BundleException {
Lines 233-239 Link Here
233	assertTrue("c1", c1.isResolved());	234	assertTrue("c1", c1.isResolved());
234	assertFalse("c1Frag", c1Frag.isResolved());	235	assertFalse("c1Frag", c1Frag.isResolved());
235		236
236	checkGenericBasics(3, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	237	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
237		238
238	File stateDir = getContext().getDataFile(getName() + 1); //$NON-NLS-1$	239	File stateDir = getContext().getDataFile(getName() + 1); //$NON-NLS-1$
239	stateDir.mkdirs();	240	stateDir.mkdirs();
Lines 253-259 Link Here
253	assertTrue("c1", c1.isResolved());	254	assertTrue("c1", c1.isResolved());
254	assertFalse("c1Frag", c1Frag.isResolved());	255	assertFalse("c1Frag", c1Frag.isResolved());
255		256
256	checkGenericBasics(3, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	257	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
257		258
258	manifest = loadManifest("p4.osgi.MF");	259	manifest = loadManifest("p4.osgi.MF");
259	BundleDescription p4 = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);	260	BundleDescription p4 = state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
Lines 267-273 Link Here
267	assertTrue("c1Frag", c1Frag.isResolved());	268	assertTrue("c1Frag", c1Frag.isResolved());
268	assertTrue("p4", p4.isResolved());	269	assertTrue("p4", p4.isResolved());
269		270
270	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	271	checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
271		272
272	stateDir = getContext().getDataFile(getName() + 2); //$NON-NLS-1$	273	stateDir = getContext().getDataFile(getName() + 2); //$NON-NLS-1$
273	stateDir.mkdirs();	274	stateDir.mkdirs();
Lines 288-294 Link Here
288	assertTrue("c1Frag", c1Frag.isResolved());	289	assertTrue("c1Frag", c1Frag.isResolved());
289	assertTrue("p4", p4.isResolved());	290	assertTrue("p4", p4.isResolved());
290		291
291	checkGenericBasics(4, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());	292	checkGenericBasics(6, c1.getResolvedGenericRequires(), p1.getSelectedGenericCapabilities());
292	}	293	}
293		294
294	public void testGenericUses() throws BundleException {	295	public void testGenericUses() throws BundleException {
Lines 362-367 Link Here
362	checkUsedCapability(c4v130, p5v100Capability);	363	checkUsedCapability(c4v130, p5v100Capability);
363	}	364	}
364		365
		366	public void testDeclaringIdentityCapability() throws BundleException {
		367	State state = buildEmptyState();
		368	Hashtable manifest = new Hashtable();
		369	long bundleID = 0;
		370	manifest.put(Constants.BUNDLE_MANIFESTVERSION, "2");
		371	manifest.put(Constants.BUNDLE_SYMBOLICNAME, "genericCapability");
		372	manifest.put(Constants.BUNDLE_VERSION, "1.0.0");
		373	StringBuffer capabililty = new StringBuffer();
		374	capabililty.append("testFailure:osgi.identity; test=failure");
		375	manifest.put(GenericCapabilityTest.GENERIC_CAPABILITY, capabililty.toString());
		376
		377	try {
		378	state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
		379	fail("Expected failure to create description that specifies osgi.identity capability");
		380	} catch (BundleException e) {
		381	// expected
		382	}
		383
		384	manifest.remove(GenericCapabilityTest.GENERIC_CAPABILITY);
		385	manifest.put(Constants.PROVIDE_CAPABILITY, "osgi.identity; osgi.identity=testFailure; test=failure");
		386	try {
		387	state.getFactory().createBundleDescription(state, manifest, (String) manifest.get(Constants.BUNDLE_SYMBOLICNAME), bundleID++);
		388	fail("Expected failure to create description that specifies osgi.identity capability");
		389	} catch (BundleException e) {
		390	// expected
		391	}
		392	}
		393
365	private void checkUsedImports(BundleDescription importer, ExportPackageDescription[] expectedPackages) {	394	private void checkUsedImports(BundleDescription importer, ExportPackageDescription[] expectedPackages) {
366	ExportPackageDescription[] imported = importer.getResolvedImports();	395	ExportPackageDescription[] imported = importer.getResolvedImports();
367	assertEquals("Wrong number of imports for bundle: " + importer, expectedPackages.length, imported.length);	396	assertEquals("Wrong number of imports for bundle: " + importer, expectedPackages.length, imported.length);
Lines 381-388 Link Here
381	private void checkUsedCapability(BundleDescription requirer, GenericDescription[] expectedCapabilities) {	410	private void checkUsedCapability(BundleDescription requirer, GenericDescription[] expectedCapabilities) {
382	GenericDescription[] required = requirer.getResolvedGenericRequires();	411	GenericDescription[] required = requirer.getResolvedGenericRequires();
383	assertEquals("Wrong number of capabilities for bundle: " + requirer, expectedCapabilities.length, required.length);	412	assertEquals("Wrong number of capabilities for bundle: " + requirer, expectedCapabilities.length, required.length);
		413	Collection providedCollection = new ArrayList(Arrays.asList(expectedCapabilities));
384	for (int i = 0; i < required.length; i++) {	414	for (int i = 0; i < required.length; i++) {
385	assertEquals("Wrong required capability from bundle: " + requirer, expectedCapabilities[i], required[i]);	415	assertTrue("Wrong provider for requirement: " + required[i], providedCollection.remove(required[i]));
386	}	416	}
387	}	417	}
388	}	418	}