felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r614707 [1/2] - in /felix/sandbox/clement/ipojo: ./ annotations/ ant/ arch/ composite/ core/ core/src/main/java/org/apache/felix/ipojo/ core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ core/src/main/java/org/apache/felix/ip...
Date Wed, 23 Jan 2008 22:18:16 GMT
Author: clement
Date: Wed Jan 23 14:18:11 2008
New Revision: 614707

URL: http://svn.apache.org/viewvc?rev=614707&view=rev
Log:
Update pom file to use the last release of the maven-bundle-plugin (1.2.0)
Update pom file to use last released bundles (shell, framework ...)
Fix a bug in the class checker to avoid the manipulation of static field.
Update the Dependency Thread local to support Android 
Clean the code of the iPOJO core to avoid redundancy.

Modified:
    felix/sandbox/clement/ipojo/annotations/pom.xml
    felix/sandbox/clement/ipojo/ant/pom.xml
    felix/sandbox/clement/ipojo/arch/pom.xml
    felix/sandbox/clement/ipojo/composite/pom.xml
    felix/sandbox/clement/ipojo/core/pom.xml
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
    felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java
    felix/sandbox/clement/ipojo/event.admin.handler/pom.xml
    felix/sandbox/clement/ipojo/examples/pom.xml
    felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml
    felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
    felix/sandbox/clement/ipojo/examples/property-handler/pom.xml
    felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml
    felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml
    felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml
    felix/sandbox/clement/ipojo/examples/tutorial-maven/pom.xml
    felix/sandbox/clement/ipojo/extender.pattern.handler/pom.xml
    felix/sandbox/clement/ipojo/jmx.handler/pom.xml
    felix/sandbox/clement/ipojo/manipulator/pom.xml
    felix/sandbox/clement/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java
    felix/sandbox/clement/ipojo/metadata/pom.xml
    felix/sandbox/clement/ipojo/plugin/pom.xml
    felix/sandbox/clement/ipojo/pom.xml
    felix/sandbox/clement/ipojo/white.board.pattern.handler/pom.xml

Modified: felix/sandbox/clement/ipojo/annotations/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/annotations/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/annotations/pom.xml (original)
+++ felix/sandbox/clement/ipojo/annotations/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,15 +1,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
+    <artifactId>iPOJO</artifactId>
     <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <version>0.7.6-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.felix.ipojo.annotations</artifactId>
   <packaging>bundle</packaging>
-  <version>0.7.6-SNAPSHOT</version>
   <name>Apache Felix iPOJO Annotations</name>
   <build>
   <plugins>
@@ -20,11 +19,11 @@
 		<source>1.5</source>
 		<target>1.5</target>
 		</configuration>
-	  </plugin>
+	</plugin>
   	<plugin>
     	<groupId>org.apache.felix</groupId>
     	<artifactId>maven-bundle-plugin</artifactId>
-    	<version>1.1.0-SNAPSHOT</version>
+    	<version>1.2.0</version>
     	<extensions>true</extensions>
     	<configuration>
         	<instructions>          

Modified: felix/sandbox/clement/ipojo/ant/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/ant/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/ant/pom.xml (original)
+++ felix/sandbox/clement/ipojo/ant/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,67 +1,84 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.apache.felix.ipojo.ant</artifactId>
-  <packaging>bundle</packaging>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Apache Felix iPOJO Ant Task</name>
-  <dependencies>
-  	<dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.4.0</version>
-    </dependency>
-    <dependency>
-    	<groupId>ant</groupId>
-    	<artifactId>ant</artifactId>
-    	<version>1.6.5</version>
-    </dependency>
-  </dependencies>
-  
-  <build>
-  <plugins>
-  	<plugin>
-    	<groupId>org.apache.felix</groupId>
-    	<artifactId>maven-bundle-plugin</artifactId>
-    	<version>1.1.0-SNAPSHOT</version>
-    	<extensions>true</extensions>
-    	<configuration>
-        	<instructions>          
-          		<Bundle-Name>iPOJO Ant Task</Bundle-Name>
-		        <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
-        		<Bundle-Description> iPOJO Ant Task </Bundle-Description>
-        		<Private-Package>org.apache.felix.ipojo.metadata, org.apache.felix.ipojo.manipulator, org.apache.felix.ipojo.xml.parser, org.apache.felix.ipojo.manipulation*, org.objectweb.asm;-split-package:=merge-first, org.objectweb.asm.commons;-split-package:=merge-first, org.apache.xerces.parsers, org.apache.xerces.xni*, org.apache.xerces.impl*, org.apache.xerces.util.*</Private-Package>
-          		<Export-Package>org.apache.felix.ipojo.task</Export-Package>
-        	</instructions>
-    	</configuration>
-  	</plugin>
-  </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.apache.felix.ipojo.ant</artifactId>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Ant Task</name>
+	<dependencies>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>0.7.6-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+			<version>0.7.6-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>ant</groupId>
+			<artifactId>ant</artifactId>
+			<version>1.6.5</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.2.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>iPOJO Ant Task</Bundle-Name>
+						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+						<Bundle-Description>
+							iPOJO Ant Task
+						</Bundle-Description>
+						<Private-Package>
+							org.apache.felix.ipojo.metadata,
+							org.apache.felix.ipojo.manipulator,
+							org.apache.felix.ipojo.xml.parser,
+							org.apache.felix.ipojo.manipulation*,
+							org.objectweb.asm;-split-package:=merge-first,
+							org.objectweb.asm.commons;-split-package:=merge-first,
+							org.apache.xerces.parsers,
+							org.apache.xerces.xni*,
+							org.apache.xerces.impl*,
+							org.apache.xerces.util.*
+						</Private-Package>
+						<Export-Package>
+							org.apache.felix.ipojo.task
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/arch/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/arch/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/arch/pom.xml (original)
+++ felix/sandbox/clement/ipojo/arch/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,74 +1,81 @@
 <project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Arch Command</name>
