diff --git a/mosgi/mosgi.console.component/pom.xml b/mosgi/mosgi.console.component/pom.xml
index 434b2e0..fa991c8 100644
--- a/mosgi/mosgi.console.component/pom.xml
+++ b/mosgi/mosgi.console.component/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX Console GUI component</name>
   <artifactId>org.apache.felix.mosgi.console.component</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -24,57 +24,22 @@
       <scope>provided</scope>
     </dependency>
   </dependencies>
-  
+
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-	    <!--bundleManifestVersion>2</bundleManifestVersion-->
-	    <!--bundleClassPath></bundleClassPath-->
-            <bundleName>MOSGi JMX Console main GUI component</bundleName>
-	    <!--bundleVersion>
-	      Default value is {pom.version}.
-	      For exemple : 0.9.3-SNAPSHOT -> Bundle-Version=0.9.3.SNAPSHOT
-	      But if we specify a ${*} value with extension "-SNAPSHOT" or a value with char '-'
-	      it will be misunderstood
-	    </bundleVersion-->
-            <bundleDescription>MOSGi JMX Console main GUI component</bundleDescription>
-	    <!--bundleVendor>Stephane FRENOT</bundleVendor-->
-	    <!--bundleDate></bundleDate-->
-	    <!--bundleUpdateLocation>
-	      This value doesn't resolve "null" messages (when we update a bundle)...
-	    <bundleUpdateLocation-->
-	    <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-	    <!--bundleCategory></bundleCategory-->
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-	    <!--exportPackage></exportPackage-->
-	    <importPackage>
-	      org.apache.felix.mosgi.console.ifc;specification-version="1.0.0",
-	      javax.management;specification-version="1.0.0",
-	      javax.swing;specification-version="1.0.0",
-	      javax.swing.table;specification-version="1.0.0",
-	      org.osgi.framework;specification-version="1.0.0",
-	      javax.swing.tree;specification-version="1.0.0"
-	    </importPackage>
-	    <!--dynamicImportPackage></dynamicImportPackage-->
-	    <!--metadataLocation></metadataLocation-->
-	    <!--bundleCopyright></bundleCopyright-->
-	    <!--bundleNativeCode></bundleNativeCode-->
-	    <!--bundleContactAdress></bundleContactAdress-->
-	    <!--bundleRequiredExecutionEnvironment></bundleRequiredExecutionEnvironment-->
-	    <!--bundleLocalization></bundleLocalization-->
-	    <!--requireBundle></requireBundle-->
-	    <!--fragmentHost></fragmentHost-->
-	    <!--serviceComponent></serviceComponent-->
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX Console main GUI component</Bundle-Name>
+            <Bundle-Description>MOSGi JMX Console main GUI component</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.console.component.Activator</Bundle-Activator>
+	    <Private-Package>${pom.artifactId}</Private-Package>
+
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.console.gui/pom.xml b/mosgi/mosgi.console.gui/pom.xml
index 6a69ce9..e27e791 100644
--- a/mosgi/mosgi.console.gui/pom.xml
+++ b/mosgi/mosgi.console.gui/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX Console Main GUI</name>
   <artifactId>org.apache.felix.mosgi.console.gui</artifactId>
   <groupId>org.apache.felix</groupId>
@@ -39,29 +39,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX Console main GUI</bundleName>
-            <bundleDescription>MOSGi JMX Console main GUI</bundleDescription>
-	    <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-	    <importPackage>
-	      org.osgi.framework;specification-version="1.0.0",
-	      javax.swing;specification-version="1.0.0",
-	      javax.swing.event;specification-version="1.0.0",
-	      javax.swing.tree;specification-version="1.0.0",
-	      javax.management;specification-version="1.0.0",
-	      javax.management.remote;specification-version="1.0.0",
-	      org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-	    </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX Console main GUI</Bundle-Name>
+            <Bundle-Description>MOSGi JMX Console main GUI</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.console.gui.Activator</Bundle-Activator>
+	    <Private-Package>${pom.artifactId}</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.console.ifc/pom.xml b/mosgi/mosgi.console.ifc/pom.xml
index 8f0fa00..8e7b816 100644
--- a/mosgi/mosgi.console.ifc/pom.xml
+++ b/mosgi/mosgi.console.ifc/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX Console Interface</name>
   <artifactId>org.apache.felix.mosgi.console.ifc</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -28,22 +28,16 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX Console  Ifc</bundleName>
