[zb4osgi-changeset] [scm] ZigBee 4 OSGi repository change: r978 - in /projects/zb4osgi/sandbox/giancarlo.riolo: zigbee.CC2530.driver/ zigbee.basedriver.api/ zigbee.basedriver.stub/ zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/ zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/ zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/ zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/communication/ zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/ zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/util/ zigbee.cc2480.datalink/ zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/af/ zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/ zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/ zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/sniffer/ zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/low/ zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/virtual/ zigbee.common/ zigbee.common/src/main/java/it/cnr/isti/primitvetypes/util/ zigbee.common/src/test/java/it/cnr/isti/collections/ zigbee.common/src/test/java/it/cnr/isti/primitvetypes/util/ zigbee.common/src/test/java/it/cnr/isti/thread/ zigbee.dongle.api/ zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/ zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/api/ zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ zigbee.ez430-rf2480.driver/ zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/ zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/ zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/ zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/cluster/glue/protocol_interfaces/ zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/device/impl/ zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/ zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/ zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/reflection/ zigbee.network.browser/ zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/api/monitor/impl/ zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/network/browser/ui/ zigbee.tester/ zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/ zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/ zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/partition/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/global/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/commands/description/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/read/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/reporting/ zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/write/ zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/ zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/
scm-notify at zb4osgi.aaloa.org
scm-notify at zb4osgi.aaloa.org
Tue Apr 1 12:02:51 CEST 2014
Author: giancarlo.riolo
Date: Tue Apr 1 12:02:50 2014
New Revision: 978
Log:
Cleaning.
Modified:
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.CC2530.driver/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.api/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigBeeNode.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigbeeDeviceBase.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/Activator.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/AFLayer.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/SimpleDriverServiceTracker.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ImportingQueue.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThread.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetwork.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/communication/AFLayerTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThreadTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThreadTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/RetryCountTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetworkTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/util/IEEEAddressTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/af/AF_INCOMING_MSG.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_DEVICE_INFO_RESPONSE.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_NV_INFO_RESPONSE.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/sniffer/FilePacketSniffer.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketParserTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/low/HWLowLevelDriverTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/virtual/EmulatorTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/main/java/it/cnr/isti/primitvetypes/util/Integers.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/collections/CircularBufferIntTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/primitvetypes/util/IntegersTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/thread/ThreadUtilsTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.dongle.api/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/EHDeviceFactory.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/UnknownEHDevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/api/ApplianceIdentification.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceIdentificationCluster.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/Activator.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/BinaryInput.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Metering.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Price.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/CommissioningImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/MessagingImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/PriceImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LevelControlSwitchDevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HADeviceRegistry.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/ReportingConfiguration.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknownHADevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/Activator.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/cluster/glue/protocol_interfaces/GenericTunnel.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/device/impl/DosageSensorDevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/HCDriverConfiguration.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/GenericHCDeviceFactory.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCClustersFactory.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceBase.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceRegistry.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDevice.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDeviceFactory.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/reflection/DeviceDescription.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/api/monitor/impl/ZigBeeDiscoveryMonitorImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/network/browser/ui/NetworkGraph.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/pom.xml
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/AttributeActionPanel.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/Command.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/CommandTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/HADeviceTreeNodeTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/Attribute.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/partition/WriteHandshakeParamResponse.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/global/DefaultResponse.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AbstractAttribute.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AttributeDescriptor.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/commands/description/PartitionCommandsDescriptor.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/AttributeImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetAddSceneImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetViewResponseImpl.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/read/ReadAttributeCommand.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/reporting/ConfigureReportingCommand.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/write/WriteAttributeCommand.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/AlarmsClusterTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsClusterTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommandTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupResponseImplTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommandTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipResponseImplTest.java
projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/ViewGroupResponseImplTest.java
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.CC2530.driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.CC2530.driver/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.CC2530.driver/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,40 +1,33 @@
<?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>
-
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.CC2530.driver</artifactId>
- <version>0.3.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>ZIC for CC253x devices</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.CC2530.driver</artifactId>
+ <version>0.3.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>ZIC for CC253x devices</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
Implementation of the ZigBee Controller Interface API for a CC2530/CC2531 chip based devices.
The firmware is based on the Z-Stack 2.x and the serial port communication protocol has been
adapted to be complaint with the "Z-Stack Monitor and Test API"
@@ -42,115 +35,117 @@
with CC2530EMK, and Open2530
]]></description>
- <inceptionYear>2011</inceptionYear>
- <organization>
- <name><![CDATA[
+ <inceptionYear>2011</inceptionYear>
+ <organization>
+ <name><![CDATA[
ISTI-CNR, Institute of Information Science and Technologies of the Italian National Research Council and 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>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>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>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>
- <developer>
- <id>manlio.bacco</id>
- <name>Manlio Bacco</name>
- <email>manlio.bacco at isti.cnr.it</email>
- <organization>Instituto Tecnologico de Aplicaciones de Comunicacion Avanzadas - Grupo Tecnologias para la Salud y el Bienestar (TSB)</organization>
- <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
- <timezone>+1</timezone>
- </developer>
- </developers>
-
- <repositories>
- <repository>
- <id>nexus.aaloa.org</id>
- <url>http://nexus.aaloa.org/content/repositories/releases/</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- </repositories>
-
- <scm>
- <connection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.CC2530.driver</connection>
- <developerConnection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.CC2530.driver</developerConnection>
- <url>http://zb4osgi.aaloa.org/redmine/projects/zb4osgi/repository/show/trunk/zigbee.CC2530.driver</url>
- </scm>
-
- <dependencies>
- <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.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.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.bundle.rxtx</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <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>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>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>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>
+ <developer>
+ <id>manlio.bacco</id>
+ <name>Manlio Bacco</name>
+ <email>manlio.bacco at isti.cnr.it</email>
+ <organization>Instituto Tecnologico de Aplicaciones de Comunicacion Avanzadas - Grupo Tecnologias para la Salud y el Bienestar (TSB)</organization>
+ <organizationUrl>http://www.isti.cnr.it/</organizationUrl>
+ <timezone>+1</timezone>
+ </developer>
+ </developers>
+
+ <repositories>
+ <repository>
+ <id>nexus.aaloa.org</id>
+ <url>http://nexus.aaloa.org/content/repositories/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
+ <scm>
+ <connection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.CC2530.driver</connection>
+ <developerConnection>scm:svn:https://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.CC2530.driver</developerConnection>
+ <url>http://zb4osgi.aaloa.org/redmine/projects/zb4osgi/repository/show/trunk/zigbee.CC2530.driver</url>
+ </scm>
+
+ <dependencies>
+ <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.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.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.bundle.rxtx</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <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>
@@ -158,59 +153,59 @@
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[
Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>,
Ãlvaro Fides Valero <alfiva at aaa.upv.es>,
Michele Girolami <michele.girolami at isti.cnr.it>,
Manlio Bacco <manlio.bacco at isti.cnr.it>
]]></Bundle-Author>
- <Bundle-Name>${pom.name}</Bundle-Name>
- <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>it.cnr.isti.zigbee.dongle.CC2530.Activator</Bundle-Activator>
- <Private-Package>
- it.cnr.isti.zigbee.dongle.CC2530.*
- </Private-Package>
- <Import-Package>
- org.osgi.*,
- gnu.io.*,
- com.itaca.ztool.*,
- it.cnr.isti.zigbee.dongle.api*,
- it.cnr.isti.cc2480.*, javax.swing,
- it.cnr.isti.primitvetypes.util, it.cnr.isti.osgi.util,
- org.slf4j.*; provider=paxlogging
- </Import-Package>
- <Export-Package>
- </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>${pom.name}</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator>it.cnr.isti.zigbee.dongle.CC2530.Activator</Bundle-Activator>
+ <Private-Package>
+ it.cnr.isti.zigbee.dongle.CC2530.*
+ </Private-Package>
+ <Import-Package>
+ org.osgi.*,
+ gnu.io.*,
+ com.itaca.ztool.*,
+ it.cnr.isti.zigbee.dongle.api*,
+ it.cnr.isti.cc2480.*, javax.swing,
+ it.cnr.isti.primitvetypes.util, it.cnr.isti.osgi.util,
+ org.slf4j.*; provider=paxlogging
+ </Import-Package>
+ <Export-Package>
+ </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.basedriver.api/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.api/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.api/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,153 +1,148 @@
<?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>
-
- <parent>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.pom</artifactId>
- <version>10-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>ZigBee Base Driver API for OSGi</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[API of the ZigBee Base Driver]]></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>
-
- <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>
- <scm>
- <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.api</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.api</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.basedriver.api</url>
- </scm>
-
- <developers>
- <developer>
- <id>slenzi</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>ffurfari</id>
- <name>Francesco Furfari</name>
- <email>francesco.furfari 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>
+ <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</artifactId>
+ <version>0.7.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <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.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <groups>
- <group>
- <title>ZigBee Base Driver API</title>
- <packages>it.cnr.isti.zigbee.api*</packages>
- </group>
- </groups>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Author>
+ <name>ZigBee Base Driver API for OSGi</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[API of the ZigBee Base Driver]]></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>
+
+ <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>
+
+ <scm>
+ <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.api</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.api</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.basedriver.api</url>
+ </scm>
+
+ <developers>
+ <developer>
+ <id>slenzi</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>ffurfari</id>
+ <name>Francesco Furfari</name>
+ <email>francesco.furfari 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>
+
+ <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.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <groups>
+ <group>
+ <title>ZigBee Base Driver API</title>
+ <packages>it.cnr.isti.zigbee.api*</packages>
+ </group>
+ </groups>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Author>
<![CDATA[
Francesco Furfari <francesco.furfari at isti.cnr.it>,
Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>,
Manlio Bacco <manlio.bacco at isti.cnr.it>
]]>
- </Bundle-Author>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Activator />
- <Private-Package>
- </Private-Package>
- <Import-Package>
- </Import-Package>
- <Export-Package>
- org.aaloa.zb4osgi.api.*;version=${pom.version},
- it.cnr.isti.zigbee.api.*;version=${pom.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-Author>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Activator />
+ <Private-Package>
+ </Private-Package>
+ <Import-Package>
+ </Import-Package>
+ <Export-Package>
+ org.aaloa.zb4osgi.api.*;version=${pom.version},
+ it.cnr.isti.zigbee.api.*;version=${pom.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.basedriver.stub/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,123 +1,118 @@
<?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>
- <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.basedriver.stub</artifactId>
+ <version>0.2.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.stub</artifactId>
- <version>0.2.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>STUB implementation of:OSGi ZigBee Base Driver</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[
+ <name>STUB implementation of:OSGi ZigBee Base Driver</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
An implementation of a ZigBee Base Driver
]]></description>
- <scm>
- <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.stub</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.stub</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.basedriver.stub</url>
- </scm>
+ <scm>
+ <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.stub</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.basedriver.stub</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.basedriver.stub</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.basedriver.api</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>
- </dependencies>
+ <repositories>
+ <repository>
+ <id>nexus.aaloa.org</id>
+ <url>http://nexus.aaloa.org/content/repositories/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
- <build>
- <plugins>
- <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>it.cnr.isti.basedriver.stub.Activator</Bundle-Activator>
- <Private-Package>
- it.cnr.isti.basedriver.stub.*,
- </Private-Package>
- <Import-Package>
- it.cnr.isti.zigbee.api.*,
- org.osgi.*,
- org.slf4j; provider=paxlogging
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.aaloa.zb4osgi</groupId>
+ <artifactId>org.aaloa.zb4osgi.zigbee.basedriver.api</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>
+ </dependencies>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changelog-plugin</artifactId>
- <configuration>
- <type>date</type>
- <dates>
- <date implementation="java.lang.String">2010-09-16</date>
- <date implementation="java.lang.String">2029-12-31</date>
- </dates>
- <dateFormat>yyyy-MM-dd</dateFormat>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+ <build>
+ <plugins>
+ <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>it.cnr.isti.basedriver.stub.Activator</Bundle-Activator>
+ <Private-Package>
+ it.cnr.isti.basedriver.stub.*,
+ </Private-Package>
+ <Import-Package>
+ it.cnr.isti.zigbee.api.*,
+ org.osgi.*,
+ org.slf4j; provider=paxlogging
+ </Import-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">2010-09-16</date>
+ <date implementation="java.lang.String">2029-12-31</date>
+ </dates>
+ <dateFormat>yyyy-MM-dd</dateFormat>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
</project>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigBeeNode.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigBeeNode.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigBeeNode.java Tue Apr 1 12:02:50 2014
@@ -21,9 +21,9 @@
*/
package it.cnr.isti.basedriver.stub.api.impl;
+import it.cnr.isti.zigbee.api.ZigBeeNode;
+
import java.util.Dictionary;
-
-import it.cnr.isti.zigbee.api.ZigBeeNode;
/**
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigbeeDeviceBase.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigbeeDeviceBase.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver.stub/src/main/java/it/cnr/isti/basedriver/stub/api/impl/StubZigbeeDeviceBase.java Tue Apr 1 12:02:50 2014
@@ -21,16 +21,16 @@
*/
package it.cnr.isti.basedriver.stub.api.impl;
-import java.util.Arrays;
-import java.util.Dictionary;
-import java.util.HashSet;
-import java.util.Properties;
-
import it.cnr.isti.zigbee.api.Cluster;
import it.cnr.isti.zigbee.api.ClusterListner;
import it.cnr.isti.zigbee.api.ZigBeeBasedriverException;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.api.ZigBeeNode;
+
+import java.util.Arrays;
+import java.util.Dictionary;
+import java.util.HashSet;
+import java.util.Properties;
/**
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/Activator.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/Activator.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/Activator.java Tue Apr 1 12:02:50 2014
@@ -25,15 +25,11 @@
import gnu.trove.TByteObjectHashMap;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.basedriver.api.impl.ZigBeeDeviceImpl;
-import it.cnr.isti.zigbee.basedriver.api.impl.ZigBeeNodeImpl;
import it.cnr.isti.zigbee.basedriver.communication.SimpleDriverServiceTracker;
import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
import java.util.Properties;
import org.osgi.framework.BundleActivator;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/AFLayer.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/AFLayer.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/AFLayer.java Tue Apr 1 12:02:50 2014
@@ -34,8 +34,6 @@
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
import java.util.Collection;
-
-import javax.naming.spi.DirStateFactory.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/SimpleDriverServiceTracker.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/SimpleDriverServiceTracker.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/communication/SimpleDriverServiceTracker.java Tue Apr 1 12:02:50 2014
@@ -22,8 +22,6 @@
package it.cnr.isti.zigbee.basedriver.communication;
-import java.util.EnumSet;
-
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.configuration.BaseDriverProperties;
import it.cnr.isti.zigbee.basedriver.configuration.BaseDriverProperties.DiscoveryMode;
@@ -33,6 +31,8 @@
import it.cnr.isti.zigbee.basedriver.discovery.LQINetworkBrowserThread;
import it.cnr.isti.zigbee.basedriver.discovery.NetworkBrowserThread;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
+
+import java.util.EnumSet;
import org.osgi.framework.ServiceEvent;
import org.osgi.framework.ServiceListener;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/configuration/ConfigurationService.java Tue Apr 1 12:02:50 2014
@@ -29,8 +29,8 @@
import it.cnr.isti.zigbee.basedriver.configuration.BaseDriverProperties.DiscoveryMode;
import it.cnr.isti.zigbee.dongle.api.ConfigurationProperties;
import it.cnr.isti.zigbee.dongle.api.DriverStatus;
+import it.cnr.isti.zigbee.dongle.api.DuplicateMacPolicy;
import it.cnr.isti.zigbee.dongle.api.NetworkMode;
-import it.cnr.isti.zigbee.dongle.api.DuplicateMacPolicy;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
import java.util.Dictionary;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThread.java Tue Apr 1 12:02:50 2014
@@ -23,7 +23,6 @@
package it.cnr.isti.zigbee.basedriver.discovery;
import gnu.trove.TByteObjectHashMap;
-import gnu.trove.TShortObjectHashMap;
import it.cnr.isti.thread.Stoppable;
import it.cnr.isti.thread.ThreadUtils;
import it.cnr.isti.zigbee.api.ZigBeeBasedriverException;
@@ -38,7 +37,6 @@
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
import it.cnr.isti.zigbee.util.IEEEAddress;
-import java.awt.Desktop.Action;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ImportingQueue.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ImportingQueue.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ImportingQueue.java Tue Apr 1 12:02:50 2014
@@ -21,8 +21,6 @@
*/
package it.cnr.isti.zigbee.basedriver.discovery;
-
-import it.cnr.isti.thread.ThreadUtils;
import java.util.ArrayList;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThread.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThread.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThread.java Tue Apr 1 12:02:50 2014
@@ -25,18 +25,15 @@
import gnu.trove.TShortObjectHashMap;
import it.cnr.isti.primitvetypes.util.Integers;
import it.cnr.isti.thread.RunnableThread;
-import it.cnr.isti.thread.Stoppable;
import it.cnr.isti.thread.ThreadUtils;
import it.cnr.isti.zigbee.api.ZigBeeNode;
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.api.impl.ZigBeeNodeImpl;
-import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
import java.util.ArrayList;
import org.aaloa.zb4osgi.api.monitor.ZigBeeDiscoveryMonitor;
-import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetwork.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetwork.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/main/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetwork.java Tue Apr 1 12:02:50 2014
@@ -25,19 +25,14 @@
import gnu.trove.TIntObjectHashMap;
import gnu.trove.TShortObjectHashMap;
import gnu.trove.TShortObjectIterator;
-import it.cnr.isti.zigbee.api.Cluster;
-import it.cnr.isti.zigbee.api.ClusterListner;
-import it.cnr.isti.zigbee.api.ZigBeeBasedriverException;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.api.ZigBeeNode;
import it.cnr.isti.zigbee.basedriver.Activator;
-import it.cnr.isti.zigbee.basedriver.api.impl.ZigBeeDeviceImpl;
import it.cnr.isti.zigbee.basedriver.api.impl.ZigBeeNodeImpl;
import it.cnr.isti.zigbee.dongle.api.DuplicateMacPolicy;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Dictionary;
import java.util.Hashtable;
import org.slf4j.Logger;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/communication/AFLayerTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/communication/AFLayerTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/communication/AFLayerTest.java Tue Apr 1 12:02:50 2014
@@ -22,11 +22,11 @@
package it.cnr.isti.zigbee.basedriver.communication;
-import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.createMock;
-import static org.easymock.classextension.EasyMock.replay;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.communication.AFLayer.SenderIdentifier;
import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
@@ -34,8 +34,6 @@
import org.junit.Before;
import org.junit.Test;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.InvalidSyntaxException;
/**
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThreadTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThreadTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/DeviceBuilderThreadTest.java Tue Apr 1 12:02:50 2014
@@ -22,12 +22,11 @@
package it.cnr.isti.zigbee.basedriver.discovery;
import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.*;
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
import static org.junit.Assert.assertEquals;
-
-import java.util.ArrayList;
-
import it.cnr.isti.thread.ThreadUtils;
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
@@ -38,7 +37,6 @@
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThreadTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThreadTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/NetworkBrowserThreadTest.java Tue Apr 1 12:02:50 2014
@@ -20,11 +20,13 @@
limitations under the License.
*/
package it.cnr.isti.zigbee.basedriver.discovery;
-import static org.easymock.classextension.EasyMock.*;
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import it.cnr.isti.thread.ThreadUtils;
-import it.cnr.isti.zigbee.api.ZigBeeNode;
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/RetryCountTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/RetryCountTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/RetryCountTest.java Tue Apr 1 12:02:50 2014
@@ -22,24 +22,24 @@
package it.cnr.isti.zigbee.basedriver.discovery;
import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
import static org.easymock.EasyMock.expect;
-import static org.easymock.classextension.EasyMock.*;
-import static org.junit.Assert.*;
-
-import java.lang.Thread.UncaughtExceptionHandler;
-import java.util.ArrayList;
-
+import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertNull;
import it.cnr.isti.thread.ThreadUtils;
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
import it.cnr.isti.zigbee.dongle.api.DuplicateMacPolicy;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
+import java.lang.Thread.UncaughtExceptionHandler;
+
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
-import org.osgi.framework.ServiceRegistration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetworkTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetworkTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/basedriver/discovery/ZigBeeNetworkTest.java Tue Apr 1 12:02:50 2014
@@ -26,12 +26,10 @@
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
-import static org.easymock.classextension.EasyMock.*;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.api.ZigBeeNode;
import it.cnr.isti.zigbee.basedriver.Activator;
import it.cnr.isti.zigbee.basedriver.api.impl.ZigBeeNodeImpl;
import it.cnr.isti.zigbee.basedriver.configuration.ConfigurationService;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/util/IEEEAddressTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/util/IEEEAddressTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.basedriver/src/test/java/it/cnr/isti/zigbee/util/IEEEAddressTest.java Tue Apr 1 12:02:50 2014
@@ -24,7 +24,6 @@
import static org.junit.Assert.assertEquals;
-import org.junit.Ignore;
import org.junit.Test;
import com.itaca.ztool.api.ZToolAddress64;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,163 +1,158 @@
<?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>
-
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</artifactId>
- <version>0.9.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>CC2480 Data Link protocol library</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.cc2480.datalink</artifactId>
+ <version>0.9.0-SNAPSHOT</version>
+ <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>
- <version>0.5.0</version>
- </dependency>
- <dependency>
- <groupId>org.aaloa.zb4osgi.bundle</groupId>
- <artifactId>org.aaloa.zb4osgi.bundle.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.zb4osgi</groupId>
+ <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+ <version>0.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aaloa.zb4osgi.bundle</groupId>
+ <artifactId>org.aaloa.zb4osgi.bundle.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>
@@ -165,59 +160,59 @@
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>,
Manlio Bacco <manlio.bacco at isti.cnr.it>,
Ãlvaro Fides Valero <alfiva at aaa.upv.es>
]]></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.primitvetypes.util, it.cnr.isti.osgi.util,
- gnu.io.*, javax.swing.*,
- org.slf4j.*; provider=paxlogging
- </Import-Package>
- <Export-Package>
- com.itaca.ztool.*;version=${pom.version},
- it.cnr.isti.cc2480.*;version=${pom.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.primitvetypes.util, it.cnr.isti.osgi.util,
+ gnu.io.*, javax.swing.*,
+ org.slf4j.*; provider=paxlogging
+ </Import-Package>
+ <Export-Package>
+ com.itaca.ztool.*;version=${pom.version},
+ it.cnr.isti.cc2480.*;version=${pom.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.cc2480.datalink/src/main/java/com/itaca/ztool/api/af/AF_INCOMING_MSG.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/af/AF_INCOMING_MSG.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/af/AF_INCOMING_MSG.java Tue Apr 1 12:02:50 2014
@@ -22,8 +22,6 @@
*/
package com.itaca.ztool.api.af;
-
-import it.cnr.isti.cc2480.low.HWLowLevelDriver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_DEVICE_INFO_RESPONSE.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_DEVICE_INFO_RESPONSE.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_DEVICE_INFO_RESPONSE.java Tue Apr 1 12:02:50 2014
@@ -22,9 +22,9 @@
*/
package com.itaca.ztool.api.util;
-import com.itaca.ztool.api.ZToolCMD;
import com.itaca.ztool.api.ZToolAddress16;
import com.itaca.ztool.api.ZToolAddress64;
+import com.itaca.ztool.api.ZToolCMD;
import com.itaca.ztool.api.ZToolPacket;
import com.itaca.ztool.util.DoubleByte;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_NV_INFO_RESPONSE.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_NV_INFO_RESPONSE.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/com/itaca/ztool/api/util/UTIL_GET_NV_INFO_RESPONSE.java Tue Apr 1 12:02:50 2014
@@ -22,8 +22,8 @@
*/
package com.itaca.ztool.api.util;
+import com.itaca.ztool.api.ZToolAddress64;
import com.itaca.ztool.api.ZToolCMD;
-import com.itaca.ztool.api.ZToolAddress64;
import com.itaca.ztool.api.ZToolPacket;
import com.itaca.ztool.util.ByteUtils;
import com.itaca.ztool.util.DoubleByte;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/high/HWHighLevelDriver.java Tue Apr 1 12:02:50 2014
@@ -27,12 +27,10 @@
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Enumeration;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Iterator;
-import java.util.Map;
import java.util.Map.Entry;
import org.slf4j.Logger;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/sniffer/FilePacketSniffer.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/sniffer/FilePacketSniffer.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/main/java/it/cnr/isti/cc2480/sniffer/FilePacketSniffer.java Tue Apr 1 12:02:50 2014
@@ -20,8 +20,6 @@
limitations under the License.
*/
package it.cnr.isti.cc2480.sniffer;
-import it.cnr.isti.cc2480.sniffer.SnifferInterface;
-
import java.io.FileOutputStream;
import java.io.PrintStream;
import java.text.SimpleDateFormat;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketParserTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketParserTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketParserTest.java Tue Apr 1 12:02:50 2014
@@ -20,14 +20,12 @@
*/
package com.itaca.ztool.api;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import it.cnr.isti.cc2480.virtual.Emulator;
import java.io.IOException;
-import java.security.GuardedObject;
-
-import it.cnr.isti.cc2480.low.HWLowLevelDriver;
-import it.cnr.isti.cc2480.low.PacketListener;
-import it.cnr.isti.cc2480.virtual.Emulator;
import org.junit.Test;
import org.slf4j.Logger;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/api/ZToolPacketTest.java Tue Apr 1 12:02:50 2014
@@ -27,7 +27,6 @@
import com.itaca.ztool.api.ZToolPacket.CommandSubsystem;
import com.itaca.ztool.api.ZToolPacket.CommandType;
import com.itaca.ztool.api.af.AF_DATA_CONFIRM;
-import com.itaca.ztool.api.af.AF_DATA_REQUEST;
import com.itaca.ztool.api.simple.ZB_GET_DEVICE_INFO;
import com.itaca.ztool.api.system.SYS_VERSION;
import com.itaca.ztool.api.zdo.ZDO_ACTIVE_EP_REQ;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/com/itaca/ztool/util/ByteUtilsTest.java Tue Apr 1 12:02:50 2014
@@ -20,10 +20,11 @@
limitations under the License.
*/
package com.itaca.ztool.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import org.junit.Test;
-import org.junit.internal.runners.statements.ExpectException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/low/HWLowLevelDriverTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/low/HWLowLevelDriverTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/low/HWLowLevelDriverTest.java Tue Apr 1 12:02:50 2014
@@ -19,15 +19,13 @@
limitations under the License.
*/
package it.cnr.isti.cc2480.low;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import it.cnr.isti.cc2480.virtual.Emulator;
import java.io.IOException;
-import it.cnr.isti.cc2480.virtual.Emulator;
-
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.itaca.ztool.api.ZToolException;
import com.itaca.ztool.api.ZToolPacket;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/virtual/EmulatorTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/virtual/EmulatorTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.cc2480.datalink/src/test/java/it/cnr/isti/cc2480/virtual/EmulatorTest.java Tue Apr 1 12:02:50 2014
@@ -20,14 +20,9 @@
*/
package it.cnr.isti.cc2480.virtual;
-import static org.junit.Assert.*;
-
-import it.cnr.isti.cc2480.virtual.Emulator;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Arrays;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,161 +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
+<!-- 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>
- <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.common</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>OSGi and Primitive Types Utility</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[
+ <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>
-
- <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>
-
- <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>
-
- <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>
- <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>
- </dependencies>
+ <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>
- <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[
+ <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>
+
+ <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>
+
+ <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>
+ <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>
+ </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>
+
+ <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=${pom.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.*,
+ org.slf4j; provider=paxlogging
+ </Import-Package>
+ <Export-Package>
+ it.cnr.isti.*;version=${pom.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.common/src/main/java/it/cnr/isti/primitvetypes/util/Integers.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/main/java/it/cnr/isti/primitvetypes/util/Integers.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/main/java/it/cnr/isti/primitvetypes/util/Integers.java Tue Apr 1 12:02:50 2014
@@ -22,7 +22,6 @@
package it.cnr.isti.primitvetypes.util;
-import java.util.Arrays;
/**
* An utility class that contains method for:<br>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/collections/CircularBufferIntTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/collections/CircularBufferIntTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/collections/CircularBufferIntTest.java Tue Apr 1 12:02:50 2014
@@ -20,7 +20,10 @@
limitations under the License.
*/
package it.cnr.isti.collections;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
import org.slf4j.Logger;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/primitvetypes/util/IntegersTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/primitvetypes/util/IntegersTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/primitvetypes/util/IntegersTest.java Tue Apr 1 12:02:50 2014
@@ -22,8 +22,11 @@
package it.cnr.isti.primitvetypes.util;
-import static org.junit.Assert.*;
-import junit.framework.Assert;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.junit.Test;
/**
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/thread/ThreadUtilsTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/thread/ThreadUtilsTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.common/src/test/java/it/cnr/isti/thread/ThreadUtilsTest.java Tue Apr 1 12:02:50 2014
@@ -22,11 +22,7 @@
package it.cnr.isti.thread;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.*;
-import junit.framework.Assert;
+import static org.junit.Assert.assertTrue;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.dongle.api/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.dongle.api/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.dongle.api/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,159 +1,154 @@
<?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>
- <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.dongle.api</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.dongle.api</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>ZigBee Interface Controller API</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[
+ <name>ZigBee Interface Controller API</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
The API of the a generic dongle that allows access to the ZigBee Network
]]></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>
- <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>
- </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>
+ <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>
+ </developers>
- <scm>
- <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.dongle.api</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.dongle.api</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.dongle.api</url>
- </scm>
+ <scm>
+ <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.dongle.api</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.dongle.api</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.dongle.api</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.common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.cc2480.datalink</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>
- </dependencies>
+ <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.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>
+ </dependencies>
- <build>
- <plugins>
- <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.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Author><![CDATA[
Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>,
Manlio Bacco <manlio.bacco at isti.cnr.it>
]]></Bundle-Author>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Private-Package>
- </Private-Package>
- <Export-Package>
- it.cnr.isti.zigbee.dongle.api.*;version=${pom.version}
- </Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Private-Package>
+ </Private-Package>
+ <Export-Package>
+ it.cnr.isti.zigbee.dongle.api.*;version=${pom.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.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/EHDeviceFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/EHDeviceFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/EHDeviceFactory.java Tue Apr 1 12:02:50 2014
@@ -23,6 +23,8 @@
package it.cnr.isti.zigbee.eh.driver.core;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import org.osgi.framework.ServiceReference;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/UnknownEHDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/UnknownEHDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.driver/src/main/java/it/cnr/isti/zigbee/eh/driver/core/UnknownEHDevice.java Tue Apr 1 12:02:50 2014
@@ -25,8 +25,6 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.eh.Activator;
import it.cnr.isti.zigbee.eh.driver.EHDriverConfiguration.ProvidedClusterMode;
-import it.cnr.isti.zigbee.eh.driver.core.EHDevice;
-import it.cnr.isti.zigbee.eh.driver.core.EHDeviceBase;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.ha.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.ha.driver.core.reflection.DeviceDescription;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/api/ApplianceIdentification.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/api/ApplianceIdentification.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/api/ApplianceIdentification.java Tue Apr 1 12:02:50 2014
@@ -23,9 +23,7 @@
package it.cnr.isti.zigbee.eh.zcl.library.api;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
-import it.cnr.isti.zigbee.zcl.library.api.core.Response;
import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
-import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
/**
* This class represent the <b>Appliance Identification</b> Cluster as defined
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceIdentificationCluster.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceIdentificationCluster.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.eh.zcl.library/src/main/java/it/cnr/isti/zigbee/eh/zcl/library/impl/ApplianceIdentificationCluster.java Tue Apr 1 12:02:50 2014
@@ -25,8 +25,6 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.eh.zcl.library.api.ApplianceIdentification;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
-import it.cnr.isti.zigbee.zcl.library.api.core.Response;
-import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
import it.cnr.isti.zigbee.zcl.library.impl.attribute.Attributes;
import it.cnr.isti.zigbee.zcl.library.impl.core.AttributeImpl;
import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLClusterBase;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,169 +1,164 @@
<?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>
- <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.ez430-rf2480.driver</artifactId>
+ <version>0.8.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.ez430-rf2480.driver</artifactId>
- <version>0.8.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>ZIC for EZ430-RF2480 dongle</name>
- <url>http://zb4osgi.aaloa.org/</url>
- <description><![CDATA[
+ <name>ZIC for EZ430-RF2480 dongle</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
Implementation of the ZigBee Controller Interface API for the usb device
designed by Texas Instrument called EZ430-RF2480. In theory this driver
can be used to interact any device complaint with the protocol defined in
the document "CC2480 Serial Interface".
]]></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>
-
- <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>slenzi</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>
+ <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>
- <scm>
- <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.ez430-rf2480.driver</url>
- </scm>
+ <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>
- <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.bundle</groupId>
- <artifactId>org.aaloa.zb4osgi.bundle.rxtx</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.apache.felix</groupId>
- <artifactId>org.osgi.core</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>
+ <developers>
+ <developer>
+ <id>slenzi</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>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Author><![CDATA[
+ <scm>
+ <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.ez430-rf2480.driver</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.ez430-rf2480.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.bundle</groupId>
+ <artifactId>org.aaloa.zb4osgi.bundle.rxtx</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.apache.felix</groupId>
+ <artifactId>org.osgi.core</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.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>it.cnr.isti.zigbee.dongle.ez430rf2480.Activator</Bundle-Activator>
- <Private-Package>
- it.cnr.isti.zigbee.dongle.ez430rf2480.*
- </Private-Package>
- <Import-Package>
- org.osgi.*,
- gnu.io.*,
- com.itaca.ztool.*,
- it.cnr.isti.zigbee.dongle.api*,
- it.cnr.isti.cc2480.*,
- it.cnr.isti.primitvetypes.util, it.cnr.isti.osgi.util,
- org.slf4j.*; provider=paxlogging
- </Import-Package>
- <Export-Package>
- </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.dongle.ez430rf2480.Activator</Bundle-Activator>
+ <Private-Package>
+ it.cnr.isti.zigbee.dongle.ez430rf2480.*
+ </Private-Package>
+ <Import-Package>
+ org.osgi.*,
+ gnu.io.*,
+ com.itaca.ztool.*,
+ it.cnr.isti.zigbee.dongle.api*,
+ it.cnr.isti.cc2480.*,
+ it.cnr.isti.primitvetypes.util, it.cnr.isti.osgi.util,
+ org.slf4j.*; provider=paxlogging
+ </Import-Package>
+ <Export-Package>
+ </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.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/Activator.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/Activator.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ez430-rf2480.driver/src/main/java/it/cnr/isti/zigbee/dongle/ez430rf2480/Activator.java Tue Apr 1 12:02:50 2014
@@ -21,13 +21,13 @@
*/
package it.cnr.isti.zigbee.dongle.ez430rf2480;
-import java.util.Properties;
-
import it.cnr.isti.osgi.util.OSGiProperties;
import it.cnr.isti.zigbee.dongle.api.ConfigurationProperties;
import it.cnr.isti.zigbee.dongle.api.NetworkMode;
import it.cnr.isti.zigbee.dongle.api.SimpleDriver;
import it.cnr.isti.zigbee.dongle.ez430rf2480.impl.DriverEZ430_RF2480;
+
+import java.util.Properties;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/BinaryInput.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/BinaryInput.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/general/BinaryInput.java Tue Apr 1 12:02:50 2014
@@ -25,7 +25,6 @@
import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
import it.cnr.isti.zigbee.ha.cluster.glue.general.event.PresentValueListener;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
-import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
/**
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Metering.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Metering.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Metering.java Tue Apr 1 12:02:50 2014
@@ -22,10 +22,10 @@
package it.cnr.isti.zigbee.ha.cluster.glue.other_profiles.smart_energy;
-import java.util.Date;
-
import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import java.util.Date;
/**
*
* @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Price.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Price.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/glue/other_profiles/smart_energy/Price.java Tue Apr 1 12:02:50 2014
@@ -22,10 +22,10 @@
package it.cnr.isti.zigbee.ha.cluster.glue.other_profiles.smart_energy;
-import java.util.Date;
-
import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
+
+import java.util.Date;
/**
*
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/CommissioningImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/CommissioningImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/CommissioningImpl.java Tue Apr 1 12:02:50 2014
@@ -30,7 +30,6 @@
import it.cnr.isti.zigbee.zcl.library.api.core.Status;
import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
import it.cnr.isti.zigbee.zcl.library.impl.general.CommissioningCluster;
-import it.cnr.isti.zigbee.zcl.library.impl.general.TimeCluster;
/**
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/MessagingImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/MessagingImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/MessagingImpl.java Tue Apr 1 12:02:50 2014
@@ -25,7 +25,6 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.ha.cluster.glue.other_profiles.smart_energy.Messaging;
import it.cnr.isti.zigbee.se.zcl.library.impl.MessagingCluster;
-import it.cnr.isti.zigbee.se.zcl.library.impl.MeteringCluster;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/PriceImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/PriceImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/cluster/impl/other_profiles/smart_energy/PriceImpl.java Tue Apr 1 12:02:50 2014
@@ -21,8 +21,6 @@
*/
package it.cnr.isti.zigbee.ha.cluster.impl.other_profiles.smart_energy;
-
-import java.util.Date;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.ha.cluster.glue.other_profiles.smart_energy.Price;
@@ -32,6 +30,8 @@
import it.cnr.isti.zigbee.zcl.library.api.core.Subscription;
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
+import java.util.Date;
+
/**
*
* @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/GenericHADevice.java Tue Apr 1 12:02:50 2014
@@ -24,7 +24,6 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
-import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.ha.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.ha.driver.core.reflection.DeviceDescription;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LevelControlSwitchDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LevelControlSwitchDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/device/impl/LevelControlSwitchDevice.java Tue Apr 1 12:02:50 2014
@@ -23,12 +23,7 @@
package it.cnr.isti.zigbee.ha.device.impl;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.Identify;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.LevelControl;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOffSwitchConfiguration;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
import it.cnr.isti.zigbee.ha.device.api.generic.LevelControlSwitch;
import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HADeviceRegistry.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HADeviceRegistry.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/HADeviceRegistry.java Tue Apr 1 12:02:50 2014
@@ -25,7 +25,6 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.ha.driver.HAImporter;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/ReportingConfiguration.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/ReportingConfiguration.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/ReportingConfiguration.java Tue Apr 1 12:02:50 2014
@@ -21,8 +21,6 @@
*/
package it.cnr.isti.zigbee.ha.driver.core;
-
-import it.cnr.isti.zigbee.ha.driver.HADriverConfiguration;
import org.osgi.framework.Constants;
import org.osgi.service.cm.ManagedService;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknownHADevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknownHADevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.ha.driver/src/main/java/it/cnr/isti/zigbee/ha/driver/core/UnknownHADevice.java Tue Apr 1 12:02:50 2014
@@ -24,15 +24,7 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.ha.Activator;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.Groups;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.OnOff;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.Scenes;
-import it.cnr.isti.zigbee.ha.cluster.glue.measureament_sensing.OccupancySensing;
-import it.cnr.isti.zigbee.ha.device.api.lighting.OnOffLight;
import it.cnr.isti.zigbee.ha.driver.HADriverConfiguration.ProvidedClusterMode;
-import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
-import it.cnr.isti.zigbee.ha.driver.core.HAProfile;
-import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.ha.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.ha.driver.core.reflection.DeviceDescription;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/Activator.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/Activator.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/Activator.java Tue Apr 1 12:02:50 2014
@@ -22,11 +22,6 @@
package it.cnr.isti.zigbee.hc;
-import it.cnr.isti.zigbee.ha.driver.core.GenericHADeviceFactory;
-import it.cnr.isti.zigbee.ha.driver.core.UnknownHADeviceFactory;
-import it.cnr.isti.zigbee.hc.Activator;
-import it.cnr.isti.zigbee.hc.device.api.aging_independently.DosageSensor;
-import it.cnr.isti.zigbee.hc.device.impl.DosageSensorDevice;
import it.cnr.isti.zigbee.hc.driver.HCDriverConfiguration;
import it.cnr.isti.zigbee.hc.driver.HCImporter;
import it.cnr.isti.zigbee.hc.driver.HCReportingConfiguration;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/cluster/glue/protocol_interfaces/GenericTunnel.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/cluster/glue/protocol_interfaces/GenericTunnel.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/cluster/glue/protocol_interfaces/GenericTunnel.java Tue Apr 1 12:02:50 2014
@@ -23,8 +23,6 @@
package it.cnr.isti.zigbee.hc.cluster.glue.protocol_interfaces;
import it.cnr.isti.zigbee.hc.cluster.glue.Cluster;
-import it.cnr.isti.zigbee.hc.cluster.glue.protocol_interfaces.AdvertiseProtocolAddressListener;
-import it.cnr.isti.zigbee.hc.cluster.glue.protocol_interfaces.MatchProtocolAddressResponse;
/**
*
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/device/impl/DosageSensorDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/device/impl/DosageSensorDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/device/impl/DosageSensorDevice.java Tue Apr 1 12:02:50 2014
@@ -24,22 +24,14 @@
+import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.device.api.lighting.OccupancySensor;
import it.cnr.isti.zigbee.hc.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.hc.device.api.aging_independently.DosageSensor;
import it.cnr.isti.zigbee.hc.driver.core.HCDeviceBase;
import it.cnr.isti.zigbee.hc.driver.core.ZigBeeHCException;
-import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.ha.cluster.glue.general.PowerConfiguration;
-import it.cnr.isti.zigbee.ha.device.api.lighting.OccupancySensor;
-import it.cnr.isti.zigbee.hc.device.api.aging_independently.DosageSensor;
import it.cnr.isti.zigbee.hc.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.hc.driver.core.reflection.DeviceDescription;
-
-
-
-
-
-
-
import org.osgi.framework.BundleContext;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/HCDriverConfiguration.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/HCDriverConfiguration.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/HCDriverConfiguration.java Tue Apr 1 12:02:50 2014
@@ -24,8 +24,8 @@
import it.cnr.isti.osgi.util.DictionaryHelper;
import it.cnr.isti.osgi.util.OSGiProperties;
-
-
+import it.cnr.isti.zigbee.ha.driver.core.HADevice;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
import java.util.Dictionary;
import java.util.HashMap;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/GenericHCDeviceFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/GenericHCDeviceFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/GenericHCDeviceFactory.java Tue Apr 1 12:02:50 2014
@@ -24,6 +24,7 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import java.lang.reflect.Constructor;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCClustersFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCClustersFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCClustersFactory.java Tue Apr 1 12:02:50 2014
@@ -24,7 +24,6 @@
import it.cnr.isti.zigbee.hc.cluster.impl.BasicImpl;
-import it.cnr.isti.zigbee.hc.cluster.impl.ProtocolTunnel11073Impl;
import org.osgi.framework.BundleContext;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDevice.java Tue Apr 1 12:02:50 2014
@@ -21,18 +21,18 @@
See the License for the specific language governing permissions and
limitations under the License.
*/
-import it.cnr.isti.zigbee.hc.driver.ArraysUtil;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.hc.cluster.glue.Cluster;
-import it.cnr.isti.zigbee.hc.cluster.glue.general.Basic;
-import it.cnr.isti.zigbee.hc.cluster.glue.general.Identify;
-import it.cnr.isti.zigbee.hc.cluster.glue.general.ProtocolTunnel11073;
-import it.cnr.isti.zigbee.hc.cluster.glue.protocol_interfaces.GenericTunnel;
import it.cnr.isti.zigbee.ha.cluster.glue.general.Alarms;
import it.cnr.isti.zigbee.ha.cluster.glue.general.Commissioning;
+import it.cnr.isti.zigbee.ha.cluster.glue.general.DeviceTemperatureConfiguration;
import it.cnr.isti.zigbee.ha.cluster.glue.general.PowerConfiguration;
import it.cnr.isti.zigbee.ha.cluster.glue.general.RSSILocation;
import it.cnr.isti.zigbee.ha.cluster.glue.general.Time;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
+import it.cnr.isti.zigbee.hc.cluster.glue.Cluster;
+import it.cnr.isti.zigbee.hc.cluster.glue.general.Basic;
+import it.cnr.isti.zigbee.hc.cluster.glue.protocol_interfaces.GenericTunnel;
+import it.cnr.isti.zigbee.hc.driver.ArraysUtil;
import it.cnr.isti.zigbee.hc.driver.core.reflection.DeviceDescription;
/**
@@ -53,17 +53,14 @@
public static final String HC_DEVICE_GROUP = "zigbee.hc.group";
public static final String HC_DEVICE_STANDARD = "zigbee.hc.standard";
- public static final int[] MANDATORY = {
- HCProfile.BASIC,
- HCProfile.IDENTIFY,
- HCProfile.GENERIC_TUNNEL,
- HCProfile.PROTOCOL_TUNNEL_11073 };
-
- public static final int[] OPTIONAL = { HCProfile.POWER_CONFIGURATION,
+ public static final int[] MANDATORY = {HCProfile.BASIC, HCProfile.IDENTIFY,
+ HCProfile.GENERIC_TUNNEL, HCProfile.PROTOCOL_TUNNEL_11073};
+
+ public static final int[] OPTIONAL = {HCProfile.POWER_CONFIGURATION,
HCProfile.ALARMS, HCProfile.TIME, HCProfile.RSSI_LOCATION,
HCProfile.ALPHA_SECURE_KEY_ESTABLISHMENT,
HCProfile.ALPHA_SECURE_ACCESS_CONTROL, HCProfile.PARTITION,
- HCProfile.COMMISSIONING };
+ HCProfile.COMMISSIONING};
public static final int[] STANDARD = ArraysUtil.append(MANDATORY, OPTIONAL);
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceBase.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceBase.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceBase.java Tue Apr 1 12:02:50 2014
@@ -24,6 +24,7 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
+import it.cnr.isti.zigbee.ha.driver.HADriverConfiguration;
import it.cnr.isti.zigbee.hc.Activator;
import it.cnr.isti.zigbee.hc.cluster.glue.Cluster;
import it.cnr.isti.zigbee.hc.cluster.glue.general.Basic;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceRegistry.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceRegistry.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/HCDeviceRegistry.java Tue Apr 1 12:02:50 2014
@@ -24,8 +24,6 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.ha.driver.core.HADeviceFactory;
-import it.cnr.isti.zigbee.ha.driver.core.UnknownHADevice;
import it.cnr.isti.zigbee.hc.driver.HCImporter;
import java.util.Collection;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDevice.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDevice.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDevice.java Tue Apr 1 12:02:50 2014
@@ -24,11 +24,7 @@
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.hc.Activator;
-import it.cnr.isti.zigbee.hc.cluster.glue.general.Basic;
import it.cnr.isti.zigbee.hc.driver.HCDriverConfiguration.ProvidedClusterMode;
-import it.cnr.isti.zigbee.hc.driver.core.HCDeviceBase;
-import it.cnr.isti.zigbee.hc.driver.core.HCProfile;
-import it.cnr.isti.zigbee.hc.driver.core.ZigBeeHCException;
import it.cnr.isti.zigbee.hc.driver.core.reflection.AbstractDeviceDescription;
import it.cnr.isti.zigbee.hc.driver.core.reflection.DeviceDescription;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDeviceFactory.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDeviceFactory.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/UnknowHCDeviceFactory.java Tue Apr 1 12:02:50 2014
@@ -23,15 +23,8 @@
package it.cnr.isti.zigbee.hc.driver.core;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
-import it.cnr.isti.zigbee.hc.Activator;
import it.cnr.isti.zigbee.hc.cluster.glue.Cluster;
import it.cnr.isti.zigbee.hc.driver.ArraysUtil;
-import it.cnr.isti.zigbee.hc.driver.HCDriverConfiguration.ProvidedClusterMode;
-import it.cnr.isti.zigbee.hc.driver.core.HCDeviceBase;
-import it.cnr.isti.zigbee.hc.driver.core.HCProfile;
-import it.cnr.isti.zigbee.hc.driver.core.ZigBeeHCException;
-import it.cnr.isti.zigbee.hc.driver.core.reflection.AbstractDeviceDescription;
-import it.cnr.isti.zigbee.hc.driver.core.reflection.DeviceDescription;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/reflection/DeviceDescription.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/reflection/DeviceDescription.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.hc.driver/src/main/java/it/cnr/isti/zigbee/hc/driver/core/reflection/DeviceDescription.java Tue Apr 1 12:02:50 2014
@@ -23,6 +23,7 @@
package it.cnr.isti.zigbee.hc.driver.core.reflection;
+import it.cnr.isti.zigbee.ha.driver.core.HADeviceBase;
import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
/**
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,181 +1,178 @@
<?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">
- 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>
- <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.network.browser</artifactId>
+ <packaging>bundle</packaging>
+ <name>Zigbee Network Browser</name>
+ <version>0.1.0-SNAPSHOT</version>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.network.browser</artifactId>
- <packaging>bundle</packaging>
- <name>Zigbee Network Browser</name>
- <version>0.1.0-SNAPSHOT</version>
-
- <inceptionYear>2010</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>slenzi</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>
+ <inceptionYear>2010</inceptionYear>
+ <organization>
+ <name>Institute of Information Science and Technologies of the Italian National Research Council</name>
+ <url>http://isti.cnr.it/</url>
+ </organization>
- <scm>
- <connection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.network.browser</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.network.browser</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.network.browser</url>
- </scm>
+ <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>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Bundle-Author><![CDATA[
+ <developers>
+ <developer>
+ <id>slenzi</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:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.network.browser</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.network.browser</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.network.browser</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Author><![CDATA[
Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>
]]></Bundle-Author>
- <Bundle-Description>
- ZigBee network browser
- </Bundle-Description>
- <Bundle-SymbolicName>org.aaloa.zb4osgi.network.browser</Bundle-SymbolicName>
- <Bundle-Activator>org.aaloa.zb4osgi.network.browser.Activtor</Bundle-Activator>
- <Export-Package>
- </Export-Package>
- <Private-Package>
- org.aaloa.zb4osgi.network.browser.*,
- org.aaloa.zb4osgi.api.monitor.impl,
- cern.colt.*, cern.jet.*, hep.aida.*,
- edu.uci.ics.jung.*, corejava,
- EDU.*,
- org.apache.commons.*,
- </Private-Package>
- <Import-Package>
- javax.*,
- org.xml.*,
- it.cnr.isti.zigbee.api.*,
- org.aaloa.zb4osgi.api.monitor,
- org.osgi.*,
- org.ops4j.*,
- org.slf4j.*; provider=paxlogging
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <Bundle-Description>
+ ZigBee network browser
+ </Bundle-Description>
+ <Bundle-SymbolicName>org.aaloa.zb4osgi.network.browser</Bundle-SymbolicName>
+ <Bundle-Activator>org.aaloa.zb4osgi.network.browser.Activtor</Bundle-Activator>
+ <Export-Package>
+ </Export-Package>
+ <Private-Package>
+ org.aaloa.zb4osgi.network.browser.*,
+ org.aaloa.zb4osgi.api.monitor.impl,
+ cern.colt.*, cern.jet.*, hep.aida.*,
+ edu.uci.ics.jung.*, corejava,
+ EDU.*,
+ org.apache.commons.*,
+ </Private-Package>
+ <Import-Package>
+ javax.*,
+ org.xml.*,
+ it.cnr.isti.zigbee.api.*,
+ org.aaloa.zb4osgi.api.monitor,
+ org.osgi.*,
+ org.ops4j.*,
+ org.slf4j.*; provider=paxlogging
+ </Import-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">2010-09-28</date>
- <date implementation="java.lang.String">2029-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">2010-09-28</date>
+ <date implementation="java.lang.String">2029-12-31</date>
+ </dates>
+ <dateFormat>yyyy-MM-dd</dateFormat>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
- <repositories>
- <repository>
- <id>nexus.aaloa.org</id>
- <url>http://nexus.aaloa.org/content/repositories/releases/</url>
- <snapshots><enabled>false</enabled></snapshots>
- </repository>
- <repository>
- <id>snapshots.nexus.aaloa.org</id>
- <url>http://nexus.aaloa.org/content/repositories/snapshots/</url>
- <releases><enabled>false</enabled></releases>
- </repository>
- </repositories>
-
- <dependencies>
- <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.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>net.sf.jung</groupId>
- <artifactId>jung-samples</artifactId>
- <version>2.0.1</version>
- </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>
+ <repositories>
+ <repository>
+ <id>nexus.aaloa.org</id>
+ <url>http://nexus.aaloa.org/content/repositories/releases/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.nexus.aaloa.org</id>
+ <url>http://nexus.aaloa.org/content/repositories/snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
- <properties>
- <bundles.configuration.location>../configurations</bundles.configuration.location>
- </properties>
+ <dependencies>
+ <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.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>net.sf.jung</groupId>
+ <artifactId>jung-samples</artifactId>
+ <version>2.0.1</version>
+ </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>
+
+ <properties>
+ <bundles.configuration.location>../configurations</bundles.configuration.location>
+ </properties>
</project>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/api/monitor/impl/ZigBeeDiscoveryMonitorImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/api/monitor/impl/ZigBeeDiscoveryMonitorImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/api/monitor/impl/ZigBeeDiscoveryMonitorImpl.java Tue Apr 1 12:02:50 2014
@@ -20,9 +20,9 @@
limitations under the License.
*/
package org.aaloa.zb4osgi.api.monitor.impl;
+import it.cnr.isti.zigbee.api.ZigBeeNode;
+
import java.util.Collection;
-
-import it.cnr.isti.zigbee.api.ZigBeeNode;
import org.aaloa.zb4osgi.api.monitor.ZigBeeDiscoveryMonitor;
import org.aaloa.zb4osgi.network.browser.ui.model.ZigBeeEdge;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/network/browser/ui/NetworkGraph.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/network/browser/ui/NetworkGraph.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.network.browser/src/main/java/org/aaloa/zb4osgi/network/browser/ui/NetworkGraph.java Tue Apr 1 12:02:50 2014
@@ -21,7 +21,6 @@
*/
package org.aaloa.zb4osgi.network.browser.ui;
-import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.api.ZigBeeNode;
import java.awt.BorderLayout;
@@ -33,7 +32,6 @@
import java.awt.Paint;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.util.HashMap;
import javax.swing.BorderFactory;
import javax.swing.JButton;
@@ -43,7 +41,6 @@
import javax.swing.JToolBar;
import javax.swing.border.EtchedBorder;
-import org.aaloa.zb4osgi.network.browser.Activtor;
import org.aaloa.zb4osgi.network.browser.ui.model.ZigBeeEdge;
import org.aaloa.zb4osgi.network.browser.ui.model.ZigBeeVertex;
import org.apache.commons.collections15.Transformer;
@@ -53,7 +50,6 @@
import edu.uci.ics.jung.visualization.VisualizationViewer;
import edu.uci.ics.jung.visualization.control.DefaultModalGraphMouse;
import edu.uci.ics.jung.visualization.control.ModalGraphMouse;
-import edu.uci.ics.jung.visualization.decorators.ToStringLabeller;
import edu.uci.ics.jung.visualization.renderers.Renderer.VertexLabel.Position;
public class NetworkGraph extends JFrame {
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/pom.xml
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/pom.xml (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/pom.xml Tue Apr 1 12:02:50 2014
@@ -1,208 +1,200 @@
<?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">
-
- <parent>
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.pom</artifactId>
- <version>10-SNAPSHOT</version>
- <relativePath>../pom/pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.tester</artifactId>
- <version>0.5.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
-
- <name>Zigbee Tester</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">
+
+ <parent>
+ <groupId>org.aaloa.zb4osgi</groupId>
+ <artifactId>org.aaloa.zb4osgi.pom</artifactId>
+ <version>10-SNAPSHOT</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+
+
+ <artifactId>org.aaloa.zb4osgi.zigbee.tester</artifactId>
+ <version>0.5.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+
+ <name>Zigbee Tester</name>
+ <url>http://zb4osgi.aaloa.org/</url>
+ <description><![CDATA[
A simple Java Swing application for controlling the ZigBee Device service, and its refined version.
This application aims at be a tool for testing the whole ZigBee 4 OSGi suite, but it also allows
the user to start to play with the ZigBee network
]]></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>
-
- <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>
- <developer>
- <id>francesco.furfari</id>
- <name>Francesco Furfari</name>
- <email>francesco.furfari 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.tester</connection>
- <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.tester</developerConnection>
- <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.tester</url>
- </scm>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Name>${project.name}</Bundle-Name>
- <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Bundle-Author><![CDATA[
+ <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>
+
+ <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>
+ <developer>
+ <id>francesco.furfari</id>
+ <name>Francesco Furfari</name>
+ <email>francesco.furfari 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.tester</connection>
+ <developerConnection>scm:svn:svn://svn.aaloa.org/projects/zb4osgi/trunk/zigbee.tester</developerConnection>
+ <url>http://zb4osgi.aaloa.org/projects/zb4osgi/repository/show/trunk/zigbee.tester</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Name>${project.name}</Bundle-Name>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+ <Bundle-Author><![CDATA[
Francesco Furfari <francesco.furfari at isti.cnr.it>,
Stefano "Kismet" Lenzi <stefano.lenzi at isti.cnr.it>
]]></Bundle-Author>
- <Bundle-Description>
- OSGi Generic Control Point to control ZigBeeDevice services
- </Bundle-Description>
- <Bundle-SymbolicName>org.aal-persona.zigbee.tester</Bundle-SymbolicName>
- <Bundle-Activator>org.persona.zigbee.tester.Activator</Bundle-Activator>
- <Export-Package>
- org.persona.zigbee.tester.event.api.*
- </Export-Package>
- <Private-Package>
- org.persona.zigbee.tester.*,
- org.persona.zigbee.util.*,
- com.itaca.ztool.util
- </Private-Package>
- <Import-Package>
- !com.itaca.ztool.api,
- javax.swing.*,
- it.cnr.isti.zigbee.api.*,
- it.cnr.isti.zigbee.ha.*,
- it.cnr.isti.zigbee.eh.*,
- it.cnr.isti.zigbee.zcl.*,
- org.osgi.*,
- org.slf4j; provider=paxlogging
- </Import-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>
-
-
- <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.apache.felix</groupId>
- <artifactId>org.osgi.core</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.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>
- </dependency>
-
-
- <!--
- *NOTE*
- The following dependencies are used only for JUnit purpose,
- but they will be resolved from OSGi enviroment at run-time
- -->
- <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.aaloa.zb4osgi</groupId>
- <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
-
-
-
- </dependencies>
-
- <properties>
- <bundles.configuration.location>../configurations</bundles.configuration.location>
- </properties>
+ <Bundle-Description>
+ OSGi Generic Control Point to control ZigBeeDevice services
+ </Bundle-Description>
+ <Bundle-SymbolicName>org.aal-persona.zigbee.tester</Bundle-SymbolicName>
+ <Bundle-Activator>org.persona.zigbee.tester.Activator</Bundle-Activator>
+ <Export-Package>
+ org.persona.zigbee.tester.event.api.*
+ </Export-Package>
+ <Private-Package>
+ org.persona.zigbee.tester.*,
+ org.persona.zigbee.util.*,
+ com.itaca.ztool.util
+ </Private-Package>
+ <Import-Package>
+ !com.itaca.ztool.api,
+ javax.swing.*,
+ it.cnr.isti.zigbee.api.*,
+ it.cnr.isti.zigbee.ha.*,
+ it.cnr.isti.zigbee.eh.*,
+ it.cnr.isti.zigbee.zcl.*,
+ org.osgi.*,
+ org.slf4j; provider=paxlogging
+ </Import-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>
+
+
+ <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.apache.felix</groupId>
+ <artifactId>org.osgi.core</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.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>
+ </dependency>
+
+
+ <!-- *NOTE* The following dependencies are used only for JUnit purpose,
+ but they will be resolved from OSGi enviroment at run-time -->
+ <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.aaloa.zb4osgi</groupId>
+ <artifactId>org.aaloa.zb4osgi.zigbee.common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+
+
+
+ </dependencies>
+
+ <properties>
+ <bundles.configuration.location>../configurations</bundles.configuration.location>
+ </properties>
</project>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DeviceNode.java Tue Apr 1 12:02:50 2014
@@ -42,7 +42,7 @@
private String udn ;
private boolean hasChild;
private int numberOfSons;
- private ArrayList children;
+ private ArrayList<Object> children;
private DeviceNode parent;
final private String friendlyName;
@@ -58,7 +58,7 @@
String[] sons = null;
hasChild = (sons != null);
if (hasChild) {
- children = new ArrayList();
+ children = new ArrayList<Object>();
numberOfSons = sons.length;
}
/*
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/discovery/DevicesList.java Tue Apr 1 12:02:50 2014
@@ -34,11 +34,11 @@
*/
public class DevicesList {
- ArrayList devices;
+ ArrayList<DeviceNode> devices;
DeviceChangeListener listener = null;
public DevicesList(){
- devices = new ArrayList();
+ devices = new ArrayList<DeviceNode>();
}
@@ -48,7 +48,7 @@
return devices.add(dev);
}
- public Iterator iterator() {
+ public Iterator<DeviceNode> iterator() {
return devices.iterator();
}
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/AttributeActionPanel.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/AttributeActionPanel.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/AttributeActionPanel.java Tue Apr 1 12:02:50 2014
@@ -22,9 +22,7 @@
package org.persona.zigbee.tester.gui;
-import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.ha.driver.core.HADevice;
-import it.cnr.isti.zigbee.ha.driver.core.ZigBeeHAException;
import it.cnr.isti.zigbee.zcl.library.api.core.AnalogSubscription;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
import it.cnr.isti.zigbee.zcl.library.api.core.ReportListener;
@@ -48,7 +46,6 @@
import javax.swing.JTextField;
import javax.swing.JTree;
-import org.persona.zigbee.tester.Activator;
import org.persona.zigbee.tester.Mediator;
import org.persona.zigbee.util.Converter;
import org.slf4j.Logger;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/Command.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/Command.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/main/java/org/persona/zigbee/tester/gui/Command.java Tue Apr 1 12:02:50 2014
@@ -26,10 +26,6 @@
import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import javax.swing.text.StyledEditorKit.ItalicAction;
/**
*
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/CommandTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/CommandTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/CommandTest.java Tue Apr 1 12:02:50 2014
@@ -22,11 +22,12 @@
*/
package org.persona.zigbee.tester.gui;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import it.cnr.isti.zigbee.ha.cluster.impl.GroupsImpl;
import java.lang.reflect.InvocationTargetException;
-
-import it.cnr.isti.zigbee.ha.cluster.impl.GroupsImpl;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/HADeviceTreeNodeTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/HADeviceTreeNodeTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.tester/src/test/java/org/persona/zigbee/tester/gui/HADeviceTreeNodeTest.java Tue Apr 1 12:02:50 2014
@@ -21,7 +21,6 @@
*/
package org.persona.zigbee.tester.gui;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import it.cnr.isti.zigbee.ha.cluster.glue.Cluster;
import it.cnr.isti.zigbee.ha.cluster.impl.AlarmsImpl;
@@ -30,8 +29,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/Attribute.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/Attribute.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/core/Attribute.java Tue Apr 1 12:02:50 2014
@@ -48,7 +48,7 @@
* @return the java {@link Class} used to represent the attribute value
*/
@SuppressWarnings("unchecked")
- public Class getType();
+ public Class<?> getType();
/**
* @return the {@link ZigBeeType} that describes the attribute type
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/partition/WriteHandshakeParamResponse.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/partition/WriteHandshakeParamResponse.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/general/partition/WriteHandshakeParamResponse.java Tue Apr 1 12:02:50 2014
@@ -23,7 +23,6 @@
package it.cnr.isti.zigbee.zcl.library.api.general.partition;
import it.cnr.isti.zigbee.zcl.library.api.core.Response;
-import it.cnr.isti.zigbee.zcl.library.api.core.Status;
/**
* This class represent the <b>Partition</b> Cluster as defined by the document:<br>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/global/DefaultResponse.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/global/DefaultResponse.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/global/DefaultResponse.java Tue Apr 1 12:02:50 2014
@@ -24,6 +24,7 @@
import it.cnr.isti.zigbee.zcl.library.api.core.Response;
import it.cnr.isti.zigbee.zcl.library.api.core.Status;
+import it.cnr.isti.zigbee.zcl.library.api.general.identify.IdentifyQueryResponse;
/**
*
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/IlluminanceLevelSensing.java Tue Apr 1 12:02:50 2014
@@ -23,9 +23,7 @@
package it.cnr.isti.zigbee.zcl.library.api.measureament_sensing;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
-import it.cnr.isti.zigbee.zcl.library.api.core.Response;
import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
-import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
/**
* This class represent the <b>Illuminance Level Sensing</b> Cluster as defined by the document:<br>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/api/measureament_sensing/PressureMeasurement.java Tue Apr 1 12:02:50 2014
@@ -23,9 +23,7 @@
package it.cnr.isti.zigbee.zcl.library.api.measureament_sensing;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
-import it.cnr.isti.zigbee.zcl.library.api.core.Response;
import it.cnr.isti.zigbee.zcl.library.api.core.ZCLCluster;
-import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
/**
* This class represent the <b>Metering</b> Cluster as defined by the document:<br>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AbstractAttribute.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AbstractAttribute.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AbstractAttribute.java Tue Apr 1 12:02:50 2014
@@ -35,7 +35,7 @@
private int id;
private String name;
- private Class clazz;
+ private Class<?> clazz;
private ZigBeeType zbType;
private boolean isReportable;
private boolean isWritable;
@@ -61,11 +61,11 @@
return this;
}
- final public Class getType() {
+ final public Class<?> getType() {
return clazz;
}
- private AbstractAttribute setType(Class clazz){
+ private AbstractAttribute setType(Class<?> clazz){
this.clazz=clazz;
return this;
}
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AttributeDescriptor.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AttributeDescriptor.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/attribute/AttributeDescriptor.java Tue Apr 1 12:02:50 2014
@@ -34,7 +34,7 @@
public interface AttributeDescriptor {
public int getId();
public String getName();
- public Class getType();
+ public Class<?> getType();
public boolean isWritable();
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/commands/description/PartitionCommandsDescriptor.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/commands/description/PartitionCommandsDescriptor.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/commands/description/PartitionCommandsDescriptor.java Tue Apr 1 12:02:50 2014
@@ -25,11 +25,11 @@
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeType;
import it.cnr.isti.zigbee.zcl.library.api.general.Partition;
import it.cnr.isti.zigbee.zcl.library.impl.core.CommandDescription;
+import it.cnr.isti.zigbee.zcl.library.impl.field.BitmaskDependency;
import it.cnr.isti.zigbee.zcl.library.impl.field.FieldType;
import it.cnr.isti.zigbee.zcl.library.impl.field.ListFieldDescriptor;
import it.cnr.isti.zigbee.zcl.library.impl.field.MatchType;
import it.cnr.isti.zigbee.zcl.library.impl.field.SimpleFieldDescriptor;
-import it.cnr.isti.zigbee.zcl.library.impl.field.BitmaskDependency;
/**
* @author <a href="mailto:giancarlo.riolo at isti.cnr.it">Giancarlo Riolo</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/AttributeImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/AttributeImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/core/AttributeImpl.java Tue Apr 1 12:02:50 2014
@@ -84,7 +84,7 @@
}
@SuppressWarnings("unchecked")
- public Class getType() {
+ public Class<?> getType() {
return descriptor.getType();
}
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/level_control/StepCommand.java Tue Apr 1 12:02:50 2014
@@ -22,11 +22,9 @@
package it.cnr.isti.zigbee.zcl.library.impl.general.level_control;
-import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
import it.cnr.isti.zigbee.zcl.library.api.general.LevelControl;
import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
-import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
/**
*
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetAddSceneImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetAddSceneImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetAddSceneImpl.java Tue Apr 1 12:02:50 2014
@@ -22,13 +22,12 @@
package it.cnr.isti.zigbee.zcl.library.impl.general.scenes;
-import java.util.Enumeration;
-import java.util.Hashtable;
import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
import it.cnr.isti.zigbee.zcl.library.api.core.ZBDeserializer;
import it.cnr.isti.zigbee.zcl.library.api.general.scenes.ExtensionFieldSetAddScene;
-import it.cnr.isti.zigbee.zcl.library.impl.attribute.AttributeDescriptor;
+import java.util.Enumeration;
+import java.util.Hashtable;
/**
*
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetViewResponseImpl.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetViewResponseImpl.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/general/scenes/ExtensionFieldSetViewResponseImpl.java Tue Apr 1 12:02:50 2014
@@ -23,11 +23,11 @@
package it.cnr.isti.zigbee.zcl.library.impl.general.scenes;
+import it.cnr.isti.zigbee.zcl.library.api.core.ZBDeserializer;
+import it.cnr.isti.zigbee.zcl.library.api.general.scenes.ExtensionFieldSetViewResponse;
+
import java.util.Enumeration;
import java.util.Hashtable;
-import it.cnr.isti.zigbee.zcl.library.api.core.Attribute;
-import it.cnr.isti.zigbee.zcl.library.api.core.ZBDeserializer;
-import it.cnr.isti.zigbee.zcl.library.api.general.scenes.ExtensionFieldSetViewResponse;
/**
*
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/read/ReadAttributeCommand.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/read/ReadAttributeCommand.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/read/ReadAttributeCommand.java Tue Apr 1 12:02:50 2014
@@ -22,12 +22,12 @@
package it.cnr.isti.zigbee.zcl.library.impl.global.read;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
-import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/reporting/ConfigureReportingCommand.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/reporting/ConfigureReportingCommand.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/reporting/ConfigureReportingCommand.java Tue Apr 1 12:02:50 2014
@@ -22,15 +22,14 @@
package it.cnr.isti.zigbee.zcl.library.impl.global.reporting;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
import it.cnr.isti.zigbee.zcl.library.api.core.ZBSerializer;
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeType;
import it.cnr.isti.zigbee.zcl.library.api.global.AttributeReportingConfigurationRecord;
import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
-import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/write/WriteAttributeCommand.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/write/WriteAttributeCommand.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/main/java/it/cnr/isti/zigbee/zcl/library/impl/global/write/WriteAttributeCommand.java Tue Apr 1 12:02:50 2014
@@ -27,7 +27,6 @@
import it.cnr.isti.zigbee.zcl.library.api.global.WriteAttributeRecord;
import it.cnr.isti.zigbee.zcl.library.impl.core.AbstractCommand;
import it.cnr.isti.zigbee.zcl.library.impl.core.ByteArrayOutputStreamSerializer;
-import it.cnr.isti.zigbee.zcl.library.impl.core.DefaultSerializer;
/**
*
* @author <a href="mailto:stefano.lenzi at isti.cnr.it">Stefano "Kismet" Lenzi</a>
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/AlarmsClusterTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/AlarmsClusterTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/AlarmsClusterTest.java Tue Apr 1 12:02:50 2014
@@ -26,15 +26,14 @@
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import it.cnr.isti.zigbee.api.Cluster;
import it.cnr.isti.zigbee.api.ZigBeeBasedriverException;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
import it.cnr.isti.zigbee.zcl.library.api.core.Status;
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
import it.cnr.isti.zigbee.zcl.library.api.general.Alarms;
-import it.cnr.isti.zigbee.zcl.library.api.general.Groups;
-import it.cnr.isti.zigbee.zcl.library.api.general.groups.AddGroupResponse;
import it.cnr.isti.zigbee.zcl.library.api.global.DefaultResponse;
import it.cnr.isti.zigbee.zcl.library.impl.RawClusterImpl;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsClusterTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsClusterTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/GroupsClusterTest.java Tue Apr 1 12:02:50 2014
@@ -23,9 +23,13 @@
package it.cnr.isti.zigbee.zcl.library.impl.general;
-import static org.easymock.EasyMock.*;
-
-import static org.junit.Assert.*;
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import it.cnr.isti.zigbee.api.Cluster;
import it.cnr.isti.zigbee.api.ZigBeeBasedriverException;
import it.cnr.isti.zigbee.api.ZigBeeDevice;
@@ -33,8 +37,8 @@
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
import it.cnr.isti.zigbee.zcl.library.api.general.Groups;
import it.cnr.isti.zigbee.zcl.library.api.general.groups.AddGroupResponse;
+import it.cnr.isti.zigbee.zcl.library.api.general.groups.GetGroupMembershipResponse;
import it.cnr.isti.zigbee.zcl.library.impl.RawClusterImpl;
-import it.cnr.isti.zigbee.zcl.library.api.general.groups.GetGroupMembershipResponse;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommandTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommandTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupCommandTest.java Tue Apr 1 12:02:50 2014
@@ -22,7 +22,7 @@
*/
package it.cnr.isti.zigbee.zcl.library.impl.general.groups;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupResponseImplTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupResponseImplTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/AddGroupResponseImplTest.java Tue Apr 1 12:02:50 2014
@@ -22,14 +22,13 @@
*/
package it.cnr.isti.zigbee.zcl.library.impl.general.groups;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import it.cnr.isti.zigbee.zcl.library.api.core.Status;
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
import it.cnr.isti.zigbee.zcl.library.api.general.Groups;
-import it.cnr.isti.zigbee.zcl.library.impl.ClusterImpl;
import it.cnr.isti.zigbee.zcl.library.impl.RawClusterImpl;
import it.cnr.isti.zigbee.zcl.library.impl.core.ResponseImpl;
-import it.cnr.isti.zigbee.zcl.library.impl.core.ZCLFrame;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommandTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommandTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipCommandTest.java Tue Apr 1 12:02:50 2014
@@ -21,7 +21,7 @@
*/
package it.cnr.isti.zigbee.zcl.library.impl.general.groups;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
import org.junit.Test;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipResponseImplTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipResponseImplTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/GetGroupMembershipResponseImplTest.java Tue Apr 1 12:02:50 2014
@@ -22,7 +22,9 @@
*/
package it.cnr.isti.zigbee.zcl.library.impl.general.groups;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
import it.cnr.isti.zigbee.zcl.library.api.general.Groups;
import it.cnr.isti.zigbee.zcl.library.impl.RawClusterImpl;
Modified: projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/ViewGroupResponseImplTest.java
==============================================================================
--- projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/ViewGroupResponseImplTest.java (original)
+++ projects/zb4osgi/sandbox/giancarlo.riolo/zigbee.zcl.library/src/test/java/it/cnr/isti/zigbee/zcl/library/impl/general/groups/ViewGroupResponseImplTest.java Tue Apr 1 12:02:50 2014
@@ -21,12 +21,12 @@
*/
package it.cnr.isti.zigbee.zcl.library.impl.general.groups;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
import it.cnr.isti.zigbee.api.Cluster;
import it.cnr.isti.zigbee.zcl.library.api.core.Response;
import it.cnr.isti.zigbee.zcl.library.api.core.ZigBeeClusterException;
import it.cnr.isti.zigbee.zcl.library.api.general.Groups;
-import it.cnr.isti.zigbee.zcl.library.api.general.groups.ViewGroupResponse;
import it.cnr.isti.zigbee.zcl.library.impl.RawClusterImpl;
import it.cnr.isti.zigbee.zcl.library.impl.core.ResponseImpl;
More information about the Commit
mailing list