-  <version>0.7.6-SNAPSHOT</version>
-  <artifactId>org.apache.felix.ipojo.arch</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.shell</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-  <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-          	<Bundle-Name>iPOJO Arch Felix Command</Bundle-Name>
-            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-            <Private-Package>org.apache.felix.ipojo.arch</Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-              <version>${pom.version}</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-            <configuration>
-   				<ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-   </build>
-   
-    <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Arch Command</name>
+	<artifactId>org.apache.felix.ipojo.arch</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.shell</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.2.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>
+							iPOJO Arch Felix Command
+						</Bundle-Name>
+						<Bundle-SymbolicName>
+							${pom.artifactId}
+						</Bundle-SymbolicName>
+						<Private-Package>
+							org.apache.felix.ipojo.arch
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+						<configuration>
+							<ignoreAnnotations>true</ignoreAnnotations>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/composite/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/composite/pom.xml (original)
+++ felix/sandbox/clement/ipojo/composite/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,109 +1,116 @@
 <project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Composite</name>
-  <artifactId>org.apache.felix.ipojo.composite</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>          
-            <Bundle-Name>iPOJO-composite-unstable</Bundle-Name>
-            <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
-            <Bundle-Description> iPOJO Composite </Bundle-Description>
-            <Import-Package>
-              org.apache.felix.ipojo,
-              org.apache.felix.ipojo.architecture,
-              org.apache.felix.ipojo.context,
-              org.apache.felix.ipojo.metadata,
-              org.apache.felix.ipojo.parser,
-              org.apache.felix.ipojo.util,
-              org.osgi.framework, 
-              org.osgi.service.cm,
-              org.osgi.service.log,
-			  !org.objectweb.asm*
-            </Import-Package>
-            <Private-Package>
-            	org.apache.felix.ipojo.manipulation,
-    			org.apache.felix.ipojo.composite.architecture,
-    			org.apache.felix.ipojo.composite.service*,
-    			org.apache.felix.ipojo.composite.instance,
-              	!org.objectweb.asm.xml*,
-              	org.objectweb.asm*;-split-package:=merge-first
-            </Private-Package>
-            <Export-Package>
-              org.apache.felix.ipojo.composite; version="0.7.6"
-            </Export-Package>
-            <IPOJO-Extension>composite:org.apache.felix.ipojo.composite.CompositeFactory</IPOJO-Extension>
-            <_donotcopy>(CVS|.svn|.+.bak|~.+|metadata.xml)</_donotcopy>
-          </instructions>
-        </configuration>
-      </plugin>
-       <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-              <version>${pom.version}</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-            <configuration>
-   				<metadata>metadata.xml</metadata>
-   				<ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Composite</name>
+	<artifactId>org.apache.felix.ipojo.composite</artifactId>
+	<dependencies>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.osgi.compendium</artifactId>
+			<version>0.9.0-SNAPSHOT</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.2.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>
+							iPOJO-composite-unstable
+						</Bundle-Name>
+						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+						<Bundle-Description>
+							iPOJO Composite
+						</Bundle-Description>
+						<Import-Package>
+							org.apache.felix.ipojo,
+							org.apache.felix.ipojo.architecture,
+							org.apache.felix.ipojo.context,
+							org.apache.felix.ipojo.metadata,
+							org.apache.felix.ipojo.parser,
+							org.apache.felix.ipojo.util,
+							org.osgi.framework
+						</Import-Package>
+						<Private-Package>
+							org.apache.felix.ipojo.manipulation,
+							org.apache.felix.ipojo.composite.architecture,
+							org.apache.felix.ipojo.composite.service*,
+							org.apache.felix.ipojo.composite.instance,
+							!org.objectweb.asm.xml*,
+							org.objectweb.asm*;-split-package:=merge-first
+						</Private-Package>
+						<Export-Package>
+							org.apache.felix.ipojo.composite;
+							version="0.7.6"
+						</Export-Package>
+						<IPOJO-Extension>
+							composite:org.apache.felix.ipojo.composite.CompositeFactory
+						</IPOJO-Extension>
+						<_donotcopy>
+							(CVS|.svn|.+.bak|~.+|metadata.xml)
+						</_donotcopy>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+						<configuration>
+							<metadata>metadata.xml</metadata>
+							<ignoreAnnotations>true</ignoreAnnotations>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/core/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/pom.xml (original)
+++ felix/sandbox/clement/ipojo/core/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,20 +1,19 @@
 <project>
   <parent>
+    <artifactId>iPOJO</artifactId>
     <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <version>0.7.6-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
   <name>Apache Felix iPOJO</name>
   <artifactId>org.apache.felix.ipojo</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -37,7 +36,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>          
@@ -49,15 +48,14 @@
             <Import-Package>
               org.osgi.framework, 
               org.osgi.service.cm,
-              org.osgi.service.log,
-			  !org.objectweb.asm*
+              org.osgi.service.log
             </Import-Package>
             <Private-Package>
     			org.apache.felix.ipojo.handlers.architecture,
     			org.apache.felix.ipojo.handlers.configuration,
               	org.apache.felix.ipojo.handlers.lifecycle.callback,
               	org.apache.felix.ipojo.handlers.lifecycle.controller,