-            <bundleDescription>MOSGi JMX Console Ifc</bundleDescription>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-	      ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX Console  Ifc</Bundle-Name>
+            <Bundle-Description>MOSGi JMX Console Ifc</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.doc/config.properties.core b/mosgi/mosgi.doc/config.properties.core
index 16a5d2c..3d64be3 100644
--- a/mosgi/mosgi.doc/config.properties.core
+++ b/mosgi/mosgi.doc/config.properties.core
@@ -16,24 +16,25 @@
  file:bundle/org.apache.felix.shell.tui-0.9.0-incubator-SNAPSHOT.jar \
  file:bundle/org.apache.felix.bundlerepository-0.9.0-incubator-SNAPSHOT.jar \
  http://ares.insa-lyon.fr/~sfrenot/devel/mosgi/insajmx/trunk/lib/log.jar \
- file:../mosgi.jmx.remotelogger/target/org.apache.felix.mosgi.jmx.remotelogger-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.jmx.agent/target/org.apache.felix.mosgi.jmx.agent-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.jmx.registry/target/org.apache.felix.mosgi.jmx.registry-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.jmx.rmiconnector/target/org.apache.felix.mosgi.jmx.rmiconnector-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.managedelements.osgiprobes/target/org.apache.felix.mosgi.managedelements.osgiprobes-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.managedelements.bundlesprobes/target/org.apache.felix.mosgi.managedelements.bundlesprobes-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.managedelements.memoryprobe/target/org.apache.felix.mosgi.managedelements.memoryprobe-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.managedelements.obrprobe/target/org.apache.felix.mosgi.managedelements.obrprobe-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.jmx.remotelogger/target/org.apache.felix.mosgi.jmx.remotelogger-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.jmx.agent/target/org.apache.felix.mosgi.jmx.agent-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.jmx.registry/target/org.apache.felix.mosgi.jmx.registry-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.jmx.rmiconnector/target/org.apache.felix.mosgi.jmx.rmiconnector-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.managedelements.osgiprobes/target/org.apache.felix.mosgi.managedelements.osgiprobes-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.managedelements.bundlesprobes/target/org.apache.felix.mosgi.managedelements.bundlesprobes-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.managedelements.obrprobe/target/org.apache.felix.mosgi.managedelements.obrprobe-0.9.0-incubator-SNAPSHOT.jar \
  http://perso.citi.insa-lyon.fr/sfrenot/devel/mosgi/managedelements/trunk/mosgi.managedelements.linuxprobes/target/org.apache.felix.mosgi.managedelements.linuxprobes-0.8.0-SNAPSHOT.jar
 
+#file:../mosgi/mosgi.managedelements.memoryprobe/target/org.apache.felix.mosgi.managedelements.memoryprobe-0.9.0-incubator-SNAPSHOT.jar \
+
 # if we need the http jmx connector
 # file:../mosgi.jmx.httpconnector/target/org.apache.felix.mosgi.jmx.httpconnector-0.8.0-SNAPSHOT.jar
 
 
