Add the composite API (initial version)
Add the SingletonComponentType


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@764777 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/api/pom.xml b/ipojo/api/pom.xml
index da811e0..371b0df 100644
--- a/ipojo/api/pom.xml
+++ b/ipojo/api/pom.xml
@@ -39,15 +39,22 @@
 					<instructions>

 						<Bundle-SymbolicName>${pom.artifactId}

 						</Bundle-SymbolicName>

-						<Import-Package>!org.objectweb.asm.tree, *</Import-Package>

-						<Export-Package>org.apache.felix.ipojo.api

-						</Export-Package>

-						<Private-Package>org.apache.felix.ipojo.manipulation,

+						<Import-Package>

+							!org.objectweb.asm.tree, 

+							org.apache.felix.ipojo.composite;resolution:=optional,

+							*

+						</Import-Package>

+						<Export-Package>

+							org.apache.felix.ipojo.api,

+							org.apache.felix.ipojo.api.composite,

+							org.apache.felix.ipojo.manipulation,

 							org.apache.felix.ipojo.manipulation.annotations,

-							org.objectweb.asm.commons, org.objectweb.asm</Private-Package>

+							org.objectweb.asm.commons, org.objectweb.asm

+						</Export-Package>

 						<Include-Resource> META-INF/LICENCE=LICENSE,

 							META-INF/NOTICE=NOTICE, META-INF/LICENSE.asm=LICENSE.asm

 						</Include-Resource>

+						

 					</instructions>

 				</configuration>

 			</plugin>

@@ -87,6 +94,11 @@
 		</dependency>

 		<dependency>

 			<groupId>org.apache.felix</groupId>

+			<artifactId>org.apache.felix.ipojo.composite</artifactId>

+			<version>1.3.0-SNAPSHOT</version>

+		</dependency>

+		<dependency>

+			<groupId>org.apache.felix</groupId>

 			<artifactId>org.apache.felix.ipojo.manipulator</artifactId>

 			<version>1.3.0-SNAPSHOT</version>

 		</dependency>