Refactored the iPOJO-related subproject to reside in the same trunk directory. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@539997 13f79535-47bb-0310-9956-ffa450edef68

commit: 376e83e2143f56fbf59e331d75e53d395bbe5bab [log] [tgz]
author: Richard S. Hall <rickhall@apache.org> Mon May 21 02:25:53 2007 +0000
committer: Richard S. Hall <rickhall@apache.org> Mon May 21 02:25:53 2007 +0000
tree: 69ff534f87cae8ebda0de3b1fee0f12d41f79e86
parent: d9efffe36beab03636afb4e36a39de14c898af58 [diff]
diff --git a/ipojo.arch/pom.xml b/ipojo/arch/pom.xml
similarity index 100%
rename from ipojo.arch/pom.xml
rename to ipojo/arch/pom.xml


diff --git a/ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java b/ipojo/arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
similarity index 100%
rename from ipojo.arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java
rename to ipojo/arch/src/main/java/org/apache/felix/ipojo/arch/ArchCommandImpl.java


diff --git a/ipojo.arch/src/main/resources/metadata.xml b/ipojo/arch/src/main/resources/metadata.xml
similarity index 100%
rename from ipojo.arch/src/main/resources/metadata.xml
rename to ipojo/arch/src/main/resources/metadata.xml


diff --git a/ipojo/pom.xml b/ipojo/core/pom.xml
similarity index 100%
rename from ipojo/pom.xml
rename to ipojo/core/pom.xml


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/Activator.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/Activator.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/Activator.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/Activator.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/ComponentFactory.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/ComponentFactory.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentFactory.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/ComponentInstance.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentInstance.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/ComponentInstance.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/ComponentInstance.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/CompositeHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/CompositeHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/CompositeHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/CompositeHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/CompositeManager.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/CompositeManager.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/CompositeManager.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/CompositeManager.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/DefaultServiceContext.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/DefaultServiceContext.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/DefaultServiceContext.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/DefaultServiceContext.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/Factory.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/Factory.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/Factory.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/Handler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/Handler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/Handler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/Handler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoConfiguration.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/IPojoContext.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoContext.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/IPojoContext.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/IPojoContext.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/InstanceCreator.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/InstanceCreator.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceCreator.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/InstanceManager.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/InstanceManager.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceStateListener.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/Nullable.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/Nullable.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/Nullable.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/Nullable.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/Pojo.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/Pojo.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/Pojo.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/Pojo.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/ServiceContext.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/ServiceContext.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/ServiceContext.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/ServiceContext.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/UnacceptableConfiguration.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/Architecture.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/ComponentDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/HandlerDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/InstanceDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/architecture/PropertyDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/CompositeServiceContext.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/FactoryProxy.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/ServiceReferenceImpl.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/ServiceReferenceImpl.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/ServiceReferenceImpl.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/ServiceReferenceImpl.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistrationImpl.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistrationImpl.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistrationImpl.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistrationImpl.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistry.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistry.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistry.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/ServiceRegistry.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/StringMap.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/StringMap.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/StringMap.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/StringMap.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/architecture/ArchitectureHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/instance/InstanceHandlerDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ImportExportHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceExporter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceExporter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceExporter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceExporter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceImporter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceImporter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceImporter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/importer/ServiceImporter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/ServiceInstantiatorHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/instantiator/SvcInstance.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionException.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/CompositionMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/FieldMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/MethodMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedService.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ProvidedServiceHandlerDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/ServiceExporter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/SpecificationMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ClassChecker.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ClassChecker.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ClassChecker.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ClassChecker.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ConstructorCodeAdapter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ConstructorCodeAdapter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ConstructorCodeAdapter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ConstructorCodeAdapter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ManipulationProperty.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ManipulationProperty.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ManipulationProperty.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/ManipulationProperty.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/Manipulator.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/Manipulator.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/Manipulator.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/Manipulator.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/POJOWriter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/POJOWriter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/POJOWriter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/POJOWriter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessClassAdapter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessClassAdapter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessClassAdapter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessClassAdapter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessCodeAdapter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessCodeAdapter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessCodeAdapter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/composite/service/provides/manipulation/PreprocessCodeAdapter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/architecture/ArchitectureHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurationHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyCallback.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/DependencyHandlerDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignature.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/MethodSignatureVisitor.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/nullable/NullableObjectWriter.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallback.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/lifecycle/callback/LifecycleCallbackHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/Property.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedService.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandler.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/providedservice/ProvidedServiceHandlerDescription.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/parser/ManipulationMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManipulationMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/parser/ManipulationMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ManipulationMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/parser/MethodMetadata.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseException.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseException.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/parser/ParseUtils.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/util/Callback.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/util/Callback.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java


