commit | 7af9f631bfd58836c72b1e82ec0e3cbf3fd13eea | [log] [tgz] |
---|---|---|
author | Timothy Bennett <tbennett@apache.org> | Tue Aug 23 03:57:17 2005 +0000 |
committer | Timothy Bennett <tbennett@apache.org> | Tue Aug 23 03:57:17 2005 +0000 |
tree | 2c2bf49a6e2fd32fc11641d69fb8ddff3e4cc2eb | |
parent | c74644c002d09b78df2019b3fe79215656036f34 [diff] |
Moved remotely git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@239327 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/org/apache/felix/bundlerepository/BundleRecord.java b/framework/src/org/apache/felix/bundlerepository/BundleRecord.java similarity index 100% rename from src/org/apache/felix/bundlerepository/BundleRecord.java rename to framework/src/org/apache/felix/bundlerepository/BundleRecord.java
diff --git a/src/org/apache/felix/bundlerepository/BundleRepository.java b/framework/src/org/apache/felix/bundlerepository/BundleRepository.java similarity index 100% rename from src/org/apache/felix/bundlerepository/BundleRepository.java rename to framework/src/org/apache/felix/bundlerepository/BundleRepository.java
diff --git a/src/org/apache/felix/bundlerepository/IAttribute.java b/framework/src/org/apache/felix/bundlerepository/IAttribute.java similarity index 100% rename from src/org/apache/felix/bundlerepository/IAttribute.java rename to framework/src/org/apache/felix/bundlerepository/IAttribute.java
diff --git a/src/org/apache/felix/bundlerepository/IDirective.java b/framework/src/org/apache/felix/bundlerepository/IDirective.java similarity index 100% rename from src/org/apache/felix/bundlerepository/IDirective.java rename to framework/src/org/apache/felix/bundlerepository/IDirective.java
diff --git a/src/org/apache/felix/bundlerepository/IPackage.java b/framework/src/org/apache/felix/bundlerepository/IPackage.java similarity index 100% rename from src/org/apache/felix/bundlerepository/IPackage.java rename to framework/src/org/apache/felix/bundlerepository/IPackage.java
diff --git a/src/org/apache/felix/bundlerepository/IVersion.java b/framework/src/org/apache/felix/bundlerepository/IVersion.java similarity index 100% rename from src/org/apache/felix/bundlerepository/IVersion.java rename to framework/src/org/apache/felix/bundlerepository/IVersion.java
diff --git a/src/org/apache/felix/bundlerepository/ResolveException.java b/framework/src/org/apache/felix/bundlerepository/ResolveException.java similarity index 100% rename from src/org/apache/felix/bundlerepository/ResolveException.java rename to framework/src/org/apache/felix/bundlerepository/ResolveException.java
diff --git a/src/org/apache/felix/bundlerepository/impl/Activator.java b/framework/src/org/apache/felix/bundlerepository/impl/Activator.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/Activator.java rename to framework/src/org/apache/felix/bundlerepository/impl/Activator.java
diff --git a/src/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java b/framework/src/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java rename to framework/src/org/apache/felix/bundlerepository/impl/BundleRepositoryImpl.java
diff --git a/src/org/apache/felix/bundlerepository/impl/FileUtil.java b/framework/src/org/apache/felix/bundlerepository/impl/FileUtil.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/FileUtil.java rename to framework/src/org/apache/felix/bundlerepository/impl/FileUtil.java
diff --git a/src/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java b/framework/src/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java rename to framework/src/org/apache/felix/bundlerepository/impl/IteratorToEnumeration.java
diff --git a/src/org/apache/felix/bundlerepository/impl/LocalState.java b/framework/src/org/apache/felix/bundlerepository/impl/LocalState.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/LocalState.java rename to framework/src/org/apache/felix/bundlerepository/impl/LocalState.java
diff --git a/src/org/apache/felix/bundlerepository/impl/MapToDictionary.java b/framework/src/org/apache/felix/bundlerepository/impl/MapToDictionary.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/MapToDictionary.java rename to framework/src/org/apache/felix/bundlerepository/impl/MapToDictionary.java
diff --git a/src/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java b/framework/src/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java rename to framework/src/org/apache/felix/bundlerepository/impl/ObrCommandImpl.java
diff --git a/src/org/apache/felix/bundlerepository/impl/R4Attribute.java b/framework/src/org/apache/felix/bundlerepository/impl/R4Attribute.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/R4Attribute.java rename to framework/src/org/apache/felix/bundlerepository/impl/R4Attribute.java
diff --git a/src/org/apache/felix/bundlerepository/impl/R4Directive.java b/framework/src/org/apache/felix/bundlerepository/impl/R4Directive.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/R4Directive.java rename to framework/src/org/apache/felix/bundlerepository/impl/R4Directive.java
diff --git a/src/org/apache/felix/bundlerepository/impl/R4Package.java b/framework/src/org/apache/felix/bundlerepository/impl/R4Package.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/R4Package.java rename to framework/src/org/apache/felix/bundlerepository/impl/R4Package.java
diff --git a/src/org/apache/felix/bundlerepository/impl/R4Version.java b/framework/src/org/apache/felix/bundlerepository/impl/R4Version.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/R4Version.java rename to framework/src/org/apache/felix/bundlerepository/impl/R4Version.java
diff --git a/src/org/apache/felix/bundlerepository/impl/RepositoryState.java b/framework/src/org/apache/felix/bundlerepository/impl/RepositoryState.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/RepositoryState.java rename to framework/src/org/apache/felix/bundlerepository/impl/RepositoryState.java
diff --git a/src/org/apache/felix/bundlerepository/impl/Util.java b/framework/src/org/apache/felix/bundlerepository/impl/Util.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/Util.java rename to framework/src/org/apache/felix/bundlerepository/impl/Util.java
diff --git a/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java b/framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java rename to framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXHandler.java
diff --git a/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java b/framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java rename to framework/src/org/apache/felix/bundlerepository/impl/kxmlsax/KXmlSAXParser.java
diff --git a/src/org/apache/felix/bundlerepository/impl/manifest.mf b/framework/src/org/apache/felix/bundlerepository/impl/manifest.mf similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/manifest.mf rename to framework/src/org/apache/felix/bundlerepository/impl/manifest.mf
diff --git a/src/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java b/framework/src/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java rename to framework/src/org/apache/felix/bundlerepository/impl/metadataparser/ClassUtility.java
diff --git a/src/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java b/framework/src/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java rename to framework/src/org/apache/felix/bundlerepository/impl/metadataparser/KXmlMetadataHandler.java
diff --git a/src/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java b/framework/src/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java rename to framework/src/org/apache/felix/bundlerepository/impl/metadataparser/MultivalueMap.java
diff --git a/src/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java b/framework/src/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java similarity index 100% rename from src/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java rename to framework/src/org/apache/felix/bundlerepository/impl/metadataparser/XmlCommonHandler.java
diff --git a/src/org/apache/felix/framework/BundleContextImpl.java b/framework/src/org/apache/felix/framework/BundleContextImpl.java similarity index 100% rename from src/org/apache/felix/framework/BundleContextImpl.java rename to framework/src/org/apache/felix/framework/BundleContextImpl.java
diff --git a/src/org/apache/felix/framework/BundleImpl.java b/framework/src/org/apache/felix/framework/BundleImpl.java similarity index 100% rename from src/org/apache/felix/framework/BundleImpl.java rename to framework/src/org/apache/felix/framework/BundleImpl.java
diff --git a/src/org/apache/felix/framework/BundleInfo.java b/framework/src/org/apache/felix/framework/BundleInfo.java similarity index 100% rename from src/org/apache/felix/framework/BundleInfo.java rename to framework/src/org/apache/felix/framework/BundleInfo.java
diff --git a/src/org/apache/felix/framework/BundleURLConnection.java b/framework/src/org/apache/felix/framework/BundleURLConnection.java similarity index 100% rename from src/org/apache/felix/framework/BundleURLConnection.java rename to framework/src/org/apache/felix/framework/BundleURLConnection.java
diff --git a/src/org/apache/felix/framework/BundleURLStreamHandler.java b/framework/src/org/apache/felix/framework/BundleURLStreamHandler.java similarity index 100% rename from src/org/apache/felix/framework/BundleURLStreamHandler.java rename to framework/src/org/apache/felix/framework/BundleURLStreamHandler.java
diff --git a/src/org/apache/felix/framework/ExportedPackageImpl.java b/framework/src/org/apache/felix/framework/ExportedPackageImpl.java similarity index 100% rename from src/org/apache/felix/framework/ExportedPackageImpl.java rename to framework/src/org/apache/felix/framework/ExportedPackageImpl.java
diff --git a/src/org/apache/felix/framework/FakeURLStreamHandler.java b/framework/src/org/apache/felix/framework/FakeURLStreamHandler.java similarity index 100% rename from src/org/apache/felix/framework/FakeURLStreamHandler.java rename to framework/src/org/apache/felix/framework/FakeURLStreamHandler.java
diff --git a/src/org/apache/felix/framework/Felix.java b/framework/src/org/apache/felix/framework/Felix.java similarity index 100% rename from src/org/apache/felix/framework/Felix.java rename to framework/src/org/apache/felix/framework/Felix.java
diff --git a/src/org/apache/felix/framework/FilterImpl.java b/framework/src/org/apache/felix/framework/FilterImpl.java similarity index 100% rename from src/org/apache/felix/framework/FilterImpl.java rename to framework/src/org/apache/felix/framework/FilterImpl.java
diff --git a/src/org/apache/felix/framework/FrameworkUtil.java b/framework/src/org/apache/felix/framework/FrameworkUtil.java similarity index 100% rename from src/org/apache/felix/framework/FrameworkUtil.java rename to framework/src/org/apache/felix/framework/FrameworkUtil.java
diff --git a/src/org/apache/felix/framework/LogWrapper.java b/framework/src/org/apache/felix/framework/LogWrapper.java similarity index 100% rename from src/org/apache/felix/framework/LogWrapper.java rename to framework/src/org/apache/felix/framework/LogWrapper.java
diff --git a/src/org/apache/felix/framework/Main.java b/framework/src/org/apache/felix/framework/Main.java similarity index 100% rename from src/org/apache/felix/framework/Main.java rename to framework/src/org/apache/felix/framework/Main.java
diff --git a/src/org/apache/felix/framework/OSGiLibrarySource.java b/framework/src/org/apache/felix/framework/OSGiLibrarySource.java similarity index 100% rename from src/org/apache/felix/framework/OSGiLibrarySource.java rename to framework/src/org/apache/felix/framework/OSGiLibrarySource.java
diff --git a/src/org/apache/felix/framework/OSGiURLPolicy.java b/framework/src/org/apache/felix/framework/OSGiURLPolicy.java similarity index 100% rename from src/org/apache/felix/framework/OSGiURLPolicy.java rename to framework/src/org/apache/felix/framework/OSGiURLPolicy.java
diff --git a/src/org/apache/felix/framework/PackageAdminActivator.java b/framework/src/org/apache/felix/framework/PackageAdminActivator.java similarity index 100% rename from src/org/apache/felix/framework/PackageAdminActivator.java rename to framework/src/org/apache/felix/framework/PackageAdminActivator.java
diff --git a/src/org/apache/felix/framework/PackageAdminImpl.java b/framework/src/org/apache/felix/framework/PackageAdminImpl.java similarity index 100% rename from src/org/apache/felix/framework/PackageAdminImpl.java rename to framework/src/org/apache/felix/framework/PackageAdminImpl.java
diff --git a/src/org/apache/felix/framework/ServiceReferenceImpl.java b/framework/src/org/apache/felix/framework/ServiceReferenceImpl.java similarity index 100% rename from src/org/apache/felix/framework/ServiceReferenceImpl.java rename to framework/src/org/apache/felix/framework/ServiceReferenceImpl.java
diff --git a/src/org/apache/felix/framework/ServiceRegistrationImpl.java b/framework/src/org/apache/felix/framework/ServiceRegistrationImpl.java similarity index 100% rename from src/org/apache/felix/framework/ServiceRegistrationImpl.java rename to framework/src/org/apache/felix/framework/ServiceRegistrationImpl.java
diff --git a/src/org/apache/felix/framework/ServiceRegistry.java b/framework/src/org/apache/felix/framework/ServiceRegistry.java similarity index 100% rename from src/org/apache/felix/framework/ServiceRegistry.java rename to framework/src/org/apache/felix/framework/ServiceRegistry.java
diff --git a/src/org/apache/felix/framework/StartLevelActivator.java b/framework/src/org/apache/felix/framework/StartLevelActivator.java similarity index 100% rename from src/org/apache/felix/framework/StartLevelActivator.java rename to framework/src/org/apache/felix/framework/StartLevelActivator.java
diff --git a/src/org/apache/felix/framework/StartLevelImpl.java b/framework/src/org/apache/felix/framework/StartLevelImpl.java similarity index 100% rename from src/org/apache/felix/framework/StartLevelImpl.java rename to framework/src/org/apache/felix/framework/StartLevelImpl.java
diff --git a/src/org/apache/felix/framework/SystemBundle.java b/framework/src/org/apache/felix/framework/SystemBundle.java similarity index 100% rename from src/org/apache/felix/framework/SystemBundle.java rename to framework/src/org/apache/felix/framework/SystemBundle.java
diff --git a/src/org/apache/felix/framework/SystemBundleActivator.java b/framework/src/org/apache/felix/framework/SystemBundleActivator.java similarity index 100% rename from src/org/apache/felix/framework/SystemBundleActivator.java rename to framework/src/org/apache/felix/framework/SystemBundleActivator.java
diff --git a/src/org/apache/felix/framework/SystemBundleArchive.java b/framework/src/org/apache/felix/framework/SystemBundleArchive.java similarity index 100% rename from src/org/apache/felix/framework/SystemBundleArchive.java rename to framework/src/org/apache/felix/framework/SystemBundleArchive.java
diff --git a/src/org/apache/felix/framework/cache/BundleArchive.java b/framework/src/org/apache/felix/framework/cache/BundleArchive.java similarity index 100% rename from src/org/apache/felix/framework/cache/BundleArchive.java rename to framework/src/org/apache/felix/framework/cache/BundleArchive.java
diff --git a/src/org/apache/felix/framework/cache/BundleCache.java b/framework/src/org/apache/felix/framework/cache/BundleCache.java similarity index 100% rename from src/org/apache/felix/framework/cache/BundleCache.java rename to framework/src/org/apache/felix/framework/cache/BundleCache.java
diff --git a/src/org/apache/felix/framework/cache/DefaultBundleArchive.java b/framework/src/org/apache/felix/framework/cache/DefaultBundleArchive.java similarity index 100% rename from src/org/apache/felix/framework/cache/DefaultBundleArchive.java rename to framework/src/org/apache/felix/framework/cache/DefaultBundleArchive.java
diff --git a/src/org/apache/felix/framework/cache/DefaultBundleCache.java b/framework/src/org/apache/felix/framework/cache/DefaultBundleCache.java similarity index 100% rename from src/org/apache/felix/framework/cache/DefaultBundleCache.java rename to framework/src/org/apache/felix/framework/cache/DefaultBundleCache.java
diff --git a/src/org/apache/felix/framework/ext/FelixBundleContext.java b/framework/src/org/apache/felix/framework/ext/FelixBundleContext.java similarity index 100% rename from src/org/apache/felix/framework/ext/FelixBundleContext.java rename to framework/src/org/apache/felix/framework/ext/FelixBundleContext.java
diff --git a/src/org/apache/felix/framework/installer/Artifact.java b/framework/src/org/apache/felix/framework/installer/Artifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/Artifact.java rename to framework/src/org/apache/felix/framework/installer/Artifact.java
diff --git a/src/org/apache/felix/framework/installer/BooleanProperty.java b/framework/src/org/apache/felix/framework/installer/BooleanProperty.java similarity index 100% rename from src/org/apache/felix/framework/installer/BooleanProperty.java rename to framework/src/org/apache/felix/framework/installer/BooleanProperty.java
diff --git a/src/org/apache/felix/framework/installer/Install.java b/framework/src/org/apache/felix/framework/installer/Install.java similarity index 100% rename from src/org/apache/felix/framework/installer/Install.java rename to framework/src/org/apache/felix/framework/installer/Install.java
diff --git a/src/org/apache/felix/framework/installer/Property.java b/framework/src/org/apache/felix/framework/installer/Property.java similarity index 100% rename from src/org/apache/felix/framework/installer/Property.java rename to framework/src/org/apache/felix/framework/installer/Property.java
diff --git a/src/org/apache/felix/framework/installer/PropertyPanel.java b/framework/src/org/apache/felix/framework/installer/PropertyPanel.java similarity index 100% rename from src/org/apache/felix/framework/installer/PropertyPanel.java rename to framework/src/org/apache/felix/framework/installer/PropertyPanel.java
diff --git a/src/org/apache/felix/framework/installer/Status.java b/framework/src/org/apache/felix/framework/installer/Status.java similarity index 100% rename from src/org/apache/felix/framework/installer/Status.java rename to framework/src/org/apache/felix/framework/installer/Status.java
diff --git a/src/org/apache/felix/framework/installer/StringProperty.java b/framework/src/org/apache/felix/framework/installer/StringProperty.java similarity index 100% rename from src/org/apache/felix/framework/installer/StringProperty.java rename to framework/src/org/apache/felix/framework/installer/StringProperty.java
diff --git a/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/AbstractArtifact.java
diff --git a/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/AbstractFileArtifact.java
diff --git a/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/AbstractJarArtifact.java
diff --git a/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/ResourceFileArtifact.java
diff --git a/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/ResourceJarArtifact.java
diff --git a/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/URLFileArtifact.java
diff --git a/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java b/framework/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java similarity index 100% rename from src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java rename to framework/src/org/apache/felix/framework/installer/artifact/URLJarArtifact.java
diff --git a/src/org/apache/felix/framework/installer/editor/BooleanEditor.java b/framework/src/org/apache/felix/framework/installer/editor/BooleanEditor.java similarity index 100% rename from src/org/apache/felix/framework/installer/editor/BooleanEditor.java rename to framework/src/org/apache/felix/framework/installer/editor/BooleanEditor.java
diff --git a/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java b/framework/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java similarity index 100% rename from src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java rename to framework/src/org/apache/felix/framework/installer/editor/BooleanStringEditor.java
diff --git a/src/org/apache/felix/framework/installer/editor/FileEditor.java b/framework/src/org/apache/felix/framework/installer/editor/FileEditor.java similarity index 100% rename from src/org/apache/felix/framework/installer/editor/FileEditor.java rename to framework/src/org/apache/felix/framework/installer/editor/FileEditor.java
diff --git a/src/org/apache/felix/framework/installer/editor/StringEditor.java b/framework/src/org/apache/felix/framework/installer/editor/StringEditor.java similarity index 100% rename from src/org/apache/felix/framework/installer/editor/StringEditor.java rename to framework/src/org/apache/felix/framework/installer/editor/StringEditor.java
diff --git a/src/org/apache/felix/framework/installer/manifest.mf b/framework/src/org/apache/felix/framework/installer/manifest.mf similarity index 100% rename from src/org/apache/felix/framework/installer/manifest.mf rename to framework/src/org/apache/felix/framework/installer/manifest.mf
diff --git a/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java b/framework/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java similarity index 100% rename from src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java rename to framework/src/org/apache/felix/framework/installer/property/BooleanPropertyImpl.java
diff --git a/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java b/framework/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java similarity index 100% rename from src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java rename to framework/src/org/apache/felix/framework/installer/property/BooleanStringPropertyImpl.java
diff --git a/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java b/framework/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java similarity index 100% rename from src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java rename to framework/src/org/apache/felix/framework/installer/property/NotBooleanPropertyImpl.java
diff --git a/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java b/framework/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java similarity index 100% rename from src/org/apache/felix/framework/installer/property/StringPropertyImpl.java rename to framework/src/org/apache/felix/framework/installer/property/StringPropertyImpl.java
diff --git a/src/org/apache/felix/framework/installer/resource/ResourceLoader.java b/framework/src/org/apache/felix/framework/installer/resource/ResourceLoader.java similarity index 100% rename from src/org/apache/felix/framework/installer/resource/ResourceLoader.java rename to framework/src/org/apache/felix/framework/installer/resource/ResourceLoader.java
diff --git a/src/org/apache/felix/framework/manifest.mf b/framework/src/org/apache/felix/framework/manifest.mf similarity index 100% rename from src/org/apache/felix/framework/manifest.mf rename to framework/src/org/apache/felix/framework/manifest.mf
diff --git a/src/org/apache/felix/framework/searchpolicy/R4Attribute.java b/framework/src/org/apache/felix/framework/searchpolicy/R4Attribute.java similarity index 100% rename from src/org/apache/felix/framework/searchpolicy/R4Attribute.java rename to framework/src/org/apache/felix/framework/searchpolicy/R4Attribute.java
diff --git a/src/org/apache/felix/framework/searchpolicy/R4Directive.java b/framework/src/org/apache/felix/framework/searchpolicy/R4Directive.java similarity index 100% rename from src/org/apache/felix/framework/searchpolicy/R4Directive.java rename to framework/src/org/apache/felix/framework/searchpolicy/R4Directive.java
diff --git a/src/org/apache/felix/framework/searchpolicy/R4Package.java b/framework/src/org/apache/felix/framework/searchpolicy/R4Package.java similarity index 100% rename from src/org/apache/felix/framework/searchpolicy/R4Package.java rename to framework/src/org/apache/felix/framework/searchpolicy/R4Package.java
diff --git a/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java b/framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java similarity index 100% rename from src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java rename to framework/src/org/apache/felix/framework/searchpolicy/R4SearchPolicy.java
diff --git a/src/org/apache/felix/framework/searchpolicy/R4Version.java b/framework/src/org/apache/felix/framework/searchpolicy/R4Version.java similarity index 100% rename from src/org/apache/felix/framework/searchpolicy/R4Version.java rename to framework/src/org/apache/felix/framework/searchpolicy/R4Version.java
diff --git a/src/org/apache/felix/framework/searchpolicy/R4Wire.java b/framework/src/org/apache/felix/framework/searchpolicy/R4Wire.java similarity index 100% rename from src/org/apache/felix/framework/searchpolicy/R4Wire.java rename to framework/src/org/apache/felix/framework/searchpolicy/R4Wire.java
diff --git a/src/org/apache/felix/framework/util/BundleListenerWrapper.java b/framework/src/org/apache/felix/framework/util/BundleListenerWrapper.java similarity index 100% rename from src/org/apache/felix/framework/util/BundleListenerWrapper.java rename to framework/src/org/apache/felix/framework/util/BundleListenerWrapper.java
diff --git a/src/org/apache/felix/framework/util/CaseInsensitiveMap.java b/framework/src/org/apache/felix/framework/util/CaseInsensitiveMap.java similarity index 100% rename from src/org/apache/felix/framework/util/CaseInsensitiveMap.java rename to framework/src/org/apache/felix/framework/util/CaseInsensitiveMap.java
diff --git a/src/org/apache/felix/framework/util/DispatchQueue.java b/framework/src/org/apache/felix/framework/util/DispatchQueue.java similarity index 100% rename from src/org/apache/felix/framework/util/DispatchQueue.java rename to framework/src/org/apache/felix/framework/util/DispatchQueue.java
diff --git a/src/org/apache/felix/framework/util/Dispatcher.java b/framework/src/org/apache/felix/framework/util/Dispatcher.java similarity index 100% rename from src/org/apache/felix/framework/util/Dispatcher.java rename to framework/src/org/apache/felix/framework/util/Dispatcher.java
diff --git a/src/org/apache/felix/framework/util/FelixConstants.java b/framework/src/org/apache/felix/framework/util/FelixConstants.java similarity index 100% rename from src/org/apache/felix/framework/util/FelixConstants.java rename to framework/src/org/apache/felix/framework/util/FelixConstants.java
diff --git a/src/org/apache/felix/framework/util/FelixDispatchQueue.java b/framework/src/org/apache/felix/framework/util/FelixDispatchQueue.java similarity index 100% rename from src/org/apache/felix/framework/util/FelixDispatchQueue.java rename to framework/src/org/apache/felix/framework/util/FelixDispatchQueue.java
diff --git a/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java b/framework/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java similarity index 100% rename from src/org/apache/felix/framework/util/FrameworkListenerWrapper.java rename to framework/src/org/apache/felix/framework/util/FrameworkListenerWrapper.java
diff --git a/src/org/apache/felix/framework/util/IteratorToEnumeration.java b/framework/src/org/apache/felix/framework/util/IteratorToEnumeration.java similarity index 100% rename from src/org/apache/felix/framework/util/IteratorToEnumeration.java rename to framework/src/org/apache/felix/framework/util/IteratorToEnumeration.java
diff --git a/src/org/apache/felix/framework/util/LibraryInfo.java b/framework/src/org/apache/felix/framework/util/LibraryInfo.java similarity index 100% rename from src/org/apache/felix/framework/util/LibraryInfo.java rename to framework/src/org/apache/felix/framework/util/LibraryInfo.java
diff --git a/src/org/apache/felix/framework/util/ListenerWrapper.java b/framework/src/org/apache/felix/framework/util/ListenerWrapper.java similarity index 100% rename from src/org/apache/felix/framework/util/ListenerWrapper.java rename to framework/src/org/apache/felix/framework/util/ListenerWrapper.java
diff --git a/src/org/apache/felix/framework/util/MapToDictionary.java b/framework/src/org/apache/felix/framework/util/MapToDictionary.java similarity index 100% rename from src/org/apache/felix/framework/util/MapToDictionary.java rename to framework/src/org/apache/felix/framework/util/MapToDictionary.java
diff --git a/src/org/apache/felix/framework/util/MutablePropertyResolver.java b/framework/src/org/apache/felix/framework/util/MutablePropertyResolver.java similarity index 100% rename from src/org/apache/felix/framework/util/MutablePropertyResolver.java rename to framework/src/org/apache/felix/framework/util/MutablePropertyResolver.java
diff --git a/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java b/framework/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java similarity index 100% rename from src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java rename to framework/src/org/apache/felix/framework/util/MutablePropertyResolverImpl.java
diff --git a/src/org/apache/felix/framework/util/ObjectInputStreamX.java b/framework/src/org/apache/felix/framework/util/ObjectInputStreamX.java similarity index 100% rename from src/org/apache/felix/framework/util/ObjectInputStreamX.java rename to framework/src/org/apache/felix/framework/util/ObjectInputStreamX.java
diff --git a/src/org/apache/felix/framework/util/PropertyResolver.java b/framework/src/org/apache/felix/framework/util/PropertyResolver.java similarity index 100% rename from src/org/apache/felix/framework/util/PropertyResolver.java rename to framework/src/org/apache/felix/framework/util/PropertyResolver.java
diff --git a/src/org/apache/felix/framework/util/ServiceListenerWrapper.java b/framework/src/org/apache/felix/framework/util/ServiceListenerWrapper.java similarity index 100% rename from src/org/apache/felix/framework/util/ServiceListenerWrapper.java rename to framework/src/org/apache/felix/framework/util/ServiceListenerWrapper.java
diff --git a/src/org/apache/felix/framework/util/Util.java b/framework/src/org/apache/felix/framework/util/Util.java similarity index 100% rename from src/org/apache/felix/framework/util/Util.java rename to framework/src/org/apache/felix/framework/util/Util.java
diff --git a/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java b/framework/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java rename to framework/src/org/apache/felix/framework/util/ldap/AttributeNotFoundException.java
diff --git a/src/org/apache/felix/framework/util/ldap/Driver.java b/framework/src/org/apache/felix/framework/util/ldap/Driver.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/Driver.java rename to framework/src/org/apache/felix/framework/util/ldap/Driver.java
diff --git a/src/org/apache/felix/framework/util/ldap/EvaluationException.java b/framework/src/org/apache/felix/framework/util/ldap/EvaluationException.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/EvaluationException.java rename to framework/src/org/apache/felix/framework/util/ldap/EvaluationException.java
diff --git a/src/org/apache/felix/framework/util/ldap/Evaluator.java b/framework/src/org/apache/felix/framework/util/ldap/Evaluator.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/Evaluator.java rename to framework/src/org/apache/felix/framework/util/ldap/Evaluator.java
diff --git a/src/org/apache/felix/framework/util/ldap/LdapLexer.java b/framework/src/org/apache/felix/framework/util/ldap/LdapLexer.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/LdapLexer.java rename to framework/src/org/apache/felix/framework/util/ldap/LdapLexer.java
diff --git a/src/org/apache/felix/framework/util/ldap/Mapper.java b/framework/src/org/apache/felix/framework/util/ldap/Mapper.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/Mapper.java rename to framework/src/org/apache/felix/framework/util/ldap/Mapper.java
diff --git a/src/org/apache/felix/framework/util/ldap/Operator.java b/framework/src/org/apache/felix/framework/util/ldap/Operator.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/Operator.java rename to framework/src/org/apache/felix/framework/util/ldap/Operator.java
diff --git a/src/org/apache/felix/framework/util/ldap/ParseException.java b/framework/src/org/apache/felix/framework/util/ldap/ParseException.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/ParseException.java rename to framework/src/org/apache/felix/framework/util/ldap/ParseException.java
diff --git a/src/org/apache/felix/framework/util/ldap/Parser.java b/framework/src/org/apache/felix/framework/util/ldap/Parser.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/Parser.java rename to framework/src/org/apache/felix/framework/util/ldap/Parser.java
diff --git a/src/org/apache/felix/framework/util/ldap/Unknown.java b/framework/src/org/apache/felix/framework/util/ldap/Unknown.java similarity index 100% rename from src/org/apache/felix/framework/util/ldap/Unknown.java rename to framework/src/org/apache/felix/framework/util/ldap/Unknown.java
diff --git a/src/org/apache/felix/moduleloader/DefaultURLPolicy.java b/framework/src/org/apache/felix/moduleloader/DefaultURLPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/DefaultURLPolicy.java rename to framework/src/org/apache/felix/moduleloader/DefaultURLPolicy.java
diff --git a/src/org/apache/felix/moduleloader/JarResourceSource.java b/framework/src/org/apache/felix/moduleloader/JarResourceSource.java similarity index 100% rename from src/org/apache/felix/moduleloader/JarResourceSource.java rename to framework/src/org/apache/felix/moduleloader/JarResourceSource.java
diff --git a/src/org/apache/felix/moduleloader/LibrarySource.java b/framework/src/org/apache/felix/moduleloader/LibrarySource.java similarity index 100% rename from src/org/apache/felix/moduleloader/LibrarySource.java rename to framework/src/org/apache/felix/moduleloader/LibrarySource.java
diff --git a/src/org/apache/felix/moduleloader/Module.java b/framework/src/org/apache/felix/moduleloader/Module.java similarity index 100% rename from src/org/apache/felix/moduleloader/Module.java rename to framework/src/org/apache/felix/moduleloader/Module.java
diff --git a/src/org/apache/felix/moduleloader/ModuleClassLoader.java b/framework/src/org/apache/felix/moduleloader/ModuleClassLoader.java similarity index 100% rename from src/org/apache/felix/moduleloader/ModuleClassLoader.java rename to framework/src/org/apache/felix/moduleloader/ModuleClassLoader.java
diff --git a/src/org/apache/felix/moduleloader/ModuleEvent.java b/framework/src/org/apache/felix/moduleloader/ModuleEvent.java similarity index 100% rename from src/org/apache/felix/moduleloader/ModuleEvent.java rename to framework/src/org/apache/felix/moduleloader/ModuleEvent.java
diff --git a/src/org/apache/felix/moduleloader/ModuleListener.java b/framework/src/org/apache/felix/moduleloader/ModuleListener.java similarity index 100% rename from src/org/apache/felix/moduleloader/ModuleListener.java rename to framework/src/org/apache/felix/moduleloader/ModuleListener.java
diff --git a/src/org/apache/felix/moduleloader/ModuleManager.java b/framework/src/org/apache/felix/moduleloader/ModuleManager.java similarity index 100% rename from src/org/apache/felix/moduleloader/ModuleManager.java rename to framework/src/org/apache/felix/moduleloader/ModuleManager.java
diff --git a/src/org/apache/felix/moduleloader/ModuleURLConnection.java b/framework/src/org/apache/felix/moduleloader/ModuleURLConnection.java similarity index 100% rename from src/org/apache/felix/moduleloader/ModuleURLConnection.java rename to framework/src/org/apache/felix/moduleloader/ModuleURLConnection.java
diff --git a/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java b/framework/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java similarity index 100% rename from src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java rename to framework/src/org/apache/felix/moduleloader/ModuleURLStreamHandler.java
diff --git a/src/org/apache/felix/moduleloader/ResourceNotFoundException.java b/framework/src/org/apache/felix/moduleloader/ResourceNotFoundException.java similarity index 100% rename from src/org/apache/felix/moduleloader/ResourceNotFoundException.java rename to framework/src/org/apache/felix/moduleloader/ResourceNotFoundException.java
diff --git a/src/org/apache/felix/moduleloader/ResourceSource.java b/framework/src/org/apache/felix/moduleloader/ResourceSource.java similarity index 100% rename from src/org/apache/felix/moduleloader/ResourceSource.java rename to framework/src/org/apache/felix/moduleloader/ResourceSource.java
diff --git a/src/org/apache/felix/moduleloader/SearchPolicy.java b/framework/src/org/apache/felix/moduleloader/SearchPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/SearchPolicy.java rename to framework/src/org/apache/felix/moduleloader/SearchPolicy.java
diff --git a/src/org/apache/felix/moduleloader/URLPolicy.java b/framework/src/org/apache/felix/moduleloader/URLPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/URLPolicy.java rename to framework/src/org/apache/felix/moduleloader/URLPolicy.java
diff --git a/src/org/apache/felix/moduleloader/Util.java b/framework/src/org/apache/felix/moduleloader/Util.java similarity index 100% rename from src/org/apache/felix/moduleloader/Util.java rename to framework/src/org/apache/felix/moduleloader/Util.java
diff --git a/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java b/framework/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/CompatibilityPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java b/framework/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/ExhaustiveSearchPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java b/framework/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/ImportSearchPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/ResolveException.java b/framework/src/org/apache/felix/moduleloader/search/ResolveException.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/ResolveException.java rename to framework/src/org/apache/felix/moduleloader/search/ResolveException.java
diff --git a/src/org/apache/felix/moduleloader/search/ResolveListener.java b/framework/src/org/apache/felix/moduleloader/search/ResolveListener.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/ResolveListener.java rename to framework/src/org/apache/felix/moduleloader/search/ResolveListener.java
diff --git a/src/org/apache/felix/moduleloader/search/SelectionPolicy.java b/framework/src/org/apache/felix/moduleloader/search/SelectionPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/SelectionPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/SelectionPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java b/framework/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/SelfContainedSearchPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/ValidationException.java b/framework/src/org/apache/felix/moduleloader/search/ValidationException.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/ValidationException.java rename to framework/src/org/apache/felix/moduleloader/search/ValidationException.java
diff --git a/src/org/apache/felix/moduleloader/search/ValidationListener.java b/framework/src/org/apache/felix/moduleloader/search/ValidationListener.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/ValidationListener.java rename to framework/src/org/apache/felix/moduleloader/search/ValidationListener.java
diff --git a/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java b/framework/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/compatibility/ExactCompatibilityPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java b/framework/src/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/selection/InteractiveSelectionPolicy.java
diff --git a/src/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java b/framework/src/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java similarity index 100% rename from src/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java rename to framework/src/org/apache/felix/moduleloader/search/selection/SimpleSelectionPolicy.java
diff --git a/src/org/apache/felix/shell/CdCommand.java b/framework/src/org/apache/felix/shell/CdCommand.java similarity index 100% rename from src/org/apache/felix/shell/CdCommand.java rename to framework/src/org/apache/felix/shell/CdCommand.java
diff --git a/src/org/apache/felix/shell/Command.java b/framework/src/org/apache/felix/shell/Command.java similarity index 100% rename from src/org/apache/felix/shell/Command.java rename to framework/src/org/apache/felix/shell/Command.java
diff --git a/src/org/apache/felix/shell/ShellService.java b/framework/src/org/apache/felix/shell/ShellService.java similarity index 100% rename from src/org/apache/felix/shell/ShellService.java rename to framework/src/org/apache/felix/shell/ShellService.java
diff --git a/src/org/apache/felix/shell/impl/Activator.java b/framework/src/org/apache/felix/shell/impl/Activator.java similarity index 100% rename from src/org/apache/felix/shell/impl/Activator.java rename to framework/src/org/apache/felix/shell/impl/Activator.java
diff --git a/src/org/apache/felix/shell/impl/BundleLevelCommandImpl.java b/framework/src/org/apache/felix/shell/impl/BundleLevelCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/BundleLevelCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/BundleLevelCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/CdCommandImpl.java b/framework/src/org/apache/felix/shell/impl/CdCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/CdCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/CdCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/HeadersCommandImpl.java b/framework/src/org/apache/felix/shell/impl/HeadersCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/HeadersCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/HeadersCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/HelpCommandImpl.java b/framework/src/org/apache/felix/shell/impl/HelpCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/HelpCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/HelpCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/InstallCommandImpl.java b/framework/src/org/apache/felix/shell/impl/InstallCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/InstallCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/InstallCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/PackagesCommandImpl.java b/framework/src/org/apache/felix/shell/impl/PackagesCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/PackagesCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/PackagesCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/PsCommandImpl.java b/framework/src/org/apache/felix/shell/impl/PsCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/PsCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/PsCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/RefreshCommandImpl.java b/framework/src/org/apache/felix/shell/impl/RefreshCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/RefreshCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/RefreshCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/ServicesCommandImpl.java b/framework/src/org/apache/felix/shell/impl/ServicesCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/ServicesCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/ServicesCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/ShutdownCommandImpl.java b/framework/src/org/apache/felix/shell/impl/ShutdownCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/ShutdownCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/ShutdownCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/StartCommandImpl.java b/framework/src/org/apache/felix/shell/impl/StartCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/StartCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/StartCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/StartLevelCommandImpl.java b/framework/src/org/apache/felix/shell/impl/StartLevelCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/StartLevelCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/StartLevelCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/StopCommandImpl.java b/framework/src/org/apache/felix/shell/impl/StopCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/StopCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/StopCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/UninstallCommandImpl.java b/framework/src/org/apache/felix/shell/impl/UninstallCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/UninstallCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/UninstallCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/UpdateCommandImpl.java b/framework/src/org/apache/felix/shell/impl/UpdateCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/UpdateCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/UpdateCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/Util.java b/framework/src/org/apache/felix/shell/impl/Util.java similarity index 100% rename from src/org/apache/felix/shell/impl/Util.java rename to framework/src/org/apache/felix/shell/impl/Util.java
diff --git a/src/org/apache/felix/shell/impl/VersionCommandImpl.java b/framework/src/org/apache/felix/shell/impl/VersionCommandImpl.java similarity index 100% rename from src/org/apache/felix/shell/impl/VersionCommandImpl.java rename to framework/src/org/apache/felix/shell/impl/VersionCommandImpl.java
diff --git a/src/org/apache/felix/shell/impl/manifest.mf b/framework/src/org/apache/felix/shell/impl/manifest.mf similarity index 100% rename from src/org/apache/felix/shell/impl/manifest.mf rename to framework/src/org/apache/felix/shell/impl/manifest.mf
diff --git a/src/org/apache/felix/shelltui/Activator.java b/framework/src/org/apache/felix/shelltui/Activator.java similarity index 100% rename from src/org/apache/felix/shelltui/Activator.java rename to framework/src/org/apache/felix/shelltui/Activator.java
diff --git a/src/org/apache/felix/shelltui/manifest.mf b/framework/src/org/apache/felix/shelltui/manifest.mf similarity index 100% rename from src/org/apache/felix/shelltui/manifest.mf rename to framework/src/org/apache/felix/shelltui/manifest.mf
diff --git a/src/org/osgi/framework/AdminPermission.java b/framework/src/org/osgi/framework/AdminPermission.java similarity index 100% rename from src/org/osgi/framework/AdminPermission.java rename to framework/src/org/osgi/framework/AdminPermission.java
diff --git a/src/org/osgi/framework/AllServiceListener.java b/framework/src/org/osgi/framework/AllServiceListener.java similarity index 100% rename from src/org/osgi/framework/AllServiceListener.java rename to framework/src/org/osgi/framework/AllServiceListener.java
diff --git a/src/org/osgi/framework/Bundle.java b/framework/src/org/osgi/framework/Bundle.java similarity index 100% rename from src/org/osgi/framework/Bundle.java rename to framework/src/org/osgi/framework/Bundle.java
diff --git a/src/org/osgi/framework/BundleActivator.java b/framework/src/org/osgi/framework/BundleActivator.java similarity index 100% rename from src/org/osgi/framework/BundleActivator.java rename to framework/src/org/osgi/framework/BundleActivator.java
diff --git a/src/org/osgi/framework/BundleContext.java b/framework/src/org/osgi/framework/BundleContext.java similarity index 100% rename from src/org/osgi/framework/BundleContext.java rename to framework/src/org/osgi/framework/BundleContext.java
diff --git a/src/org/osgi/framework/BundleEvent.java b/framework/src/org/osgi/framework/BundleEvent.java similarity index 100% rename from src/org/osgi/framework/BundleEvent.java rename to framework/src/org/osgi/framework/BundleEvent.java
diff --git a/src/org/osgi/framework/BundleException.java b/framework/src/org/osgi/framework/BundleException.java similarity index 100% rename from src/org/osgi/framework/BundleException.java rename to framework/src/org/osgi/framework/BundleException.java
diff --git a/src/org/osgi/framework/BundleListener.java b/framework/src/org/osgi/framework/BundleListener.java similarity index 100% rename from src/org/osgi/framework/BundleListener.java rename to framework/src/org/osgi/framework/BundleListener.java
diff --git a/src/org/osgi/framework/BundlePermission.java b/framework/src/org/osgi/framework/BundlePermission.java similarity index 100% rename from src/org/osgi/framework/BundlePermission.java rename to framework/src/org/osgi/framework/BundlePermission.java
diff --git a/src/org/osgi/framework/Configurable.java b/framework/src/org/osgi/framework/Configurable.java similarity index 100% rename from src/org/osgi/framework/Configurable.java rename to framework/src/org/osgi/framework/Configurable.java
diff --git a/src/org/osgi/framework/Constants.java b/framework/src/org/osgi/framework/Constants.java similarity index 100% rename from src/org/osgi/framework/Constants.java rename to framework/src/org/osgi/framework/Constants.java
diff --git a/src/org/osgi/framework/Filter.java b/framework/src/org/osgi/framework/Filter.java similarity index 100% rename from src/org/osgi/framework/Filter.java rename to framework/src/org/osgi/framework/Filter.java
diff --git a/src/org/osgi/framework/FrameworkEvent.java b/framework/src/org/osgi/framework/FrameworkEvent.java similarity index 100% rename from src/org/osgi/framework/FrameworkEvent.java rename to framework/src/org/osgi/framework/FrameworkEvent.java
diff --git a/src/org/osgi/framework/FrameworkListener.java b/framework/src/org/osgi/framework/FrameworkListener.java similarity index 100% rename from src/org/osgi/framework/FrameworkListener.java rename to framework/src/org/osgi/framework/FrameworkListener.java
diff --git a/src/org/osgi/framework/FrameworkUtil.java b/framework/src/org/osgi/framework/FrameworkUtil.java similarity index 100% rename from src/org/osgi/framework/FrameworkUtil.java rename to framework/src/org/osgi/framework/FrameworkUtil.java
diff --git a/src/org/osgi/framework/InvalidSyntaxException.java b/framework/src/org/osgi/framework/InvalidSyntaxException.java similarity index 100% rename from src/org/osgi/framework/InvalidSyntaxException.java rename to framework/src/org/osgi/framework/InvalidSyntaxException.java
diff --git a/src/org/osgi/framework/PackagePermission.java b/framework/src/org/osgi/framework/PackagePermission.java similarity index 100% rename from src/org/osgi/framework/PackagePermission.java rename to framework/src/org/osgi/framework/PackagePermission.java
diff --git a/src/org/osgi/framework/ServiceEvent.java b/framework/src/org/osgi/framework/ServiceEvent.java similarity index 100% rename from src/org/osgi/framework/ServiceEvent.java rename to framework/src/org/osgi/framework/ServiceEvent.java
diff --git a/src/org/osgi/framework/ServiceFactory.java b/framework/src/org/osgi/framework/ServiceFactory.java similarity index 100% rename from src/org/osgi/framework/ServiceFactory.java rename to framework/src/org/osgi/framework/ServiceFactory.java
diff --git a/src/org/osgi/framework/ServiceListener.java b/framework/src/org/osgi/framework/ServiceListener.java similarity index 100% rename from src/org/osgi/framework/ServiceListener.java rename to framework/src/org/osgi/framework/ServiceListener.java
diff --git a/src/org/osgi/framework/ServicePermission.java b/framework/src/org/osgi/framework/ServicePermission.java similarity index 100% rename from src/org/osgi/framework/ServicePermission.java rename to framework/src/org/osgi/framework/ServicePermission.java
diff --git a/src/org/osgi/framework/ServiceReference.java b/framework/src/org/osgi/framework/ServiceReference.java similarity index 100% rename from src/org/osgi/framework/ServiceReference.java rename to framework/src/org/osgi/framework/ServiceReference.java
diff --git a/src/org/osgi/framework/ServiceRegistration.java b/framework/src/org/osgi/framework/ServiceRegistration.java similarity index 100% rename from src/org/osgi/framework/ServiceRegistration.java rename to framework/src/org/osgi/framework/ServiceRegistration.java
diff --git a/src/org/osgi/framework/SynchronousBundleListener.java b/framework/src/org/osgi/framework/SynchronousBundleListener.java similarity index 100% rename from src/org/osgi/framework/SynchronousBundleListener.java rename to framework/src/org/osgi/framework/SynchronousBundleListener.java
diff --git a/src/org/osgi/framework/Version.java b/framework/src/org/osgi/framework/Version.java similarity index 100% rename from src/org/osgi/framework/Version.java rename to framework/src/org/osgi/framework/Version.java
diff --git a/src/org/osgi/service/condpermadmin/BundleLocationCondition.java b/framework/src/org/osgi/service/condpermadmin/BundleLocationCondition.java similarity index 100% rename from src/org/osgi/service/condpermadmin/BundleLocationCondition.java rename to framework/src/org/osgi/service/condpermadmin/BundleLocationCondition.java
diff --git a/src/org/osgi/service/condpermadmin/BundleSignerCondition.java b/framework/src/org/osgi/service/condpermadmin/BundleSignerCondition.java similarity index 100% rename from src/org/osgi/service/condpermadmin/BundleSignerCondition.java rename to framework/src/org/osgi/service/condpermadmin/BundleSignerCondition.java
diff --git a/src/org/osgi/service/condpermadmin/Condition.java b/framework/src/org/osgi/service/condpermadmin/Condition.java similarity index 100% rename from src/org/osgi/service/condpermadmin/Condition.java rename to framework/src/org/osgi/service/condpermadmin/Condition.java
diff --git a/src/org/osgi/service/condpermadmin/ConditionInfo.java b/framework/src/org/osgi/service/condpermadmin/ConditionInfo.java similarity index 100% rename from src/org/osgi/service/condpermadmin/ConditionInfo.java rename to framework/src/org/osgi/service/condpermadmin/ConditionInfo.java
diff --git a/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java b/framework/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java similarity index 100% rename from src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java rename to framework/src/org/osgi/service/condpermadmin/ConditionalPermissionAdmin.java
diff --git a/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java b/framework/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java similarity index 100% rename from src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java rename to framework/src/org/osgi/service/condpermadmin/ConditionalPermissionInfo.java
diff --git a/src/org/osgi/service/packageadmin/ExportedPackage.java b/framework/src/org/osgi/service/packageadmin/ExportedPackage.java similarity index 100% rename from src/org/osgi/service/packageadmin/ExportedPackage.java rename to framework/src/org/osgi/service/packageadmin/ExportedPackage.java
diff --git a/src/org/osgi/service/packageadmin/PackageAdmin.java b/framework/src/org/osgi/service/packageadmin/PackageAdmin.java similarity index 100% rename from src/org/osgi/service/packageadmin/PackageAdmin.java rename to framework/src/org/osgi/service/packageadmin/PackageAdmin.java
diff --git a/src/org/osgi/service/packageadmin/RequiredBundle.java b/framework/src/org/osgi/service/packageadmin/RequiredBundle.java similarity index 100% rename from src/org/osgi/service/packageadmin/RequiredBundle.java rename to framework/src/org/osgi/service/packageadmin/RequiredBundle.java
diff --git a/src/org/osgi/service/permissionadmin/PermissionAdmin.java b/framework/src/org/osgi/service/permissionadmin/PermissionAdmin.java similarity index 100% rename from src/org/osgi/service/permissionadmin/PermissionAdmin.java rename to framework/src/org/osgi/service/permissionadmin/PermissionAdmin.java
diff --git a/src/org/osgi/service/permissionadmin/PermissionInfo.java b/framework/src/org/osgi/service/permissionadmin/PermissionInfo.java similarity index 100% rename from src/org/osgi/service/permissionadmin/PermissionInfo.java rename to framework/src/org/osgi/service/permissionadmin/PermissionInfo.java
diff --git a/src/org/osgi/service/startlevel/StartLevel.java b/framework/src/org/osgi/service/startlevel/StartLevel.java similarity index 100% rename from src/org/osgi/service/startlevel/StartLevel.java rename to framework/src/org/osgi/service/startlevel/StartLevel.java
diff --git a/src/org/osgi/service/url/AbstractURLStreamHandlerService.java b/framework/src/org/osgi/service/url/AbstractURLStreamHandlerService.java similarity index 100% rename from src/org/osgi/service/url/AbstractURLStreamHandlerService.java rename to framework/src/org/osgi/service/url/AbstractURLStreamHandlerService.java
diff --git a/src/org/osgi/service/url/URLConstants.java b/framework/src/org/osgi/service/url/URLConstants.java similarity index 100% rename from src/org/osgi/service/url/URLConstants.java rename to framework/src/org/osgi/service/url/URLConstants.java
diff --git a/src/org/osgi/service/url/URLStreamHandlerService.java b/framework/src/org/osgi/service/url/URLStreamHandlerService.java similarity index 100% rename from src/org/osgi/service/url/URLStreamHandlerService.java rename to framework/src/org/osgi/service/url/URLStreamHandlerService.java
diff --git a/src/org/osgi/service/url/URLStreamHandlerSetter.java b/framework/src/org/osgi/service/url/URLStreamHandlerSetter.java similarity index 100% rename from src/org/osgi/service/url/URLStreamHandlerSetter.java rename to framework/src/org/osgi/service/url/URLStreamHandlerSetter.java
diff --git a/src/org/osgi/util/tracker/ServiceTracker.java b/framework/src/org/osgi/util/tracker/ServiceTracker.java similarity index 100% rename from src/org/osgi/util/tracker/ServiceTracker.java rename to framework/src/org/osgi/util/tracker/ServiceTracker.java
diff --git a/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java b/framework/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java similarity index 100% rename from src/org/osgi/util/tracker/ServiceTrackerCustomizer.java rename to framework/src/org/osgi/util/tracker/ServiceTrackerCustomizer.java
diff --git a/src/org/ungoverned/osgi/service/shell/CdCommand.java b/framework/src/org/ungoverned/osgi/service/shell/CdCommand.java similarity index 100% rename from src/org/ungoverned/osgi/service/shell/CdCommand.java rename to framework/src/org/ungoverned/osgi/service/shell/CdCommand.java
diff --git a/src/org/ungoverned/osgi/service/shell/Command.java b/framework/src/org/ungoverned/osgi/service/shell/Command.java similarity index 100% rename from src/org/ungoverned/osgi/service/shell/Command.java rename to framework/src/org/ungoverned/osgi/service/shell/Command.java
diff --git a/src/org/ungoverned/osgi/service/shell/ShellService.java b/framework/src/org/ungoverned/osgi/service/shell/ShellService.java similarity index 100% rename from src/org/ungoverned/osgi/service/shell/ShellService.java rename to framework/src/org/ungoverned/osgi/service/shell/ShellService.java