-mosgi.jmxconsole.tab.url.osgiprobestab=file:../mosgi.managedelements.osgiprobes.tab/target/org.apache.felix.mosgi.managedelements.osgiprobes.tab-0.9.0-incubator-SNAPSHOT.jar
-mosgi.jmxconsole.tab.url.bundlesprobestab=file:../mosgi.managedelements.bundlesprobes.tab/target/org.apache.felix.mosgi.managedelements.bundlesprobes.tab-0.9.0-incubator-SNAPSHOT.jar
-mosgi.jmxconsole.tab.url.obrprobetab=file:../mosgi.managedelements.obrprobe.tab/target/org.apache.felix.mosgi.managedelements.obrprobe.tab-0.9.0-incubator-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.osgiprobestab=file:../mosgi/mosgi.managedelements.osgiprobes.tab/target/org.apache.felix.mosgi.managedelements.osgiprobes.tab-0.9.0-incubator-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.bundlesprobestab=file:../mosgi/mosgi.managedelements.bundlesprobes.tab/target/org.apache.felix.mosgi.managedelements.bundlesprobes.tab-0.9.0-incubator-SNAPSHOT.jar
+mosgi.jmxconsole.tab.url.obrprobetab=file:../mosgi/mosgi.managedelements.obrprobe.tab/target/org.apache.felix.mosgi.managedelements.obrprobe.tab-0.9.0-incubator-SNAPSHOT.jar
 mosgi.jmxconsole.tab.url.memoryprobetab=http://perso.citi.insa-lyon.fr/sfrenot/devel/mosgi/managedelements/trunk/mosgi.managedelements.memoryprobe.tab/target/org.apache.felix.mosgi.managedelements.memoryprobe.tab-0.8.0-SNAPSHOT.jar
 mosgi.jmxconsole.tab.url.linuxprobestab=http://perso.citi.insa-lyon.fr/sfrenot/devel/mosgi/managedelements/trunk/mosgi.managedelements.linuxprobes.tab/target/org.apache.felix.mosgi.managedelements.linuxprobes.tab-0.8.0-SNAPSHOT.jar
 
diff --git a/mosgi/mosgi.doc/config.properties.jmxconsole b/mosgi/mosgi.doc/config.properties.jmxconsole
index aa73ef5..d24cbff 100644
--- a/mosgi/mosgi.doc/config.properties.jmxconsole
+++ b/mosgi/mosgi.doc/config.properties.jmxconsole
@@ -15,9 +15,9 @@
  file:bundle/org.apache.felix.shell-0.9.0-incubator-SNAPSHOT.jar \
  file:bundle/org.apache.felix.shell.tui-0.9.0-incubator-SNAPSHOT.jar \
  file:bundle/org.apache.felix.bundlerepository-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.console.gui/target/org.apache.felix.mosgi.console.gui-0.9.0-incubator-SNAPSHOT.jar \
- file:../mosgi.console.component/target/org.apache.felix.mosgi.console.component-0.9.0-incubator-SNAPSHOT.jar
+ file:../mosgi/mosgi.console.ifc/target/org.apache.felix.mosgi.console.ifc-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.console.gui/target/org.apache.felix.mosgi.console.gui-0.9.0-incubator-SNAPSHOT.jar \
+ file:../mosgi/mosgi.console.component/target/org.apache.felix.mosgi.console.component-0.9.0-incubator-SNAPSHOT.jar
 
 #possible values : both treeonly tableonly none (default=both)
 mosgi.jmxconsole.remotelogger.componentfilter=both
diff --git a/mosgi/mosgi.doc/core.sh b/mosgi/mosgi.doc/core.sh
index 8d46428..111bc0b 100755
--- a/mosgi/mosgi.doc/core.sh
+++ b/mosgi/mosgi.doc/core.sh
@@ -2,8 +2,8 @@
 
 
 echo "cd into felix directory"
-cd ../main
+cd ../../main
 
 echo "lauching felix with core gateway properties"
-java -Dfelix.config.properties=file:../mosgi.doc/config.properties.core -jar bin/felix.jar
+java -Dfelix.config.properties=file:../mosgi/mosgi.doc/config.properties.core -jar bin/felix.jar
 
diff --git a/mosgi/mosgi.doc/jmxconsole.sh b/mosgi/mosgi.doc/jmxconsole.sh
index b27dc23..1ed93de 100755
--- a/mosgi/mosgi.doc/jmxconsole.sh
+++ b/mosgi/mosgi.doc/jmxconsole.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 echo "cd into felix directory"
-cd ../main
+cd ../../main
 
 echo "lauching felix with jmxconsole properties"
