Author: thomas.diesler(a)jboss.com Date: 2009-10-02 02:06:25 -0400 (Fri, 02 Oct 2009) New Revision: 94254 Added: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/AdminPermission.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/FrameworkUtil.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceControllerContext.java Removed: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/framework/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/dependency/ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/pom.xml projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleStateDeployer.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiManifestParsingDeployer.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ListenerInterceptor.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ReferenceHandler.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ServiceHandler.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleCapability.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleClassLoadingDeployer.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleRequirement.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeAware.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractHolderMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractListenerMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractMetaDataVisitorNode.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractPackageAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameter.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameterizedAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractReferenceMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceDeployment.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/OSGiParameters.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PackageAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PathAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/QNameAttributeListValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/VersionRangeValueCreator.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ActivationPolicyMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/AttributeAware.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/AttributeMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/DependencyMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/HolderMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ListenerMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/OSGiMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/PackageAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/Parameter.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ParameterizedAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ReferenceMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceDeployment.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaDataVisitor.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaDataVisitorNode.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceValueMetaData.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/VersionRange.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/VersionRangeAttribute.java projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/resolver/BundleResolver.java 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 Log: Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/pom.xml 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/pom.xml 2009-10-02 06:06:25 UTC (rev 94254) @@ -22,7 +22,7 @@ <name>JBossOSGi Runtime - Microcontainer</name> <groupId>org.jboss.osgi.runtime</groupId> - <artifactId>jboss-osgi-runtime-microcontainer</artifactId> + <artifactId>jboss-osgi-framework</artifactId> <packaging>jar</packaging> <version>1.0.0-SNAPSHOT</version> @@ -319,7 +319,6 @@ <goal>single</goal> </goals> <configuration> - <finalName>jboss-osgi-framework-${version}</finalName> <descriptors> <descriptor>scripts/assembly-all.xml</descriptor> </descriptors> @@ -386,13 +385,6 @@ </plugin> </plugins> </build> - - <!-- Subversion --> - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... - <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/runtime/microc... - </scm> <!-- Repositories --> <repositories> @@ -406,4 +398,11 @@ </repository> </repositories> + <!-- Subversion --> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jbo... + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projec... + <url>http://fisheye.jboss.com/qsearch/JBossOSGi/projects/runtime/microc... + </scm> + </project> Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/AdminPermission.java (from rev 94253, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/framework/AdminPermission.java) =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/AdminPermission.java (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/AdminPermission.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -0,0 +1,54 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file 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.plugins; + +import java.security.BasicPermission; + +import org.osgi.framework.Bundle; + +/** + * AdminPermission. + * + * [TODO] this properly + * @author <a href=&quot;adrian(a)jboss.com&quot;&gt;Adrian Brock</a> + * @version $Revision: 1.1 $ + */ +public class AdminPermission extends BasicPermission +{ + /** The serialVersionUID */ + private static final long serialVersionUID = 8276694645277531048L; + + /** The bundle */ + //private Bundle bundle; + + /** + * Create a new AdminPermission. + * + * @param bundle the bundle + * @param actions the actions + */ + public AdminPermission(Bundle bundle, String actions) + { + super(bundle.toString(), actions); + //this.bundle = bundle; + } +} Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/FrameworkUtil.java (from rev 94253, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/framework/FrameworkUtil.java) =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/FrameworkUtil.java (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/FrameworkUtil.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -0,0 +1,40 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2009, Red Hat Middleware LLC, and individual contributors +* as indicated by the @author tags. See the copyright.txt file 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.plugins; + +import org.jboss.osgi.plugins.filter.FilterImpl; +import org.osgi.framework.Filter; +import org.osgi.framework.InvalidSyntaxException; + +/** + * FrameworkUtil. + * + * @author <a href=&quot;adrian(a)jboss.com&quot;&gt;Adrian Brock</a> + * @version $Revision: 1.1 $ + */ +public class FrameworkUtil +{ + public static Filter createFilter(String filter) throws InvalidSyntaxException + { + return new FilterImpl(filter); + } +} Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleStateDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleStateDeployer.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiBundleStateDeployer.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -29,7 +29,7 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleState; -import org.jboss.osgi.spi.metadata.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; /** * OSGiBundleStateDeployer.<p> Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiManifestParsingDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiManifestParsingDeployer.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployers/bundle/OSGiManifestParsingDeployer.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -26,7 +26,7 @@ import org.jboss.deployers.vfs.spi.deployer.ManifestDeployer; import org.jboss.osgi.plugins.metadata.AbstractOSGiMetaData; -import org.jboss.osgi.spi.metadata.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; import org.osgi.framework.Constants; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ListenerInterceptor.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ListenerInterceptor.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ListenerInterceptor.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -27,7 +27,7 @@ import org.jboss.osgi.plugins.metadata.AbstractListenerMetaData; import org.jboss.osgi.plugins.metadata.AbstractReferenceMetaData; -import org.jboss.osgi.spi.metadata.ListenerMetaData; +import org.jboss.osgi.plugins.metadata.spi.ListenerMetaData; import org.jboss.xb.binding.sunday.unmarshalling.DefaultElementInterceptor; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ReferenceHandler.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ReferenceHandler.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ReferenceHandler.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -29,7 +29,7 @@ import org.jboss.dependency.spi.Cardinality; import org.jboss.osgi.plugins.metadata.AbstractDependencyMetaData; import org.jboss.osgi.plugins.metadata.AbstractReferenceMetaData; -import org.jboss.osgi.spi.metadata.DependencyMetaData; +import org.jboss.osgi.plugins.metadata.spi.DependencyMetaData; 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/plugins/deployment/xml/ServiceHandler.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ServiceHandler.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/deployment/xml/ServiceHandler.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -28,7 +28,7 @@ import org.jboss.beans.metadata.spi.ClassLoaderMetaData; import org.jboss.osgi.plugins.metadata.AbstractDependencyMetaData; import org.jboss.osgi.plugins.metadata.AbstractServiceMetaData; -import org.jboss.osgi.spi.metadata.DependencyMetaData; +import org.jboss.osgi.plugins.metadata.spi.DependencyMetaData; 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/plugins/facade/bundle/AbstractBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/AbstractBundleState.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -40,8 +40,8 @@ import org.jboss.logging.Logger; import org.jboss.osgi.plugins.facade.api.BundleStoragePlugin; import org.jboss.osgi.plugins.facade.api.FrameworkEventsPlugin; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; import org.jboss.osgi.spi.NotImplementedException; -import org.jboss.osgi.spi.metadata.OSGiMetaData; import org.jboss.osgi.spi.util.ConstantsHelper; import org.jboss.util.collection.ConcurrentSet; import org.osgi.framework.AdminPermission; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleManager.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -67,8 +67,8 @@ import org.jboss.osgi.plugins.facade.api.ServicePlugin; import org.jboss.osgi.plugins.filter.NoFilter; import org.jboss.osgi.plugins.metadata.AbstractOSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; import org.jboss.osgi.plugins.resolver.BundleResolver; -import org.jboss.osgi.spi.metadata.OSGiMetaData; import org.jboss.util.collection.ConcurrentSet; import org.jboss.virtual.VFS; import org.jboss.virtual.VirtualFile; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiBundleState.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -31,7 +31,7 @@ import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; import org.jboss.logging.Logger; import org.jboss.osgi.plugins.facade.api.PackageAdminServicePlugin; -import org.jboss.osgi.spi.metadata.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; import org.jboss.virtual.VirtualFile; import org.osgi.framework.AdminPermission; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/bundle/OSGiSystemState.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -26,8 +26,8 @@ import java.net.URL; import java.util.Enumeration; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; import org.jboss.osgi.spi.NotImplementedException; -import org.jboss.osgi.spi.metadata.OSGiMetaData; import org.osgi.framework.BundleException; import org.osgi.framework.Constants; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleCapability.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleCapability.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleCapability.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -26,9 +26,9 @@ import org.jboss.classloading.plugins.metadata.ModuleCapability; import org.jboss.classloading.spi.dependency.Module; import org.jboss.classloading.spi.metadata.Requirement; -import org.jboss.osgi.spi.metadata.OSGiMetaData; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; 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/plugins/facade/classloading/OSGiBundleClassLoadingDeployer.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleClassLoadingDeployer.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleClassLoadingDeployer.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -37,9 +37,9 @@ import org.jboss.osgi.plugins.facade.api.SystemPackagesPlugin; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleState; -import org.jboss.osgi.spi.metadata.OSGiMetaData; -import org.jboss.osgi.spi.metadata.PackageAttribute; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; /** * OSGiBundleClassLoadingDeployer.<p> Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleRequirement.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleRequirement.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiBundleRequirement.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -26,8 +26,8 @@ import org.jboss.classloading.plugins.metadata.ModuleRequirement; import org.jboss.classloading.spi.version.VersionRange; import org.jboss.osgi.plugins.metadata.AbstractVersionRange; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; import org.osgi.framework.Constants; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageCapability.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -33,12 +33,12 @@ import org.jboss.osgi.plugins.facade.bundle.OSGiBundleManager; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleState; import org.jboss.osgi.plugins.metadata.AbstractVersionRange; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; import org.jboss.osgi.plugins.resolver.BundleCapability; import org.jboss.osgi.plugins.resolver.BundleResolver; -import org.jboss.osgi.spi.metadata.OSGiMetaData; -import org.jboss.osgi.spi.metadata.PackageAttribute; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; 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/plugins/facade/classloading/OSGiPackageRequirement.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/facade/classloading/OSGiPackageRequirement.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -30,8 +30,8 @@ import org.jboss.deployers.structure.spi.DeploymentUnit; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleState; import org.jboss.osgi.plugins.metadata.AbstractVersionRange; -import org.jboss.osgi.spi.metadata.PackageAttribute; -import org.jboss.osgi.spi.metadata.Parameter; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.Parameter; import org.osgi.framework.Constants; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractActivationPolicyMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -24,7 +24,7 @@ import java.io.Serializable; import java.util.List; -import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData; +import org.jboss.osgi.plugins.metadata.spi.ActivationPolicyMetaData; /** * Activation policy impl. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeAware.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeAware.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeAware.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,7 +23,7 @@ import java.io.Serializable; -import org.jboss.osgi.spi.metadata.AttributeAware; +import org.jboss.osgi.plugins.metadata.spi.AttributeAware; import org.jboss.util.JBossObject; import org.jboss.util.JBossStringBuilder; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractAttributeMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -24,8 +24,8 @@ import java.io.Serializable; import org.jboss.deployers.spi.DeploymentException; -import org.jboss.osgi.spi.metadata.AttributeMetaData; -import org.jboss.osgi.spi.metadata.ServiceValueMetaData; +import org.jboss.osgi.plugins.metadata.spi.AttributeMetaData; +import org.jboss.osgi.plugins.metadata.spi.ServiceValueMetaData; import org.jboss.util.UnreachableStatementException; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractDependencyMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -26,9 +26,9 @@ import org.jboss.dependency.plugins.AbstractDependencyItem; import org.jboss.dependency.spi.ControllerState; import org.jboss.dependency.spi.DependencyItem; -import org.jboss.osgi.spi.dependency.ServiceControllerContext; -import org.jboss.osgi.spi.metadata.DependencyMetaData; -import org.jboss.osgi.spi.metadata.ServiceMetaDataVisitor; +import org.jboss.osgi.plugins.metadata.spi.DependencyMetaData; +import org.jboss.osgi.plugins.metadata.spi.ServiceControllerContext; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaDataVisitor; import org.jboss.util.JBossStringBuilder; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractHolderMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractHolderMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractHolderMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -25,8 +25,8 @@ import java.util.Set; import org.jboss.beans.metadata.spi.ClassLoaderMetaData; -import org.jboss.osgi.spi.metadata.DependencyMetaData; -import org.jboss.osgi.spi.metadata.HolderMetaData; +import org.jboss.osgi.plugins.metadata.spi.DependencyMetaData; +import org.jboss.osgi.plugins.metadata.spi.HolderMetaData; /** * Common OSGi reference or service impl. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractListenerMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractListenerMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractListenerMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,7 +23,7 @@ import java.io.Serializable; -import org.jboss.osgi.spi.metadata.ListenerMetaData; +import org.jboss.osgi.plugins.metadata.spi.ListenerMetaData; /** * Simple listener meta data. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractMetaDataVisitorNode.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractMetaDataVisitorNode.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractMetaDataVisitorNode.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -24,8 +24,8 @@ import java.util.Iterator; import java.util.Set; -import org.jboss.osgi.spi.metadata.ServiceMetaDataVisitor; -import org.jboss.osgi.spi.metadata.ServiceMetaDataVisitorNode; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaDataVisitor; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaDataVisitorNode; import org.jboss.util.JBossObject; import org.jboss.util.collection.CollectionsFactory; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractOSGiMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -66,10 +66,10 @@ import org.jboss.osgi.plugins.metadata.AbstractVersionRange.OSGiVersionToOSGiVersionComparator; import org.jboss.osgi.plugins.metadata.AbstractVersionRange.OSGiVersionToStringComparator; import org.jboss.osgi.plugins.metadata.AbstractVersionRange.OSGiVersionToVersionComparator; -import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData; -import org.jboss.osgi.spi.metadata.OSGiMetaData; -import org.jboss.osgi.spi.metadata.PackageAttribute; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.ActivationPolicyMetaData; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; 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/plugins/metadata/AbstractPackageAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractPackageAttribute.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractPackageAttribute.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -24,9 +24,9 @@ import java.io.Serializable; import java.util.Map; -import org.jboss.osgi.spi.metadata.PackageAttribute; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.VersionRange; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.VersionRange; import org.jboss.reflect.plugins.PackageInfoImpl; import org.jboss.reflect.spi.PackageInfo; import org.osgi.framework.Constants; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameter.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameter.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameter.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -25,7 +25,7 @@ import java.util.Collection; import java.util.HashSet; -import org.jboss.osgi.spi.metadata.Parameter; +import org.jboss.osgi.plugins.metadata.spi.Parameter; import org.jboss.util.JBossObject; import org.jboss.util.JBossStringBuilder; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameterizedAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameterizedAttribute.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractParameterizedAttribute.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,8 +23,8 @@ import java.util.Map; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; import org.jboss.util.JBossStringBuilder; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractReferenceMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractReferenceMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractReferenceMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -29,9 +29,9 @@ import org.jboss.beans.metadata.spi.MetaDataVisitorNode; import org.jboss.beans.metadata.spi.PropertyMetaData; import org.jboss.dependency.spi.Cardinality; -import org.jboss.osgi.spi.metadata.ListenerMetaData; -import org.jboss.osgi.spi.metadata.ReferenceMetaData; -import org.jboss.osgi.spi.metadata.ServiceMetaDataVisitor; +import org.jboss.osgi.plugins.metadata.spi.ListenerMetaData; +import org.jboss.osgi.plugins.metadata.spi.ReferenceMetaData; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaDataVisitor; import org.osgi.framework.BundleContext; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceDeployment.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceDeployment.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceDeployment.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,8 +23,8 @@ import java.util.List; -import org.jboss.osgi.spi.metadata.ServiceDeployment; -import org.jboss.osgi.spi.metadata.ServiceMetaData; +import org.jboss.osgi.plugins.metadata.spi.ServiceDeployment; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaData; import org.jboss.util.JBossObject; import org.jboss.util.JBossStringBuilder; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractServiceMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -26,9 +26,9 @@ import java.util.Map; import java.util.Set; -import org.jboss.osgi.spi.metadata.AttributeMetaData; -import org.jboss.osgi.spi.metadata.ServiceMetaData; -import org.jboss.osgi.spi.metadata.ServiceMetaDataVisitor; +import org.jboss.osgi.plugins.metadata.spi.AttributeMetaData; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaData; +import org.jboss.osgi.plugins.metadata.spi.ServiceMetaDataVisitor; /** * OSGi service meta data. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/AbstractVersionRange.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -25,7 +25,7 @@ import java.util.StringTokenizer; import org.jboss.classloading.spi.version.VersionComparator; -import org.jboss.osgi.spi.metadata.VersionRange; +import org.jboss.osgi.plugins.metadata.spi.VersionRange; import org.osgi.framework.Version; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ActivationPolicyMDValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,7 +23,7 @@ import java.util.Arrays; -import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData; +import org.jboss.osgi.plugins.metadata.spi.ActivationPolicyMetaData; /** * Activation policy value creator. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/OSGiParameters.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/OSGiParameters.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/OSGiParameters.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -27,8 +27,9 @@ import java.util.Map; import org.jboss.logging.Logger; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.VersionRange; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.VersionRange; + import static org.osgi.framework.Constants.*; /** Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PackageAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PackageAttributeListValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PackageAttributeListValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.osgi.spi.metadata.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; /** * Create package attribute list from string attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeListValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeListValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -24,7 +24,7 @@ import java.util.ArrayList; import java.util.List; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; /** * Create parameterized attribute list from string attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/ParameterizedAttributeValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,7 +23,7 @@ import java.util.List; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; /** * Create paramertized attribute from string attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PathAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PathAttributeListValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/PathAttributeListValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,7 +23,7 @@ import java.util.List; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; /** * Create path attribute list from string attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/QNameAttributeListValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/QNameAttributeListValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/QNameAttributeListValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -23,7 +23,7 @@ import java.util.List; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; /** * Create [dynamic]qname attribute list from string attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/VersionRangeValueCreator.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/VersionRangeValueCreator.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/VersionRangeValueCreator.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -21,7 +21,7 @@ */ package org.jboss.osgi.plugins.metadata; -import org.jboss.osgi.spi.metadata.VersionRange; +import org.jboss.osgi.plugins.metadata.spi.VersionRange; /** * Parse VersionRange from string. Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi (from rev 94253, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata) Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ActivationPolicyMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ActivationPolicyMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ActivationPolicyMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/AttributeAware.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/AttributeAware.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/AttributeAware.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; /** * Attribute string value holder. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/AttributeMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/AttributeMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/AttributeMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; /** * ServiceAttributeMetaData. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/DependencyMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/DependencyMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/DependencyMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; /** * Metadata about what a osgi service's dependency. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/HolderMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/HolderMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/HolderMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.Set; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ListenerMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ListenerMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ListenerMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; /** * Simple listener meta data - referencing bean as listener. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/OSGiMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/OSGiMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/OSGiMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.net.URL; import java.util.Dictionary; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/PackageAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/PackageAttribute.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/PackageAttribute.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import org.jboss.reflect.spi.PackageInfo; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/Parameter.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/Parameter.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/Parameter.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; /** * Parameter interface - single value or set of values. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ParameterizedAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ParameterizedAttribute.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ParameterizedAttribute.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.Map; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ReferenceMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ReferenceMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ReferenceMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.List; import java.util.Set; Copied: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceControllerContext.java (from rev 94253, projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/dependency/ServiceControllerContext.java) =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceControllerContext.java (rev 0) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceControllerContext.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -0,0 +1,48 @@ +/* +* JBoss, Home of Professional Open Source +* Copyright 2006, 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.plugins.metadata.spi; + +import org.jboss.dependency.spi.ControllerContext; +import org.jboss.dependency.spi.dispatch.InvokeDispatchContext; +import org.osgi.framework.BundleContext; + +/** + * Information about Bundle[Context] and ServiceMetaData. + * + * @author <a href="mailto:ales.justin@jboss.com">Ales Justin</a> + */ +public interface ServiceControllerContext extends ControllerContext, InvokeDispatchContext +{ + /** + * Get the metadata + * + * @return the service metadata + */ + ServiceMetaData getServiceMetaData(); + + /** + * Get the BundleContext + * + * @return underlying bundle context + */ + BundleContext getBundleContext(); +} Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceDeployment.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ServiceDeployment.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceDeployment.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.List; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ServiceMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.List; import java.util.Map; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaDataVisitor.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ServiceMetaDataVisitor.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaDataVisitor.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -19,11 +19,10 @@ * 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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import org.jboss.dependency.spi.ControllerState; import org.jboss.dependency.spi.DependencyItem; -import org.jboss.osgi.spi.dependency.ServiceControllerContext; /** * ServiceMetaDataVisitor. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaDataVisitorNode.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ServiceMetaDataVisitorNode.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceMetaDataVisitorNode.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import java.util.Iterator; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceValueMetaData.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/ServiceValueMetaData.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/ServiceValueMetaData.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/VersionRange.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/VersionRange.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/VersionRange.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; import org.osgi.framework.Version; Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/VersionRangeAttribute.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/spi/metadata/VersionRangeAttribute.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/metadata/spi/VersionRangeAttribute.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -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.spi.metadata; +package org.jboss.osgi.plugins.metadata.spi; /** * Attribute with VersionRange attribute. Modified: projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/resolver/BundleResolver.java =================================================================== --- projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/resolver/BundleResolver.java 2009-10-02 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/main/java/org/jboss/osgi/plugins/resolver/BundleResolver.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -42,9 +42,9 @@ import org.jboss.osgi.plugins.facade.bundle.OSGiBundleState; import org.jboss.osgi.plugins.facade.bundle.OSGiBundleWrapper; import org.jboss.osgi.plugins.facade.classloading.OSGiPackageRequirement; -import org.jboss.osgi.spi.metadata.OSGiMetaData; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; import org.osgi.framework.Bundle; import org.osgi.framework.Constants; 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 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/HeaderValuesTestCase.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -36,12 +36,12 @@ import org.jboss.osgi.plugins.metadata.AbstractParameter; import org.jboss.osgi.plugins.metadata.AbstractParameterizedAttribute; import org.jboss.osgi.plugins.metadata.OSGiParameters; -import org.jboss.osgi.spi.metadata.OSGiMetaData; -import org.jboss.osgi.spi.metadata.PackageAttribute; -import org.jboss.osgi.spi.metadata.Parameter; -import org.jboss.osgi.spi.metadata.ParameterizedAttribute; -import org.jboss.osgi.spi.metadata.VersionRange; -import org.jboss.osgi.spi.metadata.ActivationPolicyMetaData; +import org.jboss.osgi.plugins.metadata.spi.ActivationPolicyMetaData; +import org.jboss.osgi.plugins.metadata.spi.OSGiMetaData; +import org.jboss.osgi.plugins.metadata.spi.PackageAttribute; +import org.jboss.osgi.plugins.metadata.spi.Parameter; +import org.jboss.osgi.plugins.metadata.spi.ParameterizedAttribute; +import org.jboss.osgi.plugins.metadata.spi.VersionRange; 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 05:48:40 UTC (rev 94253) +++ projects/jboss-osgi/projects/runtime/microcontainer/branches/tdiesler/src/test/java/org/jboss/test/bundle/metadata/VersionRangeTestCase.java 2009-10-02 06:06:25 UTC (rev 94254) @@ -7,7 +7,7 @@ import org.jboss.logging.Logger; import org.jboss.osgi.plugins.metadata.AbstractVersionRange; -import org.jboss.osgi.spi.metadata.VersionRange; +import org.jboss.osgi.plugins.metadata.spi.VersionRange; import org.jboss.test.BaseTestCase; import org.osgi.framework.Version;