-              	org.objectweb.asm
+              	org.objectweb.asm;-split-package:=first
             </Private-Package>
             <Export-Package>
               org.apache.felix.ipojo; version="0.7.6", 

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/InstanceManager.java Wed Jan 23 14:18:11 2008
@@ -695,8 +695,7 @@
             Method[] mets = m_clazz.getMethods();
             for (int i = 0; i < mets.length; i++) {
                 String id2 = mets[i].getName();
-                String desc = Type.getMethodDescriptor(mets[i]);
-                Type[] args = Type.getArgumentTypes(desc);
+                Type[] args = Type.getArgumentTypes(mets[i]);
                 for (int j = 0; j < args.length; j++) {
                     String arg = args[j].getClassName();
                     if (arg.endsWith("[]")) {

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/PolicyServiceContext.java Wed Jan 23 14:18:11 2008
@@ -140,23 +140,7 @@
             case LOCAL_AND_GLOBAL:
                 ServiceReference[] refLocal = m_local.getAllServiceReferences(clazz, filter);
                 ServiceReference[] refGlobal = m_global.getAllServiceReferences(clazz, filter);
-                if (refLocal != null && refGlobal != null) {
-                    ServiceReference[] refs = new ServiceReference[refLocal.length + refGlobal.length];
-                    int j = 0;
-                    for (int i = 0; i < refLocal.length; i++) {
-                        refs[j] = refLocal[i];
-                        j++;
-                    }
-                    for (int i = 0; i < refGlobal.length; i++) {
-                        refs[j] = refGlobal[i];
-                        j++;
-                    }
-                    return refs;
-                } else if (refLocal != null && refGlobal == null) {
-                    return refLocal;
-                } else {
-                    return refGlobal;
-                }
+                return computeServiceReferencesFromBoth(refLocal, refGlobal);
             default:
                 return null;
         }
@@ -228,27 +212,37 @@
             case LOCAL_AND_GLOBAL:
                 ServiceReference[] refLocal = m_local.getServiceReferences(clazz, filter);
                 ServiceReference[] refGlobal = m_global.getServiceReferences(clazz, filter);
-                if (refLocal != null && refGlobal != null) {
-                    ServiceReference[] refs = new ServiceReference[refLocal.length + refGlobal.length];
-                    int j = 0;
-                    for (int i = 0; i < refLocal.length; i++) {
-                        refs[j] = refLocal[i];
-                        j++;
-                    }
-                    for (int i = 0; i < refGlobal.length; i++) {
-                        refs[j] = refGlobal[i];
-                        j++;
-                    }
-                    return refs;
-                } else if (refLocal != null && refGlobal == null) {
-                    return refLocal;
-                } else {
-                    return refGlobal;
-                }
+                return computeServiceReferencesFromBoth(refLocal, refGlobal);
             default:
                 return null;
         }
 
+    }
+    
+    /**
+     * Compute the service reference array from the two given set of service references.
+     * @param refLocal : local references
+     * @param refGlobal : global references
+     * @return the set of service reference
+     */
+    private ServiceReference[] computeServiceReferencesFromBoth(ServiceReference[] refLocal, ServiceReference[] refGlobal) {
+        if (refLocal != null && refGlobal != null) {
+            ServiceReference[] refs = new ServiceReference[refLocal.length + refGlobal.length];
+            int j = 0;
+            for (int i = 0; i < refLocal.length; i++) {
+                refs[j] = refLocal[i];
+                j++;
+            }
+            for (int i = 0; i < refGlobal.length; i++) {
+                refs[j] = refGlobal[i];
+                j++;
+            }
+            return refs;
+        } else if (refLocal != null && refGlobal == null) {
+            return refLocal;
+        } else {
+            return refGlobal;
+        }
     }
 
     /**

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/configuration/ConfigurableProperty.java Wed Jan 23 14:18:11 2008
@@ -110,108 +110,100 @@
      * @throws ConfigurationException if an error occurs when loading the type class for non-primitive types.
      */
     private void setType(String type) throws ConfigurationException {
-     // Syntactic sugar to avoid writing java.lang.String
-        if ("string".equals(type) || "String".equals(type)) {
-            m_type = java.lang.String.class;
-            return;
-        }
-        if (type.equals("boolean")) {
-            m_type = Boolean.TYPE;
-            return;
-        }
-        if ("byte".equals(type)) {
-            m_type = Byte.TYPE;
-            return;
-        }
-        if ("short".equals(type)) {
-            m_type = Short.TYPE;
-            return;
-        }
-        if ("int".equals(type)) {
-            m_type = Integer.TYPE;
-            return;
-        }
-        if ("long".equals(type)) {
-            m_type = Long.TYPE;
-            return;
-        }
-        if ("float".equals(type)) {
-            m_type = Float.TYPE;
+        // Array :
+        if (type.endsWith("[]")) {
+            setArrayType(type);
+        } else {
+            // Syntactic sugar to avoid writing java.lang.String
+            if ("string".equals(type) || "String".equals(type)) {
+                m_type = java.lang.String.class;
+            } else if ("boolean".equals(type)) {
+                m_type = Boolean.TYPE;
+            } else if ("byte".equals(type)) {
+                m_type = Byte.TYPE;
+            } else if ("short".equals(type)) {
+                m_type = Short.TYPE;
+            } else if ("int".equals(type)) {
+                m_type = Integer.TYPE;
+            } else if ("long".equals(type)) {
+                m_type = Long.TYPE;
+            } else if ("float".equals(type)) {
+                m_type = Float.TYPE;
+            } else if ("double".equals(type)) {
+                m_type = Double.TYPE;
+            } else if ("char".equals(type)) {
+                m_type = Character.TYPE;
+            } else {
+                // Non array, complex type.
+                try {
+                    m_type = m_handler.getInstanceManager().getContext().getBundle().loadClass(type);
+                } catch (ClassNotFoundException e) {
+                    throw new ConfigurationException("Class not found exception in setValue on " + type + " : " + e.getMessage());
+                } catch (SecurityException e) {
+                    throw new ConfigurationException("Security excption in setValue on " + type + " : " + e.getMessage());
+                } catch (IllegalArgumentException e) {
+                    throw new ConfigurationException("Argument problem to call the constructor of the type " + type);
+                }
+            }
+        }
+    }
+    
+    /**
+     * Set the type for type array.
+     * @param type : the string descriptor of the type (must end by [] )
+     * @throws ConfigurationException : if the class cannot be loaded
+     */
+    private void setArrayType(String type) throws ConfigurationException {
+        String internalType = type.substring(0, type.length() - 2);
+        if ("string".equals(internalType) || "String".equals(internalType)) {
+            m_type = new String[0].getClass();
+            return;
+        }
+        if ("boolean".equals(internalType)) {
+            m_type = new boolean[0].getClass();
+            return;
+        }
+        if ("byte".equals(internalType)) {
+            m_type = new byte[0].getClass();
+            return;
+        }
+        if ("short".equals(internalType)) {
+            m_type = new short[0].getClass();
+            return;
+        }
+        if ("int".equals(internalType)) {
+            m_type = new int[0].getClass();
+            return;
+        }
+        if ("long".equals(internalType)) {
+            m_type = new long[0].getClass();
+            return;
+        }
+        if ("float".equals(internalType)) {
+            m_type = new float[0].getClass();
             return;
         }
-        if ("double".equals(type)) {
-            m_type = Double.TYPE;
+        if ("double".equals(internalType)) {
+            m_type = new double[0].getClass();
             return;
         }
-        if ("char".equals(type)) {
-            m_type = Character.TYPE;
+        if ("char".equals(internalType)) {
+            m_type = new char[0].getClass();
             return;
         }
 
-        // Array :
-        if (type.endsWith("[]")) {
-            String internalType = type.substring(0, type.length() - 2);
-            if ("string".equals(internalType) || "String".equals(internalType)) {
-                m_type = new String[0].getClass();
-                return;
-            }
-            if ("boolean".equals(internalType)) {
-                m_type = new boolean[0].getClass();
-                return;
-            }
-            if ("byte".equals(internalType)) {
-                m_type = new byte[0].getClass();
-                return;
-            }
-            if ("short".equals(internalType)) {
-                m_type = new short[0].getClass();
-                return;
-            }
-            if ("int".equals(internalType)) {
-                m_type = new int[0].getClass();
-                return;
-            }
-            if ("long".equals(internalType)) {
-                m_type = new long[0].getClass();
-                return;
-            }
-            if ("float".equals(internalType)) {
-                m_type = new float[0].getClass();
-                return;
-            }
-            if ("double".equals(internalType)) {
-                m_type = new double[0].getClass();
-                return;
-            }
-            if ("char".equals(internalType)) {
-                m_type = new char[0].getClass();
-                return;
-            }
-
-            // Complex array type.
-            try {
-                Class c = m_handler.getInstanceManager().getContext().getBundle().loadClass(internalType);
-                Object[] ob = (Object[]) Array.newInstance(c, 0);
-                m_type = ob.getClass();
-                return;
-            } catch (ClassNotFoundException e) {
-                throw new ConfigurationException("Class not found exception in setValue on " + internalType);
-            } catch (SecurityException e) {
-                throw new ConfigurationException("Secutiry Exception in setValue on " + internalType);
-            } catch (IllegalArgumentException e) {
-                throw new ConfigurationException("Argument problem to call the constructor of the type " + internalType);
-            }
-        }
-        
-        // Non array, complex type.
+        // Complex array type.
         try {
-            m_type = m_handler.getInstanceManager().getContext().getBundle().loadClass(type);
+            Class c = m_handler.getInstanceManager().getContext().getBundle().loadClass(internalType);
+            Object[] ob = (Object[]) Array.newInstance(c, 0);
+            m_type = ob.getClass();
+            return;
         } catch (ClassNotFoundException e) {
-            throw new ConfigurationException("Class not found exception in setValue on " + type + " : " + e.getMessage());
+            throw new ConfigurationException("Class not found exception in setValue on " + internalType);
         } catch (SecurityException e) {
-            throw new ConfigurationException("Security excption in setValue on " + type + " : " + e.getMessage());
+            throw new ConfigurationException("Secutiry Exception in setValue on " + internalType);
         } catch (IllegalArgumentException e) {
-            throw new ConfigurationException("Argument problem to call the constructor of the type " + type);
+            throw new ConfigurationException("Argument problem to call the constructor of the type " + internalType);
         }
     }
 

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/Dependency.java Wed Jan 23 14:18:11 2008
@@ -325,8 +325,7 @@
                 synchronized (m_tracker) {
                     for (int i = 0; i < m_references.size(); i++) {
                         ServiceReference ref = (ServiceReference) m_references.get(i);
-                        m_usage.getReferences().add(ref);
-                        m_usage.getObjects().add(getService(ref));
+                        m_usage.addUsage(getService(ref), ref);
                     }
                 }
             } else {
@@ -338,8 +337,7 @@
                     m_usage.getObjects().add(m_nullable);
                 } else {
                     ServiceReference ref = (ServiceReference) m_references.get(0);
-                    m_usage.getReferences().add(ref); // Get the first one
-                    m_usage.getObjects().add(getService(ref));
+                    m_usage.addUsage(getService(ref), ref);
                 }
             }
             m_usage.setStackLevel(1);
@@ -496,7 +494,7 @@
             throw new IllegalStateException("Cannot load the interface class for the dependency " + m_field + " [" + m_specification + "]");
         }
         
