You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by tj...@apache.org on 2015/06/09 18:11:19 UTC

svn commit: r1684463 [2/2] - in /aries/trunk/subsystem: subsystem-api/ subsystem-api/src/main/java/org/apache/aries/subsystem/ subsystem-api/src/main/java/org/osgi/service/subsystem/ subsystem-bundle/ subsystem-core/ subsystem-core/src/main/java/org/ap...

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RawSubsystemResource.java Tue Jun  9 16:11:17 2015
@@ -15,6 +15,7 @@ package org.apache.aries.subsystem.core.
 
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -25,6 +26,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Properties;
 import java.util.jar.Manifest;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -39,6 +41,7 @@ import org.apache.aries.subsystem.core.a
 import org.apache.aries.subsystem.core.archive.SubsystemContentHeader;
 import org.apache.aries.subsystem.core.archive.SubsystemContentHeader.Clause;
 import org.apache.aries.subsystem.core.archive.SubsystemImportServiceHeader;
+import org.apache.aries.subsystem.core.archive.SubsystemLocalizationHeader;
 import org.apache.aries.subsystem.core.archive.SubsystemManifest;
 import org.apache.aries.subsystem.core.archive.SubsystemSymbolicNameHeader;
 import org.apache.aries.subsystem.core.archive.SubsystemTypeHeader;
@@ -58,7 +61,6 @@ import org.osgi.namespace.service.Servic
 import org.osgi.resource.Capability;
 import org.osgi.resource.Requirement;
 import org.osgi.resource.Resource;
-import org.osgi.service.repository.Repository;
 import org.osgi.service.resolver.ResolutionException;
 import org.osgi.service.subsystem.Subsystem.State;
 import org.osgi.service.subsystem.SubsystemConstants;
@@ -108,13 +110,14 @@ public class RawSubsystemResource implem
 	private final List<Capability> capabilities;
 	private final DeploymentManifest deploymentManifest;
 	private final long id;
-	private final Repository localRepository;
+	private final org.apache.aries.subsystem.core.repository.Repository localRepository;
 	private final Location location;
     private final BasicSubsystem parentSubsystem;
 	private final List<Requirement> requirements;
 	private final Collection<Resource> resources;
 	private final Resource fakeImportServiceResource;
 	private final SubsystemManifest subsystemManifest;
+	private final Collection<TranslationFile> translations;
 
 	public RawSubsystemResource(String location, IDirectory content, BasicSubsystem parent) throws URISyntaxException, IOException, ResolutionException {
 		id = SubsystemIdentifier.getNextId();
@@ -132,6 +135,7 @@ public class RawSubsystemResource implem
 			subsystemManifest = computeSubsystemManifestAfterRequirements(manifest);
 			capabilities = computeCapabilities();
 			deploymentManifest = computeDeploymentManifest(content);
+			translations = computeTranslations(content);
 		}
 		finally {
 			IOUtils.close(content.toCloseable());
@@ -153,6 +157,7 @@ public class RawSubsystemResource implem
 		id = Long.parseLong(deploymentManifest.getHeaders().get(DeploymentManifest.ARIESSUBSYSTEM_ID).getValue());
 		location = new Location(deploymentManifest.getHeaders().get(DeploymentManifest.ARIESSUBSYSTEM_LOCATION).getValue());
 		parentSubsystem = parent;
+		translations = Collections.emptyList();
 	}
 
 	private static Resource createFakeResource(SubsystemManifest manifest) {
@@ -232,7 +237,7 @@ public class RawSubsystemResource implem
 		return id;
 	}
 
-	public Repository getLocalRepository() {
+	public org.apache.aries.subsystem.core.repository.Repository getLocalRepository() {
 		return localRepository;
 	}
 
@@ -252,14 +257,14 @@ public class RawSubsystemResource implem
 		return Collections.unmodifiableList(result);
 	}
 
-	public Collection<Resource> getResources() {
-		return Collections.unmodifiableCollection(resources);
-	}
-
 	public SubsystemManifest getSubsystemManifest() {
 		return subsystemManifest;
 	}
 
+	public Collection<TranslationFile> getTranslations() {
+		return translations;
+	}
+	
 	@Override
 	public int hashCode() {
 		int result = 17;
@@ -331,7 +336,7 @@ public class RawSubsystemResource implem
 		return new ImportPackageHeader(clauses);
 	}
 