-java -Dfelix.config.properties=file:../mosgi.doc/config.properties.jmxconsole -jar bin/felix.jar
+java -Dfelix.config.properties=file:../mosgi/mosgi.doc/config.properties.jmxconsole -jar bin/felix.jar
diff --git a/mosgi/mosgi.jmx.agent/pom.xml b/mosgi/mosgi.jmx.agent/pom.xml
index 17a3bd0..e234cf4 100644
--- a/mosgi/mosgi.jmx.agent/pom.xml
+++ b/mosgi/mosgi.jmx.agent/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX agent</name>
   <artifactId>org.apache.felix.mosgi.jmx.agent</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -33,32 +33,22 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX-MX4J Agent Service</bundleName>
-            <bundleDescription>MOSGi JMX-MX4J Agent Service</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              ${pom.artifactId};specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.agent.mx4j.server;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.agent.mx4j.server.interceptor;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.agent.mx4j.util;specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.service.log;specification-version="1.0.0",
-              org.osgi.framework;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              javax.management.loading;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX-MX4J Agent Service</Bundle-Name>
+            <Bundle-Description>MOSGi JMX-MX4J Agent Service</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.jmx.agent.AgentActivator</Bundle-Activator>
+            <Export-Package>${pom.artifactId},
+              org.apache.felix.mosgi.jmx.agent.mx4j.server,
+              org.apache.felix.mosgi.jmx.agent.mx4j.server.interceptor,
+              org.apache.felix.mosgi.jmx.agent.mx4j.util
+            </Export-Package>
+	    <Private-Package>${pom.artifactId}.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.jmx.httpconnector/pom.xml b/mosgi/mosgi.jmx.httpconnector/pom.xml
index b198fcd..224383e 100644
--- a/mosgi/mosgi.jmx.httpconnector/pom.xml
+++ b/mosgi/mosgi.jmx.httpconnector/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX httpconnector</name>
   <artifactId>org.apache.felix.mosgi.jmx.httpconnector</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -38,32 +38,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX-MX4J http connector</bundleName>
-            <bundleDescription>MOSGi JMX-MX4J http connector</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <importPackage>
-              org.osgi.service.log;specification-version="1.0.0",
-              org.osgi.framework;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.agent.mx4j.util;specification-version="1.0.0",
-              javax.management.loading;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              org.w3c.dom;specification-version="1.0.0",
-              javax.xml.parsers;specification-version="1.0.0",
-              javax.xml.transform;specification-version="1.0.0",
-              javax.xml.transform.stream;specification-version="1.0.0",
-              javax.xml.transform.dom;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX-MX4J http connector</Bundle-Name>
+            <Bundle-Description>MOSGi JMX-MX4J http connector</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.jmx.httpconnector.HttpConnectorActivator</Bundle-Activator>
+	    <Private-Package>${pom.artifactId}.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.jmx.registry/pom.xml b/mosgi/mosgi.jmx.registry/pom.xml
index 9b4ec94..f6bff72 100644
--- a/mosgi/mosgi.jmx.registry/pom.xml
+++ b/mosgi/mosgi.jmx.registry/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX registry</name>
   <artifactId>org.apache.felix.mosgi.jmx.registry</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -33,26 +33,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX rmiregistry</bundleName>
-            <bundleDescription>MOSGi JMX rmiregistry</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              ${pom.artifactId}.mx4j.tools.naming;specification-version="1.0.0"
-            </exportPackage>
-	    <dynamicImportPackage>
-	      *
-	    </dynamicImportPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX rmiregistry</Bundle-Name>
+            <Bundle-Description>MOSGi JMX rmiregistry</Bundle-Description>
+	    <Bundle-Activator>org.apache.felix.mosgi.jmx.registry.mx4j.tools.naming.NamingService</Bundle-Activator>
+            <Export-Package>${pom.artifactId}.mx4j.tools.naming</Export-Package>
+	    <DynamicImport-Package>*</DynamicImport-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.jmx.remotelogger/pom.xml b/mosgi/mosgi.jmx.remotelogger/pom.xml
index 5f33c16..ba0a59e 100644
--- a/mosgi/mosgi.jmx.remotelogger/pom.xml
+++ b/mosgi/mosgi.jmx.remotelogger/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX remotelogger</name>
   <artifactId>org.apache.felix.mosgi.jmx.remotelogger</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -23,36 +23,22 @@
       <artifactId>org.osgi.compendium</artifactId>
       <scope>provided</scope>
     </dependency>