diff --git a/ipojo/src/main/java/org/apache/felix/ipojo/util/Logger.java b/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Logger.java
similarity index 100%
rename from ipojo/src/main/java/org/apache/felix/ipojo/util/Logger.java
rename to ipojo/core/src/main/java/org/apache/felix/ipojo/util/Logger.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/Configuration.java b/ipojo/core/src/main/java/org/osgi/service/cm/Configuration.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/Configuration.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/Configuration.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java b/ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationAdmin.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ConfigurationEvent.java b/ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ConfigurationEvent.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationEvent.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ConfigurationException.java b/ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationException.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ConfigurationException.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationException.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ConfigurationListener.java b/ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationListener.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ConfigurationListener.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationListener.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ConfigurationPermission.java b/ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ConfigurationPermission.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationPermission.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java b/ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ConfigurationPlugin.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ManagedService.java b/ipojo/core/src/main/java/org/osgi/service/cm/ManagedService.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ManagedService.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ManagedService.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java b/ipojo/core/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java
rename to ipojo/core/src/main/java/org/osgi/service/cm/ManagedServiceFactory.java


diff --git a/ipojo/src/main/java/org/osgi/service/cm/package.html b/ipojo/core/src/main/java/org/osgi/service/cm/package.html
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/package.html
rename to ipojo/core/src/main/java/org/osgi/service/cm/package.html


diff --git a/ipojo/src/main/java/org/osgi/service/cm/packageinfo b/ipojo/core/src/main/java/org/osgi/service/cm/packageinfo
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/cm/packageinfo
rename to ipojo/core/src/main/java/org/osgi/service/cm/packageinfo


diff --git a/ipojo/src/main/java/org/osgi/service/log/LogEntry.java b/ipojo/core/src/main/java/org/osgi/service/log/LogEntry.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/log/LogEntry.java
rename to ipojo/core/src/main/java/org/osgi/service/log/LogEntry.java


diff --git a/ipojo/src/main/java/org/osgi/service/log/LogListener.java b/ipojo/core/src/main/java/org/osgi/service/log/LogListener.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/log/LogListener.java
rename to ipojo/core/src/main/java/org/osgi/service/log/LogListener.java


diff --git a/ipojo/src/main/java/org/osgi/service/log/LogReaderService.java b/ipojo/core/src/main/java/org/osgi/service/log/LogReaderService.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/log/LogReaderService.java
rename to ipojo/core/src/main/java/org/osgi/service/log/LogReaderService.java


diff --git a/ipojo/src/main/java/org/osgi/service/log/LogService.java b/ipojo/core/src/main/java/org/osgi/service/log/LogService.java
similarity index 100%
rename from ipojo/src/main/java/org/osgi/service/log/LogService.java
rename to ipojo/core/src/main/java/org/osgi/service/log/LogService.java


diff --git a/ipojo.metadata/pom.xml b/ipojo/metadata/pom.xml
similarity index 100%
rename from ipojo.metadata/pom.xml
rename to ipojo/metadata/pom.xml


diff --git a/ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java b/ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java
similarity index 100%
rename from ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java
rename to ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Attribute.java


diff --git a/ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java b/ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
similarity index 100%
rename from ipojo.metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java
rename to ipojo/metadata/src/main/java/org/apache/felix/ipojo/metadata/Element.java