-	private Repository computeLocalRepository() {
+	private org.apache.aries.subsystem.core.repository.Repository computeLocalRepository() {
 		if (fakeImportServiceResource != null) {
 			Collection<Resource> temp = new ArrayList<Resource>(resources);
 			temp.add(fakeImportServiceResource);
@@ -374,23 +379,34 @@ public class RawSubsystemResource implem
 	}
 
 	private List<Requirement> computeRequirements(SubsystemManifest manifest) throws ResolutionException {
-		if (isComposite(manifest))
+		if (isComposite(manifest)) {
+			// Composites determine their own requirements.
 			return manifest.toRequirements(this);
+		}
+		// Gather up all of the content resources for the subsystem.
 		SubsystemContentHeader header = manifest.getSubsystemContentHeader();
-		if (header == null)
+		if (header == null) {
+			// Empty subsystems (i.e. subsystems with no content) are allowed.
 			return Collections.emptyList();
-		// TODO Need the system repository in here. Preferred provider as well?
-		LocalRepository localRepo = new LocalRepository(resources);
-		RepositoryServiceRepository serviceRepo = new RepositoryServiceRepository(Activator.getInstance().getBundleContext());
-		CompositeRepository compositeRepo = new CompositeRepository(localRepo, serviceRepo);
+		}
 		List<Requirement> requirements = header.toRequirements(this);
 		List<Resource> resources = new ArrayList<Resource>(requirements.size());
+		// TODO Do we need the system repository in here (e.g., for features)?
+		// What about the preferred provider repository?
+		// Search the local repository and service repositories for content.
+		RepositoryServiceRepository serviceRepo = new RepositoryServiceRepository();
+		// TODO Should we search the service repositories first, the assumption
+		// being they will contain more current content than the subsystem
+		// archive?
+		CompositeRepository compositeRepo = new CompositeRepository(localRepository, serviceRepo);
 		for (Requirement requirement : requirements) {
 			Collection<Capability> capabilities = compositeRepo.findProviders(requirement);
-			if (capabilities.isEmpty())
-				continue;
-			resources.add(capabilities.iterator().next().getResource());
+			if (!capabilities.isEmpty()) {
+				resources.add(capabilities.iterator().next().getResource());
+			}
 		}
+		// Now compute the dependencies of the content resources. These are
+		// dependencies not satisfied by the content resources themselves.
 		return new DependencyCalculator(resources).calculateDependencies();
 	}
 
@@ -523,6 +539,33 @@ public class RawSubsystemResource implem
 		return header;
 	}
 
+	private Collection<TranslationFile> computeTranslations(IDirectory directory) throws IOException {
+		SubsystemManifest manifest = getSubsystemManifest();
+		SubsystemLocalizationHeader header = manifest.getSubsystemLocalizationHeader();
+		String directoryName = header.getDirectoryName();
+		// TODO Assumes the ZIP file includes directory entries. Issues?
+		IFile file = directoryName == null ? directory : directory.getFile(directoryName);
+		if (file == null || !file.isDirectory())
+			return Collections.emptyList();
+		List<IFile> files = file.convert().listFiles();
+		if (files == null || files.isEmpty())
+			return Collections.emptyList();
+		ArrayList<TranslationFile> result = new ArrayList<TranslationFile>(files.size());
+		for (IFile f : files) {
+			Properties properties = new Properties();
+			InputStream is = f.open();
+			try {
+				properties.load(is);
+				result.add(new TranslationFile(f.getName(), properties));
+			}
+			finally {
+				is.close();
+			}
+		}
+		result.trimToSize();
+		return result;
+	}
+	
 	private DeploymentManifest initializeDeploymentManifest(IDirectory idir)
 			throws IOException {
 		Manifest manifest = ManifestProcessor.obtainManifestFromAppDir(idir,

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RepositoryServiceRepository.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RepositoryServiceRepository.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RepositoryServiceRepository.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/RepositoryServiceRepository.java Tue Jun  9 16:11:17 2015
@@ -13,6 +13,7 @@
  */
 package org.apache.aries.subsystem.core.internal;
 
+import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,34 +26,41 @@ import org.osgi.framework.InvalidSyntaxE
 import org.osgi.framework.ServiceReference;
 import org.osgi.resource.Capability;
 import org.osgi.resource.Requirement;
-import org.osgi.service.repository.Repository;
+import org.osgi.service.subsystem.SubsystemException;
 
-public class RepositoryServiceRepository implements Repository {
-	private final BundleContext context;
+public class RepositoryServiceRepository implements org.apache.aries.subsystem.core.repository.Repository {
+	private BundleContext context;
 	
 	public RepositoryServiceRepository() {
-		this(Activator.getInstance().getBundleContext());
-	}
-	
-	public RepositoryServiceRepository(BundleContext context) {
-		this.context = context;
+		context = Activator.getInstance().getBundleContext();
 	}
 	
+	@SuppressWarnings("unchecked")
 	public Collection<Capability> findProviders(Requirement requirement) {
 		Set<Capability> result = new HashSet<Capability>();
-		Collection<ServiceReference<Repository>> references;
+		ServiceReference<?>[] references;
 		try {
-			references = context.getServiceReferences(Repository.class, null);
+			references = context.getAllServiceReferences("org.osgi.service.repository.Repository", null);
+			if (references == null)
+				return result;
 		}
 		catch (InvalidSyntaxException e) {
 			throw new IllegalStateException(e);
 		}
-		for (ServiceReference<Repository> reference : references) {
-			Repository repository = context.getService(reference);
+		for (ServiceReference<?> reference : references) {
+			Object repository = context.getService(reference);
+			if (repository == null)
+				continue;
 			try {
-				if (repository == null)
-					continue;
-				Map<Requirement, Collection<Capability>> map = repository.findProviders(Collections.singleton(requirement));
+				Class<?> clazz = repository.getClass();
+				Map<Requirement, Collection<Capability>> map;
+				try {
+					Method method = clazz.getMethod("findProviders", Collection.class);
+					map = (Map<Requirement, Collection<Capability>>)method.invoke(repository, Collections.singleton(requirement));
+				}
+				catch (Exception e) {
+					throw new SubsystemException(e);
+				}
 				Collection<Capability> capabilities = map.get(requirement);
 				if (capabilities == null)
 					continue;
@@ -66,13 +74,10 @@ public class RepositoryServiceRepository
 	}
 	
 	@Override
-	public Map<Requirement, Collection<Capability>> findProviders(
-			Collection<? extends Requirement> requirements) {
+	public Map<Requirement, Collection<Capability>> findProviders(Collection<? extends Requirement> requirements) {
 		Map<Requirement, Collection<Capability>> result = new HashMap<Requirement, Collection<Capability>>();
 		for (Requirement requirement : requirements)
 			result.put(requirement, findProviders(requirement));
 		return result;
-				
-		
 	}
 }

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceHelper.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceHelper.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceHelper.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/ResourceHelper.java Tue Jun  9 16:11:17 2015
@@ -34,7 +34,6 @@ import org.osgi.resource.Capability;
 import org.osgi.resource.Namespace;
 import org.osgi.resource.Requirement;
 import org.osgi.resource.Resource;
-import org.osgi.service.repository.Repository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -84,7 +83,7 @@ public class ResourceHelper {
 		return getSymbolicNameAttribute(resource) + '@' + getVersionAttribute(resource);
 	}
 	
-	public static Resource getResource(Requirement requirement, Repository repository) {
+	public static Resource getResource(Requirement requirement, org.apache.aries.subsystem.core.repository.Repository repository) {
 		Map<Requirement, Collection<Capability>> map = repository.findProviders(Arrays.asList(requirement));
 		Collection<Capability> capabilities = map.get(requirement);
 		return capabilities == null ? null : capabilities.size() == 0 ? null : capabilities.iterator().next().getResource();

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StartAction.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StartAction.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StartAction.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/StartAction.java Tue Jun  9 16:11:17 2015
@@ -59,15 +59,25 @@ public class StartAction extends Abstrac
 
 	private final Coordination coordination;
 	private final BasicSubsystem instigator;
+	private final boolean resolveOnly;
 
 	public StartAction(BasicSubsystem instigator, BasicSubsystem requestor, BasicSubsystem target) {
-		this(instigator, requestor, target, null);
+		this(instigator, requestor, target, false);
 	}
 
+	public StartAction(BasicSubsystem instigator, BasicSubsystem requestor, BasicSubsystem target, boolean resolveOnly) {
+		this(instigator, requestor, target, null, resolveOnly);
+	}
+	
 	public StartAction(BasicSubsystem instigator, BasicSubsystem requestor, BasicSubsystem target, Coordination coordination) {
+		this(instigator, requestor, target, coordination, false);
+	}
+	
+	public StartAction(BasicSubsystem instigator, BasicSubsystem requestor, BasicSubsystem target, Coordination coordination, boolean resolveOnly) {
 		super(requestor, target, false);
 		this.instigator = instigator;
 		this.coordination = coordination;
+		this.resolveOnly = resolveOnly;
 	}
 
 	@Override
@@ -104,6 +114,8 @@ public class StartAction extends Abstrac
 			// Resolve if necessary.
 			if (State.INSTALLED.equals(state))
 				resolve(target);
+			if (resolveOnly)
+				return null;
 			target.setState(State.STARTING);
 			// TODO Need to hold a lock here to guarantee that another start
 			// operation can't occur when the state goes to RESOLVED.
@@ -284,7 +296,7 @@ public class StartAction extends Abstrac
 			String filter = capability.getDirectives().get(SubsystemExportServiceCapability.DIRECTIVE_FILTER);
 			if (logger.isDebugEnabled())
 				logger.debug("Allowing " + policy + " of " + filter);
-			builder.allow(policy, filter.toString());
+			builder.allow(policy, filter);
 		}
 	}
 

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResource.java Tue Jun  9 16:11:17 2015
@@ -19,7 +19,6 @@ import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -40,7 +39,6 @@ import org.apache.aries.subsystem.core.a
 import org.apache.aries.subsystem.core.archive.SubsystemImportServiceHeader;
 import org.apache.aries.subsystem.core.archive.SubsystemImportServiceRequirement;
 import org.apache.aries.subsystem.core.archive.SubsystemManifest;
-import org.apache.aries.subsystem.core.internal.BundleResourceInstaller.BundleConstituent;
 import org.apache.aries.util.filesystem.FileSystem;
 import org.apache.aries.util.filesystem.IDirectory;
 import org.apache.aries.util.manifest.ManifestHeaderProcessor;
@@ -56,16 +54,16 @@ import org.osgi.framework.ServiceReferen
 import org.osgi.framework.hooks.weaving.WeavingHook;
 import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
 import org.osgi.framework.namespace.IdentityNamespace;
+import org.osgi.framework.namespace.NativeNamespace;
 import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.namespace.service.ServiceNamespace;
 import org.osgi.resource.Capability;
+import org.osgi.resource.Namespace;
 import org.osgi.resource.Requirement;
 import org.osgi.resource.Resource;
 import org.osgi.resource.Wire;
-import org.osgi.resource.Wiring;
 import org.osgi.service.coordinator.Coordination;
 import org.osgi.service.coordinator.Participant;
-import org.osgi.service.repository.Repository;
-import org.osgi.service.resolver.HostedCapability;
 import org.osgi.service.resolver.ResolutionException;
 import org.osgi.service.resolver.ResolveContext;
 import org.osgi.service.subsystem.Subsystem;
@@ -83,7 +81,6 @@ public class SubsystemResource implement
 	private final Collection<DeployedContentHeader.Clause> missingResources = new HashSet<DeployedContentHeader.Clause>();
 	private final Collection<Resource> optionalResources = new HashSet<Resource>();
 	private final BasicSubsystem parent;
-	private final Repository preferredProviderRepository;
 	private final RawSubsystemResource resource;
 	private final Collection<Resource> sharedContent = new HashSet<Resource>();
 	private final Collection<Resource> sharedDependencies = new HashSet<Resource>();
@@ -95,7 +92,6 @@ public class SubsystemResource implement
 	public SubsystemResource(RawSubsystemResource resource, BasicSubsystem parent) throws IOException, BundleException, InvalidSyntaxException, URISyntaxException {
 		this.parent = parent;
 		this.resource = resource;
-		preferredProviderRepository = new PreferredProviderRepository(this);
 		computeContentResources(resource.getDeploymentManifest());
 		capabilities = computeCapabilities();
 		computeDependencies(resource.getDeploymentManifest());
@@ -109,7 +105,6 @@ public class SubsystemResource implement
 	public SubsystemResource(IDirectory directory) throws IOException, URISyntaxException, ResolutionException, BundleException, InvalidSyntaxException {
 		parent = null;
 		resource = new RawSubsystemResource(directory, parent);
-		preferredProviderRepository = null;
 		deploymentManifest = resource.getDeploymentManifest();
 		computeContentResources(deploymentManifest);
 		capabilities = computeCapabilities();
@@ -175,7 +170,7 @@ public class SubsystemResource implement
 		return installableDependencies;
 	}
 
-	public Repository getLocalRepository() {
+	public org.apache.aries.subsystem.core.repository.Repository getLocalRepository() {
 		return resource.getLocalRepository();
 	}
 
@@ -183,10 +178,18 @@ public class SubsystemResource implement
 		return resource.getLocation().getValue();
 	}
 
+	Collection<Resource> getMandatoryResources() {
+		return mandatoryResources;
+	}
+	
 	public Collection<DeployedContentHeader.Clause> getMissingResources() {
 		return missingResources;
 	}
 
+	Collection<Resource> getOptionalResources() {
+		return optionalResources;
+	}
+	
 	public Collection<BasicSubsystem> getParents() {
 		if (parent == null) {
 			Header<?> header = getDeploymentManifest().getHeaders().get(DeploymentManifest.ARIESSUBSYSTEM_PARENTS);
@@ -217,7 +220,9 @@ public class SubsystemResource implement
 						region.getRegionDigraph().removeRegion(region);
 				}
 			});
-			setImportIsolationPolicy();
+			if (!isApplication()) {
+				setImportIsolationPolicy();
+			}
 		}
 		return region;
 	}
@@ -236,10 +241,6 @@ public class SubsystemResource implement
 		}
 	}
 
-	public Collection<Resource> getResources() {
-		return resource.getResources();
-	}
-
 	public Collection<Resource> getSharedContent() {
 		return sharedContent;
 	}
@@ -252,6 +253,10 @@ public class SubsystemResource implement
 		return resource.getSubsystemManifest();
 	}
 
+	public Collection<TranslationFile> getTranslations() {
+		return resource.getTranslations();
+	}
+	
 	@Override
 	public int hashCode() {
 		int result = 17;
@@ -272,43 +277,6 @@ public class SubsystemResource implement
 			sharedContent.add(resource);
 	}
 
-	private boolean addDependencies(Repository repository, Requirement requirement, List<Capability> capabilities) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		if (repository == null)
-			return false;
-		Map<Requirement, Collection<Capability>> m = repository.findProviders(Collections.singleton(requirement));
-		if (m.containsKey(requirement)) {
-			Collection<Capability> cc = m.get(requirement);
-			// TODO The following check only needs to be done on capabilities from the system repository.
-			addValidCapabilities(cc, capabilities, requirement);
-		}
-		return !capabilities.isEmpty();
-	}
-
-	private boolean addDependenciesFromContentRepository(Requirement requirement, List<Capability> capabilities) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		// TODO Why create this with each method call? What not cache it as an instance variable?
-		Repository repository = new ContentRepository(installableContent, sharedContent);
-		return addDependencies(repository, requirement, capabilities);
-	}
-
-	private boolean addDependenciesFromLocalRepository(Requirement requirement, List<Capability> capabilities) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		Repository repository = resource.getLocalRepository();
-		return addDependencies(repository, requirement, capabilities);
-	}
-
-	private boolean addDependenciesFromPreferredProviderRepository(Requirement requirement, List<Capability> capabilities) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		return addDependencies(preferredProviderRepository, requirement, capabilities);
-	}
-
-	private boolean addDependenciesFromRepositoryServiceRepositories(Requirement requirement, List<Capability> capabilities) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		Repository repository = new RepositoryServiceRepository();
-		return addDependencies(repository, requirement, capabilities);
-	}
-
-	private boolean addDependenciesFromSystemRepository(Requirement requirement, List<Capability> capabilities) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		Repository repository = Activator.getInstance().getSystemRepository();
-		return addDependencies(repository, requirement, capabilities);
-	}
-
 	private void addDependency(Resource resource) {
 		if (resource == null)
 			return;
@@ -322,12 +290,6 @@ public class SubsystemResource implement
 		missingResources.add(resource);
 	}
 