-    <!--dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency-->
   </dependencies>
 
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX remote logger</bundleName>
-            <bundleDescription>MOSGi JMX remote logger</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-	    <importPackage>
-  	      org.osgi.service.log;specification-version="1.0.0",
-	      org.osgi.framework;specification-version="1.0.0",
-	      javax.management;specification-version="1.0.0"
-	    </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX remote logger</Bundle-Name>
+            <Bundle-Description>MOSGi JMX remote logger</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.jmx.remotelogger.Logger</Bundle-Activator>
+	    <Private-Package>${pom.artifactId}.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.jmx.rmiconnector/pom.xml b/mosgi/mosgi.jmx.rmiconnector/pom.xml
index 5f189e2..ca7451e 100644
--- a/mosgi/mosgi.jmx.rmiconnector/pom.xml
+++ b/mosgi/mosgi.jmx.rmiconnector/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX rmiconnector</name>
   <artifactId>org.apache.felix.mosgi.jmx.rmiconnector</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -43,35 +43,18 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX-MX4J RMI Connector</bundleName>
-            <bundleDescription>MOSGi JMX-MX4J RMI Connector</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi;specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.service.log;specification-version="1.0.0",
-              org.osgi.framework;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.registry.mx4j.tools.naming;specification-version="1.0.0",
-              org.apache.felix.mosgi.jmx.agent.mx4j.util;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              javax.management.loading;specification-version="1.0.0",
-              javax.management.remote;specification-version="1.0.0",
-              javax.management.remote.rmi;specification-version="1.0.0",
-              javax.naming;specification-version="1.0.0",
-              javax.security.auth;specification-version="1.0.0"
-             </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX-MX4J RMI Connector</Bundle-Name>
+            <Bundle-Description>MOSGi JMX-MX4J RMI Connector</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.jmx.rmiconnector.RmiConnectorActivator</Bundle-Activator>
+            <Export-Package>org.apache.felix.mosgi.jmx.rmiconnector.mx4j.remote.provider.rmi </Export-Package>
+	    <Private-Package>${pom.artifactId}.*</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.bundlesprobes.tab/pom.xml b/mosgi/mosgi.managedelements.bundlesprobes.tab/pom.xml
index aaed398..c7f9eb4 100644
--- a/mosgi/mosgi.managedelements.bundlesprobes.tab/pom.xml
+++ b/mosgi/mosgi.managedelements.bundlesprobes.tab/pom.xml
@@ -5,13 +5,13 @@
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi Bundles management tab for the JMX console</name>
   <artifactId>org.apache.felix.mosgi.managedelements.bundlesprobes.tab</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
-  
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -38,31 +38,16 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi Bundles management tab for the JMX console</bundleName>
-            <bundleDescription>MOSGi Bundles management tab for the JMX console</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              javax.management;specification-version="1.0.0",
-              org.osgi.framework;specification-version="1.0.0",
-              javax.management.openmbean;specification-version="1.0.0",
-              javax.swing;specification-version="1.0.0",
-              javax.swing.table;specification-version="1.0.0",
-              org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi Bundles management tab for the JMX console</Bundle-Name>
+            <Bundle-Description>MOSGi Bundles management tab for the JMX console</Bundle-Description>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.bundlesprobes.tab.BundlesProbesTabUI</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.bundlesprobes/pom.xml b/mosgi/mosgi.managedelements.bundlesprobes/pom.xml
index a7da0d3..9026dd6 100644
--- a/mosgi/mosgi.managedelements.bundlesprobes/pom.xml
+++ b/mosgi/mosgi.managedelements.bundlesprobes/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for OSGi bundles management</name>
   <artifactId>org.apache.felix.mosgi.managedelements.bundlesprobes</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -38,29 +38,16 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX MBean for OSGi bundles management</bundleName>