-        if (m_isOptional) {
+        if (m_isOptional && ! m_isAggregate) {
             if (m_di != null) {
                 try {
                     Class c = getHandler().getInstanceManager().getContext().getBundle().loadClass(m_di);
@@ -569,7 +567,6 @@
     /**
      * Set that this dependency is a service level dependency.
      * This forces the scoping policy to be STRICT. 
-     * @param b
      */
     public void setServiceLevelDependency() {
         m_isServiceLevelRequirement = true;
@@ -603,9 +600,7 @@
             level = level - 1;
             if (level == 0) {
                 // Exit the method flow => Release all object
-                m_usage.getObjects().clear();
-                List refs = m_usage.getReferences();
-                refs.clear();
+                m_usage.clearUsage();
             }
         }
     }

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/handlers/dependency/ServiceUsage.java Wed Jan 23 14:18:11 2008
@@ -21,6 +21,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.osgi.framework.ServiceReference;
+
 /**
  * Object managing thread local copy of required services.
  * 
@@ -69,16 +71,37 @@
      * @return the list of stored service objects.
      */
     public List getObjects() {
-        Usage use = (Usage) super.get();
+        Usage use = (Usage) get();
         return use.m_objects;
     }
     
+    public void addUsage(Object o, ServiceReference ref) {
+        Usage use = (Usage) get();
+        use.m_objects.add(o);
+        use.m_refs.add(ref);
+        set(use);
+    }
+    
+    public void removeUsage(Object o, ServiceReference ref) {
+        Usage use = (Usage) get();
+        use.m_objects.remove(o);
+        use.m_refs.remove(ref);
+        set(use);
+    }
+    
+    public void clearUsage() {
+        Usage use = (Usage) get();
+        use.m_objects.clear();
+        use.m_refs.clear();
+        set(use);
+    }
+    
     /**
      * Get the stack level.
      * @return the stack level.
      */
     public int getStackLevel() {
-        Usage use = (Usage) super.get();
+        Usage use = (Usage) get();
         return use.m_stack.intValue();
     }
     
@@ -87,8 +110,9 @@
      * @param level : the new stack level.
      */
     public void setStackLevel(int level) {
-        Usage use = (Usage) super.get();
+        Usage use = (Usage) get();
         use.m_stack = new Integer(level);
+        set(use);
     }
     
     

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/parser/FieldMetadata.java Wed Jan 23 14:18:11 2008
@@ -100,7 +100,7 @@
      * @param string : String form of the type
      * @return the internal notation or null if not found
      */
-    private String getInternalPrimitiveType(String string) {
+    public static String getInternalPrimitiveType(String string) {
         if (string.equalsIgnoreCase("boolean")) {
             return "Z";
         }
@@ -125,7 +125,7 @@
         if (string.equalsIgnoreCase("double")) {
             return "D";
         }
-        System.err.println("No primitive type found for " + m_type);
+        System.err.println("No primitive type found for " + string);
         return null;
     }
 

Modified: felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java (original)
+++ felix/sandbox/clement/ipojo/core/src/main/java/org/apache/felix/ipojo/util/Callback.java Wed Jan 23 14:18:11 2008
@@ -22,6 +22,7 @@
 import java.lang.reflect.Method;
 
 import org.apache.felix.ipojo.InstanceManager;
+import org.apache.felix.ipojo.parser.FieldMetadata;
 import org.apache.felix.ipojo.parser.MethodMetadata;
 
 /**
@@ -69,33 +70,8 @@
         m_isStatic = isStatic;
         m_manager = im;
         if (args != null) {
-            m_args = new String[args.length];
-            for (int i = 0; i < args.length; i++) {
-                // Primitive Array 
-                if (args[i].endsWith("[]") && args[i].indexOf(".") == -1) {
-                    String arr = "";
-                    for (int j = 0; j < args[i].length(); j++) {
-                        if (args[i].charAt(j) == '[') { arr += '['; }
-                    }
-                    int index = args[i].indexOf('[');
-                    m_args[i] = arr + getInternalPrimitiveType(args[i].substring(0, index));
-                }
-                // Non-Primitive Array 
-                if (args[i].endsWith("[]") && args[i].indexOf(".") != -1) {
-                    String arr = "";
-                    for (int j = 0; j < args[i].length(); j++) {
-                        if (args[i].charAt(j) == '[') { arr += '['; }
-                    }
-                    int index = args[i].indexOf('[');
-                    m_args[i] = arr + "L" + args[i].substring(0, index) + ";";
-                }
-                // Simple type 
-                if (!args[i].endsWith("[]")) {
-                    m_args[i] = args[i];
-                }
-            }
+            computeArguments(args);
         }
-        
     }
     
     /**
@@ -126,6 +102,14 @@
         m_method = mm.getMethodName();
         m_manager = im;
         String[] args = mm.getMethodArguments();
+        computeArguments(args);
+    }
+    
+    /**
+     * Compute arguments of the method.
+     * @param args : arguments of the method.
+     */
+    private void computeArguments(String[] args) {
         m_args = new String[args.length];
         for (int i = 0; i < args.length; i++) {
             // Primitive Array 
@@ -135,7 +119,7 @@
                     if (args[i].charAt(j) == '[') { arr += '['; }
                 }
                 int index = args[i].indexOf('[');
-                m_args[i] = arr + getInternalPrimitiveType(args[i].substring(0, index));
+                m_args[i] = arr + FieldMetadata.getInternalPrimitiveType(args[i].substring(0, index));
             }
             // Non-Primitive Array 
             if (args[i].endsWith("[]") && args[i].indexOf(".") != -1) {
@@ -151,39 +135,6 @@
                 m_args[i] = args[i];
             }
         }
-    }
-
-    /**
-     * Get the internal notation for primitive type.
-     * @param string : Stringform of the type
-     * @return the internal notation or null if not found
-     */
-    private String getInternalPrimitiveType(String string) {
-        if (string.equalsIgnoreCase("boolean")) {
-            return "Z";
-        }
-        if (string.equalsIgnoreCase("char")) {
-            return "C";
-        }
-        if (string.equalsIgnoreCase("byte")) {
-            return "B";
-        }
-        if (string.equalsIgnoreCase("short")) {
-            return "S";
-        }
-        if (string.equalsIgnoreCase("int")) {
-            return "I";
-        }
-        if (string.equalsIgnoreCase("float")) {
-            return "F";
-        }
-        if (string.equalsIgnoreCase("long")) {
-            return "J";
-        }
-        if (string.equalsIgnoreCase("double")) {
-            return "D";
-        }
-        return null;
     }
     
     /**

Modified: felix/sandbox/clement/ipojo/event.admin.handler/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/event.admin.handler/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/event.admin.handler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/event.admin.handler/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,74 +1,84 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Event Admin Handler</name>
-  <groupId>org.apache.felix</groupId>
-  <version>0.7.6-SNAPSHOT</version>
-  <artifactId>org.apache.felix.ipojo.handler.event</artifactId>
-	  
-  <dependencies>
-	  <dependency>
-  			<groupId>org.apache.felix</groupId>
-      		<artifactId>org.apache.felix.ipojo</artifactId>
-	        <version>0.7.6-SNAPSHOT</version>
-	  </dependency>
-	  <dependency>
-  			<groupId>org.apache.felix</groupId>
-      		<artifactId>org.apache.felix.ipojo.metadata</artifactId>
-	      	<version>0.7.6-SNAPSHOT</version>
-	  </dependency>
-	  <dependency>
-  			<groupId>org.apache.felix</groupId>
-      		<artifactId>org.osgi.core</artifactId>
-      		<version>1.1.0-SNAPSHOT</version>
-	  </dependency>
-	  <dependency>
-	     <groupId>org.apache.felix</groupId>
-  		 <artifactId>org.osgi.compendium</artifactId>
-         <version>0.9.0-SNAPSHOT</version>
-	</dependency>
-  </dependencies>
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Event Admin Handler</name>
+	<artifactId>org.apache.felix.ipojo.handler.event</artifactId>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Private-Package>org.apache.felix.ipojo.handler.event</Private-Package>
-            <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>ipojo.event.admin.handler</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-          <version>${pom.version}</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-            <configuration>
-   				<metadata>metadata.xml</metadata>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.compendium</artifactId>
+			<version>0.9.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Private-Package>
+							org.apache.felix.ipojo.handler.event
+						</Private-Package>
+						<Bundle-Name>${pom.name}</Bundle-Name>
+						<Bundle-SymbolicName>
+							ipojo.event.admin.handler
+						</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+						<configuration>
+							<metadata>metadata.xml</metadata>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/examples/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,8 +1,8 @@
 <project>
   <parent>
     <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <artifactId>iPOJO</artifactId>
+    <version>0.7.6-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -10,7 +10,6 @@
   <groupId>ipojo.examples</groupId>
   <artifactId>ipojo.examples</artifactId>
   <name>Apache Felix iPOJO Examples</name>
-  <version>0.7.6-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
 	<module>tutorial-maven</module>

Modified: felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandler/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,23 +1,22 @@
 <project>
   <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+    <groupId>ipojo.examples</groupId>
+  	<artifactId>ipojo.examples.property.handler</artifactId>
+  	<version>0.7.6-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
   <name>Apache Felix iPOJO Property Handler</name>
-  <version>0.7.6-SNAPSHOT</version>
   <artifactId>org.apache.felix.ipojo.example.handler.property</artifactId>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo</artifactId>
       <version>${pom.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.metadata</artifactId>
       <version>${pom.version}</version>
     </dependency>
@@ -35,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/property-handler/PropertyHandlerTest/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,23 +1,22 @@
 <project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
+   <parent>
+    <groupId>ipojo.examples</groupId>
+  	<artifactId>ipojo.examples.property.handler</artifactId>
+  	<version>0.7.6-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
   <name>Apache Felix iPOJO Property Handler Test</name>
-  <version>0.7.6-SNAPSHOT</version>
   <artifactId>org.apache.felix.ipojo.example.handler.property.test</artifactId>
   <dependencies>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.ipojo.annotations</artifactId>
       <version>${pom.version}</version>
     </dependency>
     <dependency>
-      <groupId>${pom.groupId}</groupId>
+      <groupId>ipojo.examples</groupId>
       <artifactId>org.apache.felix.ipojo.example.handler.property</artifactId>
       <version>${pom.version}</version>
     </dependency>
@@ -35,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: felix/sandbox/clement/ipojo/examples/property-handler/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/property-handler/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/property-handler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/property-handler/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,16 +1,14 @@
 <project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+ <parent>
+    <groupId>ipojo.examples</groupId>
+  	<artifactId>ipojo.examples</artifactId>
+  	<version>0.7.6-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ipojo.examples</groupId>
   <artifactId>ipojo.examples.property.handler</artifactId>
   <name>Apache Felix iPOJO Property Handler</name>
-  <version>0.7.6-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <profiles>

Modified: felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.client/pom.xml Wed Jan 23 14:18:11 2008
@@ -35,7 +35,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <configuration>
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>

Modified: felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.impl/pom.xml Wed Jan 23 14:18:11 2008
@@ -35,7 +35,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/hello.service/pom.xml Wed Jan 23 14:18:11 2008
@@ -27,7 +27,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>

Modified: felix/sandbox/clement/ipojo/examples/tutorial-maven/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/examples/tutorial-maven/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/examples/tutorial-maven/pom.xml (original)
+++ felix/sandbox/clement/ipojo/examples/tutorial-maven/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,9 +1,13 @@
 <project>
+  <parent>
+    <groupId>ipojo.examples</groupId>
+  	<artifactId>ipojo.examples</artifactId>
+  	<version>0.7.6-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>ipojo.examples</groupId>
   <artifactId>ipojo.tutorial</artifactId>
   <name>Apache Felix iPOJO Tutorial</name>
-  <version>0.7.6-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
 	<module>hello.service</module>

Modified: felix/sandbox/clement/ipojo/extender.pattern.handler/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/extender.pattern.handler/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/extender.pattern.handler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/extender.pattern.handler/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,76 +1,86 @@
 <project>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Extender Pattern Handler</name>
-  <groupId>org.apache.felix</groupId>
-  <version>0.7.6-SNAPSHOT</version>
-  <artifactId>org.apache.felix.ipojo.handler.extender.pattern</artifactId>
-	  
-  <dependencies>
-	  <dependency>
-  			<groupId>org.apache.felix</groupId>
-      		<artifactId>org.apache.felix.ipojo</artifactId>
-	        <version>0.7.6-SNAPSHOT</version>
-	  </dependency>
-	  <dependency>
-  			<groupId>org.apache.felix</groupId>
-      		<artifactId>org.apache.felix.ipojo.metadata</artifactId>
-	      	<version>0.7.6-SNAPSHOT</version>
-	  </dependency>
-	  <dependency>
-  			<groupId>org.apache.felix</groupId>
-      		<artifactId>org.osgi.core</artifactId>
-      		<version>1.1.0-SNAPSHOT</version>
-	  </dependency>
-	  <dependency>
-	     <groupId>org.apache.felix</groupId>
-  		 <artifactId>org.osgi.compendium</artifactId>
-         <version>0.9.0-SNAPSHOT</version>
-	</dependency>
-  </dependencies>
-  
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Extender Pattern Handler</name>
+	<artifactId>
+		org.apache.felix.ipojo.handler.extender.pattern
+	</artifactId>
 
-  
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Private-Package>org.apache.felix.ipojo.handler.extender</Private-Package>
-            <Bundle-Name>${pom.name}</Bundle-Name>
-            <Bundle-SymbolicName>ipojo.event.admin.handler.extender</Bundle-SymbolicName>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-	      <groupId>org.apache.felix</groupId>
-	      <artifactId>maven-ipojo-plugin</artifactId>
-          <version>${pom.version}</version>
-		  <executions>
-          	<execution>
-            	<goals>
-	              <goal>ipojo-bundle</goal>
-               </goals>
-            <configuration>
-   				<metadata>metadata.xml</metadata>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.core</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.compendium</artifactId>
+			<version>0.9.0-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Private-Package>
+							org.apache.felix.ipojo.handler.extender
+						</Private-Package>
+						<Bundle-Name>${pom.name}</Bundle-Name>
+						<Bundle-SymbolicName>
+							ipojo.event.admin.handler.extender
+						</Bundle-SymbolicName>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+						<configuration>
+							<metadata>metadata.xml</metadata>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/jmx.handler/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/jmx.handler/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/jmx.handler/pom.xml (original)
+++ felix/sandbox/clement/ipojo/jmx.handler/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,16 +1,20 @@
 <project>
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<packaging>bundle</packaging>
-	<groupId>org.apache.felix</groupId>
 	<artifactId>org.apache.felix.ipojo.handler.jmx</artifactId>
-	<version>0.7.6-SNAPSHOT</version>
 	<name>Apache Felix iPOJO JMX Handler</name>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.osgi.core</artifactId>
-			<version>1.1.0-SNAPSHOT</version>
+			<version>1.0.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
@@ -20,12 +24,12 @@
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
-			<version>0.7.6-SNAPSHOT</version>
+			<version>${pom.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.ipojo</artifactId>
-			<version>0.7.6-SNAPSHOT</version>
+			<version>${pom.version}</version>
 		</dependency>
 	</dependencies>
 
@@ -41,7 +45,9 @@
 							org.apache.felix.ipojo.handlers.jmx
 						</Private-Package>
 						<Bundle-Name>${pom.name}</Bundle-Name>
-						<Bundle-SymbolicName>ipojo.jmx.handler</Bundle-SymbolicName>
+						<Bundle-SymbolicName>
+							ipojo.jmx.handler
+						</Bundle-SymbolicName>
 					</instructions>
 				</configuration>
 			</plugin>
@@ -54,31 +60,33 @@
 				</configuration>
 			</plugin>
 			<plugin>
-		      <groupId>org.apache.felix</groupId>
-		      <artifactId>maven-ipojo-plugin</artifactId>
-	          	<version>${pom.version}</version>
-		  		<executions>
-	      			<execution>
-	        			<goals>
-	              			<goal>ipojo-bundle</goal>
-	           			</goals>
-	        			<configuration>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-ipojo-plugin</artifactId>
+				<version>${pom.version}</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>ipojo-bundle</goal>
+						</goals>
+						<configuration>
 							<metadata>metadata.xml</metadata>
-	        			</configuration>
-	      			</execution>
-	    		</executions>
-      		</plugin>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/manipulator/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/manipulator/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/manipulator/pom.xml (original)
+++ felix/sandbox/clement/ipojo/manipulator/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,75 +1,74 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Apache Felix iPOJO Manipulator</name>
-  
-  
-  <dependencies>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-all</artifactId>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>3.0</version>
-      <exclusions>
-    	<exclusion>
-      		<groupId>asm</groupId>
-      		<artifactId>asm-tree</artifactId>
-    	</exclusion>
-  	   </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>          
-            <Bundle-Name>iPOJO Manipulator</Bundle-Name>
-            <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
-            <Bundle-Description> iPOJO Manipulator </Bundle-Description>
-            <Export-Package>org.apache.felix.ipojo.manipulator</Export-Package>
-            <Private-Package>
-            	org.apache.felix.ipojo.manipulation,
-            	org.apache.felix.ipojo.manipulation.annotations,
-            	org.apache.felix.ipojo.xml.parser,
-              	org.objectweb.asm,
-              	org.objectweb.asm.commons
-            </Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<packaging>bundle</packaging>
+	<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+	<name>Apache Felix iPOJO Manipulator</name>
+
+	<dependencies>
+		<dependency>
+			<groupId>asm</groupId>
+			<artifactId>asm-all</artifactId>
+			<version>3.0</version>
+			<exclusions>
+				<exclusion>
+					<groupId>asm</groupId>
+					<artifactId>asm-tree</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>0.7.6-SNAPSHOT</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.2.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>iPOJO Manipulator</Bundle-Name>
+						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+						<Bundle-Description>
+							iPOJO Manipulator
+						</Bundle-Description>
+						<Export-Package>
+							org.apache.felix.ipojo.manipulator
+						</Export-Package>
+						<Private-Package>
+							org.apache.felix.ipojo.manipulation,
+							org.apache.felix.ipojo.manipulation.annotations,
+							org.apache.felix.ipojo.xml.parser,
+							org.objectweb.asm, org.objectweb.asm.commons
+						</Private-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
+</project>

Modified: felix/sandbox/clement/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java (original)
+++ felix/sandbox/clement/ipojo/manipulator/src/main/java/org/apache/felix/ipojo/manipulation/ClassChecker.java Wed Jan 23 14:18:11 2008
@@ -81,7 +81,9 @@
             m_isAlreadyManipulated = true;
         } else if (name.startsWith("class$")) { // Does not add class$* field generated by 'x.class'
             return null;
-        } 
+        } else if ((access & ACC_STATIC) == ACC_STATIC) {
+            return null;
+        }
         
         Type type = Type.getType(desc);
         if (type.getSort() == Type.ARRAY) {

Modified: felix/sandbox/clement/ipojo/metadata/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/metadata/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/metadata/pom.xml (original)
+++ felix/sandbox/clement/ipojo/metadata/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,42 +1,47 @@
 <project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-  <packaging>bundle</packaging>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Apache Felix iPOJO Metadata</name>
-  <build>
-  <plugins>
-  	<plugin>
-    	<groupId>org.apache.felix</groupId>
-    	<artifactId>maven-bundle-plugin</artifactId>
-    	<version>1.1.0-SNAPSHOT</version>
-    	<extensions>true</extensions>
-    	<configuration>
-        	<instructions>          
-          		<Bundle-Name>iPOJO Metadata</Bundle-Name>
-		        <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
-        		<Bundle-Description> iPOJO Metadata </Bundle-Description>
-          		<Export-Package>org.apache.felix.ipojo.metadata</Export-Package>
-        	</instructions>
-    	</configuration>
-  	</plugin>
-  </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+	<packaging>bundle</packaging>
+	<name>Apache Felix iPOJO Metadata</name>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>1.2.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>iPOJO Metadata</Bundle-Name>
+						<Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+						<Bundle-Description>
+							iPOJO Metadata
+						</Bundle-Description>
+						<Export-Package>
+							org.apache.felix.ipojo.metadata
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/plugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/plugin/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/plugin/pom.xml (original)
+++ felix/sandbox/clement/ipojo/plugin/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,62 +1,63 @@
 <project>
-  <parent>
-    <artifactId>felix</artifactId>
-    <groupId>org.apache.felix</groupId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-ipojo-plugin</artifactId>
-  <version>0.7.6-SNAPSHOT</version>
-  <name>Apache Felix iPOJO Maven Plugin</name>
-  <packaging>maven-plugin</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <version>2.0</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-archiver</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.1</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.4.0</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>0.7.6-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>http://people.apache.org/~clement/styles/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<parent>
+		<artifactId>iPOJO</artifactId>
+		<groupId>org.apache.felix</groupId>
+		<version>0.7.6-SNAPSHOT</version>
+		<relativePath>../pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>maven-ipojo-plugin</artifactId>
+	<name>Apache Felix iPOJO Maven Plugin</name>
+	<packaging>maven-plugin</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-plugin-api</artifactId>
+			<version>2.0</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-archiver</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.plexus</groupId>
+			<artifactId>plexus-utils</artifactId>
+			<version>1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.maven</groupId>
+			<artifactId>maven-artifact</artifactId>
+			<version>2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.4.0</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.metadata</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>${pom.groupId}</groupId>
+			<artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+			<version>${pom.version}</version>
+		</dependency>
+	</dependencies>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						http://people.apache.org/~clement/styles/checkstyle_ipojo.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: felix/sandbox/clement/ipojo/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/clement/ipojo/pom.xml?rev=614707&r1=614706&r2=614707&view=diff
==============================================================================
--- felix/sandbox/clement/ipojo/pom.xml (original)
+++ felix/sandbox/clement/ipojo/pom.xml Wed Jan 23 14:18:11 2008
@@ -1,13 +1,7 @@
 <project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
-
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>ipojo</artifactId>
+  <artifactId>iPOJO</artifactId>
+  <groupId>org.apache.felix</groupId>
   <name>Apache Felix iPOJO</name>
   <version>0.7.6-SNAPSHOT</version>
   <packaging>pom</packaging>
@@ -24,7 +18,7 @@
 		<module>white.board.pattern.handler</module>
 		<module>extender.pattern.handler</module>
 	</modules>
-  
+	
   <profiles>
 	<profile>
 		<id>java5</id>



Mime
View raw message