[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r977 - in /projects/zb4osgi/sandbox/giancarlo.riolo: zigbee.eh.driver/ zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/cluster/impl/ zigbee.eh.zcl.library/ zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Tue Apr 1 11:44:31 CEST 2014
Author: giancarlo.riolo
Date: Tue Apr 1 11:44:31 2014
New Revision: 977
Log:
Pom Issues.
Modified:
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/cluster/impl/ApplianceControlImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceControlCluster.java
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/pom.xml Tue Apr 1 11:44:31 2014
@@ -1,224 +1,228 @@
<?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.
--->
-<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>10-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.aaloa.zb4osgi.zigbee.eh.driver</artifactId>
- <packaging>bundle</packaging>
- <version>0.1.0-SNAPSHOT</version>
-
- <name>ZigBee Energy at Home Profile Driver</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[
+<!-- 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>10-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>org.aaloa.zb4osgi.zigbee.eh.driver</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.1.0-SNAPSHOT</version>
+
+ <name>ZigBee Energy at Home Profile Driver</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
A Energy at Home Profile refinent driver that is able to refin ZigBeeDevice service
as defined by the ZigBee OSGi Base Driver, using the OSGi Device Access Specification
]]></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>
-
- <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>
-
- <scm>
- <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.eh.driver</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.eh.driver</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.eh.driver</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.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.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>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.common</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-javadoc-plugin</artifactId>
- <configuration>
- <groups>
- <group>
- <title>ZigBee Refinement Driver Extendible Architecture</title>
- <packages>it.cnr.isti.zigbee.ha.driver*:it.cnr.isti.zigbee.ha.cluster.factory:it.cnr.isti.zigbee.ha</packages>
- </group>
- <group>
- <title>Simple ZigBee Cluster API</title>
- <packages>it.cnr.isti.zigbee.eh.cluster.glue*</packages>
- </group>
- <group>
- <title>Home Automation Device API</title>
- <packages>it.cnr.isti.zigbee.eh.device.api*</packages>
- </group>
- <group>
- <title>Default Simple ZigBee Cluster implementation</title>
- <packages>it.cnr.isti.zigbee.eh.cluster.impl*</packages>
- </group>
- <group>
- <title>Default Home Automation Device implementation</title>
- <packages>it.cnr.isti.zigbee.ha.device.factory:it.cnr.isti.zigbee.ha.device.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[
+ <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>
+
+ <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.eh.driver</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.eh.driver</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.eh.driver</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.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>
+ </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>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.aaloa.zb4osgi</groupId>
+ <artifactId>org.aaloa.zb4osgi.zigbee.common</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-javadoc-plugin</artifactId>
+ <configuration>
+ <groups>
+ <group>
+ <title>ZigBee Refinement Driver Extendible Architecture</title>
+ <packages>it.cnr.isti.zigbee.ha.driver*:it.cnr.isti.zigbee.ha.cluster.factory:it.cnr.isti.zigbee.ha</packages>
+ </group>
+ <group>
+ <title>Simple ZigBee Cluster API</title>
+ <packages>it.cnr.isti.zigbee.eh.cluster.glue*</packages>
+ </group>
+ <group>
+ <title>Home Automation Device API</title>
+ <packages>it.cnr.isti.zigbee.eh.device.api*</packages>
+ </group>
+ <group>
+ <title>Default Simple ZigBee Cluster implementation</title>
+ <packages>it.cnr.isti.zigbee.eh.cluster.impl*</packages>
+ </group>
+ <group>
+ <title>Default Home Automation Device implementation</title>
+ <packages>it.cnr.isti.zigbee.ha.device.factory:it.cnr.isti.zigbee.ha.device.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>it.cnr.isti.zigbee.eh.Activator</Bundle-Activator>
- <Import-Package>
- !com.itaca.ztool.api.*,
- it.cnr.isti.zigbee.zcl.*,
- it.cnr.isti.zigbee.eh.zcl.library.*,
- it.cnr.isti.zigbee.api.*,
- it.cnr.isti.osgi.util,
- it.cnr.isti.zigbee.ha.cluster.glue,
- it.cnr.isti.zigbee.ha.driver,
- it.cnr.isti.zigbee.ha.driver.core,
- it.cnr.isti.zigbee.ha.driver.core.reflection,
- it.cnr.isti.zigbee.ha.cluster.glue.general,
- it.cnr.isti.zigbee.ha.cluster.impl,
- it.cnr.isti.zigbee.ha,
- it.cnr.isti.zigbee.ha.cluster.impl.other_profiles.smart_energy,
- org.osgi.*,
- org.slf4j; provider=paxlogging
- </Import-Package>
- <Private-Package>
- it.cnr.isti.primitvetypes.util,
- com.itaca.ztool.util
- </Private-Package>
- <Export-Package>
- it.cnr.isti.zigbee.eh.*;version=${project.version},
- it.cnr.isti.zigbee.eh.cluster.impl.*;version=${project.version},
- it.cnr.isti.zigbee.eh.driver.core.*; ${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>it.cnr.isti.zigbee.eh.Activator</Bundle-Activator>
+ <Import-Package>
+ !com.itaca.ztool.api.*,
+ it.cnr.isti.zigbee.zcl.*,
+ it.cnr.isti.zigbee.eh.zcl.library.*,
+ it.cnr.isti.zigbee.api.*,
+ it.cnr.isti.osgi.util,
+ it.cnr.isti.zigbee.ha.cluster.glue,
+ it.cnr.isti.zigbee.ha.driver,
+ it.cnr.isti.zigbee.ha.driver.core,
+ it.cnr.isti.zigbee.ha.driver.core.reflection,
+ it.cnr.isti.zigbee.ha,
+ it.cnr.isti.zigbee.ha.cluster.impl.other_profiles.smart_energy,
+ org.osgi.*,
+ org.slf4j; provider=paxlogging,
+ it.cnr.isti.zigbee.eh.zcl.library.impl;version=${project.version},
+ it.cnr.isti.zigbee.ha.cluster.glue.general,
+ it.cnr.isti.zigbee.ha.cluster.impl,
+ it.cnr.isti.zigbee.eh.zcl.library.api,
+ it.cnr.isti.zigbee.eh.zcl.library.impl
+
+
+ </Import-Package>
+ <Private-Package>
+ it.cnr.isti.primitvetypes.util,
+ com.itaca.ztool.util
+ </Private-Package>
+ <Export-Package>
+ it.cnr.isti.zigbee.eh.*;version=${project.version},
+ it.cnr.isti.zigbee.eh.cluster.impl.*;version=${project.version},
+ it.cnr.isti.zigbee.eh.driver.core.*; ${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/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/cluster/impl/ApplianceControlImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/cluster/impl/ApplianceControlImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/cluster/impl/ApplianceControlImpl.java Tue Apr 1 11:44:31 2014
@@ -18,42 +18,39 @@
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.
-*/
+ */
package it.cnr.isti.zigbee.eh.cluster.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl;
+import it.cnr.isti.zigbee.eh.zcl.library.impl.ApplianceControlCluster;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
-
/**
- * @author <a href="giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
- *
+ * @author <a href="giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
+ *
*/
-public class ApplianceControlImpl implements ApplianceControl{
-
-// private ApplianceControlCluster applianceControlCluster;
+public class ApplianceControlImpl implements ApplianceControl {
+
+ private ApplianceControlCluster applianceControlCluster;
private Attribute zclVersion;
-
- public ApplianceControlImpl(ZigBeeDevice zbDevice){
- // basicCluster = new BasicCluster(zbDevice);
- // zclVersion = basicCluster.getAttributeZCLVersion();
-
- }
-
-
+ public ApplianceControlImpl(ZigBeeDevice zbDevice) {
+ // basicCluster = new BasicCluster(zbDevice);
+ // zclVersion = basicCluster.getAttributeZCLVersion();
+
+ }
public Attribute getZCLVersion() {
return zclVersion;
}
-
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see it.cnr.isti.zigbee.ha.cluster.glue.Cluster#getId()
*/
public int getId() {
@@ -61,9 +58,9 @@
return 0;
}
-
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see it.cnr.isti.zigbee.ha.cluster.glue.Cluster#getName()
*/
public String getName() {
@@ -71,9 +68,9 @@
return null;
}
-
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see it.cnr.isti.zigbee.ha.cluster.glue.Cluster#getActiveSubscriptions()
*/
public Subscription[] getActiveSubscriptions() {
@@ -81,9 +78,9 @@
return null;
}
-
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see it.cnr.isti.zigbee.ha.cluster.glue.Cluster#getAttributes()
*/
public Attribute[] getAttributes() {
@@ -91,9 +88,9 @@
return null;
}
-
-
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see it.cnr.isti.zigbee.ha.cluster.glue.Cluster#getAttribute(int)
*/
public Attribute getAttribute(int id) {
@@ -101,137 +98,153 @@
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getDescription()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getDescription
+ * ()
*/
public String getDescription() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getBasicIdentification()
+ /*
+ * (non-Javadoc)
+ *
+ * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#
+ * getBasicIdentification()
*/
public long getBasicIdentification() throws ZigBeeHAException {
// TODO Auto-generated method stub
return 0;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getCompanyName()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getCompanyName
+ * ()
*/
public String getCompanyName() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getCompanyId()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getCompanyId
+ * ()
*/
public int getCompanyId() throws ZigBeeHAException {
// TODO Auto-generated method stub
return 0;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getBrandName()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getBrandName
+ * ()
*/
public String getBrandName() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getBrandId()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getBrandId()
*/
public int getBrandId() throws ZigBeeHAException {
// TODO Auto-generated method stub
return 0;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getPartNumber()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getPartNumber
+ * ()
*/
public String getPartNumber() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getProductRevision()
+ /*
+ * (non-Javadoc)
+ *
+ * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#
+ * getProductRevision()
*/
public String getProductRevision() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getSoftwareRevision()
+ /*
+ * (non-Javadoc)
+ *
+ * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#
+ * getSoftwareRevision()
*/
public String getSoftwareRevision() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getApplicationType()
+ /*
+ * (non-Javadoc)
+ *
+ * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#
+ * getApplicationType()
*/
public String getApplicationType() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getProductTypeName()
+ /*
+ * (non-Javadoc)
+ *
+ * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#
+ * getProductTypeName()
*/
public String getProductTypeName() throws ZigBeeHAException {
// TODO Auto-generated method stub
return null;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getProductTypeId()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getProductTypeId
+ * ()
*/
public int getProductTypeId() throws ZigBeeHAException {
// TODO Auto-generated method stub
return 0;
}
-
-
- /* (non-Javadoc)
- * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#getCECEDSpecificationVersion()
+ /*
+ * (non-Javadoc)
+ *
+ * @see it.cnr.isti.zigbee.eh.cluster.glue.general.ApplianceControl#
+ * getCECEDSpecificationVersion()
*/
public short getCECEDSpecificationVersion() throws ZigBeeHAException {
// TODO Auto-generated method stub
return 0;
}
-
-
-
}
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/pom.xml Tue Apr 1 11:44:31 2014
@@ -1,188 +1,184 @@
<?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.zb4osgi</groupId>
+ <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+ <version>10-SNAPSHOT</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>org.aaloa.zb4osgi.zigbee.eh.zcl.library</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.1.0-SNAPSHOT</version>
- <parent>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.pom</artifactId>
- <version>10-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
-
- <artifactId>org.aaloa.zb4osgi.zigbee.eh.zcl.library</artifactId>
- <packaging>bundle</packaging>
- <version>0.1.0-SNAPSHOT</version>
-
- <name>Energy at Home Cluster Library</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[
+ <name>Energy at Home Cluster Library</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
A set of Java classes reppresenting the Energy at Home 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.eh.zcl.library</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.eh.zcl.library</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.eh.zcl.library</url>
- </scm>
+ <scm>
+ <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.eh.zcl.library</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.eh.zcl.library</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.eh.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.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>
- <!-- 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>Energy at Home Cluster Library API</title>
- <packages>it.cnr.isti.zigbee.eh.zcl.library.api*</packages>
- </group>
- <group>
- <title>Energy at Home ZigBee Cluster Library implementation</title>
- <packages>it.cnr.isti.zigbee.eh.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[
+ <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>
+
+ <!-- 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>Energy at Home Cluster Library API</title>
+ <packages>it.cnr.isti.zigbee.eh.zcl.library.api*</packages>
+ </group>
+ <group>
+ <title>Energy at Home ZigBee Cluster Library implementation</title>
+ <packages>it.cnr.isti.zigbee.eh.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.primitvetypes.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.primitvetypes.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.eh.zcl.library.*;version=${project.version},
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- </Import-Package>
- <Export-Package>
- it.cnr.isti.zigbee.eh.zcl.library.api.*;version=${project.version},
- it.cnr.isti.zigbee.eh.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/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceControlCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceControlCluster.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceControlCluster.java Tue Apr 1 11:44:31 2014
@@ -95,6 +95,7 @@
productTypeId, CECEDSpecificationVersion};
}
+
@Override
public short getId() {
return ApplianceControl.ID;
More information about the Commit
mailing list