-            <bundleDescription>MOSGi JMX MBean for OSGi bundles management</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-	      ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.framework;specification-version="1.0.0",
-              org.osgi.service.log;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX MBean for OSGi bundles management</Bundle-Name>
+            <Bundle-Description>MOSGi JMX MBean for OSGi bundles management</Bundle-Description>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.bundlesprobes.BundlesProbes</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.memoryprobe/pom.xml b/mosgi/mosgi.managedelements.memoryprobe/pom.xml
index b545eb1..c367959 100644
--- a/mosgi/mosgi.managedelements.memoryprobe/pom.xml
+++ b/mosgi/mosgi.managedelements.memoryprobe/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for obr interaction</name>
   <artifactId>org.apache.felix.mosgi.managedelements.memoryprobe</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -43,25 +43,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX MBean for memory supervision</bundleName>
-            <bundleDescription>MOSGi JMX MBean for memory supervision</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <importPackage>
-              org.osgi.framework;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX MBean for memory supervision</Bundle-Name>
+            <Bundle-Description>MOSGi JMX MBean for memory supervision</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.memoryprobe.MemoryProbe</Bundle-Activator>
+	    <Private-Package>${pom.artifactId}</Private-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.obrprobe.tab/pom.xml b/mosgi/mosgi.managedelements.obrprobe.tab/pom.xml
index ad91931..533f01d 100644
--- a/mosgi/mosgi.managedelements.obrprobe.tab/pom.xml
+++ b/mosgi/mosgi.managedelements.obrprobe.tab/pom.xml
@@ -5,13 +5,13 @@
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
   </parent>
-  
+
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi obr remote manipulation tab for the JMX console</name>
   <artifactId>org.apache.felix.mosgi.managedelements.obrprobe.tab</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
