[jboss-osgi-commits] JBoss-OSGI SVN: r94261 - in projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler: src/main/java/org/jboss/osgi/framework/bundle and 12 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-10-02 06:00:02 -0400 (Fri, 02 Oct 2009) New Revision: 94261 Added: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ Removed: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/MicrocontainerServiceImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/PackageAdminImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/StartLevelImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/.project projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleRequirement.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractActivationPolicyMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractAttributeAware.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractAttributeMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractDependencyMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractHolderMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractListenerMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractMetaDataVisitorNode.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractPackageAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractParameter.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractParameterizedAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractReferenceMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractServiceDeployment.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractServiceMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ActivationPolicyMDValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/BooleanValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/CollectionValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/IntegerValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/PackageAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ParameterizedAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ParameterizedAttributeValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/PathAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/QNameAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/StringListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/StringValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/URLValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ValueCreatorUtil.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/VersionRangeValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/VersionValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ListenerHandler.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ListenerInterceptor.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaBinding.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaBindingHelper.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaInitializer.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ReferenceHandler.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ServiceHandler.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml Log: Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/.project =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/.project 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/.project 2009-10-02 10:00:02 UTC (rev 94261) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-runtime-microcontainer</name> + <name>jboss-osgi-framework</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/bundle/OSGiBundleManager.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -61,7 +61,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.framework.filter.NoFilter; import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractOSGiMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; import org.jboss.osgi.framework.plugins.AutoInstallPlugin; import org.jboss.osgi.framework.plugins.BundleStoragePlugin; import org.jboss.osgi.framework.plugins.FrameworkEventsPlugin; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleRequirement.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleRequirement.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiBundleRequirement.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -27,7 +27,7 @@ import org.jboss.classloading.spi.version.VersionRange; import org.jboss.osgi.framework.metadata.Parameter; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange; import org.osgi.framework.Constants; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageCapability.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -36,7 +36,7 @@ import org.jboss.osgi.framework.metadata.PackageAttribute; import org.jboss.osgi.framework.metadata.Parameter; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange; import org.jboss.osgi.framework.resolver.BundleCapability; import org.jboss.osgi.framework.resolver.BundleResolver; import org.osgi.framework.Constants; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/classloading/OSGiPackageRequirement.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -31,7 +31,7 @@ import org.jboss.osgi.framework.bundle.OSGiBundleState; import org.jboss.osgi.framework.metadata.PackageAttribute; import org.jboss.osgi.framework.metadata.Parameter; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange; import org.osgi.framework.Constants; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/deployers/OSGiManifestParsingDeployer.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -26,7 +26,7 @@ import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer; import org.jboss.osgi.framework.metadata.OSGiMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractOSGiMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; import org.osgi.framework.Constants; /** Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal (from rev 94258, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl) Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractActivationPolicyMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractActivationPolicyMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractActivationPolicyMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractAttributeAware.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractAttributeAware.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractAttributeAware.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractAttributeMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractAttributeMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractAttributeMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractDependencyMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractDependencyMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractDependencyMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractHolderMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractHolderMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractHolderMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; import java.util.Set; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractListenerMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractListenerMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractListenerMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractMetaDataVisitorNode.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractMetaDataVisitorNode.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractMetaDataVisitorNode.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Iterator; import java.util.Set; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractOSGiMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractOSGiMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,18 +19,18 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.ACTIVATION_POLICY_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.INTEGER_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.PACKAGE_LIST_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.PARAM_ATTRIB_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.PATH_ATTRIB_LIST_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.QNAME_ATTRIB_LIST_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.STRING_LIST_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.STRING_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.URL_VC; -import static org.jboss.osgi.framework.metadata.impl.ValueCreatorUtil.VERSION_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.ACTIVATION_POLICY_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.INTEGER_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.PACKAGE_LIST_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.PARAM_ATTRIB_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.PATH_ATTRIB_LIST_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.QNAME_ATTRIB_LIST_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.STRING_LIST_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.STRING_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.URL_VC; +import static org.jboss.osgi.framework.metadata.internal.ValueCreatorUtil.VERSION_VC; import static org.osgi.framework.Constants.BUNDLE_ACTIVATOR; import static org.osgi.framework.Constants.BUNDLE_CATEGORY; import static org.osgi.framework.Constants.BUNDLE_CLASSPATH; @@ -67,9 +67,9 @@ import org.jboss.osgi.framework.metadata.OSGiMetaData; import org.jboss.osgi.framework.metadata.PackageAttribute; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange.OSGiVersionToOSGiVersionComparator; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange.OSGiVersionToStringComparator; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange.OSGiVersionToVersionComparator; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange.OSGiVersionToOSGiVersionComparator; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange.OSGiVersionToStringComparator; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange.OSGiVersionToVersionComparator; import org.osgi.framework.Constants; import org.osgi.framework.Version; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractPackageAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractPackageAttribute.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractPackageAttribute.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; import java.util.Map; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractParameter.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractParameter.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractParameter.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; import java.util.Collection; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractParameterizedAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractParameterizedAttribute.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractParameterizedAttribute.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Map; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractReferenceMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractReferenceMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractReferenceMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.List; import java.util.Set; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractServiceDeployment.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractServiceDeployment.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractServiceDeployment.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractServiceMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractServiceMetaData.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractServiceMetaData.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Collections; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import org.jboss.logging.Logger; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/AbstractVersionRange.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/AbstractVersionRange.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.Serializable; import java.util.StringTokenizer; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ActivationPolicyMDValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ActivationPolicyMDValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ActivationPolicyMDValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Arrays; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/BooleanValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/BooleanValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/BooleanValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; /** * Parse boolean from string. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/CollectionValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/CollectionValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/CollectionValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Collection; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/IntegerValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/IntegerValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/IntegerValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; /** * Parse int from string. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ListValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ListValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/OSGiParameters.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/OSGiParameters.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Collection; import java.util.Collections; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/PackageAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/PackageAttributeListValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/PackageAttributeListValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.ArrayList; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ParameterizedAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ParameterizedAttributeListValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ParameterizedAttributeListValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.ArrayList; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ParameterizedAttributeValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ParameterizedAttributeValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ParameterizedAttributeValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/PathAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/PathAttributeListValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/PathAttributeListValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/QNameAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/QNameAttributeListValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/QNameAttributeListValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/StringListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/StringListValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/StringListValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.util.Arrays; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/StringValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/StringValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/StringValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; /** * Plain string forwarding - no conversion. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/URLValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/URLValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/URLValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.net.MalformedURLException; import java.net.URL; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; /** * Create value from attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ValueCreatorUtil.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/ValueCreatorUtil.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/ValueCreatorUtil.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; /** * ValueCreator holder. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/VersionRangeValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/VersionRangeValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/VersionRangeValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import org.jboss.osgi.framework.metadata.VersionRange; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/VersionValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/impl/VersionValueCreator.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/metadata/internal/VersionValueCreator.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import org.osgi.framework.Version; Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal (from rev 94258, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl) Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/AbstractPluginImpl.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractPluginImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.plugins.impl; +package org.jboss.osgi.framework.plugins.internal; //$Id$ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/AbstractServicePluginImpl.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AbstractServicePluginImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.plugins.impl; +package org.jboss.osgi.framework.plugins.internal; //$Id: AbstractPluginImpl.java 92725 2009-08-24 06:19:18Z thomas.diesler(a)jboss.com $ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/AutoInstallPluginImpl.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/AutoInstallPluginImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.plugins.impl; +package org.jboss.osgi.framework.plugins.internal; //$Id$ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/BundleStoragePluginImpl.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/BundleStoragePluginImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.plugins.impl; +package org.jboss.osgi.framework.plugins.internal; //$Id$ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/FrameworkEventsPluginImpl.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/FrameworkEventsPluginImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.plugins.impl; +package org.jboss.osgi.framework.plugins.internal; //$Id: SystemPackagesPluginImpl.java 92858 2009-08-27 10:58:32Z thomas.diesler(a)jboss.com $ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/impl/SystemPackagesPluginImpl.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.plugins.impl; +package org.jboss.osgi.framework.plugins.internal; //$Id$ Deleted: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/MicrocontainerServiceImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/MicrocontainerServiceImpl.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/MicrocontainerServiceImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -1,199 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.framework.service; - -//$Id$ - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import javax.management.MBeanServer; -import javax.management.StandardMBean; - -import org.jboss.dependency.plugins.AbstractController; -import org.jboss.dependency.plugins.AbstractControllerContext; -import org.jboss.dependency.plugins.AbstractControllerContextActions; -import org.jboss.dependency.plugins.action.ControllerContextAction; -import org.jboss.dependency.spi.ControllerContext; -import org.jboss.dependency.spi.ControllerContextActions; -import org.jboss.dependency.spi.ControllerState; -import org.jboss.kernel.Kernel; -import org.jboss.kernel.spi.dependency.KernelController; -import org.jboss.kernel.spi.dependency.KernelControllerContext; -import org.jboss.logging.Logger; -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.framework.plugins.MicrocontainerServicePlugin; -import org.jboss.osgi.framework.plugins.impl.AbstractServicePluginImpl; -import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; -import org.jboss.osgi.spi.service.MicrocontainerService; -import org.osgi.framework.Constants; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.framework.ServiceEvent; -import org.osgi.framework.ServiceListener; -import org.osgi.framework.ServiceReference; -import org.osgi.framework.ServiceRegistration; - -/** - * An implementation of the {@link MicrocontainerService}. - * - * @author thomas.diesler(a)jboss.com - * @since 31-Aug-2009 - */ -public class MicrocontainerServiceImpl extends AbstractServicePluginImpl implements MicrocontainerServicePlugin, MicrocontainerServiceMBean -{ - /** The log */ - private static final Logger log = Logger.getLogger(MicrocontainerServiceImpl.class); - - private Kernel kernel; - private ServiceRegistration registration; - - public MicrocontainerServiceImpl(OSGiBundleManager bundleManager) - { - super(bundleManager); - - this.kernel = bundleManager.getKernel(); - } - - public void startService() - { - installKernelBean(BEAN_SYSTEM_BUNDLE_CONTEXT, getSystemContext()); - registration = getSystemContext().registerService(MicrocontainerService.class.getName(), this, null); - - // Track the MBeanServer and register this service as an MBean - try - { - String filter = "(" + Constants.OBJECTCLASS + "=" + MBeanServer.class.getName() + ")"; - getSystemContext().addServiceListener(new JMXServiceListener(this), filter); - } - catch (InvalidSyntaxException ex) - { - // ignore - } - } - - public void stopService() - { - if (registration != null) - { - registration.unregister(); - registration = null; - } - } - - public Object getRegisteredBean(String beanName) - { - ControllerContext context = kernel.getController().getInstalledContext(beanName); - return context != null ? context.getTarget() : null; - } - - @SuppressWarnings("unchecked") - public <T> T getRegisteredBean(Class<T> beanClass, String beanName) - { - Object target = getRegisteredBean(beanName); - if (target == null | beanClass.isAssignableFrom(target.getClass()) == false) - return null; - - return (T)target; - } - - public List<String> getRegisteredBeans() - { - List<String> names = new ArrayList<String>(); - - AbstractController controller = (AbstractController)kernel.getController(); - for (ControllerContext ctx : controller.getAllContexts()) - { - if (ctx instanceof KernelControllerContext) - names.add(ctx.getName().toString()); - } - - return names; - } - - private void installKernelBean(String beanName, Object target) - { - KernelController controller = kernel.getController(); - ControllerContextActions actions = new AbstractControllerContextActions(new HashMap<ControllerState, ControllerContextAction>()); - try - { - controller.install(new AbstractControllerContext(beanName, actions, null, target)); - } - catch (Throwable th) - { - throw new IllegalStateException("Cannot install kernel bean: " + beanName, th); - } - } - - private void registerMBeans(MBeanServer server, MicrocontainerServiceMBean mbeanImpl) - { - try - { - installKernelBean(BEAN_MBEAN_SERVER, server); - StandardMBean mbean = new StandardMBean(mbeanImpl, MicrocontainerServiceMBean.class); - server.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE); - } - catch (Exception ex) - { - throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex); - } - } - - private void unregisterMBeans(MBeanServer server) - { - try - { - if (server.isRegistered(MBEAN_MICROCONTAINER_SERVICE)) - server.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE); - } - catch (Exception ex) - { - log.warn("Cannot unregister MicrocontainerServiceMBean", ex); - } - } - - class JMXServiceListener implements ServiceListener - { - private MicrocontainerServiceMBean mbean; - - public JMXServiceListener(MicrocontainerServiceMBean mbean) - { - this.mbean = mbean; - } - - public void serviceChanged(ServiceEvent event) - { - ServiceReference sref = event.getServiceReference(); - MBeanServer server = (MBeanServer)getSystemContext().getService(sref); - int type = event.getType(); - switch (type) - { - case ServiceEvent.REGISTERED: - registerMBeans(server, mbean); - break; - case ServiceEvent.UNREGISTERING: - unregisterMBeans(server); - break; - } - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/PackageAdminImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/PackageAdminImpl.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/PackageAdminImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -1,260 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.framework.service; - -//$Id: StartLevelImpl.java 93118 2009-09-02 08:24:44Z thomas.diesler(a)jboss.com $ - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; - -import org.jboss.classloading.plugins.metadata.PackageCapability; -import org.jboss.classloading.spi.metadata.CapabilitiesMetaData; -import org.jboss.classloading.spi.metadata.Capability; -import org.jboss.classloading.spi.metadata.ClassLoadingMetaData; -import org.jboss.deployers.structure.spi.DeploymentUnit; -import org.jboss.logging.Logger; -import org.jboss.osgi.framework.bundle.AbstractBundleState; -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.framework.bundle.OSGiBundleState; -import org.jboss.osgi.framework.bundle.OSGiBundleWrapper; -import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; -import org.jboss.osgi.framework.plugins.impl.AbstractServicePluginImpl; -import org.jboss.osgi.framework.resolver.BundleResolver; -import org.jboss.osgi.spi.NotImplementedException; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; -import org.osgi.framework.Version; -import org.osgi.service.packageadmin.ExportedPackage; -import org.osgi.service.packageadmin.PackageAdmin; -import org.osgi.service.packageadmin.RequiredBundle; - -/** - * An implementation of the {@link PackageAdmin}. - * - * [TODO] [JBOSGI-149] Fully implement PackageAdmin - * - * @author thomas.diesler(a)jboss.com - * @since 03-Sep-2009 - */ -public class PackageAdminImpl extends AbstractServicePluginImpl implements PackageAdminServicePlugin -{ - /** The log */ - private static final Logger log = Logger.getLogger(PackageAdminImpl.class); - - private ServiceRegistration registration; - - public PackageAdminImpl(OSGiBundleManager bundleManager) - { - super(bundleManager); - } - - public void startService() - { - BundleContext sysContext = getSystemContext(); - registration = sysContext.registerService(PackageAdmin.class.getName(), this, null); - } - - public void stopService() - { - if (registration != null) - { - registration.unregister(); - registration = null; - } - } - - @SuppressWarnings("unchecked") - public Bundle getBundle(Class clazz) - { - throw new NotImplementedException(); - } - - public int getBundleType(Bundle bundle) - { - throw new NotImplementedException(); - } - - public Bundle[] getBundles(String symbolicName, String versionRange) - { - throw new NotImplementedException(); - } - - public ExportedPackage getExportedPackage(String name) - { - throw new NotImplementedException(); - } - - public ExportedPackage[] getExportedPackages(Bundle bundle) - { - OSGiBundleState bundleState = assertBundleState(bundle); - DeploymentUnit unit = bundleState.getDeploymentUnit(); - ClassLoadingMetaData metaData = unit.getAttachment(ClassLoadingMetaData.class); - if (metaData == null) - throw new IllegalStateException("Cannot obtain ClassLoadingMetaData"); - - List<ExportedPackage> exported = new ArrayList<ExportedPackage>(); - CapabilitiesMetaData capabilities = metaData.getCapabilities(); - for (Capability capability : capabilities.getCapabilities()) - { - if (capability instanceof PackageCapability) - { - exported.add(new ExportedPackageImpl(bundleState, (PackageCapability)capability)); - } - } - if (exported.size() == 0) - return null; - - ExportedPackage[] result = new ExportedPackage[exported.size()]; - exported.toArray(result); - - return result; - } - - public ExportedPackage[] getExportedPackages(String name) - { - throw new NotImplementedException(); - } - - public Bundle[] getFragments(Bundle bundle) - { - throw new NotImplementedException(); - } - - public Bundle[] getHosts(Bundle bundle) - { - throw new NotImplementedException(); - } - - public RequiredBundle[] getRequiredBundles(String symbolicName) - { - throw new NotImplementedException(); - } - - public void refreshPackages(Bundle[] bundles) - { - // [TODO] refreshPackages(Bundle[] bundles) - log.debug("Ignore refreshPackages"); - } - - public boolean resolveBundles(Bundle[] bundleArr) - { - // Collect the bundles that are in state INSTALLED - List<Bundle> unresolvedBundles = new ArrayList<Bundle>(); - if (bundleArr == null) - { - unresolvedBundles.addAll(bundleManager.getBundles(Bundle.INSTALLED)); - } - else - { - for (Bundle bundle : bundleArr) - { - if (bundle.getState() == Bundle.INSTALLED) - unresolvedBundles.add(bundle); - } - } - - if (unresolvedBundles.isEmpty()) - return true; - - BundleResolver bundleResolver = bundleManager.getBundleResolver(); - List<OSGiBundleState> resolvableBundles = bundleResolver.resolveBundles(unresolvedBundles); - boolean allResolved = resolvableBundles.containsAll(unresolvedBundles); - - int resolved = 1; - while (resolved > 0) - { - resolved = 0; - Iterator<OSGiBundleState> it = resolvableBundles.iterator(); - while (it.hasNext()) - { - OSGiBundleState bundleState = assertBundleState(it.next()); - if (bundleManager.resolve(bundleState, false)) - { - it.remove(); - resolved++; - } - } - } - - // Sanity check, that the controller could actually also resolve these bundles - if (resolvableBundles.isEmpty() == false) - throw new IllegalStateException("Controller could not resolve: " + resolvableBundles); - - return allResolved; - } - - private OSGiBundleState assertBundleState(Bundle bundle) - { - if (bundle instanceof OSGiBundleWrapper) - bundle = ((OSGiBundleWrapper)bundle).getBundleState(); - - if (bundle instanceof OSGiBundleState == false) - throw new IllegalArgumentException("Cannot obtain bunde state from: " + bundle); - - return (OSGiBundleState)bundle; - } - - private static class ExportedPackageImpl implements ExportedPackage - { - private Bundle bundle; - private PackageCapability capability; - - public ExportedPackageImpl(AbstractBundleState bundle, PackageCapability capability) - { - this.bundle = bundle.getBundle(); - this.capability = capability; - } - - public Bundle getExportingBundle() - { - return bundle; - } - - public Bundle[] getImportingBundles() - { - throw new NotImplementedException(); - } - - public String getName() - { - return capability.getName(); - } - - @SuppressWarnings("deprecation") - public String getSpecificationVersion() - { - throw new NotImplementedException(); - } - - public Version getVersion() - { - return Version.parseVersion(capability.getVersion().toString()); - } - - public boolean isRemovalPending() - { - throw new NotImplementedException(); - } - } -} \ No newline at end of file Deleted: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/StartLevelImpl.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/StartLevelImpl.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/StartLevelImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -1,107 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.osgi.framework.service; - -//$Id$ - -import org.jboss.logging.Logger; -import org.jboss.osgi.framework.bundle.OSGiBundleManager; -import org.jboss.osgi.framework.plugins.StartLevelServicePlugin; -import org.jboss.osgi.framework.plugins.impl.AbstractServicePluginImpl; -import org.osgi.framework.Bundle; -import org.osgi.framework.ServiceRegistration; -import org.osgi.service.startlevel.StartLevel; - -/** - * An implementation of the {@link StartLevel}. - * - * [TODO] [JBOSGI-150] Fully implement StartLevel - * - * @author thomas.diesler(a)jboss.com - * @since 31-Aug-2009 - */ -public class StartLevelImpl extends AbstractServicePluginImpl implements StartLevelServicePlugin -{ - /** The log */ - private static final Logger log = Logger.getLogger(StartLevelImpl.class); - - private ServiceRegistration registration; - - public StartLevelImpl(OSGiBundleManager bundleManager) - { - super(bundleManager); - } - - public void startService() - { - registration = getSystemContext().registerService(StartLevel.class.getName(), this, null); - } - - public void stopService() - { - if (registration != null) - { - registration.unregister(); - registration = null; - } - } - - public int getBundleStartLevel(Bundle bundle) - { - return 1; - } - - public int getInitialBundleStartLevel() - { - return 1; - } - - public int getStartLevel() - { - return 1; - } - - public boolean isBundleActivationPolicyUsed(Bundle bundle) - { - return false; - } - - public boolean isBundlePersistentlyStarted(Bundle bundle) - { - return false; - } - - public void setBundleStartLevel(Bundle bundle, int startlevel) - { - log.info("Ignore setBundleStartLevel(" + bundle + "," + startlevel + ")"); - } - - public void setInitialBundleStartLevel(int startlevel) - { - log.info("Ignore setInitialBundleStartLevel(" + startlevel + ")"); - } - - public void setStartLevel(int startlevel) - { - log.info("Ignore setStartLevel(" + startlevel + ")"); - } -} \ No newline at end of file Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java (from rev 94258, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/MicrocontainerServiceImpl.java) =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/MicrocontainerServiceImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -0,0 +1,199 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.framework.service.internal; + +//$Id$ + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import javax.management.MBeanServer; +import javax.management.StandardMBean; + +import org.jboss.dependency.plugins.AbstractController; +import org.jboss.dependency.plugins.AbstractControllerContext; +import org.jboss.dependency.plugins.AbstractControllerContextActions; +import org.jboss.dependency.plugins.action.ControllerContextAction; +import org.jboss.dependency.spi.ControllerContext; +import org.jboss.dependency.spi.ControllerContextActions; +import org.jboss.dependency.spi.ControllerState; +import org.jboss.kernel.Kernel; +import org.jboss.kernel.spi.dependency.KernelController; +import org.jboss.kernel.spi.dependency.KernelControllerContext; +import org.jboss.logging.Logger; +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.plugins.MicrocontainerServicePlugin; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.spi.management.MicrocontainerServiceMBean; +import org.jboss.osgi.spi.service.MicrocontainerService; +import org.osgi.framework.Constants; +import org.osgi.framework.InvalidSyntaxException; +import org.osgi.framework.ServiceEvent; +import org.osgi.framework.ServiceListener; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.ServiceRegistration; + +/** + * An implementation of the {@link MicrocontainerService}. + * + * @author thomas.diesler(a)jboss.com + * @since 31-Aug-2009 + */ +public class MicrocontainerServiceImpl extends AbstractServicePluginImpl implements MicrocontainerServicePlugin, MicrocontainerServiceMBean +{ + /** The log */ + private static final Logger log = Logger.getLogger(MicrocontainerServiceImpl.class); + + private Kernel kernel; + private ServiceRegistration registration; + + public MicrocontainerServiceImpl(OSGiBundleManager bundleManager) + { + super(bundleManager); + + this.kernel = bundleManager.getKernel(); + } + + public void startService() + { + installKernelBean(BEAN_SYSTEM_BUNDLE_CONTEXT, getSystemContext()); + registration = getSystemContext().registerService(MicrocontainerService.class.getName(), this, null); + + // Track the MBeanServer and register this service as an MBean + try + { + String filter = "(" + Constants.OBJECTCLASS + "=" + MBeanServer.class.getName() + ")"; + getSystemContext().addServiceListener(new JMXServiceListener(this), filter); + } + catch (InvalidSyntaxException ex) + { + // ignore + } + } + + public void stopService() + { + if (registration != null) + { + registration.unregister(); + registration = null; + } + } + + public Object getRegisteredBean(String beanName) + { + ControllerContext context = kernel.getController().getInstalledContext(beanName); + return context != null ? context.getTarget() : null; + } + + @SuppressWarnings("unchecked") + public <T> T getRegisteredBean(Class<T> beanClass, String beanName) + { + Object target = getRegisteredBean(beanName); + if (target == null | beanClass.isAssignableFrom(target.getClass()) == false) + return null; + + return (T)target; + } + + public List<String> getRegisteredBeans() + { + List<String> names = new ArrayList<String>(); + + AbstractController controller = (AbstractController)kernel.getController(); + for (ControllerContext ctx : controller.getAllContexts()) + { + if (ctx instanceof KernelControllerContext) + names.add(ctx.getName().toString()); + } + + return names; + } + + private void installKernelBean(String beanName, Object target) + { + KernelController controller = kernel.getController(); + ControllerContextActions actions = new AbstractControllerContextActions(new HashMap<ControllerState, ControllerContextAction>()); + try + { + controller.install(new AbstractControllerContext(beanName, actions, null, target)); + } + catch (Throwable th) + { + throw new IllegalStateException("Cannot install kernel bean: " + beanName, th); + } + } + + private void registerMBeans(MBeanServer server, MicrocontainerServiceMBean mbeanImpl) + { + try + { + installKernelBean(BEAN_MBEAN_SERVER, server); + StandardMBean mbean = new StandardMBean(mbeanImpl, MicrocontainerServiceMBean.class); + server.registerMBean(mbean, MBEAN_MICROCONTAINER_SERVICE); + } + catch (Exception ex) + { + throw new IllegalStateException("Cannot register MicrocontainerServiceMBean", ex); + } + } + + private void unregisterMBeans(MBeanServer server) + { + try + { + if (server.isRegistered(MBEAN_MICROCONTAINER_SERVICE)) + server.unregisterMBean(MBEAN_MICROCONTAINER_SERVICE); + } + catch (Exception ex) + { + log.warn("Cannot unregister MicrocontainerServiceMBean", ex); + } + } + + class JMXServiceListener implements ServiceListener + { + private MicrocontainerServiceMBean mbean; + + public JMXServiceListener(MicrocontainerServiceMBean mbean) + { + this.mbean = mbean; + } + + public void serviceChanged(ServiceEvent event) + { + ServiceReference sref = event.getServiceReference(); + MBeanServer server = (MBeanServer)getSystemContext().getService(sref); + int type = event.getType(); + switch (type) + { + case ServiceEvent.REGISTERED: + registerMBeans(server, mbean); + break; + case ServiceEvent.UNREGISTERING: + unregisterMBeans(server); + break; + } + } + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java (from rev 94258, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/PackageAdminImpl.java) =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/PackageAdminImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -0,0 +1,260 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.framework.service.internal; + +//$Id: StartLevelImpl.java 93118 2009-09-02 08:24:44Z thomas.diesler(a)jboss.com $ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.jboss.classloading.plugins.metadata.PackageCapability; +import org.jboss.classloading.spi.metadata.CapabilitiesMetaData; +import org.jboss.classloading.spi.metadata.Capability; +import org.jboss.classloading.spi.metadata.ClassLoadingMetaData; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.logging.Logger; +import org.jboss.osgi.framework.bundle.AbstractBundleState; +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.bundle.OSGiBundleState; +import org.jboss.osgi.framework.bundle.OSGiBundleWrapper; +import org.jboss.osgi.framework.plugins.PackageAdminServicePlugin; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.jboss.osgi.framework.resolver.BundleResolver; +import org.jboss.osgi.spi.NotImplementedException; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceRegistration; +import org.osgi.framework.Version; +import org.osgi.service.packageadmin.ExportedPackage; +import org.osgi.service.packageadmin.PackageAdmin; +import org.osgi.service.packageadmin.RequiredBundle; + +/** + * An implementation of the {@link PackageAdmin}. + * + * [TODO] [JBOSGI-149] Fully implement PackageAdmin + * + * @author thomas.diesler(a)jboss.com + * @since 03-Sep-2009 + */ +public class PackageAdminImpl extends AbstractServicePluginImpl implements PackageAdminServicePlugin +{ + /** The log */ + private static final Logger log = Logger.getLogger(PackageAdminImpl.class); + + private ServiceRegistration registration; + + public PackageAdminImpl(OSGiBundleManager bundleManager) + { + super(bundleManager); + } + + public void startService() + { + BundleContext sysContext = getSystemContext(); + registration = sysContext.registerService(PackageAdmin.class.getName(), this, null); + } + + public void stopService() + { + if (registration != null) + { + registration.unregister(); + registration = null; + } + } + + @SuppressWarnings("unchecked") + public Bundle getBundle(Class clazz) + { + throw new NotImplementedException(); + } + + public int getBundleType(Bundle bundle) + { + throw new NotImplementedException(); + } + + public Bundle[] getBundles(String symbolicName, String versionRange) + { + throw new NotImplementedException(); + } + + public ExportedPackage getExportedPackage(String name) + { + throw new NotImplementedException(); + } + + public ExportedPackage[] getExportedPackages(Bundle bundle) + { + OSGiBundleState bundleState = assertBundleState(bundle); + DeploymentUnit unit = bundleState.getDeploymentUnit(); + ClassLoadingMetaData metaData = unit.getAttachment(ClassLoadingMetaData.class); + if (metaData == null) + throw new IllegalStateException("Cannot obtain ClassLoadingMetaData"); + + List<ExportedPackage> exported = new ArrayList<ExportedPackage>(); + CapabilitiesMetaData capabilities = metaData.getCapabilities(); + for (Capability capability : capabilities.getCapabilities()) + { + if (capability instanceof PackageCapability) + { + exported.add(new ExportedPackageImpl(bundleState, (PackageCapability)capability)); + } + } + if (exported.size() == 0) + return null; + + ExportedPackage[] result = new ExportedPackage[exported.size()]; + exported.toArray(result); + + return result; + } + + public ExportedPackage[] getExportedPackages(String name) + { + throw new NotImplementedException(); + } + + public Bundle[] getFragments(Bundle bundle) + { + throw new NotImplementedException(); + } + + public Bundle[] getHosts(Bundle bundle) + { + throw new NotImplementedException(); + } + + public RequiredBundle[] getRequiredBundles(String symbolicName) + { + throw new NotImplementedException(); + } + + public void refreshPackages(Bundle[] bundles) + { + // [TODO] refreshPackages(Bundle[] bundles) + log.debug("Ignore refreshPackages"); + } + + public boolean resolveBundles(Bundle[] bundleArr) + { + // Collect the bundles that are in state INSTALLED + List<Bundle> unresolvedBundles = new ArrayList<Bundle>(); + if (bundleArr == null) + { + unresolvedBundles.addAll(bundleManager.getBundles(Bundle.INSTALLED)); + } + else + { + for (Bundle bundle : bundleArr) + { + if (bundle.getState() == Bundle.INSTALLED) + unresolvedBundles.add(bundle); + } + } + + if (unresolvedBundles.isEmpty()) + return true; + + BundleResolver bundleResolver = bundleManager.getBundleResolver(); + List<OSGiBundleState> resolvableBundles = bundleResolver.resolveBundles(unresolvedBundles); + boolean allResolved = resolvableBundles.containsAll(unresolvedBundles); + + int resolved = 1; + while (resolved > 0) + { + resolved = 0; + Iterator<OSGiBundleState> it = resolvableBundles.iterator(); + while (it.hasNext()) + { + OSGiBundleState bundleState = assertBundleState(it.next()); + if (bundleManager.resolve(bundleState, false)) + { + it.remove(); + resolved++; + } + } + } + + // Sanity check, that the controller could actually also resolve these bundles + if (resolvableBundles.isEmpty() == false) + throw new IllegalStateException("Controller could not resolve: " + resolvableBundles); + + return allResolved; + } + + private OSGiBundleState assertBundleState(Bundle bundle) + { + if (bundle instanceof OSGiBundleWrapper) + bundle = ((OSGiBundleWrapper)bundle).getBundleState(); + + if (bundle instanceof OSGiBundleState == false) + throw new IllegalArgumentException("Cannot obtain bunde state from: " + bundle); + + return (OSGiBundleState)bundle; + } + + private static class ExportedPackageImpl implements ExportedPackage + { + private Bundle bundle; + private PackageCapability capability; + + public ExportedPackageImpl(AbstractBundleState bundle, PackageCapability capability) + { + this.bundle = bundle.getBundle(); + this.capability = capability; + } + + public Bundle getExportingBundle() + { + return bundle; + } + + public Bundle[] getImportingBundles() + { + throw new NotImplementedException(); + } + + public String getName() + { + return capability.getName(); + } + + @SuppressWarnings("deprecation") + public String getSpecificationVersion() + { + throw new NotImplementedException(); + } + + public Version getVersion() + { + return Version.parseVersion(capability.getVersion().toString()); + } + + public boolean isRemovalPending() + { + throw new NotImplementedException(); + } + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java (from rev 94258, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/StartLevelImpl.java) =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/StartLevelImpl.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -0,0 +1,107 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.osgi.framework.service.internal; + +//$Id$ + +import org.jboss.logging.Logger; +import org.jboss.osgi.framework.bundle.OSGiBundleManager; +import org.jboss.osgi.framework.plugins.StartLevelServicePlugin; +import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; +import org.osgi.framework.Bundle; +import org.osgi.framework.ServiceRegistration; +import org.osgi.service.startlevel.StartLevel; + +/** + * An implementation of the {@link StartLevel}. + * + * [TODO] [JBOSGI-150] Fully implement StartLevel + * + * @author thomas.diesler(a)jboss.com + * @since 31-Aug-2009 + */ +public class StartLevelImpl extends AbstractServicePluginImpl implements StartLevelServicePlugin +{ + /** The log */ + private static final Logger log = Logger.getLogger(StartLevelImpl.class); + + private ServiceRegistration registration; + + public StartLevelImpl(OSGiBundleManager bundleManager) + { + super(bundleManager); + } + + public void startService() + { + registration = getSystemContext().registerService(StartLevel.class.getName(), this, null); + } + + public void stopService() + { + if (registration != null) + { + registration.unregister(); + registration = null; + } + } + + public int getBundleStartLevel(Bundle bundle) + { + return 1; + } + + public int getInitialBundleStartLevel() + { + return 1; + } + + public int getStartLevel() + { + return 1; + } + + public boolean isBundleActivationPolicyUsed(Bundle bundle) + { + return false; + } + + public boolean isBundlePersistentlyStarted(Bundle bundle) + { + return false; + } + + public void setBundleStartLevel(Bundle bundle, int startlevel) + { + log.info("Ignore setBundleStartLevel(" + bundle + "," + startlevel + ")"); + } + + public void setInitialBundleStartLevel(int startlevel) + { + log.info("Ignore setInitialBundleStartLevel(" + startlevel + ")"); + } + + public void setStartLevel(int startlevel) + { + log.info("Ignore setStartLevel(" + startlevel + ")"); + } +} \ No newline at end of file Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds (from rev 94258, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds) Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ListenerHandler.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/ListenerHandler.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ListenerHandler.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,12 +19,12 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import org.jboss.osgi.framework.metadata.impl.AbstractListenerMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractListenerMetaData; import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementHandler; import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding; import org.xml.sax.Attributes; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ListenerInterceptor.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/ListenerInterceptor.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ListenerInterceptor.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,15 +19,15 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import java.util.ArrayList; import java.util.List; import javax.xml.namespace.QName; import org.jboss.osgi.framework.metadata.ListenerMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractListenerMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractReferenceMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractListenerMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractReferenceMetaData; import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaBinding.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/OSGiSchemaBinding.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaBinding.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import javax.xml.namespace.QName; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaBindingHelper.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/OSGiSchemaBindingHelper.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaBindingHelper.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import org.jboss.xb.binding.sunday.unmarshalling.TypeBinding; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaInitializer.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/OSGiSchemaInitializer.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/OSGiSchemaInitializer.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBinding; import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingInitializer; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ReferenceHandler.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/ReferenceHandler.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ReferenceHandler.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import java.util.Collections; import javax.xml.namespace.NamespaceContext; @@ -28,8 +28,8 @@ import org.jboss.beans.metadata.spi.ClassLoaderMetaData; import org.jboss.dependency.spi.Cardinality; import org.jboss.osgi.framework.metadata.DependencyMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractDependencyMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractReferenceMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractDependencyMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractReferenceMetaData; import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementHandler; import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding; import org.xml.sax.Attributes; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ServiceHandler.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/ds/ServiceHandler.java 2009-10-02 07:47:56 UTC (rev 94258) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/framework/service/internal/ds/ServiceHandler.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -19,7 +19,7 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.osgi.framework.service.ds; +package org.jboss.osgi.framework.service.internal.ds; import java.util.Collections; import javax.xml.namespace.NamespaceContext; @@ -27,8 +27,8 @@ import org.jboss.beans.metadata.spi.ClassLoaderMetaData; import org.jboss.osgi.framework.metadata.DependencyMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractDependencyMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractServiceMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractDependencyMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractServiceMetaData; import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementHandler; import org.jboss.xb.binding.sunday.unmarshalling.ElementBinding; import org.xml.sax.Attributes; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/javacc/HeaderValue.jj 2009-10-02 10:00:02 UTC (rev 94261) @@ -7,7 +7,7 @@ } PARSER_BEGIN(HeaderValue) -package org.jboss.osgi.framework.metadata.impl; +package org.jboss.osgi.framework.metadata.internal; import java.io.StringReader; import java.util.ArrayList; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -38,11 +38,11 @@ import org.jboss.osgi.framework.metadata.Parameter; import org.jboss.osgi.framework.metadata.ParameterizedAttribute; import org.jboss.osgi.framework.metadata.VersionRange; -import org.jboss.osgi.framework.metadata.impl.AbstractOSGiMetaData; -import org.jboss.osgi.framework.metadata.impl.AbstractPackageAttribute; -import org.jboss.osgi.framework.metadata.impl.AbstractParameter; -import org.jboss.osgi.framework.metadata.impl.AbstractParameterizedAttribute; -import org.jboss.osgi.framework.metadata.impl.OSGiParameters; +import org.jboss.osgi.framework.metadata.internal.AbstractOSGiMetaData; +import org.jboss.osgi.framework.metadata.internal.AbstractPackageAttribute; +import org.jboss.osgi.framework.metadata.internal.AbstractParameter; +import org.jboss.osgi.framework.metadata.internal.AbstractParameterizedAttribute; +import org.jboss.osgi.framework.metadata.internal.OSGiParameters; import org.osgi.framework.Version; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-10-02 10:00:02 UTC (rev 94261) @@ -7,7 +7,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.framework.metadata.VersionRange; -import org.jboss.osgi.framework.metadata.impl.AbstractVersionRange; +import org.jboss.osgi.framework.metadata.internal.AbstractVersionRange; import org.jboss.test.BaseTestCase; import org.osgi.framework.Version; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml 2009-10-02 08:43:33 UTC (rev 94260) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/resources/bootstrap/bootstrap.xml 2009-10-02 10:00:02 UTC (rev 94261) @@ -45,13 +45,13 @@ ******************************** --> - <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.impl.FrameworkEventsPluginImpl"> + <bean name="OSGiFrameworkEventsPlugin" class="org.jboss.osgi.framework.plugins.internal.FrameworkEventsPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.impl.BundleStoragePluginImpl"> + <bean name="OSGiStoragePlugin" class="org.jboss.osgi.framework.plugins.internal.BundleStoragePluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.impl.SystemPackagesPluginImpl"> + <bean name="OSGiSystemPackages" class="org.jboss.osgi.framework.plugins.internal.SystemPackagesPluginImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> @@ -63,13 +63,13 @@ ******************************** --> - <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.MicrocontainerServiceImpl"> + <bean name="MicrocontainerService" class="org.jboss.osgi.framework.service.internal.MicrocontainerServiceImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="StartLevelService" class="org.jboss.osgi.framework.service.StartLevelImpl"> + <bean name="StartLevelService" class="org.jboss.osgi.framework.service.internal.StartLevelImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.PackageAdminImpl"> + <bean name="PackageAdminService" class="org.jboss.osgi.framework.service.internal.PackageAdminImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean>