Author: alesj Date: 2010-02-15 11:22:49 -0500 (Mon, 15 Feb 2010) New Revision: 100975 Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ContextComparator.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ControllerContextPluginImpl.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DictionaryFactory.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/FilterParserAndMatcher.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MetaDataRetrievalService.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleContextWrapper.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleValidatorR4.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleWrapper.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiFragmentState.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ServiceRefDictionary.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSEntryPathsEnumeration.java projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSFindEntriesEnumeration.java Log: Optimize imports. Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractBundleState.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,25 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.security.Permission; -import java.security.cert.X509Certificate; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.MissingResourceException; -import java.util.PropertyResourceBundle; -import java.util.ResourceBundle; -import java.util.concurrent.atomic.AtomicInteger; - import org.jboss.dependency.plugins.tracker.AbstractContextTracker; import org.jboss.dependency.spi.ControllerContext; import org.jboss.dependency.spi.tracker.ContextTracking; @@ -52,23 +33,17 @@ import org.jboss.osgi.spi.NotImplementedException; import org.jboss.osgi.spi.util.ConstantsHelper; import org.jboss.virtual.VirtualFile; -import org.osgi.framework.AdminPermission; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleException; -import org.osgi.framework.BundleListener; -import org.osgi.framework.Constants; -import org.osgi.framework.Filter; -import org.osgi.framework.FrameworkListener; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.SynchronousBundleListener; -import org.osgi.framework.Version; +import org.osgi.framework.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.security.Permission; +import java.security.cert.X509Certificate; +import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; + /** * The abstract state of all bundles. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/AbstractDeployedBundleState.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,16 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.List; -import java.util.concurrent.atomic.AtomicLong; - import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.osgi.deployment.deployer.Deployment; @@ -41,6 +31,12 @@ import org.osgi.framework.Bundle; import org.osgi.framework.BundleException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; +import java.util.*; +import java.util.concurrent.atomic.AtomicLong; + /** * The abstract state of a user deployed {@link Bundle} or Fragment. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ContextComparator.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ContextComparator.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ContextComparator.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,10 +21,10 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.dependency.spi.ControllerContext; + import java.util.Comparator; -import org.jboss.dependency.spi.ControllerContext; - /** * Compare controller contexts. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ControllerContextPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ControllerContextPluginImpl.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ControllerContextPluginImpl.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -23,12 +23,6 @@ //$Id$ -import java.util.Collections; -import java.util.Set; -import java.util.jar.Attributes; -import java.util.jar.Manifest; -import java.util.jar.Attributes.Name; - import org.jboss.dependency.spi.ControllerContext; import org.jboss.deployers.structure.spi.DeploymentRegistry; import org.jboss.deployers.structure.spi.DeploymentUnit; @@ -40,6 +34,12 @@ import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; +import java.util.Collections; +import java.util.Set; +import java.util.jar.Attributes; +import java.util.jar.Attributes.Name; +import java.util.jar.Manifest; + /** * A plugin that manages OSGi services * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DescribeAction.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,17 +21,17 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Dictionary; - import org.jboss.kernel.spi.metadata.KernelMetaDataRepository; +import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader; import org.jboss.metadata.spi.loader.MutableMetaDataLoader; import org.jboss.metadata.spi.repository.MutableMetaDataRepository; import org.jboss.metadata.spi.retrieval.MetaDataRetrieval; import org.jboss.metadata.spi.scope.CommonLevels; import org.jboss.metadata.spi.scope.Scope; import org.jboss.metadata.spi.scope.ScopeKey; -import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader; +import java.util.Dictionary; + /** * Describe osgi service. * Put its properties into MDR. Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DictionaryFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DictionaryFactory.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/DictionaryFactory.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,10 +21,10 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.dependency.spi.ControllerContext; + import java.util.Dictionary; -import org.jboss.dependency.spi.ControllerContext; - /** * Get OSGi's dictionary from controller context instance. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/FilterParserAndMatcher.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/FilterParserAndMatcher.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/FilterParserAndMatcher.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,9 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Dictionary; -import java.util.Set; - import org.jboss.beans.metadata.api.model.QualifierContent; import org.jboss.dependency.spi.ControllerContext; import org.jboss.kernel.spi.qualifier.QualifierMatcher; @@ -34,6 +31,9 @@ import org.osgi.framework.FrameworkUtil; import org.osgi.framework.InvalidSyntaxException; +import java.util.Dictionary; +import java.util.Set; + /** * OSGi filter parsing and matching. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/GenericServiceReferenceWrapper.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,11 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Set; - import org.jboss.dependency.spi.ControllerContext; import org.jboss.dependency.spi.tracker.ContextTracker; import org.jboss.dependency.spi.tracker.ContextTracking; @@ -33,6 +28,11 @@ import org.jboss.osgi.framework.util.KernelUtils; import org.osgi.framework.Bundle; +import java.util.Dictionary; +import java.util.Enumeration; +import java.util.HashSet; +import java.util.Set; + /** * GenericServiceReferenceWrapper. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/InstanceMetaDataRetrievalFactory.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,10 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Dictionary; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArraySet; - import org.jboss.dependency.spi.Controller; import org.jboss.dependency.spi.ControllerContext; import org.jboss.kernel.Kernel; @@ -36,6 +32,10 @@ import org.jboss.metadata.spi.scope.Scope; import org.jboss.metadata.spi.scope.ScopeKey; +import java.util.Dictionary; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArraySet; + /** * Add OSGi's dictionary to MDR. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/KernelDictionaryFactory.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,10 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Dictionary; -import java.util.HashSet; -import java.util.Set; - import org.jboss.beans.info.spi.BeanInfo; import org.jboss.beans.metadata.spi.BeanMetaData; import org.jboss.beans.metadata.spi.RelatedClassMetaData; @@ -34,6 +30,10 @@ import org.jboss.reflect.spi.ClassInfo; import org.osgi.framework.Constants; +import java.util.Dictionary; +import java.util.HashSet; +import java.util.Set; + /** * Kernel dictionary factory. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,11 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Arrays; -import java.util.Collections; -import java.util.Dictionary; -import java.util.Enumeration; - import org.jboss.dependency.spi.ControllerContext; import org.jboss.logging.Logger; import org.jboss.metadata.spi.MetaData; @@ -37,6 +32,11 @@ import org.osgi.framework.Bundle; import org.osgi.framework.Constants; +import java.util.Arrays; +import java.util.Collections; +import java.util.Dictionary; +import java.util.Enumeration; + /** * MetaDataRepository utils. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MetaDataRetrievalService.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MetaDataRetrievalService.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/MetaDataRetrievalService.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,7 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import org.jboss.dependency.plugins.tracker.NoopContextTracker; import org.jboss.dependency.spi.tracker.ContextTracker; import org.jboss.kernel.Kernel; import org.jboss.kernel.spi.qualifier.QualifierMatchers; Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleContextWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleContextWrapper.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleContextWrapper.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -23,22 +23,13 @@ // $Id: $ +import org.jboss.virtual.VirtualFile; +import org.osgi.framework.*; + import java.io.File; import java.io.InputStream; import java.util.Dictionary; -import org.jboss.virtual.VirtualFile; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.BundleListener; -import org.osgi.framework.Filter; -import org.osgi.framework.FrameworkListener; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; - /** * A wrapper around the bundle state that just exposes the BundleContext API. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,33 +21,8 @@ */ package org.jboss.osgi.framework.bundle; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; - import org.jboss.dependency.spi.ControllerContext; import org.jboss.dependency.spi.ControllerState; -import org.jboss.dependency.spi.tracker.ContextTracker; import org.jboss.deployers.client.spi.DeployerClient; import org.jboss.deployers.client.spi.IncompleteDeploymentException; import org.jboss.deployers.client.spi.IncompleteDeployments; @@ -61,42 +36,34 @@ import org.jboss.deployers.vfs.spi.client.VFSDeployment; import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory; import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.qualifier.QualifierMatchers; import org.jboss.logging.Logger; -import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader; -import org.jboss.metadata.spi.MutableMetaData; -import org.jboss.metadata.spi.repository.MutableMetaDataRepository; -import org.jboss.metadata.spi.retrieval.MetaDataRetrieval; -import org.jboss.metadata.spi.retrieval.MetaDataRetrievalFactory; -import org.jboss.metadata.spi.scope.CommonLevels; -import org.jboss.metadata.spi.scope.ScopeKey; import org.jboss.osgi.deployment.deployer.Deployment; import org.jboss.osgi.deployment.deployer.DeploymentFactory; import org.jboss.osgi.framework.deployers.OSGiBundleActivatorDeployer; import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; -import org.jboss.osgi.framework.plugins.AutoInstallPlugin; -import org.jboss.osgi.framework.plugins.BundleStoragePlugin; -import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin; -import org.jboss.osgi.framework.plugins.PackageAdminPlugin; -import org.jboss.osgi.framework.plugins.Plugin; -import org.jboss.osgi.framework.plugins.ResolverPlugin; -import org.jboss.osgi.framework.plugins.ServicePlugin; +import org.jboss.osgi.framework.plugins.*; import org.jboss.osgi.framework.util.URLHelper; import org.jboss.osgi.spi.util.BundleInfo; import org.jboss.util.platform.Java; import org.jboss.virtual.VFS; import org.jboss.virtual.VFSUtils; import org.jboss.virtual.VirtualFile; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleEvent; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; -import org.osgi.framework.FrameworkEvent; -import org.osgi.framework.Version; +import org.osgi.framework.*; import org.osgi.service.packageadmin.PackageAdmin; +import java.io.*; +import java.net.MalformedURLException; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.atomic.AtomicInteger; + /** * OSGiBundleManager. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleState.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -23,6 +23,15 @@ // $Id: $ +import org.jboss.classloading.spi.metadata.ClassLoadingMetaData; +import org.jboss.dependency.spi.ControllerContext; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.osgi.framework.classloading.OSGiClassLoadingMetaData; +import org.jboss.osgi.framework.classloading.OSGiClassLoadingMetaData.FragmentHostMetaData; +import org.jboss.osgi.framework.metadata.OSGiMetaData; +import org.jboss.osgi.framework.plugins.ServiceManagerPlugin; +import org.osgi.framework.*; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -32,20 +41,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.jboss.classloading.spi.metadata.ClassLoadingMetaData; -import org.jboss.dependency.spi.ControllerContext; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.osgi.framework.classloading.OSGiClassLoadingMetaData; -import org.jboss.osgi.framework.classloading.OSGiClassLoadingMetaData.FragmentHostMetaData; -import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.plugins.ServiceManagerPlugin; -import org.osgi.framework.AdminPermission; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.Version; - /** * The state of a user deployed {@link Bundle} and its associated {@link BundleContext}. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleValidatorR4.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleValidatorR4.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleValidatorR4.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,14 +21,14 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.osgi.framework.metadata.OSGiMetaData; +import org.jboss.osgi.framework.metadata.PackageAttribute; +import org.osgi.framework.Constants; + import java.util.HashSet; import java.util.List; import java.util.Set; -import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.metadata.PackageAttribute; -import org.osgi.framework.Constants; - /** * A bundle validator for OSGi R4. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleWrapper.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleWrapper.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,6 +21,8 @@ */ package org.jboss.osgi.framework.bundle; +import org.osgi.framework.*; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -30,12 +32,6 @@ import java.util.List; import java.util.Map; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.Version; - /** * OSGiBundleWrapper. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiControllerContextActions.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,14 +21,14 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.HashMap; -import java.util.Map; - import org.jboss.dependency.plugins.AbstractControllerContextActions; import org.jboss.dependency.plugins.action.ControllerContextAction; import org.jboss.dependency.spi.ControllerContextActions; import org.jboss.dependency.spi.ControllerState; +import java.util.HashMap; +import java.util.Map; + /** * OSGi actions. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiFragmentState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiFragmentState.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiFragmentState.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,16 +21,16 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.osgi.spi.NotImplementedException; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleException; + import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Enumeration; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.osgi.spi.NotImplementedException; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; - /** * The state of a fragment {@link Bundle}. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceRegistrationWrapper.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,11 +21,11 @@ */ package org.jboss.osgi.framework.bundle; -import java.util.Dictionary; - import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; +import java.util.Dictionary; + /** * OSGiServiceRegistrationWrapper. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,18 +21,6 @@ */ package org.jboss.osgi.framework.bundle; -import java.security.AccessControlContext; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Dictionary; -import java.util.Enumeration; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.atomic.AtomicLong; - import org.jboss.beans.info.spi.BeanInfo; import org.jboss.dependency.plugins.AbstractControllerContext; import org.jboss.dependency.spi.ControllerContext; @@ -51,16 +39,13 @@ import org.jboss.osgi.spi.util.BundleClassLoader; import org.jboss.util.collection.CollectionsFactory; import org.jboss.util.id.GUID; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; -import org.osgi.framework.FrameworkEvent; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceFactory; -import org.osgi.framework.ServicePermission; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; +import org.osgi.framework.*; +import java.security.AccessControlContext; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicLong; + /** * OSGiServiceState. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/OSGiSystemState.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,19 +21,19 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.osgi.framework.metadata.OSGiMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; +import org.osgi.framework.BundleException; +import org.osgi.framework.Constants; + import java.io.IOException; import java.io.InputStream; import java.net.URL; import java.util.Enumeration; import java.util.jar.Attributes; +import java.util.jar.Attributes.Name; import java.util.jar.Manifest; -import java.util.jar.Attributes.Name; -import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; -import org.osgi.framework.BundleException; -import org.osgi.framework.Constants; - /** * OSGiSystemBundle. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ServiceRefDictionary.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ServiceRefDictionary.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/ServiceRefDictionary.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,11 +21,11 @@ */ package org.jboss.osgi.framework.bundle; +import org.osgi.framework.ServiceReference; + import java.util.Dictionary; import java.util.Enumeration; -import org.osgi.framework.ServiceReference; - /** * Service reference based dictionary. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSEntryPathsEnumeration.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSEntryPathsEnumeration.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSEntryPathsEnumeration.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,14 +21,14 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.virtual.VirtualFile; + import java.io.IOException; import java.util.ArrayList; import java.util.Enumeration; import java.util.Iterator; import java.util.List; -import org.jboss.virtual.VirtualFile; - /** * VFSEntryPathsEnumeration. * Modified: projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSFindEntriesEnumeration.java =================================================================== --- projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSFindEntriesEnumeration.java 2010-02-15 15:54:54 UTC (rev 100974) +++ projects/jboss-osgi/projects/runtime/framework/branches/alesj_service-mix/src/main/java/org/jboss/osgi/framework/bundle/VFSFindEntriesEnumeration.java 2010-02-15 16:22:49 UTC (rev 100975) @@ -21,6 +21,11 @@ */ package org.jboss.osgi.framework.bundle; +import org.jboss.virtual.VirtualFile; +import org.jboss.virtual.VirtualFileVisitor; +import org.jboss.virtual.VisitorAttributes; +import org.jboss.virtual.plugins.vfs.helpers.MatchAllVirtualFileFilter; + import java.io.IOException; import java.net.URL; import java.util.ArrayList; @@ -29,11 +34,6 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.jboss.virtual.VirtualFile; -import org.jboss.virtual.VirtualFileVisitor; -import org.jboss.virtual.VisitorAttributes; -import org.jboss.virtual.plugins.vfs.helpers.MatchAllVirtualFileFilter; - /** * VFSFindEntriesEnumeration. *