diff --git a/ipojo.plugin/pom.xml b/ipojo/plugin/pom.xml
similarity index 100%
rename from ipojo.plugin/pom.xml
rename to ipojo/plugin/pom.xml


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ConstructorCodeAdapter.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/ConstructorCodeAdapter.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ConstructorCodeAdapter.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/ConstructorCodeAdapter.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/ManipulationProperty.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/Manipulator.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/MethodDescriptor.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/MethodDescriptor.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/MethodDescriptor.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/MethodDescriptor.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessClassAdapter.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/manipulation/PreprocessCodeAdapter.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/parser/ManifestMetadataParser.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/parser/ParseException.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/parser/XMLMetadataParser.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/Clazz.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/Clazz.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/Clazz.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/Clazz.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/IPojoPluginConfiguration.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/Jar.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/Jar.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/Jar.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/Jar.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiJarMojo.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiJarMojo.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiJarMojo.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiJarMojo.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiManifest.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiManifest.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiManifest.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/OsgiManifest.java


diff --git a/ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/QuotedTokenizer.java b/ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/QuotedTokenizer.java
similarity index 100%
rename from ipojo.plugin/src/main/java/org/apache/felix/ipojo/plugin/QuotedTokenizer.java
rename to ipojo/plugin/src/main/java/org/apache/felix/ipojo/plugin/QuotedTokenizer.java


diff --git a/ipojo.plugin/src/main/resources/META-INF/archetype.xml b/ipojo/plugin/src/main/resources/META-INF/archetype.xml
similarity index 100%
rename from ipojo.plugin/src/main/resources/META-INF/archetype.xml
rename to ipojo/plugin/src/main/resources/META-INF/archetype.xml


diff --git a/ipojo.plugin/src/main/resources/META-INF/plexus/components.xml b/ipojo/plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from ipojo.plugin/src/main/resources/META-INF/plexus/components.xml
rename to ipojo/plugin/src/main/resources/META-INF/plexus/components.xml


diff --git a/ipojo.plugin/src/main/resources/archetype-resources/pom.xml b/ipojo/plugin/src/main/resources/archetype-resources/pom.xml
similarity index 100%
rename from ipojo.plugin/src/main/resources/archetype-resources/pom.xml
rename to ipojo/plugin/src/main/resources/archetype-resources/pom.xml


diff --git a/ipojo.plugin/src/main/resources/archetype-resources/src/main/java/source.txt b/ipojo/plugin/src/main/resources/archetype-resources/src/main/java/source.txt
similarity index 100%
rename from ipojo.plugin/src/main/resources/archetype-resources/src/main/java/source.txt
rename to ipojo/plugin/src/main/resources/archetype-resources/src/main/java/source.txt


diff --git a/ipojo.plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml b/ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml
similarity index 100%
rename from ipojo.plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml
rename to ipojo/plugin/src/main/resources/archetype-resources/src/main/resources/metadata.xml


diff --git a/pom.xml b/pom.xml
index 1f6e659..2a7fa39 100644
--- a/pom.xml
+++ b/pom.xml

@@ -97,7 +97,7 @@
       <modules>
         <module>bundleplugin</module>
         <module>tools/maven2/maven-osgi-plugin</module>
-        <module>ipojo.plugin</module>
+        <module>ipojo/plugin</module>
       </modules>
     </profile>
 
@@ -110,7 +110,7 @@
         </property>
       </activation>
       <modules>
-        <module>ipojo.arch</module>
+        <module>ipojo/arch</module>
       </modules>
     </profile>
 
@@ -139,8 +139,8 @@
         <module>configadmin</module>
         <module>metatype</module>
         
-        <module>ipojo</module>
-        <module>ipojo.metadata</module>
+        <module>ipojo/core</module>
+        <module>ipojo/metadata</module>
       </modules>
     </profile>
commit	376e83e2143f56fbf59e331d75e53d395bbe5bab	[log] [tgz]
author	Richard S. Hall <rickhall@apache.org>	Mon May 21 02:25:53 2007 +0000
committer	Richard S. Hall <rickhall@apache.org>	Mon May 21 02:25:53 2007 +0000
tree	69ff534f87cae8ebda0de3b1fee0f12d41f79e86
parent	d9efffe36beab03636afb4e36a39de14c898af58 [diff]