-	private void addValidCapabilities(Collection<Capability> from, Collection<Capability> to, Requirement requirement) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		for (Capability c : from)
-			if (isValid(c, requirement))
-				to.add(c);
-	}
-
 	private void addSubsystemServiceImportToSharingPolicy(
 			RegionFilterBuilder builder) throws InvalidSyntaxException, BundleException, IOException, URISyntaxException {
 		builder.allow(
@@ -404,10 +366,11 @@ public class SubsystemResource implement
 		}
 	}
 
-	private void computeDependencies(SubsystemManifest manifest) {
+	private void computeDependencies(SubsystemManifest manifest)  {
 		SubsystemContentHeader contentHeader = manifest.getSubsystemContentHeader();
 		try {
 			Map<Resource, List<Wire>> resolution = Activator.getInstance().getResolver().resolve(createResolveContext());
+			setImportIsolationPolicy(resolution);
 			for (Map.Entry<Resource, List<Wire>> entry : resolution.entrySet()) {
 				Resource key = entry.getKey();
 				if (!contentHeader.contains(key)) {
@@ -424,6 +387,15 @@ public class SubsystemResource implement
 		catch (ResolutionException e) {
 			throw new SubsystemException(e);
 		}
+		catch (Exception e) {
+			if (e instanceof SubsystemException) {
+				throw (SubsystemException)e;
+			}
+			if (e instanceof SecurityException) {
+				throw (SecurityException)e;
+			}
+			throw new SubsystemException(e);
+		}
 	}
 
 	private DeployedContentHeader computeDeployedContentHeader() {
@@ -480,86 +452,7 @@ public class SubsystemResource implement
 	}
 
 	private ResolveContext createResolveContext() {
-		return new ResolveContext() {
-			private final Map<Resource, Wiring> wirings = computeWirings();
-
-			private Map<Resource, Wiring> computeWirings() {
-				Map<Resource, Wiring> wirings = new HashMap<Resource, Wiring>();
-				for (BasicSubsystem subsystem : Activator.getInstance().getSubsystems().getSubsystems())
-					for (Resource constituent : subsystem.getConstituents())
-						addWiring(constituent, wirings);
-				return Collections.unmodifiableMap(wirings);
-			}
-
-			private void addWiring(Resource resource, Map<Resource, Wiring> wirings) {
-				if (resource instanceof BundleConstituent) {
-					BundleConstituent bc = (BundleConstituent)resource;
-					wirings.put(bc.getBundle().adapt(BundleRevision.class), bc.getWiring());
-				}
-				else if (resource instanceof BundleRevision) {
-					BundleRevision br = (BundleRevision)resource;
-					wirings.put(br, br.getWiring());
-				}
-			}
-
-			@Override
-			public List<Capability> findProviders(Requirement requirement) {
-				List<Capability> result = new ArrayList<Capability>();
-				try {
-					// Only check the system repository for osgi.ee and osgi.native
-					if (ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE.equals(requirement.getNamespace())
-							|| DependencyCalculator.NATIVE_NAMESPACE.equals(requirement.getNamespace())) {
-						addDependenciesFromSystemRepository(requirement, result);
-						return result;
-					}
-					if (addDependenciesFromContentRepository(requirement, result))
-						return result;
-					if (addDependenciesFromPreferredProviderRepository(requirement, result))
-						return result;
-					if (addDependenciesFromSystemRepository(requirement, result))
-						return result;
-					if (addDependenciesFromLocalRepository(requirement, result))
-						return result;
-					if (addDependenciesFromRepositoryServiceRepositories(requirement, result))
-						return result;
-				}
-				catch (Throwable t) {
-					if (t instanceof SubsystemException)
-						throw (SubsystemException)t;
-					if (t instanceof SecurityException)
-						throw (SecurityException)t;
-					throw new SubsystemException(t);
-				}
-				return result;
-			}
-
-			@Override
-			public Collection<Resource> getMandatoryResources() {
-				return SubsystemResource.this.mandatoryResources;
-			}
-
-			@Override
-			public Collection<Resource> getOptionalResources() {
-				return SubsystemResource.this.optionalResources;
-			}
-
-			@Override
-			public int insertHostedCapability(List<Capability> capabilities,
-					HostedCapability hostedCapability) {
-				capabilities.add(hostedCapability);
-				return capabilities.size() - 1;
-			}
-
-			@Override
-			public boolean isEffective(Requirement requirement) {
-				return true;
-			}
-
-			@Override
-			public synchronized Map<Resource, Wiring> getWirings() {
-				return wirings;
-			}
-		};
+		return new org.apache.aries.subsystem.core.internal.ResolveContext(this);
 	}
 
 	private Resource findContent(Requirement requirement) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
@@ -647,10 +540,16 @@ public class SubsystemResource implement
 		return result;
 	}
 
-	private boolean isContent(Resource resource) {
-		return getSubsystemManifest().getSubsystemContentHeader().contains(resource);
+	boolean isApplication() {
+		String type = resource.getSubsystemManifest().getSubsystemTypeHeader().getType();
+		return SubsystemConstants.SUBSYSTEM_TYPE_APPLICATION.equals(type);
 	}
 
+	boolean isComposite() {
+		String type = resource.getSubsystemManifest().getSubsystemTypeHeader().getType();
+		return SubsystemConstants.SUBSYSTEM_TYPE_COMPOSITE.equals(type);
+	}
+	
 	private boolean isInstallable(Resource resource) {
 		return !isShared(resource);
 	}
@@ -662,7 +561,7 @@ public class SubsystemResource implement
 		return header.isMandatory(resource);
 	}
 
-	private boolean isRoot() {
+	boolean isRoot() {
 		return BasicSubsystem.ROOT_LOCATION.equals(getLocation());
 	}
 
@@ -671,41 +570,58 @@ public class SubsystemResource implement
 	}
 
 	private boolean isScoped() {
-		String type = resource.getSubsystemManifest().getSubsystemTypeHeader().getType();
-		return SubsystemConstants.SUBSYSTEM_TYPE_APPLICATION.equals(type) ||
-				SubsystemConstants.SUBSYSTEM_TYPE_COMPOSITE.equals(type);
+		return isApplication() || isComposite();
 	}
 
 	private boolean isUnscoped() {
 		return !isScoped();
 	}
 
-	private boolean isValid(Capability capability, Requirement requirement) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		if (IdentityNamespace.IDENTITY_NAMESPACE.equals(capability.getNamespace()))
-			return true;
-		Region from = findRegionForCapabilityValidation(capability.getResource());
-		Region to = findRegionForCapabilityValidation(requirement.getResource());
-		return new SharingPolicyValidator(from, to).isValid(capability);
-	}
-
-	private Region findRegionForCapabilityValidation(Resource resource) throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
-		if (isInstallable(resource)) {
-			if (isContent(resource))
-				return getRegion();
-			return Utils.findFirstSubsystemAcceptingDependenciesStartingFrom(parent).getRegion();
+	private void setImportIsolationPolicy(Map<Resource, List<Wire>> resolution) throws Exception {
+		if (!isApplication()) {
+			return;
 		}
-		else {
-			// This is an already installed resource from the system repository.
-			if (Utils.isBundle(resource))
-				// If it's a bundle, use region digraph to get the region in order
-				// to account for bundles in isolated regions outside of the
-				// subsystems API.
-				return Activator.getInstance().getRegionDigraph().getRegion(((BundleRevision)resource).getBundle());
-			else
-				// If it's anything else, get the region from one of the
-				// subsystems referencing it.
-				return Activator.getInstance().getSubsystems().getSubsystemsReferencing(resource).iterator().next().getRegion();
+		SubsystemContentHeader contentHeader = getSubsystemManifest().getSubsystemContentHeader();
+		// Prepare the regions and filter builder to set the sharing policy.
+		Region from = getRegion();
+		Region to = ((BasicSubsystem)getParents().iterator().next()).getRegion();
+		RegionFilterBuilder builder = from.getRegionDigraph().createRegionFilterBuilder();
+		// Always provide visibility to this subsystem's service registration.
+		addSubsystemServiceImportToSharingPolicy(builder, to);
+		for (Resource resource : resolution.keySet()) {
+			// If the resource is content but the wire provider is not,
+			// the sharing policy must be updated.
+			List<Wire> wires = resolution.get(resource);
+			for (Wire wire : wires) {
+				Resource provider = wire.getProvider();
+				if (contentHeader.contains(provider)) {
+					// The provider is content so the requirement does
+					// not need to become part of the sharing policy.
+					continue;
+				}
+				// The provider is not content, so the requirement must
+				// be added to the sharing policy.
+				Requirement requirement = wire.getRequirement();
+				String namespace = requirement.getNamespace();
+				if (ServiceNamespace.SERVICE_NAMESPACE.equals(namespace)) {
+					// The osgi.service namespace must be translated to one
+					// that region digraph understands.
+					namespace = RegionFilter.VISIBLE_SERVICE_NAMESPACE;
+				}
+				String filter = requirement.getDirectives().get(Namespace.REQUIREMENT_FILTER_DIRECTIVE);
+				if (filter == null) {
+					builder.allowAll(namespace);
+				}
+				else {
+					builder.allow(namespace, filter);
+				}
+			}
 		}
+		// Always add access to osgi.ee and osgi.native namespaces
+		setImplicitAccessToNativeAndEECapabilities(builder);
+		// Now set the sharing policy, if the regions are different.
+		RegionFilter regionFilter = builder.build();
+		from.connectRegion(to, regionFilter);
 	}
 
 	private void setImportIsolationPolicy() throws BundleException, IOException, InvalidSyntaxException, URISyntaxException {
@@ -734,7 +650,6 @@ public class SubsystemResource implement
 			setImportIsolationPolicy(builder, (RequireBundleHeader)header);
 			// Always add access to osgi.ee and osgi.native namespaces
 			setImplicitAccessToNativeAndEECapabilities(builder);
-
 		}
 		RegionFilter regionFilter = builder.build();
 		from.connectRegion(to, regionFilter);
@@ -742,14 +657,6 @@ public class SubsystemResource implement
 
 	private void setImportIsolationPolicy(RegionFilterBuilder builder, ImportPackageHeader header) throws InvalidSyntaxException {
 		String policy = RegionFilter.VISIBLE_PACKAGE_NAMESPACE;
-		// work around https://www.osgi.org/bugzilla/show_bug.cgi?id=144
-		// In the first instance, what if the various weaving services were to have a property,
-		// osgi.woven.packages, that was a comma separated list of packages that might be woven
-		// by that hook.
-		Collection<String> wovenPackages = getWovenPackages();
-		for (String pkg : wovenPackages) {
-			builder.allow(policy, "(osgi.wiring.package=" + pkg + ")");
-		}
 		if (header == null)
 			return;
 		for (ImportPackageHeader.Clause clause : header.getClauses()) {
@@ -758,23 +665,7 @@ public class SubsystemResource implement
 			builder.allow(policy, filter);
 		}
 	}
-
-	// First pass at this: really just a sketch.
-	private Collection<String> getWovenPackages() throws InvalidSyntaxException
-	{
-		// Find all weaving services in our region
-		BundleContext bc = Activator.getInstance().getBundleContext();
-		Collection<ServiceReference<WeavingHook>> weavers = bc.getServiceReferences(WeavingHook.class, null);
-		Collection<String> wovenPackages = new ArrayList<String>();
-		for (ServiceReference<WeavingHook> sr : weavers) {
-			String someWovenPackages = (String) sr.getProperty("osgi.woven.packages");
-			if (someWovenPackages != null) {
-				wovenPackages.addAll(ManifestHeaderProcessor.split(someWovenPackages, ","));
-			}
-		}
-		return wovenPackages;
-	}
-
+	
 	private void setImportIsolationPolicy(RegionFilterBuilder builder, RequireBundleHeader header) throws InvalidSyntaxException {
 		if (header == null)
 			return;
@@ -803,10 +694,9 @@ public class SubsystemResource implement
 		}
 	}
 
-
 	private void setImplicitAccessToNativeAndEECapabilities(RegionFilterBuilder builder) {
 		builder.allowAll(ExecutionEnvironmentNamespace.EXECUTION_ENVIRONMENT_NAMESPACE);
-		builder.allowAll(DependencyCalculator.NATIVE_NAMESPACE);
+		builder.allowAll(NativeNamespace.NATIVE_NAMESPACE);
 	}
 
 	private void setImportIsolationPolicy(RegionFilterBuilder builder, SubsystemImportServiceHeader header) throws InvalidSyntaxException {

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SubsystemResourceInstaller.java Tue Jun  9 16:11:17 2015
@@ -13,6 +13,8 @@
  */
 package org.apache.aries.subsystem.core.internal;
 
+import java.io.InputStream;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -22,7 +24,6 @@ import org.apache.aries.util.filesystem.
 import org.osgi.resource.Resource;
 import org.osgi.service.coordinator.Coordination;
 import org.osgi.service.coordinator.Participant;
-import org.osgi.service.repository.RepositoryContent;
 import org.osgi.service.subsystem.Subsystem.State;
 
 public class SubsystemResourceInstaller extends ResourceInstaller {
@@ -31,16 +32,15 @@ public class SubsystemResourceInstaller
 	}
 
 	public Resource install() throws Exception {
-		BasicSubsystem result;
-		if (resource instanceof RepositoryContent)
-			result = installRepositoryContent((RepositoryContent)resource);
-		else if (resource instanceof BasicSubsystem)
-			result = installAriesSubsystem((BasicSubsystem)resource);
+		if (resource instanceof BasicSubsystem)
+			return installAriesSubsystem((BasicSubsystem)resource);
 		else if (resource instanceof RawSubsystemResource)
-			result = installRawSubsystemResource((RawSubsystemResource)resource);
-		else
-			result = installSubsystemResource((SubsystemResource)resource);
-		return result;
+			return installRawSubsystemResource((RawSubsystemResource)resource);
+		else if (resource instanceof SubsystemResource)
+			return installSubsystemResource((SubsystemResource)resource);
+		else {
+			return installRepositoryContent(resource);
+		}
 	}
 
 	private void addChild(final BasicSubsystem child) {
@@ -147,8 +147,10 @@ public class SubsystemResourceInstaller
 		});
 	}
 
-	private BasicSubsystem installRepositoryContent(RepositoryContent resource) throws Exception {
-		RawSubsystemResource rawSubsystemResource = new RawSubsystemResource(getLocation(), FileSystem.getFSRoot(resource.getContent()), subsystem);
+	private BasicSubsystem installRepositoryContent(Resource resource) throws Exception {
+		Method method = resource.getClass().getMethod("getContent");
+		InputStream is = (InputStream)method.invoke(resource);
+		RawSubsystemResource rawSubsystemResource = new RawSubsystemResource(getLocation(), FileSystem.getFSRoot(is), subsystem);
 		return installRawSubsystemResource(rawSubsystemResource);
 	}
 

Modified: aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SystemRepository.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SystemRepository.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SystemRepository.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/main/java/org/apache/aries/subsystem/core/internal/SystemRepository.java Tue Jun  9 16:11:17 2015
@@ -21,9 +21,8 @@ import java.util.Map;
 import org.osgi.resource.Capability;
 import org.osgi.resource.Requirement;
 import org.osgi.resource.Resource;
-import org.osgi.service.repository.Repository;
 
-public class SystemRepository implements Repository {
+public class SystemRepository implements org.apache.aries.subsystem.core.repository.Repository {
 	private final BasicSubsystem root;
 	
 	public SystemRepository(BasicSubsystem root) {

Modified: aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java (original)
+++ aries/trunk/subsystem/subsystem-core/src/test/java/org/apache/aries/subsystem/core/internal/BundleRevisionResourceTest.java Tue Jun  9 16:11:17 2015
@@ -14,14 +14,18 @@
 package org.apache.aries.subsystem.core.internal;
 
 import static org.junit.Assert.assertEquals;
+import static org.easymock.EasyMock.*;
 
 import java.lang.reflect.Field;
+import java.util.Collections;
 
 import org.easymock.EasyMock;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.osgi.framework.wiring.BundleRevision;
+import org.osgi.resource.Capability;
+import org.osgi.resource.Requirement;
 
 public class BundleRevisionResourceTest {
     Activator storedActivator;
@@ -44,7 +48,9 @@ public class BundleRevisionResourceTest
 
     @Test
     public void testNoModellerServiceCapabilities() {
-        BundleRevision br = EasyMock.createNiceMock(BundleRevision.class);
+        BundleRevision br = createNiceMock(BundleRevision.class);
+        expect(br.getCapabilities(anyObject(String.class))).andReturn(Collections.<Capability>emptyList());
+        replay(br);
         BundleRevisionResource brr = new BundleRevisionResource(br);
         assertEquals(0, brr.getCapabilities("osgi.service").size());
     }
@@ -52,6 +58,8 @@ public class BundleRevisionResourceTest
     @Test
     public void testNoModellerServiceRequirements() {
         BundleRevision br = EasyMock.createNiceMock(BundleRevision.class);
+        expect(br.getRequirements(anyObject(String.class))).andReturn(Collections.<Requirement>emptyList());
+        replay(br);
         BundleRevisionResource brr = new BundleRevisionResource(br);
         assertEquals(0, brr.getRequirements("osgi.service").size());
     }

Modified: aries/trunk/subsystem/subsystem-install/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-install/pom.xml?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-install/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-install/pom.xml Tue Jun  9 16:11:17 2015
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
-            <version>0.1-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: aries/trunk/subsystem/subsystem-itests/pom.xml
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/pom.xml?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/pom.xml (original)
+++ aries/trunk/subsystem/subsystem-itests/pom.xml Tue Jun  9 16:11:17 2015
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>5.0.0</version>
+            <version>6.0.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -129,7 +129,7 @@
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.api</artifactId>
             <scope>test</scope>
-            <version>1.1.1-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.osgi</groupId>
@@ -141,7 +141,7 @@
             <groupId>org.apache.aries.subsystem</groupId>
             <artifactId>org.apache.aries.subsystem.core</artifactId>
             <scope>test</scope>
-            <version>1.2.1-SNAPSHOT</version>
+            <version>1.3.0-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.osgi</groupId>
@@ -199,25 +199,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.resolver</artifactId>
-            <version>1.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>org.osgi.core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.osgi</groupId>
-                    <artifactId>org.osgi.compendium</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.service.obr</artifactId>
             <scope>test</scope>
             <version>1.0.2</version>
@@ -318,7 +299,7 @@
         <dependency>
             <groupId>org.eclipse.tycho</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
-            <version>3.8.0.v20120529-1548</version>
+            <version>3.10.0.v20140606-1445</version>
         </dependency>
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>

Modified: aries/trunk/subsystem/subsystem-itests/src/test/bundles/dynamicImport/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/bundles/dynamicImport/META-INF/MANIFEST.MF?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/bundles/dynamicImport/META-INF/MANIFEST.MF (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/bundles/dynamicImport/META-INF/MANIFEST.MF Tue Jun  9 16:11:17 2015
@@ -5,6 +5,5 @@ Bundle-SymbolicName: org.apache.aries.su
 Bundle-Version: 1.0.0
 Import-Package: org.osgi.framework
 Bundle-Activator: org.apache.aries.subsystem.itests.dynamicImport.Activator
-Provide-Capability: osgi.ee;osgi.ee=JavaSE;version=1.5
 DynamicImport-Package: org.apache.aries.subsystem.itests.hello.api
 

Modified: aries/trunk/subsystem/subsystem-itests/src/test/bundles/helloImpl/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/bundles/helloImpl/META-INF/MANIFEST.MF?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/bundles/helloImpl/META-INF/MANIFEST.MF (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/bundles/helloImpl/META-INF/MANIFEST.MF Tue Jun  9 16:11:17 2015
@@ -5,5 +5,3 @@ Bundle-SymbolicName: org.apache.aries.su
 Bundle-Version: 1.0.0
 Import-Package: org.apache.aries.subsystem.itests.hello.api, org.osgi.framework
 Bundle-Activator: org.apache.aries.subsystem.itests.hello.impl.Activator
-Provide-Capability: osgi.ee;osgi.ee=JavaSE;version=1.5
-

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/DynamicImportTest.java Tue Jun  9 16:11:17 2015
@@ -8,9 +8,7 @@ import static org.junit.Assert.fail;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Dictionary;
 import java.util.HashMap;
-import java.util.Hashtable;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -75,16 +73,18 @@ public class DynamicImportTest extends S
 	
 	class TokenWeaver implements WeavingHook {
 		@Override
-		public void weave(WovenClass arg0) {} 
+		public void weave(WovenClass arg0) {
+			if ("org.apache.aries.subsystem.itests.dynamicImport".equals(arg0.getBundleWiring().getBundle().getSymbolicName())) {
+				arg0.getDynamicImports().add("org.apache.aries.subsystem.itests.hello.api");
+			}
+		} 
 	}
 	
 	@SuppressWarnings("rawtypes")
     @Test
 	public void testFirstPassWeavingApproach() throws Exception
 	{
-		Dictionary<String, String> props = new Hashtable<String, String>();
-		props.put("osgi.woven.packages", "some.woven.package, org.apache.aries.subsystem.itests.hello.api");
-		ServiceRegistration sr = bundleContext.registerService(WeavingHook.class, new TokenWeaver(), props);
+		ServiceRegistration<?> sr = bundleContext.registerService(WeavingHook.class, new TokenWeaver(), null);
 		try { 
 			Subsystem subsystem = installSubsystemFromFile ("dynamicImport.esa");
 			startSubsystem(subsystem);
@@ -139,8 +139,6 @@ public class DynamicImportTest extends S
     @Test
 	public void testDynamicPackageImportsAddedToSharingPolicyWhenNoImportPackageHeader() throws Exception {
 		final AtomicBoolean weavingHookCalled = new AtomicBoolean(false);
-		Dictionary<String, Object> props = new Hashtable<String, Object>();
-		props.put("osgi.woven.packages", "org.osgi.framework");
 		ServiceRegistration reg = bundleContext.registerService(
 				WeavingHook.class, 
 				new WeavingHook() {
@@ -152,7 +150,7 @@ public class DynamicImportTest extends S
 						}
 					}
 				}, 
-				props);
+				null);
 		try {
 			Subsystem s = installSubsystemFromFile(APPLICATION_A);
 			try {

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/RootSubsystemTest.java Tue Jun  9 16:11:17 2015
@@ -106,7 +106,7 @@ public class RootSubsystemTest extends S
 		core.stop();
 		assertServiceEventsStop(root);
 		core.uninstall();
-		core = bundleContext.installBundle(core.getLocation());
+		core = bundleContext.installBundle(normalizeBundleLocation(core));
 		core.start();
 		// There should be install events since the persisted root subsystem was
 		// deleted when the subsystems implementation bundle was uninstalled.

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java Tue Jun  9 16:11:17 2015
@@ -91,7 +91,6 @@ import org.osgi.framework.wiring.Framewo
 import org.osgi.resource.Capability;
 import org.osgi.resource.Resource;
 import org.osgi.service.repository.Repository;
-import org.osgi.service.repository.RepositoryContent;
 import org.osgi.service.subsystem.Subsystem;
 import org.osgi.service.subsystem.Subsystem.State;
 import org.osgi.service.subsystem.SubsystemConstants;
@@ -141,7 +140,7 @@ public abstract class SubsystemTest exte
 				streamBundle(createCoreFragment()).noStart(),
 				mavenBundle("org.apache.aries.subsystem",   "org.apache.aries.subsystem.itest.interfaces").versionAsInProject(),
 				mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(),
-				mavenBundle("org.apache.felix",             "org.apache.felix.resolver").versionAsInProject(),
+				//mavenBundle("org.apache.felix",             "org.apache.felix.resolver").versionAsInProject(),
 				mavenBundle("org.eclipse.equinox",          "org.eclipse.equinox.coordinator").version("1.1.0.v20120522-1841"),
 				mavenBundle("org.eclipse.equinox",          "org.eclipse.equinox.event").versionAsInProject(),
 				mavenBundle("org.eclipse.equinox",          "org.eclipse.equinox.region").version("1.1.0.v20120522-1841"),
@@ -578,11 +577,11 @@ public abstract class SubsystemTest exte
 						.end().file("OSGI-INF/blueprint/blueprint.xml", blueprintXml));
 	}
 
-	private RepositoryContent createBundleRepositoryContent(String file) throws Exception {
+	protected Resource createBundleRepositoryContent(String file) throws Exception {
 		return createBundleRepositoryContent(new File(file));
 	}
 
-	private RepositoryContent createBundleRepositoryContent(File file) throws Exception {
+	protected Resource createBundleRepositoryContent(File file) throws Exception {
 		return new BundleResource(FileSystem.getFSRoot(file));
 	}
 
@@ -1004,6 +1003,10 @@ public abstract class SubsystemTest exte
 		}
 	}
 
+	protected static String normalizeBundleLocation(Bundle bundle) {
+		return normalizeBundleLocation(bundle.getLocation());
+	}
+	
 	protected static String normalizeBundleLocation(String location) {
 		if (location.startsWith("initial@"))
 			return location.substring(8);

Modified: aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java
URL: http://svn.apache.org/viewvc/aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java?rev=1684463&r1=1684462&r2=1684463&view=diff
==============================================================================
--- aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java (original)
+++ aries/trunk/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/UnmanagedBundleTest.java Tue Jun  9 16:11:17 2015
@@ -94,7 +94,7 @@ public class UnmanagedBundleTest extends
 		try {
 			Bundle a = bundleContext.installBundle(BUNDLE_A, new FileInputStream(BUNDLE_A));
 			try {
-				core = bundleContext.installBundle(core.getLocation());
+				core = bundleContext.installBundle(normalizeBundleLocation(core));
 				core.start();
 				assertConstituent(getRootSubsystem(), BUNDLE_A);
 			}
@@ -104,7 +104,7 @@ public class UnmanagedBundleTest extends
 		}
 		finally {
 			if (core.getState() == Bundle.UNINSTALLED) {
-				core = bundleContext.installBundle(core.getLocation());
+				core = bundleContext.installBundle(normalizeBundleLocation(core));
 				core.start();
 			}
 		}