-  
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -38,31 +38,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi obr remote manipulation tab for the JMX console</bundleName>
-            <bundleDescription>MOSGi obr remote manipulation tab for the JMX console</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              ${pom.artifactId}
-            </exportPackage>
-            <importPackage>
-              javax.management,
-              org.osgi.framework,
-              javax.swing,
-              javax.swing.table,
-              org.osgi.service.obr,
-              org.apache.felix.mosgi.console.ifc
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi obr remote manipulation tab for the JMX console</Bundle-Name>
+            <Bundle-Description>MOSGi obr remote manipulation tab for the JMX console</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.obrprobe.tab.ObrProbeTabUI</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java b/mosgi/mosgi.managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java
index c3ac10a..e607182 100644
--- a/mosgi/mosgi.managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java
+++ b/mosgi/mosgi.managedelements.obrprobe.tab/src/main/java/org/apache/felix/mosgi/managedelements/obrprobe/tab/ObrProbeTabUI.java
@@ -121,10 +121,10 @@
   public Component getGUI(){return this;}
 
   public void propertyChange(PropertyChangeEvent e){
-System.out.println("TEST"+e.getPropertyName());	
+//System.out.println("TEST"+e.getPropertyName());	
    if (e.getPropertyName().equals(Plugin.NEW_NODE_READY)){
      this.mbsc=(MBeanServerConnection)e.getNewValue();
-System.out.println("TESTE"+this.mbsc);	
+//System.out.println("TESTE"+this.mbsc);	
    }else if(e.getPropertyName().equals(Plugin.EMPTY_NODE)){
      this.mbsc=null;
    }
diff --git a/mosgi/mosgi.managedelements.obrprobe/pom.xml b/mosgi/mosgi.managedelements.obrprobe/pom.xml
index 17f678b..2f9d790 100644
--- a/mosgi/mosgi.managedelements.obrprobe/pom.xml
+++ b/mosgi/mosgi.managedelements.obrprobe/pom.xml
@@ -7,11 +7,11 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for obr interaction</name>
   <artifactId>org.apache.felix.mosgi.managedelements.obrprobe</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
-  
+
   <dependencies>
     <dependency>
       <groupId>${pom.groupId}</groupId>
@@ -43,30 +43,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX MBean for obr interaction</bundleName>
-            <bundleDescription>MOSGi JMX MBean for obr interaction</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.framework;specification-version="1.0.0",
-              org.osgi.service.log;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              org.osgi.service.obr,
-              org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX MBean for obr interaction</Bundle-Name>
+            <Bundle-Description>MOSGi JMX MBean for obr interaction</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.obrprobe.ObrProbe</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.osgiprobes.tab/pom.xml b/mosgi/mosgi.managedelements.osgiprobes.tab/pom.xml
index 2abc820..2d42a02 100644
--- a/mosgi/mosgi.managedelements.osgiprobes.tab/pom.xml
+++ b/mosgi/mosgi.managedelements.osgiprobes.tab/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi OSGi gateway status tab for the JMX console</name>
   <artifactId>org.apache.felix.mosgi.managedelements.osgiprobes.tab</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -33,30 +33,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi OSGi gateway status tab for the JMX console</bundleName>
-            <bundleDescription>MOSGi OSGi gateway status tab for the JMX console</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-	      ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-	    <importPackage>
-	      javax.management;specification-version="1.0.0",
-	      org.osgi.framework;specification-version="1.0.0",
-	      javax.swing;specification-version="1.0.0",
-	      javax.swing.table;specification-version="1.0.0",
-	      org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-	    </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi OSGi gateway status tab for the JMX console</Bundle-Name>
+            <Bundle-Description>MOSGi OSGi gateway status tab for the JMX console</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.osgiprobes.tab.OsgiProbesTabUI</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>
diff --git a/mosgi/mosgi.managedelements.osgiprobes/pom.xml b/mosgi/mosgi.managedelements.osgiprobes/pom.xml
index 6ed3de7..d05f41b 100644
--- a/mosgi/mosgi.managedelements.osgiprobes/pom.xml
+++ b/mosgi/mosgi.managedelements.osgiprobes/pom.xml
@@ -7,7 +7,7 @@
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
+  <packaging>bundle</packaging>
   <name>Apache Felix MOSGi JMX MBean for OSGi gateway status</name>
   <artifactId>org.apache.felix.mosgi.managedelements.osgiprobes</artifactId>
   <version>0.9.0-incubator-SNAPSHOT</version>
@@ -38,29 +38,17 @@
   <build>
     <plugins>
       <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!--version>${felix.version}</version-->
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
         <configuration>
-          <osgiManifest>
-            <bundleName>MOSGi JMX MBean for OSGi gateway status</bundleName>
-            <bundleDescription>MOSGi JMX MBean for OSGi gateway status</bundleDescription>
-            <bundleActivator>auto-detect</bundleActivator>
-            <bundleDocUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/</bundleDocUrl>
-            <bundleUrl>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}.jar</bundleUrl>
-            <bundleSource>http://oscar-osgi.sf.net/obr2/${pom.artifactId}/${pom.artifactId}-${pom.version}-src.jar</bundleSource>
-            <bundleSymbolicName>${pom.artifactId}</bundleSymbolicName>
-            <exportPackage>
-              ${pom.artifactId};specification-version="1.0.0"
-            </exportPackage>
-            <importPackage>
-              org.osgi.framework;specification-version="1.0.0",
-              org.osgi.service.log;specification-version="1.0.0",
-              javax.management;specification-version="1.0.0",
-              org.apache.felix.mosgi.console.ifc;specification-version="1.0.0"
-            </importPackage>
-          </osgiManifest>
+          <instructions>
+            <Bundle-Name>MOSGi JMX MBean for OSGi gateway status</Bundle-Name>
+            <Bundle-Description>MOSGi JMX MBean for OSGi gateway status</Bundle-Description>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+	    <Bundle-Activator>org.apache.felix.mosgi.managedelements.osgiprobes.OsgiProbes</Bundle-Activator>
+            <Export-Package>${pom.artifactId}</Export-Package>
+          </instructions>
         </configuration>
       </plugin>
     </plugins>