No commit message

killghost · Jun 4, 2012 · 4f0dd7e · 4f0dd7e
1 parent c181770
commit 4f0dd7e
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/samples.annotations/pom.xml b/samples.annotations/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>iPOJO.Annotations</groupId>
   <artifactId>samples.annotations</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.1</version>
   <packaging>pom</packaging>
 
   <name>samples.annotations</name>

diff --git a/samples.annotations/service.consumer/pom.xml b/samples.annotations/service.consumer/pom.xml
@@ -4,13 +4,13 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>samples.hello</artifactId>
+		<artifactId>samples.annotations</artifactId>
 		<groupId>iPOJO.Annotations</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.1</version>
 	</parent>
 	<groupId>iPOJO.Annotations</groupId>
 	<artifactId>service.consumer</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1</version>
 	<packaging>bundle</packaging>
 	<name>service.consumer</name>
 	<url>http://maven.apache.org</url>
@@ -21,7 +21,7 @@
 		<dependency>
 			<groupId>iPOJO.Annotations</groupId>
 			<artifactId>service.provider</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
+			<version>0.0.1</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
@@ -47,13 +47,25 @@
 						<Bundle-SymbolicName>
 							${pom.artifactId}
 						</Bundle-SymbolicName>
-						<Export-Package>
+						<Private-Package>
 							ipojo.example.hello.client.*
-						</Export-Package>
+						</Private-Package>
 						<Import-Package>ipojo.example.hello.*</Import-Package>
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>1.8.4</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/samples.annotations/service.consumer/src/main/resources/metadata.xml b/samples.annotations/service.consumer/src/main/resources/metadata.xml
@@ -1,3 +1,3 @@
 <ipojo>
-	<instance component="ipojo.example.hello.client.HelloClient" />
+	<instance component="AnnotedHelloClient" />
 </ipojo>
diff --git a/samples.annotations/service.provider/pom.xml b/samples.annotations/service.provider/pom.xml
@@ -4,13 +4,13 @@
 	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<artifactId>samples.hello</artifactId>
+		<artifactId>samples.annotations</artifactId>
 		<groupId>iPOJO.Annotations</groupId>
-		<version>0.0.1-SNAPSHOT</version>
+		<version>0.0.1</version>
 	</parent>
 	<groupId>iPOJO.Annotations</groupId>
 	<artifactId>service.provider</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1</version>
 	<packaging>bundle</packaging>
 	<name>service.provider</name>
 	<url>http://maven.apache.org</url>
@@ -49,9 +49,22 @@
 							!ipojo.example.hello.impl,
 							ipojo.example.hello.*
 						</Export-Package>
+						<Private-Package>ipojo.example.hello.impl</Private-Package>
 					</instructions>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>1.8.4</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 </project>