commit | 0fcc2713b215736e0395dadd7bbad275d5c0240b | [log] [tgz] |
---|---|---|
author | Richard S. Hall <rickhall@apache.org> | Tue Aug 01 15:22:00 2006 +0000 |
committer | Richard S. Hall <rickhall@apache.org> | Tue Aug 01 15:22:00 2006 +0000 |
tree | 28fd1bb38660d11e71d8f1a1882d580cc3752dfc | |
parent | 1ab60ea8e4d68c05ac2d860d1aa134cbca3508e1 [diff] |
Shortened the subproject directory names. git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@427607 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/org.apache.felix.bundlerepository/pom.xml b/bundlerepository/pom.xml similarity index 100% rename from org.apache.felix.bundlerepository/pom.xml rename to bundlerepository/pom.xml
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/Activator.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Activator.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/Activator.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/Activator.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/CapabilityImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/CapabilityImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/CapabilityImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/CapabilityImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/CategoryImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/CategoryImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/CategoryImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/CategoryImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/FileUtil.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/FileUtil.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/FileUtil.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/FileUtil.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/IteratorToEnumeration.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/IteratorToEnumeration.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/IteratorToEnumeration.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/IteratorToEnumeration.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/LocalRepositoryImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/MapToDictionary.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/MapToDictionary.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/MapToDictionary.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/MapToDictionary.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ObrCommandImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ObrCommandImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ObrCommandImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/ObrCommandImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/PropertyImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/PropertyImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/PropertyImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/PropertyImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Attribute.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Attribute.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Attribute.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Attribute.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Directive.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Directive.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Directive.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Directive.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Export.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Export.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Export.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Export.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Import.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Import.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Import.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Import.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Package.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Package.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Package.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/R4Package.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryAdminImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/RepositoryImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/RequirementImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResolverImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceComparator.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceImpl.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceImpl.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceImpl.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/ResourceImpl.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/Util.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/Util.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/Util.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/Util.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/VersionRange.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/VersionRange.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/VersionRange.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/VersionRange.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ClassUtility.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ClassUtility.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ClassUtility.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ClassUtility.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/KXml2MetadataHandler.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/KXml2MetadataHandler.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/KXml2MetadataHandler.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/KXml2MetadataHandler.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MappingProcessingInstructionHandler.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MappingProcessingInstructionHandler.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MappingProcessingInstructionHandler.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MappingProcessingInstructionHandler.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MetadataHandler.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MetadataHandler.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MetadataHandler.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/MetadataHandler.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ReplaceUtility.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ReplaceUtility.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ReplaceUtility.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/ReplaceUtility.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlCommonHandler.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlCommonHandler.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlCommonHandler.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlCommonHandler.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlMetadataHandler.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlMetadataHandler.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlMetadataHandler.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/XmlMetadataHandler.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXHandler.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXHandler.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXHandler.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXHandler.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXParser.java b/bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXParser.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXParser.java rename to bundlerepository/src/main/java/org/apache/felix/bundlerepository/metadataparser/kxmlsax/KXml2SAXParser.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Capability.java b/bundlerepository/src/main/java/org/osgi/service/obr/Capability.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Capability.java rename to bundlerepository/src/main/java/org/osgi/service/obr/Capability.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/CapabilityProvider.java b/bundlerepository/src/main/java/org/osgi/service/obr/CapabilityProvider.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/CapabilityProvider.java rename to bundlerepository/src/main/java/org/osgi/service/obr/CapabilityProvider.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Repository.java b/bundlerepository/src/main/java/org/osgi/service/obr/Repository.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Repository.java rename to bundlerepository/src/main/java/org/osgi/service/obr/Repository.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/RepositoryAdmin.java b/bundlerepository/src/main/java/org/osgi/service/obr/RepositoryAdmin.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/RepositoryAdmin.java rename to bundlerepository/src/main/java/org/osgi/service/obr/RepositoryAdmin.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/RepositoryPermission.java b/bundlerepository/src/main/java/org/osgi/service/obr/RepositoryPermission.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/RepositoryPermission.java rename to bundlerepository/src/main/java/org/osgi/service/obr/RepositoryPermission.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Requirement.java b/bundlerepository/src/main/java/org/osgi/service/obr/Requirement.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Requirement.java rename to bundlerepository/src/main/java/org/osgi/service/obr/Requirement.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Resolver.java b/bundlerepository/src/main/java/org/osgi/service/obr/Resolver.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Resolver.java rename to bundlerepository/src/main/java/org/osgi/service/obr/Resolver.java
diff --git a/org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Resource.java b/bundlerepository/src/main/java/org/osgi/service/obr/Resource.java similarity index 100% rename from org.apache.felix.bundlerepository/src/main/java/org/osgi/service/obr/Resource.java rename to bundlerepository/src/main/java/org/osgi/service/obr/Resource.java
diff --git a/org.apache.felix.main/pom.xml b/org.apache.felix.main/pom.xml index e89aa7e..9a729ee 100644 --- a/org.apache.felix.main/pom.xml +++ b/org.apache.felix.main/pom.xml
@@ -55,11 +55,11 @@ todir="${basedir}/lib"/> <copy file="${basedir}/../org.osgi.core/target/org.osgi.core-${pom.version}.jar" todir="${basedir}/lib"/> -<copy file="${basedir}/../org.apache.felix.shell/target/org.apache.felix.shell-${pom.version}.jar" +<copy file="${basedir}/../shell/target/org.apache.felix.shell-${pom.version}.jar" todir="${basedir}/bundle"/> -<copy file="${basedir}/../org.apache.felix.shell.tui/target/org.apache.felix.shell.tui-${pom.version}.jar" +<copy file="${basedir}/../shell.tui/target/org.apache.felix.shell.tui-${pom.version}.jar" todir="${basedir}/bundle"/> -<copy file="${basedir}/../org.apache.felix.bundlerepository/target/org.apache.felix.bundlerepository-${pom.version}.jar" +<copy file="${basedir}/../bundlerepository/target/org.apache.felix.bundlerepository-${pom.version}.jar" todir="${basedir}/bundle"/> </tasks> </configuration>
diff --git a/pom.xml b/pom.xml index d0ff19d..5a6158f 100644 --- a/pom.xml +++ b/pom.xml
@@ -12,11 +12,11 @@ <module>org.osgi.core</module> <module>org.osgi.compendium</module> <module>org.apache.felix.framework</module> - <module>org.apache.felix.shell</module> - <module>org.apache.felix.shell.tui</module> - <module>org.apache.felix.shell.gui</module> - <module>org.apache.felix.shell.gui.plugin</module> - <module>org.apache.felix.bundlerepository</module> + <module>shell</module> + <module>shell.tui</module> + <module>shell.gui</module> + <module>shell.gui.plugin</module> + <module>bundlerepository</module> <module>org.apache.felix.daemon</module> <module>org.apache.felix.dependencymanager</module> <module>org.apache.felix.main</module>
diff --git a/org.apache.felix.shell.gui.plugin/pom.xml b/shell.gui.plugin/pom.xml similarity index 100% rename from org.apache.felix.shell.gui.plugin/pom.xml rename to shell.gui.plugin/pom.xml
diff --git a/org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/Activator.java b/shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/Activator.java similarity index 100% rename from org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/Activator.java rename to shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/Activator.java
diff --git a/org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/BundleListPlugin.java b/shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/BundleListPlugin.java similarity index 100% rename from org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/BundleListPlugin.java rename to shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/BundleListPlugin.java
diff --git a/org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OBRPlugin.java b/shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OBRPlugin.java similarity index 100% rename from org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OBRPlugin.java rename to shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OBRPlugin.java
diff --git a/org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OutputAreaStream.java b/shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OutputAreaStream.java similarity index 100% rename from org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OutputAreaStream.java rename to shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/OutputAreaStream.java
diff --git a/org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ScrollableOutputArea.java b/shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ScrollableOutputArea.java similarity index 100% rename from org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ScrollableOutputArea.java rename to shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ScrollableOutputArea.java
diff --git a/org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ShellPlugin.java b/shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ShellPlugin.java similarity index 100% rename from org.apache.felix.shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ShellPlugin.java rename to shell.gui.plugin/src/main/java/org/apache/felix/shell/gui/plugin/ShellPlugin.java
diff --git a/org.apache.felix.shell.gui/pom.xml b/shell.gui/pom.xml similarity index 100% rename from org.apache.felix.shell.gui/pom.xml rename to shell.gui/pom.xml
diff --git a/org.apache.felix.shell.gui/src/main/java/org/apache/felix/shell/gui/Plugin.java b/shell.gui/src/main/java/org/apache/felix/shell/gui/Plugin.java similarity index 100% rename from org.apache.felix.shell.gui/src/main/java/org/apache/felix/shell/gui/Plugin.java rename to shell.gui/src/main/java/org/apache/felix/shell/gui/Plugin.java
diff --git a/org.apache.felix.shell.gui/src/main/java/org/apache/felix/shell/gui/impl/Activator.java b/shell.gui/src/main/java/org/apache/felix/shell/gui/impl/Activator.java similarity index 100% rename from org.apache.felix.shell.gui/src/main/java/org/apache/felix/shell/gui/impl/Activator.java rename to shell.gui/src/main/java/org/apache/felix/shell/gui/impl/Activator.java
diff --git a/org.apache.felix.shell.gui/src/main/java/org/apache/felix/shell/gui/impl/ShellPanel.java b/shell.gui/src/main/java/org/apache/felix/shell/gui/impl/ShellPanel.java similarity index 100% rename from org.apache.felix.shell.gui/src/main/java/org/apache/felix/shell/gui/impl/ShellPanel.java rename to shell.gui/src/main/java/org/apache/felix/shell/gui/impl/ShellPanel.java
diff --git a/org.apache.felix.shell.tui/pom.xml b/shell.tui/pom.xml similarity index 100% rename from org.apache.felix.shell.tui/pom.xml rename to shell.tui/pom.xml
diff --git a/org.apache.felix.shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java b/shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java similarity index 100% rename from org.apache.felix.shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java rename to shell.tui/src/main/java/org/apache/felix/shell/tui/Activator.java
diff --git a/org.apache.felix.shell/pom.xml b/shell/pom.xml similarity index 100% rename from org.apache.felix.shell/pom.xml rename to shell/pom.xml
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/CdCommand.java b/shell/src/main/java/org/apache/felix/shell/CdCommand.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/CdCommand.java rename to shell/src/main/java/org/apache/felix/shell/CdCommand.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/Command.java b/shell/src/main/java/org/apache/felix/shell/Command.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/Command.java rename to shell/src/main/java/org/apache/felix/shell/Command.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/ShellService.java b/shell/src/main/java/org/apache/felix/shell/ShellService.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/ShellService.java rename to shell/src/main/java/org/apache/felix/shell/ShellService.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/Activator.java b/shell/src/main/java/org/apache/felix/shell/impl/Activator.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/Activator.java rename to shell/src/main/java/org/apache/felix/shell/impl/Activator.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/BundleLevelCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/BundleLevelCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/BundleLevelCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/BundleLevelCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/CdCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/CdCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/CdCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/CdCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/HeadersCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/HeadersCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/HeadersCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/HeadersCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/HelpCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/HelpCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/HelpCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/HelpCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/InstallCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/InstallCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/InstallCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/InstallCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/PackagesCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/PackagesCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/PackagesCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/PackagesCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/PsCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/PsCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/PsCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/PsCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/RefreshCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/RefreshCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/RefreshCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/RefreshCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/ResolveCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/ResolveCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/ResolveCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/ResolveCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/ServicesCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/ServicesCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/ServicesCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/ServicesCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/ShutdownCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/ShutdownCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/ShutdownCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/ShutdownCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/StartCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/StartCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/StartCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/StartCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/StartLevelCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/StartLevelCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/StartLevelCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/StartLevelCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/StopCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/StopCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/StopCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/StopCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/UninstallCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/UninstallCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/UninstallCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/UninstallCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/UpdateCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/UpdateCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/UpdateCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/UpdateCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/Util.java b/shell/src/main/java/org/apache/felix/shell/impl/Util.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/Util.java rename to shell/src/main/java/org/apache/felix/shell/impl/Util.java
diff --git a/org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/VersionCommandImpl.java b/shell/src/main/java/org/apache/felix/shell/impl/VersionCommandImpl.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/apache/felix/shell/impl/VersionCommandImpl.java rename to shell/src/main/java/org/apache/felix/shell/impl/VersionCommandImpl.java
diff --git a/org.apache.felix.shell/src/main/java/org/ungoverned/osgi/service/shell/CdCommand.java b/shell/src/main/java/org/ungoverned/osgi/service/shell/CdCommand.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/ungoverned/osgi/service/shell/CdCommand.java rename to shell/src/main/java/org/ungoverned/osgi/service/shell/CdCommand.java
diff --git a/org.apache.felix.shell/src/main/java/org/ungoverned/osgi/service/shell/Command.java b/shell/src/main/java/org/ungoverned/osgi/service/shell/Command.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/ungoverned/osgi/service/shell/Command.java rename to shell/src/main/java/org/ungoverned/osgi/service/shell/Command.java
diff --git a/org.apache.felix.shell/src/main/java/org/ungoverned/osgi/service/shell/ShellService.java b/shell/src/main/java/org/ungoverned/osgi/service/shell/ShellService.java similarity index 100% rename from org.apache.felix.shell/src/main/java/org/ungoverned/osgi/service/shell/ShellService.java rename to shell/src/main/java/org/ungoverned/osgi/service/shell/ShellService.java