[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r1160 - in /projects/zb4osgi/sandbox/giancarlo.riolo: ./ externals/ externals/bundles/ externals/rxtx/ integration.test/ it/ pom/ testing/ trunk/ zb4o-GUI-tester/ zb4o-basedriver-api/ zb4o-basedriver-stub/ zb4o-basedriver/ zb4o-cc2480-datalink/ zb4o-cc2530-driver/ zb4o-common/ zb4o-dongle-api/ zb4o-eh-driver/ zb4o-eh-zcl-library/ zb4o-ez430-rf2480-driver/ zb4o-ha-driver-stub/ zb4o-ha-driver/ zb4o-hc-driver/ zb4o-hc-zcl-library/ zb4o-karaf-features/ zb4o-karaf-features/src/main/resources/ zb4o-network-browser/ zb4o-se-zcl-library/ zb4o-zcl-library/ zigbee.CC2530.driver/ zigbee.basedriver.api/ zigbee.basedriver.stub/ zigbee.basedriver/ zigbee.cc2480.datalink/ zigbee.common/ zigbee.dongle.api/ zigbee.eh.driver/ zigbee.eh.zcl.library/ zigbee.ez430-rf2480.driver/ zigbee.ha.driver.stub/ zigbee.ha.driver/ zigbee.hc.driver/ zigbee.karaf.features/ zigbee.network.browser/ zigbee.se.zcl.library/ zigbee.tester/ zigbee.zcl.library/ zigbee.zhccl.library/

scm-notify at zb4osgi.aaloa.org scm-notify at zb4osgi.aaloa.org
Fri Feb 13 17:43:47 CET 2015


Author: giancarlo.riolo
Date: Fri Feb 13 17:43:47 2015
New Revision: 1160

Log:
Sandobox Release refactoring

Added:
    projects/zb4osgi/sandbox/giancarlo.riolo/externals/rxtx/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/externals/bundles/rxtx/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-api/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.api/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-stub/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2480-datalink/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2530-driver/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.CC2530.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-common/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-dongle-api/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.dongle.api/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-driver/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-zcl-library/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ez430-rf2480-driver/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ha-driver/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ha-driver-stub/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver.stub/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-driver/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-zcl-library/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zhccl.library/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.karaf.features/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-network-browser/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-se-zcl-library/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.se.zcl.library/
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-zcl-library/
      - copied from r1159, projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/
Removed:
    projects/zb4osgi/sandbox/giancarlo.riolo/externals/bundles/
    projects/zb4osgi/sandbox/giancarlo.riolo/externals/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/integration.test/
    projects/zb4osgi/sandbox/giancarlo.riolo/it/
    projects/zb4osgi/sandbox/giancarlo.riolo/testing/
    projects/zb4osgi/sandbox/giancarlo.riolo/trunk/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.CC2530.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.api/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.dongle.api/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver.stub/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.karaf.features/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.native.driver.zstack-HowTo.txt
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.se.zcl.library/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/
    projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zhccl.library/
Modified:
    projects/zb4osgi/sandbox/giancarlo.riolo/externals/rxtx/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/pom/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pax.args
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-api/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-stub/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2480-datalink/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2530-driver/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-common/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-dongle-api/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-driver/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-zcl-library/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ez430-rf2480-driver/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ha-driver/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-driver/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-zcl-library/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/src/main/resources/features.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-network-browser/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-se-zcl-library/pom.xml
    projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-zcl-library/pom.xml

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/externals/rxtx/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/externals/rxtx/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/externals/rxtx/pom.xml	Fri Feb 13 17:43:47 2015
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../../../pom/pom.xml</relativePath>
-  </parent>
+	<parent>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../../pom/pom.xml</relativePath>
+	</parent>
 
-  <properties>
-    <pkgArtifactId>rxtx</pkgArtifactId>
-    <pkgVersion>2.1.7</pkgVersion>
-    <osgiPackaging>3</osgiPackaging>
-  </properties>
+	<properties>
+		<pkgArtifactId>rxtx</pkgArtifactId>
+		<pkgVersion>2.1.7</pkgVersion>
+		<osgiPackaging>3</osgiPackaging>
+	</properties>
 
-  <groupId>org.aaloa.zb4osgi.bundle</groupId>
-  <artifactId>org.aaloa.zb4osgi.externals.rxtx</artifactId>
-  <version>1.0.0</version>
-  <packaging>bundle</packaging>
-  <name>${pkgArtifactId} Bundle Wrapper</name>
-  <description>
+
+	<artifactId>externals-rxtx</artifactId>
+
+	<packaging>bundle</packaging>
+	<name>${pkgArtifactId} Bundle Wrapper</name>
+	<description>
 A wrapping of the ${pkgArtifactId} version ${pkgVersion}
 as OSGi bundle. This bundle includes also the native libraries
 needed by the RXTX software. The native libraries are not present
@@ -28,78 +29,80 @@
   </description>
 
 
-  <dependencies>
-    <dependency>
-      <groupId>org.rxtx</groupId>
-      <artifactId>${pkgArtifactId}</artifactId>
-      <version>${pkgVersion}</version>
-    </dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.rxtx</groupId>
+			<artifactId>${pkgArtifactId}</artifactId>
+			<version>${pkgVersion}</version>
+		</dependency>
+	</dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.0.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-Description>${project.description}</Bundle-Description>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <!--
-            An extract on the algorithm use by OSGi for native loading:
-            A - The match operation is a case insensitive comparison.
-            B -  Only select the native code clauses for which the following expressions all evaluate to true.
-              * osname  ~= [org.osgi.framework.os.name]
-              * processor  ~= [org.osgi.framework.processor]
-              * osversion range includes [org.osgi.framework.os.version] or osversion is not specified
-              * language  ~= [org.osgi.framework.language] or language is not specified
-             C - If a parameter (i.e. osname ) is present multiple times it is evaluated as OR
-             -->
-            <Bundle-NativeCode>
-              Windows/i386-mingw32/rxtxSerial.dll; Windows/i386-mingw32/rxtxParallel.dll; osname=win32; processor=x86,
-              Windows/win64/rxtxSerial.dll; Windows/win64/rxtxParallel.dll; osname=win32; processor=x86-64,
-              <!--
-              We removed the following line because win64 is not defined on any OSGi specification
-              Windows/win64/rxtxSerial.dll; Windows/win64/rxtxParallel.dll; osname=win64; processor=x86-64,
-               -->
-              <!--
-              The following lines seems to break the loading of 64-bit library on some Windows 7 machine running 64 bit JVM
-              NOTE: The error seems to be that win32 is an alias of windows7 regardless of the os architecture
-              Windows/i386-mingw32/rxtxSerial.dll; Windows/i386-mingw32/rxtxParallel.dll; osname=win32; processor=x86-64,
-              -->
-              <!--
-              We removed this line because win32 is an alias of "Windows 7" so it is duplication of first clause
-              Windows/i386-mingw32/rxtxSerial.dll; Windows/i386-mingw32/rxtxParallel.dll; osname=Windows 7; processor=x86,
-               -->
-              <!--
-              We removed this line because win32 is an alias of "Windows 7" so it is duplication of second clause
-              Windows/win64/rxtxSerial.dll; Windows/win64/rxtxParallel.dll; osname=Windows 7; processor=x86-64,
-               -->
-              Linux/i686-unknown-linux-gnu/librxtxSerial.so; Linux/i686-unknown-linux-gnu/librxtxParallel.so; osname=linux; processor=x86,
-              Linux/ia64-unknown-linux-gnu/librxtxSerial.so; osname=linux; processor=ia64,
-              Linux/arm-unknown-linux-gnu/librxtxSerial.so; osname=linux; processor=ARM_le,
-              Linux/x86_64-unknown-linux-gnu/librxtxSerial.so; osname=linux; processor=x86_64,
-              Mac_OS_X/librxtxSerial.jnilib; osname=Mac OS X; processor=x86_64,
-              Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial.so; osname=solaris; processor=sparc32,
-              Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial.so; osname=solaris; processor=sparc64
-            </Bundle-NativeCode>
-            <Export-Package>
-              gnu.io.*;version=${pkgVersion}
-            </Export-Package>
-            <Import-Package>*</Import-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.0.0</version>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Name>${project.name}</Bundle-Name>
+						<Bundle-Description>${project.description}</Bundle-Description>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<!-- An extract on the algorithm use by OSGi for native loading: A 
+							- The match operation is a case insensitive comparison. B - Only select the 
+							native code clauses for which the following expressions all evaluate to true. 
+							* osname ~= [org.osgi.framework.os.name] * processor ~= [org.osgi.framework.processor] 
+							* osversion range includes [org.osgi.framework.os.version] or osversion is 
+							not specified * language ~= [org.osgi.framework.language] or language is 
+							not specified C - If a parameter (i.e. osname ) is present multiple times 
+							it is evaluated as OR -->
+						<Bundle-NativeCode>
+							Windows/i386-mingw32/rxtxSerial.dll;
+							Windows/i386-mingw32/rxtxParallel.dll; osname=win32;
+							processor=x86,
+							Windows/win64/rxtxSerial.dll; Windows/win64/rxtxParallel.dll; osname=win32; processor=x86-64,
+							<!-- We removed the following line because win64 is not defined on 
+								any OSGi specification Windows/win64/rxtxSerial.dll; Windows/win64/rxtxParallel.dll; 
+								osname=win64; processor=x86-64, -->
+							<!-- The following lines seems to break the loading of 64-bit library 
+								on some Windows 7 machine running 64 bit JVM NOTE: The error seems to be 
+								that win32 is an alias of windows7 regardless of the os architecture Windows/i386-mingw32/rxtxSerial.dll; 
+								Windows/i386-mingw32/rxtxParallel.dll; osname=win32; processor=x86-64, -->
+							<!-- We removed this line because win32 is an alias of "Windows 7" 
+								so it is duplication of first clause Windows/i386-mingw32/rxtxSerial.dll; 
+								Windows/i386-mingw32/rxtxParallel.dll; osname=Windows 7; processor=x86, -->
+							<!-- We removed this line because win32 is an alias of "Windows 7" 
+								so it is duplication of second clause Windows/win64/rxtxSerial.dll; Windows/win64/rxtxParallel.dll; 
+								osname=Windows 7; processor=x86-64, -->
+							Linux/i686-unknown-linux-gnu/librxtxSerial.so;
+							Linux/i686-unknown-linux-gnu/librxtxParallel.so; osname=linux;
+							processor=x86,
+							Linux/ia64-unknown-linux-gnu/librxtxSerial.so; osname=linux; processor=ia64,
+							Linux/arm-unknown-linux-gnu/librxtxSerial.so; osname=linux;
+							processor=ARM_le,
+							Linux/x86_64-unknown-linux-gnu/librxtxSerial.so; osname=linux;
+							processor=x86_64,
+							Mac_OS_X/librxtxSerial.jnilib; osname=Mac OS X; processor=x86_64,
+							Solaris/sparc-solaris/sparc32-sun-solaris2.8/librxtxSerial.so;
+							osname=solaris; processor=sparc32,
+							Solaris/sparc-solaris/sparc64-sun-solaris2.8/librxtxSerial.so;
+							osname=solaris; processor=sparc64
+						</Bundle-NativeCode>
+						<Export-Package>
+							gnu.io.*;version=${pkgVersion}
+						</Export-Package>
+						<Import-Package>*</Import-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-  <scm>
-    <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/externals/bundles/rxtx</connection>
-    <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/externals/bundles/rxtx</developerConnection>
-    <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/externals/bundles/rxtx</url>
-  </scm>
+	<scm>
+		<connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/externals/bundles/rxtx</connection>
+		<developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/externals/bundles/rxtx</developerConnection>
+		<url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/externals/bundles/rxtx</url>
+	</scm>
 
 </project>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/pom.xml	Fri Feb 13 17:43:47 2015
@@ -1,153 +1,153 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
-  license agreements. See the NOTICE file distributed with this work for additional 
-  information regarding copyright ownership. The ASF licenses this file to 
-  you under the Apache License, Version 2.0 (the "License"); you may not use 
-  this file except in compliance with the License. You may obtain a copy of 
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-  by applicable law or agreed to in writing, software distributed under the 
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-  OF ANY KIND, either express or implied. See the License for the specific 
-  language governing permissions and limitations under the License. -->
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath>pom/pom.xml</relativePath>
-  </parent>
+	<parent>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
+		<version>1.0.0</version>
+		<relativePath>pom/pom.xml</relativePath>
+	</parent>
 
-  <artifactId>org.aaloa.zb4osgi.builder</artifactId>
-  <packaging>pom</packaging>
-  
+	<artifactId>zb4o-builder</artifactId>
+	<packaging>pom</packaging>
 
-  <name>Suite of bundle for integrating ZigBee device in OSGi and PERSONA</name>
-  <url>http://zb4osgi.aaloa.org/</url>
-  <description>
+
+	<name>Suite of bundle for integrating ZigBee device in OSGi and PERSONA</name>
+	<url>http://zb4osgi.aaloa.org/</url>
+	<description>
     This is the root pom of a suite of bundles (artifacts) which goal is to implement
     an ZigBee OSGi Base Driver,  to implement a set of Refine Driver for ZigBee 
     Device, and to integrate the refined device into the PERSONA middleware
   </description>
 
-  <modules>
-    <module>pom</module>
-    <module>zigbee.cc2480.datalink</module>
-    <module>zigbee.CC2530.driver</module>
-    <module>zigbee.ez430-rf2480.driver</module>
-    <module>zigbee.zcl.library</module>
-    <module>zigbee.zhccl.library</module>
-    <module>zigbee.se.zcl.library</module>
-    <module>zigbee.eh.zcl.library</module>
-    <module>zigbee.basedriver</module>
-    <module>zigbee.basedriver.api</module>
-    <module>zigbee.basedriver.stub</module>
-    <module>zigbee.dongle.api</module>
-    <module>zigbee.ha.driver</module>
-    <module>zigbee.hc.driver</module>
-     <module>zigbee.eh.driver</module>
-    <module>zigbee.tester</module>   
-    <module>zigbee.common</module>
-    <module>zigbee.network.browser</module>
-    <module>externals/bundles</module>
-  </modules>
+	<modules>
+		<module>pom</module>
+		<module>zb4o-cc2480-datalink</module>
+		<module>zb4o-cc2530-driver</module>
+		<module>zb4o-ez430-rf2480-driver</module>
+		<module>zb4o-zcl-library</module>
+		<module>zb4o-hc-zcl-library</module>
+		<module>zb4o-se-zcl-library</module>
+		<module>zb4o-eh-zcl-library</module>
+		<module>zb4o-basedriver</module>
+		<module>zb4o-basedriver-api</module>
+		<module>zb4o-basedriver-stub</module>
+		<module>zb4o-dongle-api</module>
+		<module>zb4o-ha-driver</module>
+		<module>zb4o-hc-driver</module>
+		<module>zb4o-eh-driver</module>
+		<module>zb4o-GUI-tester</module>
+		<module>zb4o-common</module>
+		<module>zb4o-network-browser</module>
+		<module>externals/rxtx</module>
+	</modules>
 
-  <scm>
-    <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk</connection>
-    <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk</developerConnection>
-    <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository</url>
-  </scm>
+	<scm>
+		<connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk</connection>
+		<developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk</developerConnection>
+		<url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository</url>
+	</scm>
 
-  <repositories>
-    <repository>
-      <id>ops4j.releases</id>
-      <url>http://repository.ops4j.org/maven2/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>nexus.aaloa.org</id>
-      <url>http://nexus.aaloa.org/content/repositories/releases/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-    <repository>
-      <id>snap.nexus.aaloa.org</id>
-      <url>http://nexus.aaloa.org/content/repositories/snapshots/</url>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-    </repository>
-  </repositories>
+	<repositories>
+		<repository>
+			<id>ops4j.releases</id>
+			<url>http://repository.ops4j.org/maven2/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>nexus.aaloa.org</id>
+			<url>http://nexus.aaloa.org/content/repositories/releases/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+		<repository>
+			<id>snap.nexus.aaloa.org</id>
+			<url>http://nexus.aaloa.org/content/repositories/snapshots/</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+	</repositories>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.ops4j</groupId>
-        <artifactId>maven-pax-plugin</artifactId>
-        <version>1.5</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>3.1</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.4.0</version>
-      </plugin>
-    </plugins>
-  </build>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.ops4j</groupId>
+				<artifactId>maven-pax-plugin</artifactId>
+				<version>1.5</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>3.1</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<version>2.4.0</version>
+			</plugin>
+		</plugins>
+	</build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <links>
-            <link>http://download.oracle.com/javaee/1.4/api/</link>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <!-- <link>http://trove4j.sourceforge.net/javadocs/</link> -->
-            <link>http://users.frii.com/jarvi/rxtx/doc/</link>
-            <link>http://www.slf4j.org/apidocs/</link>
-            <link>http://junit.sourceforge.net/javadoc/</link>
-            <link>http://easymock.org/api/easymock/3.0/</link>
-            <link>http://easymock.org/api/easymockclassextension/3.0/</link>
-          </links>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>javadoc</report>
-              <report>test-javadoc</report>
-            </reports>
-          </reportSet>
-        </reportSets>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.16</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <format>html</format>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<links>
+						<link>http://download.oracle.com/javaee/1.4/api/</link>
+						<link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+						<!-- <link>http://trove4j.sourceforge.net/javadocs/</link> -->
+						<link>http://users.frii.com/jarvi/rxtx/doc/</link>
+						<link>http://www.slf4j.org/apidocs/</link>
+						<link>http://junit.sourceforge.net/javadoc/</link>
+						<link>http://easymock.org/api/easymock/3.0/</link>
+						<link>http://easymock.org/api/easymockclassextension/3.0/</link>
+					</links>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>javadoc</report>
+							<report>test-javadoc</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+				<version>2.3</version>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<version>2.16</version>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.6</version>
+				<configuration>
+					<format>html</format>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/pom/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/pom/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/pom/pom.xml	Fri Feb 13 17:43:47 2015
@@ -13,8 +13,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.aaloa.zb4osgi</groupId>
-	<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+	<groupId>org.aaloa.zb4o</groupId>
+	<artifactId>pom</artifactId>
 	<packaging>pom</packaging>
 	<version>1.0.0</version>
 
@@ -139,8 +139,8 @@
 					<args>${pax.args.file}</args>
 				</configuration>
 			</plugin>
-			
-			
+
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
@@ -189,62 +189,68 @@
 		<!-- INTRA PROJECT DEPENDENCIES -->
 		<dependencies>
 			<dependency>
-				<groupId>org.aaloa.zb4osgi.bundle</groupId>
-				<artifactId>org.aaloa.zb4osgi.externals.rxtx</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.dongle.api</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.ha.driver</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.eh.driver</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.eh.zcl.library</artifactId>
-				<version>${project.version}</version>
-				<scope>provided</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.aaloa.zb4osgi</groupId>
-				<artifactId>org.aaloa.zb4osgi.zigbee.se.zcl.library</artifactId>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>externals-rxtx</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-common</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-basedriver-api</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-dongle-api</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-cc2480-datalink</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-zcl-library</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-ha-driver</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-eh-driver</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-eh-zcl-library</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-se-zcl-library</artifactId>
+				<version>${project.version}</version>
+				<scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.aaloa.zb4o</groupId>
+				<artifactId>zb4o-hc-zcl-library</artifactId>
 				<version>${project.version}</version>
 				<scope>provided</scope>
 			</dependency>
@@ -305,11 +311,11 @@
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-	<groupId>org.codehaus.mojo</groupId>
-	<artifactId>license-maven-plugin</artifactId>
-	<version>1.8</version>
-</dependency>
-			
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>license-maven-plugin</artifactId>
+				<version>1.8</version>
+			</dependency>
+
 		</dependencies>
 	</dependencyManagement>
 

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pax.args
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pax.args	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pax.args	Fri Feb 13 17:43:47 2015
@@ -18,24 +18,24 @@
 
 
 # ZigBee Stack General Dependencies & Tool
-mvn:org.aaloa.zb4osgi.bundle/org.aaloa.zb4osgi.externals.rxtx/1.0.0
+mvn:org.aaloa.zb4o/externals-rxtx/1.0.0
 wrap:mvn:net.sf.trove4j/trove4j/2.1.0
 
 # ZigBee Hardware Access Layer 
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.dongle.api/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.CC2530.driver/1.0.0 at nostart
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.ez430-rf2480.driver/1.0.0 at nostart
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.cc2480.datalink/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.common/1.0.0
+mvn:org.aaloa.zb4o/zb4o-dongle-api/1.0.0
+mvn:org.aaloa.zb4o/zb4o-cc2530-driver/1.0.0 at nostart
+mvn:org.aaloa.zb4o/zb4o-ez430-rf2480-driver/1.0.0 at nostart
+mvn:org.aaloa.zb4o/zb4o-cc2480-datalink/1.0.0
+mvn:org.aaloa.zb4o/zb4o-common/1.0.0
 
 # ZigBee Base Driver 
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.basedriver/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.basedriver.stub/1.0.0 at nostart
+mvn:org.aaloa.zb4o/zb4o-basedriver/1.0.0
+mvn:org.aaloa.zb4o/zb4o-basedriver-stub/1.0.0 at nostart
 
 # ZigBee Refinement Architecture 
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.ha.driver/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.hc.driver/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.eh.driver/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.zhccl.library/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.se.zcl.library/1.0.0
-mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.eh.zcl.library/1.0.0
+mvn:org.aaloa.zb4o/zb4o-ha-driver/1.0.0
+mvn:org.aaloa.zb4o/zb4o-hc-driver/1.0.0
+mvn:org.aaloa.zb4o/zb4o-eh-driver/1.0.0
+mvn:org.aaloa.zb4o/zb4o-hc-zcl-library/1.0.0
+mvn:org.aaloa.zb4o/zb4o-se-zcl-library/1.0.0
+mvn:org.aaloa.zb4o/zb4o-eh-zcl-library/1.0.0

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-GUI-tester/pom.xml	Fri Feb 13 17:43:47 2015
@@ -13,8 +13,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
@@ -22,8 +22,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.tester</artifactId>
-	<version>1.0.0</version>
+	<artifactId>zb4o-GUI-tester</artifactId>
 	<packaging>bundle</packaging>
 
 	<name>Zigbee Tester</name>
@@ -161,20 +160,20 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.ha.driver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-ha-driver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-zcl-library</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-cc2480-datalink</artifactId>
 		</dependency>
 
 
@@ -189,8 +188,8 @@
 			<artifactId>pax-logging-service</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-api/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-api/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-api/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-	<version>1.0.0</version>
+	<artifactId>zb4o-basedriver-api</artifactId>	
 	<packaging>bundle</packaging>
 
 	<name>ZigBee Base Driver API for OSGi</name>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-stub/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-stub/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver-stub/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.stub</artifactId>
-	<version>1.0.0</version>
+	<artifactId>zb4o-basedriver-stub</artifactId>
 	<packaging>bundle</packaging>
 
 	<name>STUB implementation of:OSGi ZigBee Base Driver</name>
@@ -50,8 +49,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
@@ -89,7 +88,8 @@
 						<Import-Package>
 							it.cnr.isti.zigbee.api.*,
 							org.osgi.*,
-							org.slf4j; provider=paxlogging
+							org.slf4j;
+							provider=paxlogging
 						</Import-Package>
 					</instructions>
 				</configuration>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-basedriver/pom.xml	Fri Feb 13 17:43:47 2015
@@ -13,13 +13,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.basedriver</artifactId>
+	<artifactId>zb4o-basedriver</artifactId>
 	<packaging>bundle</packaging>
 
 	<name>ZigBee Base Driver</name>
@@ -95,20 +95,20 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.dongle.api</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-cc2480-datalink</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-dongle-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
@@ -203,5 +203,4 @@
 			</plugin>
 		</plugins>
 	</reporting>
-	<version>1.0.0</version>
 </project>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2480-datalink/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2480-datalink/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2480-datalink/pom.xml	Fri Feb 13 17:43:47 2015
@@ -1,157 +1,157 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use
-  this file except in compliance with the License. You may obtain a copy of
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-  OF ANY KIND, either express or implied. See the License for the specific
-  language governing permissions and limitations under the License. -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
-
-
-  <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
-  <version>1.0.0</version>
-  <packaging>bundle</packaging>
-
-  <name>CC2480 Data Link protocol library</name>
-  <url>http://zb4osgi.aaloa.org/</url>
-  <description><![CDATA[
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../pom/pom.xml</relativePath>
+	</parent>
+
+
+	<artifactId>zb4o-cc2480-datalink</artifactId>
+
+	<packaging>bundle</packaging>
+
+	<name>CC2480 Data Link protocol library</name>
+	<url>http://zb4osgi.aaloa.org/</url>
+	<description><![CDATA[
     A Java library that implementats the Texas Instrument CC2480 Interface Specification.
   In particular, it provides the implementation of data link protocol over the serial port and
   a class model that represents the message specified by the Specification
   ]]></description>
 
-  <inceptionYear>2008</inceptionYear>
-  <organization>
-    <name><![CDATA[
+	<inceptionYear>2008</inceptionYear>
+	<organization>
+		<name><![CDATA[
     ISTI-CNR, Institute of Information Science and Technologies of the Italian National Research Council
     Instituto Tecnologico de Aplicaciones de Comunicacion Avanzadas - Grupo Tecnologias para la Salud y el Bienestar (TSB)
     ]]></name>
-    <url><![CDATA[
+		<url><![CDATA[
     http://isti.cnr.it/
     http://www.itaca.upv.es/
     ]]></url>
-  </organization>
-
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
-
-  <developers>
-    <developer>
-      <id>michele.girolami</id>
-      <name>Michele Girolami</name>
-      <email>michele.girolami at isti.cnr.it</email>
-      <organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
-      <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>manlio.bacco</id>
-      <name>Manlio Bacco</name>
-      <email>manlio.bacco at isti.cnr.it</email>
-      <organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
-      <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>stefano.lenzi</id>
-      <name>Stefano "Kismet" Lenzi</name>
-      <email>stefano.lenzi at isti.cnr.it</email>
-      <organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
-      <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-    <developer>
-      <id>alfiva</id>
-      <name>Álvaro Fides Valero</name>
-      <email>alfiva at aaa.upv.es</email>
-      <organization>Instituto Tecnologico de Aplicaciones de Comunicacion Avanzadas - Grupo Tecnologias para la Salud y el Bienestar (TSB)</organization>
-      <organizationUrl>http://www.itaca.upv.es//</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
-
-  <scm>
-    <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.cc2480.datalink</connection>
-    <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.cc2480.datalink</developerConnection>
-    <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.cc2480.datalink</url>
-  </scm>
-
-  <repositories>
-    <repository>
-      <id>nexus.aaloa.org</id>
-      <url>http://nexus.aaloa.org/content/repositories/releases/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
-      </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi.bundle</groupId>
-      <artifactId>org.aaloa.zb4osgi.externals.rxtx</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-service</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <groups>
-            <group>
-              <title><![CDATA[Core CC2480 Frames & Utility]]></title>
-              <packages>com.itaca.ztool.api</packages>
-            </group>
-            <group>
-              <title>Raw Byte Handling Utility</title>
-              <packages>com.itaca.ztool.util</packages>
-            </group>
-            <group>
-              <title>CC2480 Frames representation</title>
-              <packages>com.itaca.ztool.api.*</packages>
-            </group>
-            <group>
-              <title>CC2480 Data Link Protocol implementation</title>
-              <packages>it.cnr.isti.cc2480.*</packages>
-            </group>
-          </groups>
-          <bottom><![CDATA[
+	</organization>
+
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+
+	<developers>
+		<developer>
+			<id>michele.girolami</id>
+			<name>Michele Girolami</name>
+			<email>michele.girolami at isti.cnr.it</email>
+			<organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
+			<organizationUrl>http://www.isti.cnr.it/</organizationUrl>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>manlio.bacco</id>
+			<name>Manlio Bacco</name>
+			<email>manlio.bacco at isti.cnr.it</email>
+			<organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
+			<organizationUrl>http://www.isti.cnr.it/</organizationUrl>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>stefano.lenzi</id>
+			<name>Stefano "Kismet" Lenzi</name>
+			<email>stefano.lenzi at isti.cnr.it</email>
+			<organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
+			<organizationUrl>http://www.isti.cnr.it/</organizationUrl>
+			<timezone>+1</timezone>
+		</developer>
+		<developer>
+			<id>alfiva</id>
+			<name>Álvaro Fides Valero</name>
+			<email>alfiva at aaa.upv.es</email>
+			<organization>Instituto Tecnologico de Aplicaciones de Comunicacion Avanzadas - Grupo Tecnologias para la Salud y el Bienestar (TSB)</organization>
+			<organizationUrl>http://www.itaca.upv.es//</organizationUrl>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
+
+	<scm>
+		<connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.cc2480.datalink</connection>
+		<developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.cc2480.datalink</developerConnection>
+		<url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.cc2480.datalink</url>
+	</scm>
+
+	<repositories>
+		<repository>
+			<id>nexus.aaloa.org</id>
+			<url>http://nexus.aaloa.org/content/repositories/releases/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>externals-rxtx</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-service</artifactId>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<groups>
+						<group>
+							<title><![CDATA[Core CC2480 Frames & Utility]]></title>
+							<packages>com.itaca.ztool.api</packages>
+						</group>
+						<group>
+							<title>Raw Byte Handling Utility</title>
+							<packages>com.itaca.ztool.util</packages>
+						</group>
+						<group>
+							<title>CC2480 Frames representation</title>
+							<packages>com.itaca.ztool.api.*</packages>
+						</group>
+						<group>
+							<title>CC2480 Data Link Protocol implementation</title>
+							<packages>it.cnr.isti.cc2480.*</packages>
+						</group>
+					</groups>
+					<bottom><![CDATA[
    Copyright 2008-2013 <a href="http://isti.cnr.it">CNR-ISTI,
    Institute of Information Science and Technologies
    of the Italian National Research Council</a>
@@ -159,16 +159,16 @@
    Copyright 2008-2013 <a href="http://www.itaca.upv.es/">
    Instituto Tecnologico de Aplicaciones de Comunicacion Avanzadas - Grupo Tecnologias para la Salud y el Bienestar (TSB)</a>
           ]]></bottom>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Author><![CDATA[
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Author><![CDATA[
               Andrew Rapp <andrew.rapp at gmail.com>,
               Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>,
               Michele Girolami <michele.girolami at isti.cnr.it>,
@@ -176,44 +176,44 @@
               Álvaro Fides Valero <alfiva at aaa.upv.es>,
               Tommi S.E. Laukkanen <tommmi.s.e.laukkanen at gmail.com>
             ]]></Bundle-Author>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator />
-            <Import-Package>
-              org.osgi.*,
-              it.cnr.isti.thread,
-              it.cnr.isti.io,
-              it.cnr.isti.collections,
-              it.cnr.isti.primitivetypes.util,
-              it.cnr.isti.osgi.util,
-              gnu.io.*, javax.swing.*,
-              org.slf4j.*; provider=paxlogging
-            </Import-Package>
-            <Export-Package>
-              com.itaca.ztool.*;version=${project.version},
-              it.cnr.isti.cc2480.*;version=${project.version}
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <configuration>
-          <type>date</type>
-          <dates>
-            <date implementation="java.lang.String">2013-08-04</date>
-            <date implementation="java.lang.String">2030-12-31</date>
-          </dates>
-          <dateFormat>yyyy-MM-dd</dateFormat>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+						<Bundle-Name>${project.name}</Bundle-Name>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-Activator />
+						<Import-Package>
+							org.osgi.*,
+							it.cnr.isti.thread,
+							it.cnr.isti.io,
+							it.cnr.isti.collections,
+							it.cnr.isti.primitivetypes.util,
+							it.cnr.isti.osgi.util,
+							gnu.io.*, javax.swing.*,
+							org.slf4j.*; provider=paxlogging
+						</Import-Package>
+						<Export-Package>
+							com.itaca.ztool.*;version=${project.version},
+							it.cnr.isti.cc2480.*;version=${project.version}
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<configuration>
+					<type>date</type>
+					<dates>
+						<date implementation="java.lang.String">2013-08-04</date>
+						<date implementation="java.lang.String">2030-12-31</date>
+					</dates>
+					<dateFormat>yyyy-MM-dd</dateFormat>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 
 </project>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2530-driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2530-driver/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-cc2530-driver/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+    <groupId>org.aaloa.zb4o</groupId>
+    <artifactId>pom</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.CC2530.driver</artifactId>
-  <version>1.0.0</version>
+  <artifactId>zb4o-cc2530-driver</artifactId>
   <packaging>bundle</packaging>
 
   <name>ZIC for CC2530/CC2531 chipset dongle</name>
@@ -122,20 +121,20 @@
       <artifactId>pax-logging-service</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.dongle.api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi.bundle</groupId>
-      <artifactId>org.aaloa.zb4osgi.externals.rxtx</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-dongle-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-cc2480-datalink</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>externals-rxtx</artifactId>
     </dependency>
     <!-- TESTING -->
     <dependency>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-common/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-common/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-common/pom.xml	Fri Feb 13 17:43:47 2015
@@ -1,156 +1,156 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
-  license agreements. See the NOTICE file distributed with this work for additional
-  information regarding copyright ownership. The ASF licenses this file to
-  you under the Apache License, Version 2.0 (the "License"); you may not use
-  this file except in compliance with the License. You may obtain a copy of
-  the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required
-  by applicable law or agreed to in writing, software distributed under the
-  License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
-  OF ANY KIND, either express or implied. See the License for the specific
-  language governing permissions and limitations under the License. -->
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
 <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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
+	<parent>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../pom/pom.xml</relativePath>
+	</parent>
 
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
-  <version>1.0.0</version>
-  <packaging>bundle</packaging>
+	<artifactId>zb4o-common</artifactId>
 
-  <name>OSGi and Primitive Types Utility</name>
-  <url>http://zb4osgi.aaloa.org/</url>
-  <description><![CDATA[
+	<packaging>bundle</packaging>
+
+	<name>OSGi and Primitive Types Utility</name>
+	<url>http://zb4osgi.aaloa.org/</url>
+	<description><![CDATA[
     A set of utility classes for Java primitive types and OSGi enviroment
   ]]></description>
 
-  <inceptionYear>2008</inceptionYear>
-  <organization>
-    <name>Institute of Information Science and Technologies of the Italian National Research Council</name>
-    <url>http://isti.cnr.it/</url>
-  </organization>
+	<inceptionYear>2008</inceptionYear>
+	<organization>
+		<name>Institute of Information Science and Technologies of the Italian National Research Council</name>
+		<url>http://isti.cnr.it/</url>
+	</organization>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
 
-  <developers>
-    <developer>
-      <id>stefano.lenzi</id>
-      <name>Stefano "Kismet" Lenzi</name>
-      <email>stefano.lenzi at isti.cnr.it</email>
-      <organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
-      <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>
-  </developers>
+	<developers>
+		<developer>
+			<id>stefano.lenzi</id>
+			<name>Stefano "Kismet" Lenzi</name>
+			<email>stefano.lenzi at isti.cnr.it</email>
+			<organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
+			<organizationUrl>http://www.isti.cnr.it/</organizationUrl>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
 
-  <scm>
-    <connection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.common</connection>
-    <developerConnection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.common</developerConnection>
-    <url>http://zb4osgi.aaloa.org/redmine/projects/zb4osgi/repository/show/trunk/zigbee.common</url>
-  </scm>
+	<scm>
+		<connection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.common</connection>
+		<developerConnection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.common</developerConnection>
+		<url>http://zb4osgi.aaloa.org/redmine/projects/zb4osgi/repository/show/trunk/zigbee.common</url>
+	</scm>
 
-  <repositories>
-    <repository>
-      <id>nexus.aaloa.org</id>
-      <url>http://nexus.aaloa.org/content/repositories/releases/</url>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
+	<repositories>
+		<repository>
+			<id>nexus.aaloa.org</id>
+			<url>http://nexus.aaloa.org/content/repositories/releases/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-service</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <!-- TESTING -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymockclassextension</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-    </dependency>
-  </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-service</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.osgi.core</artifactId>
+		</dependency>
+		<!-- TESTING -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymockclassextension</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
+	</dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.6</source>
+					<target>1.6</target>
+				</configuration>
+			</plugin>
 
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Author><![CDATA[
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Author><![CDATA[
               Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>,
             ]]></Bundle-Author>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator />
-            <Import-Package>
-              org.osgi.*,
-              org.slf4j; provider=paxlogging
-            </Import-Package>
-            <Export-Package>
-              it.cnr.isti.*;version=${project.version}
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+						<Bundle-Name>${project.name}</Bundle-Name>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-Activator />
+						<Import-Package>
+							org.osgi.*,
+							org.slf4j; provider=paxlogging
+						</Import-Package>
+						<Export-Package>
+							it.cnr.isti.*;version=${project.version}
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <configuration>
-          <type>date</type>
-          <dates>
-            <date implementation="java.lang.String">2013-08-04</date>
-            <date implementation="java.lang.String">2030-12-31</date>
-          </dates>
-          <dateFormat>yyyy-MM-dd</dateFormat>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<configuration>
+					<type>date</type>
+					<dates>
+						<date implementation="java.lang.String">2013-08-04</date>
+						<date implementation="java.lang.String">2030-12-31</date>
+					</dates>
+					<dateFormat>yyyy-MM-dd</dateFormat>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 
 </project>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-dongle-api/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-dongle-api/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-dongle-api/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+    <groupId>org.aaloa.zb4o</groupId>
+    <artifactId>pom</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.dongle.api</artifactId>
-  <version>1.0.0</version>
+  <artifactId>zb4o-dongle-api</artifactId>
   <packaging>bundle</packaging>
 
   <name>ZigBee Interface Controller API</name>
@@ -82,12 +81,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-cc2480-datalink</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-driver/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-driver/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.eh.driver</artifactId>
-	<packaging>bundle</packaging>
-	<version>1.0.0</version>
+	<artifactId>zb4o-eh-driver</artifactId>
+	<packaging>bundle</packaging>	
 
 	<name>ZigBee Energy at Home Profile Driver</name>
 	<url>http://zb4osgi.aaloa.org/</url>
@@ -74,24 +73,24 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.ha.driver</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.se.zcl.library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.eh.zcl.library</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-zcl-library</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-ha-driver</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-se-zcl-library</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-eh-zcl-library</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
@@ -110,8 +109,8 @@
 			<artifactId>org.osgi.compendium</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
 		</dependency>
 
 		<!-- TESTING -->

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-zcl-library/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-zcl-library/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-eh-zcl-library/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.eh.zcl.library</artifactId>
+	<artifactId>zb4o-eh-zcl-library</artifactId>
 	<packaging>bundle</packaging>
-	<version>1.0.0</version>
+
 
 	<name>Energy at Home Cluster Library</name>
 	<url>http://zb4osgi.aaloa.org/</url>
@@ -73,23 +73,23 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-cc2480-datalink</artifactId>
 			<scope>compile</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-zcl-library</artifactId>
 		</dependency>
 
 
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ez430-rf2480-driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ez430-rf2480-driver/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ez430-rf2480-driver/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+    <groupId>org.aaloa.zb4o</groupId>
+    <artifactId>pom</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.ez430-rf2480.driver</artifactId>
-  <version>1.0.0</version>
+  <artifactId>zb4o-ez430-rf2480-driver</artifactId>
   <packaging>bundle</packaging>
 
   <name>ZIC for EZ430-RF2480 dongle</name>
@@ -77,20 +76,20 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.aaloa.zb4osgi.bundle</groupId>
-      <artifactId>org.aaloa.zb4osgi.externals.rxtx</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>externals-rxtx</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.dongle.api</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-dongle-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-common</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-cc2480-datalink</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ha-driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ha-driver/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-ha-driver/pom.xml	Fri Feb 13 17:43:47 2015
@@ -14,15 +14,14 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.ha.driver</artifactId>
+	<artifactId>zb4o-ha-driver</artifactId>
 	<packaging>bundle</packaging>
-	<version>1.0.0</version>
 
 	<name>ZigBee Home Automation Profile Driver</name>
 	<url>http://zb4osgi.aaloa.org/</url>
@@ -106,21 +105,21 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.se.zcl.library</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.eh.zcl.library</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-zcl-library</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-se-zcl-library</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-eh-zcl-library</artifactId>
 		</dependency>
 		
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.logging</groupId>
@@ -139,8 +138,8 @@
 			<artifactId>org.osgi.compendium</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
 		</dependency>
 
 		<!-- TESTING -->

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-driver/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-driver/pom.xml	Fri Feb 13 17:43:47 2015
@@ -21,15 +21,15 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+    <groupId>org.aaloa.zb4o</groupId>
+    <artifactId>pom</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.hc.driver</artifactId>
+  <artifactId>zb4o-hc-driver</artifactId>
   <packaging>bundle</packaging>
-  <version>1.0.0</version>
+
 
   <name>ZigBee Health Care Profile Driver</name>
   <url>http://zb4osgi.aaloa.org/</url>
@@ -79,21 +79,20 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.ha.driver</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.zhccl.library</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-ha-driver</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-zcl-library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-hc-zcl-library</artifactId>     
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-basedriver-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
@@ -112,8 +111,8 @@
       <artifactId>org.osgi.compendium</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-common</artifactId>
     </dependency>
 
   <!-- TESTING -->

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-zcl-library/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-zcl-library/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-hc-zcl-library/pom.xml	Fri Feb 13 17:43:47 2015
@@ -21,13 +21,13 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+    <groupId>org.aaloa.zb4o</groupId>
+    <artifactId>pom</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.zhccl.library</artifactId>
+  <artifactId>zb4o-hc-zcl-library</artifactId>
   <packaging>bundle</packaging>
 
 
@@ -78,21 +78,21 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-cc2480-datalink</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-zcl-library</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-basedriver-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/pom.xml	Fri Feb 13 17:43:47 2015
@@ -3,13 +3,13 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
-	<artifactId>org.aaloa.zb4osgi.features</artifactId>	
+	<artifactId>zb4o-features</artifactId>
 	<name>Karaf Features</name>
 	<packaging>pom</packaging>
 

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/src/main/resources/features.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/src/main/resources/features.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-karaf-features/src/main/resources/features.xml	Fri Feb 13 17:43:47 2015
@@ -4,71 +4,71 @@
 		<!-- Deps -->
 		<bundle>wrap:mvn:net.sf.trove4j/trove4j/2.1.0</bundle>
 		<!-- ZB4O modules -->
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.common/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-common/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.basedriver.api/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-basedriver-api/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.basedriver/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-basedriver/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.ha.driver/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-ha-driver/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.hc.driver/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-hc-driver/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.eh.driver/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-eh-driver/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.zcl.library/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-zcl-library/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.zhccl.library/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-hc-zcl-library/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.se.zcl.library/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-se.zcl-library/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.eh.zcl.library/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-eh.zcl-library/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.cc2480.datalink/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-cc2480-datalink/${project.version}
 		</bundle>
-		<bundle>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.dongle.api/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/zb4o-dongle-api/${project.version}
 		</bundle>
 	</feature>
 	<feature name="zb4o-driver-stub" version="${project.version}"> <!-- OK -->
 		<feature version="${project.version}">zb4o-base</feature>
 		<feature version="${project.version}">zb4o-tester</feature>
-		<bundle start='false'>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.basedriver.stub/${project.version}
+		<bundle start='false'>mvn:org.aaloa.zb4o/zb4o-basedriver-stub/${project.version}
 		</bundle>
 	</feature>
-	<feature name="zb4o-driver-CC2530" version="${project.version}">
+	<feature name="zb4o-driver-cc2530" version="${project.version}">
 		<feature version="${project.version}">zb4o-base</feature>
 		<feature version="${project.version}">zb4o-rxtx</feature>
-		<bundle start='false'>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.CC2530.driver/${project.version}
+		<bundle start='false'>mvn:org.aaloa.zb4o/zb4o-cc2530-driver/${project.version}
 		</bundle>
 
 	</feature>
-	<feature name="zb4o-driver-EZ430" version="${project.version}">
+	<feature name="zb4o-driver-ez430" version="${project.version}">
 		<feature version="${project.version}">zb4o-base</feature>
 		<feature version="${project.version}">zb4o-rxtx</feature>
-		<bundle start='false'>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.ez430-rf2480.driver/${project.version}
+		<bundle start='false'>mvn:org.aaloa.zb4o/zb4o-ez430-rf2480-driver/${project.version}
 		</bundle>
 	</feature>
-	<feature name="zb4o-tester" version="${project.version}">
+	<feature name="zb4o-GUI-tester" version="${project.version}">
 		<feature version="${project.version}">zb4o-base</feature>
-		<bundle start='true'>mvn:org.aaloa.zb4osgi/org.aaloa.zb4osgi.zigbee.tester/${project.version}
+		<bundle start='true'>mvn:org.aaloa.zb4o/zb4o-GUI-tester/${project.version}
 		</bundle>
 	</feature>
 	<feature name="zb4o" version="${project.version}">
 		<feature version="${project.version}">zb4o-base</feature>		
-		<feature version="${project.version}">zb4o-driver-CC2530</feature>		
+		<feature version="${project.version}">zb4o-driver-cc2530</feature>		
 		<feature version="${project.version}">zb4o-tester</feature>
 	</feature>
 	
 	<feature name="zb4o-dev" version="${project.version}">
 		<feature version="${project.version}">zb4o-base</feature>
 		<feature version="${project.version}">zb4o-driver-stub</feature>
-		<feature version="${project.version}">zb4o-driver-CC2530</feature>
-		<feature version="${project.version}">zb4o-driver-EZ430</feature>
+		<feature version="${project.version}">zb4o-driver-cc2530</feature>
+		<feature version="${project.version}">zb4o-driver-ez430</feature>
 		<feature version="${project.version}">zb4o-tester</feature>
 	</feature>
 	
 	<feature name="zb4o-rxtx" version="${project.version}">
-		<bundle>mvn:org.aaloa.zb4osgi.bundle/org.aaloa.zb4osgi.externals.rxtx/${project.version}
+		<bundle>mvn:org.aaloa.zb4o/externals.rxtx/${project.version}
 		</bundle>
 	</feature>
 </features>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-network-browser/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-network-browser/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-network-browser/pom.xml	Fri Feb 13 17:43:47 2015
@@ -13,18 +13,18 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
 	<parent>
-		<groupId>org.aaloa.zb4osgi</groupId>
-		<artifactId>org.aaloa.zb4osgi.pom</artifactId>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
 		<version>1.0.0</version>
 		<relativePath>../pom/pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.aaloa.zb4osgi.zigbee.network.browser</artifactId>
+	<artifactId>zb4o-network-browser</artifactId>
 	<packaging>bundle</packaging>
 	<name>Zigbee Network Browser</name>
-	<version>1.0.0</version>
+
 
 	<inceptionYear>2010</inceptionYear>
 	<organization>
@@ -145,16 +145,16 @@
 			<artifactId>org.osgi.compendium</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.ha.driver</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-ha-driver</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-zcl-library</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.aaloa.zb4osgi</groupId>
-			<artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>net.sf.jung</groupId>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-se-zcl-library/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-se-zcl-library/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-se-zcl-library/pom.xml	Fri Feb 13 17:43:47 2015
@@ -1,188 +1,183 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License.  You may obtain a copy of the License at
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor 
+	license agreements. See the NOTICE file distributed with this work for additional 
+	information regarding copyright ownership. The ASF licenses this file to 
+	you under the Apache License, Version 2.0 (the "License"); you may not use 
+	this file except in compliance with the License. You may obtain a copy of 
+	the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
+	by applicable law or agreed to in writing, software distributed under the 
+	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
+	OF ANY KIND, either express or implied. See the License for the specific 
+	language governing permissions and limitations under the License. -->
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
 
-    http://www.apache.org/licenses/LICENSE-2.0
+	<parent>
+		<groupId>org.aaloa.zb4o</groupId>
+		<artifactId>pom</artifactId>
+		<version>1.0.0</version>
+		<relativePath>../pom/pom.xml</relativePath>
+	</parent>
 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied.  See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+	<artifactId>zb4o-se-zcl-library</artifactId>
+	<packaging>bundle</packaging>
 
-  <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
-    <version>1.0.0</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.se.zcl.library</artifactId>
-  <packaging>bundle</packaging>
-  <version>1.0.0</version>
-
-  <name>ZigBee Smart Energy v.1 Cluster Library</name>
-  <url>http://zb4osgi.aaloa.org/</url>
-  <description><![CDATA[
+	<name>ZigBee Smart Energy v.1 Cluster Library</name>
+	<url>http://zb4osgi.aaloa.org/</url>
+	<description><![CDATA[
 A set of Java classes reppresenting the Smart Energy v.1 ZigBee Cluster library
   ]]></description>
 
-  <inceptionYear>2014</inceptionYear>
-  <organization>
-    <name>Institute of Information Science and Technologies of the Italian National Research Council</name>
-    <url>http://isti.cnr.it/</url>
-  </organization>
+	<inceptionYear>2014</inceptionYear>
+	<organization>
+		<name>Institute of Information Science and Technologies of the Italian National Research Council</name>
+		<url>http://isti.cnr.it/</url>
+	</organization>
 
-  <licenses>
-    <license>
-      <name>The Apache Software License, Version 2.0</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
 
-  <developers>
-    <developer>
-      <id>giancarlo.riolo</id>
-      <name>Giancarlo Riolo</name>
-      <email>giancarlo.riolo at isti.cnr.it</email>
-      <organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
-      <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
-      <timezone>+1</timezone>
-    </developer>  
-  </developers>
+	<developers>
+		<developer>
+			<id>giancarlo.riolo</id>
+			<name>Giancarlo Riolo</name>
+			<email>giancarlo.riolo at isti.cnr.it</email>
+			<organization>Institute of Information Science and Technologies of the Italian National Research Council</organization>
+			<organizationUrl>http://www.isti.cnr.it/</organizationUrl>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
 
-  <scm>
-    <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.se.zcl.library</connection>
-    <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.se.zcl.library</developerConnection>
-    <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.se.zcl.library</url>
-  </scm>
+	<scm>
+		<connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.se.zcl.library</connection>
+		<developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.se.zcl.library</developerConnection>
+		<url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.se.zcl.library</url>
+	</scm>
 
-  <repositories>
-    <repository>
-      <id>nexus.aaloa.org</id>
-      <url>http://nexus.aaloa.org/content/repositories/releases/</url>
-      <snapshots><enabled>false</enabled></snapshots>
-    </repository>
-  </repositories>
+	<repositories>
+		<repository>
+			<id>nexus.aaloa.org</id>
+			<url>http://nexus.aaloa.org/content/repositories/releases/</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-    </dependency>
-     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.ops4j.pax.logging</groupId>
-      <artifactId>pax-logging-service</artifactId>
-    </dependency>
+	<dependencies>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-cc2480-datalink</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-basedriver-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-zcl-library</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.aaloa.zb4o</groupId>
+			<artifactId>zb4o-common</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.ops4j.pax.logging</groupId>
+			<artifactId>pax-logging-service</artifactId>
+		</dependency>
 
-    <!-- TESTING -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymockclassextension</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.easymock</groupId>
-      <artifactId>easymock</artifactId>
-    </dependency>
-  </dependencies>
+		<!-- TESTING -->
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymockclassextension</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.easymock</groupId>
+			<artifactId>easymock</artifactId>
+		</dependency>
+	</dependencies>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <configuration>
-          <groups>
-    <group>
-      <title>ZigBee Smart Energy v.1 Cluster Library API</title>
-      <packages>it.cnr.isti.zigbee.se.zcl.library.api*</packages>
-    </group>
-    <group>
-      <title>Smart Energy v.1 ZigBee Cluster Library implementation</title>
-      <packages>it.cnr.isti.zigbee.se.zcl.library.impl*</packages>
-    </group>
-  </groups>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>        
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Author><![CDATA[
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<groups>
+						<group>
+							<title>ZigBee Smart Energy v.1 Cluster Library API</title>
+							<packages>it.cnr.isti.zigbee.se.zcl.library.api*</packages>
+						</group>
+						<group>
+							<title>Smart Energy v.1 ZigBee Cluster Library implementation</title>
+							<packages>it.cnr.isti.zigbee.se.zcl.library.impl*</packages>
+						</group>
+					</groups>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<extensions>true</extensions>
+				<configuration>
+					<instructions>
+						<Bundle-Author><![CDATA[
               Giancarlo Riolo <giancarlo.riolo at isti.cnr.it>
             ]]></Bundle-Author>
-            <Bundle-Name>${project.name}</Bundle-Name>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Activator />
-            <Private-Package>
-              com.itaca.ztool.util
-            </Private-Package>
-            <Import-Package>
-             it.cnr.isti.primitivetypes.util,
-              it.cnr.isti.zigbee.api,
-              it.cnr.isti.zigbee.zcl.library.api.*,
-              it.cnr.isti.zigbee.zcl.library.impl.*,
-              org.slf4j; provider=paxlogging
+						<Bundle-Name>${project.name}</Bundle-Name>
+						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+						<Bundle-Activator />
+						<Private-Package>
+							com.itaca.ztool.util
+						</Private-Package>
+						<Import-Package>
+							it.cnr.isti.primitivetypes.util,
+							it.cnr.isti.zigbee.api,
+							it.cnr.isti.zigbee.zcl.library.api.*,
+							it.cnr.isti.zigbee.zcl.library.impl.*,
+							org.slf4j; provider=paxlogging
 
-            </Import-Package>
-            <Export-Package>
-              it.cnr.isti.zigbee.se.zcl.library.api.*;version=${project.version},
-              it.cnr.isti.zigbee.se.zcl.library.impl.*;version=${project.version}
-            </Export-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+						</Import-Package>
+						<Export-Package>
+							it.cnr.isti.zigbee.se.zcl.library.api.*;version=${project.version},
+							it.cnr.isti.zigbee.se.zcl.library.impl.*;version=${project.version}
+						</Export-Package>
+					</instructions>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changelog-plugin</artifactId>
-        <configuration>
-          <type>date</type>
-          <dates>
-            <date implementation="java.lang.String">2013-08-04</date>
-            <date implementation="java.lang.String">2030-12-31</date>
-          </dates>
-          <dateFormat>yyyy-MM-dd</dateFormat>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changelog-plugin</artifactId>
+				<configuration>
+					<type>date</type>
+					<dates>
+						<date implementation="java.lang.String">2013-08-04</date>
+						<date implementation="java.lang.String">2030-12-31</date>
+					</dates>
+					<dateFormat>yyyy-MM-dd</dateFormat>
+				</configuration>
+			</plugin>
+		</plugins>
+	</reporting>
 </project>

Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-zcl-library/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-zcl-library/pom.xml	(original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zb4o-zcl-library/pom.xml	Fri Feb 13 17:43:47 2015
@@ -21,15 +21,14 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.aaloa.zb4osgi</groupId>
-    <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+    <groupId>org.aaloa.zb4o</groupId>
+    <artifactId>pom</artifactId>
     <version>1.0.0</version>
     <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
-  <artifactId>org.aaloa.zb4osgi.zigbee.zcl.library</artifactId>
+  <artifactId>zb4o-zcl-library</artifactId>
   <packaging>bundle</packaging>
-  <version>1.0.0</version>
 
   <name>ZigBee Common Cluster Library</name>
   <url>http://zb4osgi.aaloa.org/</url>
@@ -102,17 +101,17 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-cc2480-datalink</artifactId>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.aaloa.zb4osgi</groupId>
-      <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-basedriver-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.aaloa.zb4o</groupId>
+      <artifactId>zb4o-common</artifactId>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>




More information about the Commit mailing list