Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore5
-rw-r--r--.gitlab-ci.yml9
-rw-r--r--.project17
-rw-r--r--com.orange.om2m.p2.repo/.project17
-rw-r--r--com.orange.om2m.p2.repo/category.xml3
-rw-r--r--org.eclipse.om2m.android.dashboard/.classpath34
-rw-r--r--org.eclipse.om2m.android.dashboard/.project46
-rw-r--r--org.eclipse.om2m.binding.coap/.classpath9
-rw-r--r--org.eclipse.om2m.binding.coap/.project34
-rw-r--r--org.eclipse.om2m.binding.http/.classpath7
-rw-r--r--org.eclipse.om2m.binding.http/.project34
-rw-r--r--org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java41
-rw-r--r--org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java90
-rw-r--r--org.eclipse.om2m.binding.mqtt/.classpath8
-rw-r--r--org.eclipse.om2m.binding.mqtt/.project34
-rw-r--r--org.eclipse.om2m.binding.service/.classpath7
-rw-r--r--org.eclipse.om2m.binding.service/.project34
-rw-r--r--org.eclipse.om2m.commons.logging/.classpath7
-rw-r--r--org.eclipse.om2m.commons.logging/.project34
-rw-r--r--org.eclipse.om2m.commons/.classpath8
-rw-r--r--org.eclipse.om2m.commons/.project34
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java34
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java2
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java894
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java43
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java10
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java2
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java27
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java106
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java337
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java335
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java169
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java249
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java166
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java40
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java70
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DasInfo.java38
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java18
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthTokenReqInfo.java37
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java12
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java88
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java53
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java85
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java32
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java68
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java65
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java17
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java68
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java49
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java22
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java53
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java83
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java28
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java88
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CookerHoodJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CredentialsFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeactivateClockTimerFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DecrementNumberValueFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DehumidifierJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainer.java190
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirConditionerFlexContainerAnnc.java292
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainer.java183
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirPurifierFlexContainerAnnc.java286
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAirQualityMonitorFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceAudioReceiverFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceBloodPressureMonitorFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainer.java86
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCameraFlexContainerAnnc.java161
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesDryerFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainer.java166
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherDryerFlexContainerAnnc.java252
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainer.java184
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceClothesWasherFlexContainerAnnc.java358
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainer.java172
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCoffeeMachineFlexContainerAnnc.java350
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainer.java22
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceContactDetectorFlexContainerAnnc.java31
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCookerHoodFlexContainerAnnc.java184
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainer.java149
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceCooktopFlexContainerAnnc.java48
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainer.java166
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDehumidifierFlexContainerAnnc.java252
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDishWasherFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainer.java78
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorFlexContainerAnnc.java119
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceDoorLockFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceElectricVehicleChargerFlexContainerAnnc.java119
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFanFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainer.java20
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFloodDetectorFlexContainerAnnc.java29
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFoodProbeFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceFreezerFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGasValveFlexContainerAnnc.java104
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceGlucosemeterFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHeartRateMonitorFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainer.java251
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHomeCCTVFlexContainerAnnc.java456
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceHumidifierFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainer.java132
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceKettleFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainer.java65
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceLightFlexContainerAnnc.java134
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainer.java55
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMicrogenerationFlexContainerAnnc.java108
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainer.java20
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMotionDetectorFlexContainerAnnc.java29
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainer.java132
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceMultiFunctionPrinterFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceNumberDeviceFlexContainer.java66
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceNumberDeviceFlexContainerAnnc.java85
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainer.java166
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOutdoorLampFlexContainerAnnc.java286
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainer.java53
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceOvenFlexContainerAnnc.java106
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePrinterFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DevicePulseOximeterFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainer.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRefrigeratorFlexContainerAnnc.java66
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceRobotCleanerFlexContainerAnnc.java132
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceScannerFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSecurityPanelFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainer.java132
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSetTopBoxFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartElectricMeterFlexContainerAnnc.java132
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmartPlugFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainer.java20
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSmokeDetectorFlexContainerAnnc.java29
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSteamClosetFlexContainerAnnc.java150
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainer.java55
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceStorageBatteryFlexContainerAnnc.java108
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainer.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceSwitchFlexContainerAnnc.java82
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainer.java85
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTelevisionFlexContainerAnnc.java108
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainer.java38
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceTemperatureDetectorFlexContainerAnnc.java66
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermometerFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainer.java50
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThermostatFlexContainerAnnc.java95
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainer.java149
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceThreeDPrinterFlexContainerAnnc.java252
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWarningFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterHeaterFlexContainerAnnc.java132
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainer.java40
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWaterValveFlexContainerAnnc.java69
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainer.java166
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeatherStationFlexContainerAnnc.java281
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.java184
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainer.java81
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DeviceWindowShadeFlexContainerAnnc.java116
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DishWasherJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DoorStatusFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainer.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownChannelFlexContainerAnnc.java17
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/DownVolumeFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ElectricVehicleConnectorFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyConsumptionFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainer.java43
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/EnergyGenerationFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FaultDetectionFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FilterInfoFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FlexContainerFactory.java398
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/FoamingFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GeoLocationFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainer.java98
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GlucometerFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/GrinderFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HangupFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeatingZoneFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HeightFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/HotWaterSupplyFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainer.java68
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ImpactSensorFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/IncrementNumberValueFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeepWarmFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/KeypadFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidLevelFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainer.java53
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LiquidRemainingFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/LockFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainer.java73
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MediaSelectFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/MotionSensorFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NextTrackFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/NumberValueFlexContainerAnnc.java48
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ObjectFactory.java1303
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainer.java103
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OpenLevelFlexContainerAnnc.java80
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainer.java53
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OperationModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OvercurrentSensorFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OximeterFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainer.java68
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/OzoneMeterFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PersonSensorFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainer.java115
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PhoneCallFlexContainerAnnc.java96
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainer.java103
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PlayerControlFlexContainerAnnc.java80
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainer.java25
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PowerSaveFlexContainerAnnc.java17
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PreviousTrackFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PrintQueueFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainer.java68
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PulsemeterFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/PushButtonFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RecorderFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RefrigerationFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainer.java28
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RelativeHumidityFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainer.java53
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RemoteControlEnableFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetNumberValueFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ResetTextMessageFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RobotCleanerJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainer.java73
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/RunStateFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SecurityModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SessionDescriptionFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainer.java28
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SignalStrengthFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainer.java38
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SmokeSensorFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SphygmomanometerFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SpinLevelFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Start3DprintFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainer.java63
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/SteamClosetJobModeFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainer.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/Stop3DprintFlexContainerAnnc.java46
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainer.java85
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TelevisionChannelFlexContainerAnnc.java32
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainer.java33
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureAlarmFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainer.java48
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TemperatureFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainer.java96
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TextMessageFlexContainerAnnc.java64
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainer.java113
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ThreeDPrinterFlexContainerAnnc.java80
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainer.java105
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TimerFlexContainerAnnc.java32
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainer.java13
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ToggleFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/TurboFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainer.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpChannelFlexContainerAnnc.java17
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainer.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UpVolumeFlexContainerAnnc.java17
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainer.java58
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/UvSensorFlexContainerAnnc.java47
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterFlowFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WaterSensorFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainer.java23
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/WeightFlexContainerAnnc.java15
-rw-r--r--org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/utils/CustomAttributList.java42
-rw-r--r--org.eclipse.om2m.core.service/.classpath7
-rw-r--r--org.eclipse.om2m.core.service/.project34
-rw-r--r--org.eclipse.om2m.core/.classpath7
-rw-r--r--org.eclipse.om2m.core/.project34
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/DiscoveryController.java34
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/FlexContainerController.java52
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/dynamicauthorization/DynamicAuthorizationSelector.java121
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/ContainerMapper.java8
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/FlexContainerMapper.java26
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/entitymapper/MgmtObjMapper.java44
-rw-r--r--org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/router/Router.java200
-rw-r--r--org.eclipse.om2m.dal.driver.sample/.classpath7
-rw-r--r--org.eclipse.om2m.dal.driver.sample/.project39
-rw-r--r--org.eclipse.om2m.dal/.classpath7
-rw-r--r--org.eclipse.om2m.dal/.project34
-rw-r--r--org.eclipse.om2m.das.service/.classpath7
-rw-r--r--org.eclipse.om2m.das.service/.project34
-rw-r--r--org.eclipse.om2m.das.testsuite/.classpath7
-rw-r--r--org.eclipse.om2m.das.testsuite/.project34
-rw-r--r--org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainer.java4
-rw-r--r--org.eclipse.om2m.das.testsuite/src/main/java/org/eclipse/om2m/das/testsuite/ae/DASServiceTest_FlexContainerAnnc.java4
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/.classpath8
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/.project34
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/pom.xml59
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding.json132
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/src/main/resources/xml-binding.xml22
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestDeviceLightFlexContainer.java123
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestDynAuthTokenReqInfo.java65
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/src/test/java/org/eclipse/om2m/datamapping/jaxb/MapperTestUrilList.java8
-rw-r--r--org.eclipse.om2m.datamapping.jaxb/src/test/resources/deviceLightDatashareFlexContainer.json84
-rw-r--r--org.eclipse.om2m.datamapping.service/.classpath7
-rw-r--r--org.eclipse.om2m.datamapping.service/.project34
-rw-r--r--org.eclipse.om2m.flexcontainer.service/src/main/java/org/eclipse/om2m/flexcontainer/service/FlexContainerService.java2
-rw-r--r--org.eclipse.om2m.interworking.service/.classpath7
-rw-r--r--org.eclipse.om2m.interworking.service/.project34
-rw-r--r--org.eclipse.om2m.ipe.dal/.classpath7
-rw-r--r--org.eclipse.om2m.ipe.dal/.project34
-rw-r--r--org.eclipse.om2m.ipe.sample.sdt/.classpath7
-rw-r--r--org.eclipse.om2m.ipe.sample.sdt/.project34
-rw-r--r--org.eclipse.om2m.ipe.sample.sdt/src/main/java/org/eclipse/om2m/ipe/sample/sdt/model/Lamp.java2
-rw-r--r--org.eclipse.om2m.ipe.sample/.classpath7
-rw-r--r--org.eclipse.om2m.ipe.sample/.project34
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/.classpath7
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/.project34
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/CSEUtil.java3
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/DeviceDiscoveryTestSuite.java33
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/SDTModuleTestSuite.java8
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AbstractModuleTest.java1
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/AlarmSpeakerModuleTest.java42
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/BinarySwitchModuleTest.java6
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourModuleTest.java18
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/ColourSaturationModuleTest.java15
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/FaultDetectionModuleTest.java20
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/RunModeModuleTest.java307
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/SmokeSensorModuleTest.java6
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterLevelModuleTest.java19
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/module/WaterSensorModuleTest.java12
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionHttpServlet.java1
-rw-r--r--org.eclipse.om2m.ipe.sdt.testsuite/src/main/java/org/eclipse/om2m/ipe/sdt/testsuite/subscription/SubscriptionTestSuite.java13
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/ModuleSDTListener.java4
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTActionAdaptor.java2
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTDeviceAdaptor.java11
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTModuleAdaptor.java36
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/SDTUtil.java93
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ActionFlexContainerService.java21
-rw-r--r--org.eclipse.om2m.ipe.sdt/src/main/java/org/eclipse/om2m/ipe/sdt/flexcontainerservice/ModuleFlexContainerService.java33
-rw-r--r--org.eclipse.om2m.persistence.eclipselink/.classpath9
-rw-r--r--org.eclipse.om2m.persistence.eclipselink/.project34
-rw-r--r--org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeAnncDAO.java4
-rw-r--r--org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/AeDAO.java4
-rw-r--r--org.eclipse.om2m.persistence.eclipselink/src/main/java/org/eclipse/om2m/persistence/eclipselink/internal/dao/FlexContainerAnncDAO.java5
-rw-r--r--org.eclipse.om2m.persistence.mongodb/.classpath9
-rw-r--r--org.eclipse.om2m.persistence.mongodb/.project34
-rw-r--r--org.eclipse.om2m.persistence.service/.classpath7
-rw-r--r--org.eclipse.om2m.persistence.service/.project34
-rw-r--r--org.eclipse.om2m.sdt.comparator.xml/.classpath7
-rw-r--r--org.eclipse.om2m.sdt.comparator.xml/.project34
-rw-r--r--org.eclipse.om2m.sdt/.project17
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/DataPoint.java25
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/Identifiers.java6
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/ModuleClass.java14
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ArrayDataPoint.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/EnumDataPoint.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/datapoints/ValuedDataPoint.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Array.java43
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/BasicType.java79
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/DataType.java46
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/SimpleType.java12
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.api/src/main/java/org/eclipse/om2m/sdt/types/Struct.java10
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/.project17
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/build.properties23
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/pom.xml26
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/src/main/java/org/eclipse/om2m/sdt/home/monitoring/authentication/service/AuthenticationInfo.java31
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/src/main/java/org/eclipse/om2m/sdt/home/monitoring/authentication/service/AuthenticationService.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.applications.authentication.service/src/main/java/org/eclipse/om2m/sdt/home/monitoring/authentication/service/UserInfo.java43
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/META-INF/MANIFEST.MF65
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/OSGI-INF/home.monitoring.application.xml7
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/build.properties49
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/Activator.java277
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/AuthenticationServiceServlet.java67
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/CredentialsServlet.java117
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/HomeServlet.java133
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/InCseContextServlet.java12
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LoginServlet.java116
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/LogoutServlet.java80
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/MyHttpContext.java80
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/servlet/SessionManager.java89
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AeRegistration.java7
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/AuthFillter.java173
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/Constants.java62
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/java/org/eclipse/om2m/sdt/home/monitoring/util/HttpSessionHelper.java69
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/css/color_picker.css86
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/css/style.css4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/images/pointer.png (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/images/marker.png)bin652 -> 652 bytes
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/images/ringM2M.pngbin0 -> 6693 bytes
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/app.js240
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/color_picker.js268
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/color_tools.js77
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/js/farbtastic.js465
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/login.html165
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/org.eclipse.om2m.sdt.home.monitoring/src/main/resources/webapps/monitor.html31
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.applications/pom.xml78
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/ResourceDiscovery.java64
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.cloud/src/main/java/org/eclipse/om2m/sdt/home/cloud/SDTUtil.java16
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/META-INF/MANIFEST.MF3
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.driver/src/main/java/org/eclipse/om2m/sdt/home/driver/Logger.java68
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOFloodDetector.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLight.java71
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOLightBlindControl.java34
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.enocean/src/main/java/org/eclipse/om2m/sdt/home/enocean/EOWaterValve.java33
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.hue/src/main/java/org/eclipse/om2m/sdt/home/hue/HomeLight.java114
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/.classpath8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/.project34
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/LIFXDevice.java1
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/DiscoveryCloud.java62
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/cloud/LIFXDeviceCloud.java14
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/impl/lan/LIFXDeviceLan.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.lifx/src/main/java/org/eclipse/om2m/sdt/home/lifx/sdt/LIFXSDTDevice.java25
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/Activator.java23
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedCamera.java53
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedDeviceNumberDevice.java49
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedKettle.java82
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedLight.java7
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSmartElectricMeter.java5
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSwitch.java (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedSwitchButton.java)6
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedThermometer.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWarningDevice.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWaterValve.java13
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/devices/MockedWeatherStation.java60
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedAlarmSpeaker.java11
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedDoorStatus.java9
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedLock.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedPlayerControl.java41
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedRunMode.java47
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedRunState.java66
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedSessionDescription.java42
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedStreaming.java47
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java33
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/.classpath9
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/.project39
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/Home.java3
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/model/WelcomeCamera.java16
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWeatherStation.java70
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/main/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDevice.java76
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.netatmo/src/test/java/org/eclipse/om2m/sdt/home/netatmo/sdt/SDTWelcomeCameraDeviceTestCase.java28
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/.classpath7
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/.project34
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/Activator.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/SmarterCoffeeMachine.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeCommunication.java9
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smartercoffee/src/main/java/org/eclipse/om2m/sdt/home/smartercoffee/communication/SmarterCoffeeStatus.java24
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/pom.xml2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/Activator.java80
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/SmarterKettle.java36
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleCommunication.java8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleMain.java8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/SmarterKettleStatus.java80
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.smarterkettle/src/main/java/org/eclipse/om2m/sdt/home/smarterkettle/communication/TCPConnection.java25
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.tester/src/main/java/org/eclipse/om2m/sdt/home/tester/Activator.java28
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTDiscovery.java68
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.utils/src/main/java/org/eclipse/om2m/sdt/home/utils/SDTUtil.java16
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/META-INF/MANIFEST.MF15
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/NextTrack.java34
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/actions/PreviousTrack.java34
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/AirQualityMonitor.java (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/DeviceNumberDevice.java)26
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Camera.java52
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/CoffeeMachine.java18
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericDevice.java8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/GenericSensor.java10
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/HomeCCTV.java187
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Kettle.java91
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Light.java18
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/MotionDetector.java3
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmartElectricMeter.java18
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Switch.java (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SwitchButton.java)19
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Thermostat.java18
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/Warning.java (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WarningDevice.java)6
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WaterHeater.java18
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/WeatherStation.java129
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AbstractAlarmSensor.java8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AcousticSensor.java66
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AirQualitySensor.java229
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AlarmSpeaker.java10
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Anemometer.java (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Noise.java)40
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AtmosphericPressureSensor.java50
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/AudioVolume.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Barometer.java118
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Battery.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/BinarySwitch.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiler.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Boiling.java63
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brewing.java8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Brightness.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/CarbonDioxideSensor.java34
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/CarbonMonoxideSensor.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Clock.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Colour.java6
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ColourSaturation.java6
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ContactSensor.java7
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Credentials.java90
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/DoorStatus.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyConsumption.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/EnergyOverloadCircuitBreaker.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/ExtendedCarbonDioxideSensor.java53
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/FaultDetection.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Foaming.java6
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GenericSensor.java8
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/GlassBreakSensor.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Grinder.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/HotWaterSupply.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/LiquidLevel.java7
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Lock.java4
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/NumberValue.java10
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PersonSensor.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PlayerControl.java155
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PresenceSensor.java28
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/PushButton.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RelativeHumidity.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunMode.java88
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/RunState.java51
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SessionDescription.java70
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/SmokeSensor.java49
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Streaming.java92
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/Temperature.java2
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/TouchSensor.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/modules/UvSensor.java66
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ActionType.java58
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/AlertColourCode.java26
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DatapointType.java272
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DeviceType.java111
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/DoorState.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/FlexContainers.java62
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/FoamStrength.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrainsLevel.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/GrindCoarseness.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeBasicType.java84
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeDataType.java61
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/HomeSimpleType.java39
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/JobState.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/JobStates.java104
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/LiquidLevel.java29
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java48
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/ModuleType.java167
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/PlayerMode.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SpinLevel.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/SupportedMediaSources.java27
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/TasteStrength.java33
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/Tone.java32
-rw-r--r--org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/UvStatus.java (renamed from org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/devices/SmokeExtractor.java)20
-rw-r--r--org.eclipse.om2m.sdt/pom.xml1
-rw-r--r--org.eclipse.om2m.site.asn-cse/.project17
-rw-r--r--org.eclipse.om2m.site.in-cse/.project17
-rw-r--r--org.eclipse.om2m.site.in-cse/log4j.configuration2
-rw-r--r--org.eclipse.om2m.site.in-cse/om2m.product14
-rw-r--r--org.eclipse.om2m.site.in-cse/pax-confman-propsloader-0.2.2.jarbin0 -> 28158 bytes
-rw-r--r--org.eclipse.om2m.site.in-cse/pom.xml12
-rw-r--r--org.eclipse.om2m.site.mn-cse/.project17
-rw-r--r--org.eclipse.om2m.site.mn-cse/configurations/services/hue.basedriver.properties8
-rw-r--r--org.eclipse.om2m.site.mn-cse/om2m.product6
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/.classpath7
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/.project34
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AccessControlPolicyTest.java12
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/Activator.java2
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/AlarmSpeakerFlexContainerTest.java38
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/BinarySwitchFlexContainerTest.java22
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/CallbackTest.java30
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/EnergyConsumptionFlexContainerTest.java110
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FaultDetectionFlexContainerTest.java42
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FlexContainerTestSuite.java16
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/FloodDetectorFlexContainerTest.java40
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/GasValveFlexContainerTest.java40
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightDeviceFlexContainerTest.java40
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LightFlexContainerTest.java62
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/LocationFlexContainerTest.java8
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/RunStateFlexContainerTest.java (renamed from org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/RunModeFlexContainerTest.java)140
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmartElectricMeterFlexContainerTest.java48
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SmokeDetectorFlexContainerTest.java40
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/SubscriptionTest.java26
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WarningDeviceFlexContainerTest.java52
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterSensorFlexContainerTest.java26
-rw-r--r--org.eclipse.om2m.testsuite.flexcontainer/src/main/java/org/eclipse/om2m/testsuite/flexcontainer/WaterValveFlexContainerTest.java40
-rw-r--r--org.eclipse.om2m.webapp.resourcesbrowser.json/.classpath7
-rw-r--r--org.eclipse.om2m.webapp.resourcesbrowser.json/.project34
-rw-r--r--org.eclipse.om2m.webapp.resourcesbrowser.json/src/main/resources/webapps/om2m.js600
-rw-r--r--org.eclipse.om2m.webapp.resourcesbrowser.xml/.classpath7
-rw-r--r--org.eclipse.om2m.webapp.resourcesbrowser.xml/.project34
-rw-r--r--protocols/.project17
-rw-r--r--protocols/org.eclipse.om2m.protocols.hue/.project17
688 files changed, 28180 insertions, 12454 deletions
diff --git a/.gitignore b/.gitignore
index 8d5a6057..4729d750 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
target
data
.DS_Store
-.settings \ No newline at end of file
+.settings
+.classpath
+.project
+bin \ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aaedff16..9c4bed34 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,9 @@
-image: registry.forge.orange-labs.fr/org.eclipse.om2m/om2m/com.orange.om2m.docker.builder:0.0.5
+image: registry.forge.orange-labs.fr/org.eclipse.om2m/om2m/com.orange.om2m.docker.builder:0.0.6
+variables:
+ MAVEN_OPTS: "-Xms4000m -Xmx6000m"
+
+
cache:
paths:
- .m2
@@ -15,6 +19,7 @@ build:
script:
- "nohup dockerd&"
- "mvn clean install -Dmaven.repo.local=./.m2/repository -B -s /root/.m2/settings.xml"
+ - "mvn sonar:sonar -Dsonar.host.url=http://10.192.37.63/sonar"
tags:
- docker-privileged
- rsc
@@ -24,7 +29,7 @@ deploy:
stage: deploy
script:
- "nohup dockerd&"
- - "mvn deploy -B -Dmaven.repo.local=./.m2/repository -s /root/.m2/settings.xml -DaltDeploymentRepository=inhouse.snapshot::default::http://maven2.rd.francetelecom.fr/proxy/repository/inhouse.snapshot -Drepo=${CI_COMMIT_REF_NAME} -Pdocker"
+ - "mvn deploy -B -Dmaven.test.skip=true -Dmaven.repo.local=./.m2/repository -s /root/.m2/settings.xml -DaltDeploymentRepository=inhouse.snapshot::default::http://maven2.rd.francetelecom.fr/proxy/repository/inhouse.snapshot -Drepo=${CI_COMMIT_REF_NAME} -Pdocker"
- "rm -fr .m2"
tags:
- docker-privileged
diff --git a/.project b/.project
deleted file mode 100644
index 1cd62f30..00000000
--- a/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/com.orange.om2m.p2.repo/.project b/com.orange.om2m.p2.repo/.project
deleted file mode 100644
index 7f9e244e..00000000
--- a/com.orange.om2m.p2.repo/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>com.orange.om2m.p2.repo</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
-</projectDescription>
diff --git a/com.orange.om2m.p2.repo/category.xml b/com.orange.om2m.p2.repo/category.xml
index b19aad18..3047497f 100644
--- a/com.orange.om2m.p2.repo/category.xml
+++ b/com.orange.om2m.p2.repo/category.xml
@@ -123,6 +123,9 @@
<bundle id="org.eclipse.om2m.hue.impl" version="1.1.0.qualifier">
<category name="om2m"/>
</bundle>
+ <bundle id="org.eclipse.om2m.sdt.home.monitoring.authentication.service" version="1.1.0.qualifier">
+ <category name="om2m"/>
+ </bundle>
<category-def name="om2m" label="om2m">
<description>
om2m p2 repository
diff --git a/org.eclipse.om2m.android.dashboard/.classpath b/org.eclipse.om2m.android.dashboard/.classpath
deleted file mode 100644
index 4becec1e..00000000
--- a/org.eclipse.om2m.android.dashboard/.classpath
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="bin/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="gen">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="me.gladwell.eclipse.m2e.android.classpath.NONRUNTIME_DEPENDENCIES">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
- <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
- <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.android.dashboard/.project b/org.eclipse.om2m.android.dashboard/.project
deleted file mode 100644
index 57a4e827..00000000
--- a/org.eclipse.om2m.android.dashboard/.project
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>dashboard.sdt</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.android.ide.eclipse.adt.ApkBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>com.android.ide.eclipse.adt.AndroidNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- </natures>
- <linkedResources>
- <link>
- <name>AndroidManifest.xml</name>
- <type>1</type>
- <locationURI>PROJECT_LOC/src/main/AndroidManifest.xml</locationURI>
- </link>
- </linkedResources>
-</projectDescription>
diff --git a/org.eclipse.om2m.binding.coap/.classpath b/org.eclipse.om2m.binding.coap/.classpath
deleted file mode 100644
index 2a7df70d..00000000
--- a/org.eclipse.om2m.binding.coap/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/main/java/"/>
- <classpathentry exported="true" kind="lib" path="libs/californium-0.18.6-final.jar"/>
- <classpathentry exported="true" kind="lib" path="libs/element-connector-0.2-final.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.binding.coap/.project b/org.eclipse.om2m.binding.coap/.project
deleted file mode 100644
index 22688b79..00000000
--- a/org.eclipse.om2m.binding.coap/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m.binding.coap</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.om2m.binding.http/.classpath b/org.eclipse.om2m.binding.http/.classpath
deleted file mode 100644
index 56b865eb..00000000
--- a/org.eclipse.om2m.binding.http/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/main/java/"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.binding.http/.project b/org.eclipse.om2m.binding.http/.project
deleted file mode 100644
index e9d02a5a..00000000
--- a/org.eclipse.om2m.binding.http/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m.binding.http</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java
index 0809f6de..0c8909f0 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/RestHttpServlet.java
@@ -25,6 +25,7 @@ import java.math.BigInteger;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Base64;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -62,6 +63,12 @@ public class RestHttpServlet extends HttpServlet {
private static Log LOGGER = LogFactory.getLog(RestHttpServlet.class);
/** Serial Version UID */
private static final long serialVersionUID = 1L;
+ /** Bearer Auth Type */
+ private static final String BEARER_AUTH_TYPE = "Bearer";
+ /** Basic Auth Type */
+ private static final String BASIC_AUTH_TYPE = "Basic";
+ /** Authorization header */
+ private static final String AUTHORIZATION_HEADER = "Authorization";
/** Discovered CSE service */
private static CseService cse;
@@ -335,10 +342,13 @@ public class RestHttpServlet extends HttpServlet {
// Get the originator from the X-M2M-Origin header
- String authorization = httpServletRequest.getHeader(HttpHeaders.ORIGINATOR);
- if (authorization != null) {
- request.setFrom(authorization);
+ String originator = httpServletRequest.getHeader(HttpHeaders.ORIGINATOR);
+ if (originator != null) {
+ request.setFrom(originator);
}
+
+ // authorization
+ parseAuthorizationHeader(request, httpServletRequest.getHeader(AUTHORIZATION_HEADER));
// Get the request identifier
String requestIdentifier = httpServletRequest.getHeader(HttpHeaders.REQUEST_IDENTIFIER) ;
@@ -413,6 +423,31 @@ public class RestHttpServlet extends HttpServlet {
}
+ private void parseAuthorizationHeader(RequestPrimitive request, String authorizationHeader) {
+ LOGGER.info("parseAuthorizationHeader(authorizationHeader:" + authorizationHeader + ")" );
+ if ((authorizationHeader == null) || (authorizationHeader.isEmpty())) {
+ return;
+ }
+
+ if (authorizationHeader.startsWith(BASIC_AUTH_TYPE)) {
+ // basic type
+ LOGGER.debug("request with basic http auth");
+
+ String base64UsernameAndPassword = authorizationHeader.substring(BASIC_AUTH_TYPE.length() + 1).trim();
+ String usernameAndPassword = new String(Base64.getDecoder().decode(base64UsernameAndPassword));
+
+ request.setFrom(usernameAndPassword);
+ }
+
+ if (authorizationHeader.startsWith(BEARER_AUTH_TYPE)) {
+ // bearer type
+ String accessToken = authorizationHeader.substring(BEARER_AUTH_TYPE.length() + 1);
+
+ request.getTokens().add(accessToken);
+ }
+
+ }
+
public static String httpRequestToString(HttpServletRequest request, String content){
String heads = "{\n";
Enumeration<String> headerNames = request.getHeaderNames();
diff --git a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java
index 36c8def0..20697bdb 100644
--- a/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java
+++ b/org.eclipse.om2m.binding.http/src/main/java/org/eclipse/om2m/binding/http/constants/HttpHeaders.java
@@ -1,44 +1,46 @@
-/*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
- * 7 Colonel Roche 31077 Toulouse - France
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * Thierry Monteil : Project manager, technical co-manager
- * Mahdi Ben Alaya : Technical co-manager
- * Samir Medjiah : Technical co-manager
- * Khalil Drira : Strategy expert
- * Guillaume Garzone : Developer
- * François Aïssaoui : Developer
- *
- * New contributors :
- *******************************************************************************/
-package org.eclipse.om2m.binding.http.constants;
-
-public class HttpHeaders {
-
- /** Private constructor */
- private HttpHeaders(){
- }
-
- public static final String REQUEST_IDENTIFIER = "X-M2M-RI";
- public static final String ACCEPT = "Accept";
- public static final String CONTENT_TYPE = "Content-Type";
- public static final String CONTENT_LOCATION = "Content-Location";
- public static final String ETAG = "Etag";
- public static final String ORIGINATOR = "X-M2M-Origin";
- public static final String GROUP_REQUEST_IDENTIFIER = "X-M2M-GID";
- public static final String RESPONSE_TYPE = "X-M2M-RTU";
- public static final String HOST = "Host";
- public static final String ORIGINATING_TIMESTAMP = "X-M2M-OT";
- public static final String RESULT_EXPIRATION_TIMESTAMP = "X-M2M-RST";
- public static final String REQUEST_EXPIRATION_TIMESTAMP = "X-M2M-RET";
- public static final String OPERATION_EXECUTION_TIME = "X-M2M-OET";
- public static final String EVENT_CATEGORY = "X-M2M-EC";
- public static final String RESPONSE_STATUS_CODE = "X-M2M-RSC";
-
-}
+/*******************************************************************************
+ * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * 7 Colonel Roche 31077 Toulouse - France
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Initial Contributors:
+ * Thierry Monteil : Project manager, technical co-manager
+ * Mahdi Ben Alaya : Technical co-manager
+ * Samir Medjiah : Technical co-manager
+ * Khalil Drira : Strategy expert
+ * Guillaume Garzone : Developer
+ * François Aïssaoui : Developer
+ *
+ * New contributors :
+ *******************************************************************************/
+package org.eclipse.om2m.binding.http.constants;
+
+public class HttpHeaders {
+
+ /** Private constructor */
+ private HttpHeaders(){
+ }
+
+ public static final String REQUEST_IDENTIFIER = "X-M2M-RI";
+ public static final String ACCEPT = "Accept";
+ public static final String CONTENT_TYPE = "Content-Type";
+ public static final String CONTENT_LOCATION = "Content-Location";
+ public static final String AUTHORIZATION = "Authorization";
+ public static final String ETAG = "Etag";
+ public static final String ORIGINATOR = "X-M2M-Origin";
+ public static final String GROUP_REQUEST_IDENTIFIER = "X-M2M-GID";
+ public static final String RESPONSE_TYPE = "X-M2M-RTU";
+ public static final String HOST = "Host";
+ public static final String ORIGINATING_TIMESTAMP = "X-M2M-OT";
+ public static final String RESULT_EXPIRATION_TIMESTAMP = "X-M2M-RST";
+ public static final String REQUEST_EXPIRATION_TIMESTAMP = "X-M2M-RET";
+ public static final String OPERATION_EXECUTION_TIME = "X-M2M-OET";
+ public static final String EVENT_CATEGORY = "X-M2M-EC";
+ public static final String RESPONSE_STATUS_CODE = "X-M2M-RSC";
+ public static final String TOKEN = "X-M2M-Token";
+
+}
diff --git a/org.eclipse.om2m.binding.mqtt/.classpath b/org.eclipse.om2m.binding.mqtt/.classpath
deleted file mode 100644
index f7edce6b..00000000
--- a/org.eclipse.om2m.binding.mqtt/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="lib" path="libs/org.eclipse.paho.client.mqttv3-1.0.2.jar"/>
- <classpathentry kind="src" path="src/main/java/"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.binding.mqtt/.project b/org.eclipse.om2m.binding.mqtt/.project
deleted file mode 100644
index fed26a33..00000000
--- a/org.eclipse.om2m.binding.mqtt/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m.binding.mqtt</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.om2m.binding.service/.classpath b/org.eclipse.om2m.binding.service/.classpath
deleted file mode 100644
index 642bfb34..00000000
--- a/org.eclipse.om2m.binding.service/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.binding.service/.project b/org.eclipse.om2m.binding.service/.project
deleted file mode 100644
index a413df64..00000000
--- a/org.eclipse.om2m.binding.service/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m.binding.service</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.om2m.commons.logging/.classpath b/org.eclipse.om2m.commons.logging/.classpath
deleted file mode 100644
index b845c2b5..00000000
--- a/org.eclipse.om2m.commons.logging/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry exported="true" kind="lib" path="libs/org.apache.log4j_1.2.13.v200903072027.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.commons.logging/.project b/org.eclipse.om2m.commons.logging/.project
deleted file mode 100644
index 48280b2d..00000000
--- a/org.eclipse.om2m.commons.logging/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m.commons.logging</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.om2m.commons/.classpath b/org.eclipse.om2m.commons/.classpath
deleted file mode 100644
index 848ca71e..00000000
--- a/org.eclipse.om2m.commons/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry exported="true" kind="lib" path="libs/javax.persistence.jar"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/org.eclipse.om2m.commons/.project b/org.eclipse.om2m.commons/.project
deleted file mode 100644
index 331307cd..00000000
--- a/org.eclipse.om2m.commons/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.om2m.commons</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.m2e.core.maven2Nature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java
index 37f91d64..76371148 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/ShortName.java
@@ -382,7 +382,7 @@ public class ShortName {
public static final String HOSTED_SRV_LINK = "hsl";
// Short names for mgmt objects generic attributes
- public static final String DESCRIPTION = "des";
+ public static final String DESCRIPTION = "dc";
public static final String MGMT_DEF = "mgd";
public static final String OBJ_IDS = "obis";
public static final String OBJ_PATHS = "obps";
@@ -447,16 +447,16 @@ public class ShortName {
public static final String SW_VERSION = "swv";
public static final String HW_VERSION = "hwv";
public static final String OS_VERSION = "osv";
- public static final String MANUF_DET_LINKS = "mfdtl";
- public static final String MANUF_DATE = "mfDte";
- public static final String DEVICE_SUB_MODEL = "sumod";
- public static final String DEVICE_NAME = "dnm";
- public static final String COUNTRY = "ctry";
+ public static final String MANUF_DET_LINKS = "mfdl";
+ public static final String MANUF_DATE = "mfd";
+ public static final String DEVICE_SUB_MODEL = "smod";
+ public static final String DEVICE_NAME = "dvnm";
+ public static final String COUNTRY = "cnty";
public static final String LOCATION = "loc";
public static final String SYS_TIME = "syst";
- public static final String SUPPORT_URL = "surl";
+ public static final String SUPPORT_URL = "spur";
public static final String PRES_URL = "purl";
- public static final String PROTOCOL = "prtl";
+ public static final String PROTOCOL = "ptl";
// short names for battery
public static final String BATTERY_LEVEL = "btl";
@@ -469,4 +469,22 @@ public class ShortName {
public static final String DYNAMIC_AUTHORIZATION_ENABLED = "dae";
public static final String DYNAMIC_AUTHORIZATION_PoA = "dap";
public static final String DYNAMIC_AUTHORIZATION_LIFETIME = "dal";
+
+ // short names for DynAuthDasRequest
+ public static final String TARGETED_RESOURCE_TYPE = "tirt";
+ public static final String TARGETED_RESOURCE_ID = "trid";
+ public static final String ORIGINATOR_IP = "oip";
+ public static final String ORIGINATOR_LOCATION = "olo";
+ public static final String ORIGINATOR_ROLE_IDS = "orid";
+ public static final String REQUEST_TIMESTAMP = "rts";
+ public static final String PROPOSED_PRIVILEDGES_LIFETIME = "ppl";
+ public static final String ROLE_IDS_FROM_ACPS = "rfa";
+ public static final String TOKEN_IDS = "tids";
+
+ // short names for DynamicAuthTokenReqInfo
+ public static final String DYNAMIC_AUTHORIZATION_TOKEN_REQ_INFO = "tqf";
+ public static final String TOKEN_REQ_INFO = "tqf";
+ public static final String DAS_INFO = "dasi";
+ public static final String URI = "uri";
+ public static final String DAS_REQUEST = "daq";
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java
index cd633a8f..7d66e49b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CSEBaseEntity.java
@@ -148,7 +148,7 @@ public class CSEBaseEntity extends ResourceEntity {
/** List of FlexContainerEntites */
- @OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
+ @OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL}, mappedBy="parentCSEB")
@JoinTable(
name=DBEntities.CSEB_FCNT_JOIN,
joinColumns={@JoinColumn(name=DBEntities.CSEB_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java
index 95153a6e..391a3821 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ContainerEntity.java
@@ -1,447 +1,447 @@
-/*******************************************************************************
-
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
- * 7 Colonel Roche 31077 Toulouse - France
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * Thierry Monteil : Project manager, technical co-manager
- * Mahdi Ben Alaya : Technical co-manager
- * Samir Medjiah : Technical co-manager
- * Khalil Drira : Strategy expert
- * Guillaume Garzone : Developer
- * François Aïssaoui : Developer
- *
- * New contributors :
- *******************************************************************************/
-package org.eclipse.om2m.commons.entities;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.JoinColumn;
-import javax.persistence.JoinTable;
-import javax.persistence.ManyToMany;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-
-import org.eclipse.om2m.commons.constants.DBEntities;
-import org.eclipse.om2m.commons.constants.ShortName;
-
-/**
- * Container JPA entity
- *
- */
-@Entity(name=DBEntities.CONTAINER_ENTITY)
-@Inheritance(strategy = InheritanceType.JOINED)
-public class ContainerEntity extends AnnounceableSubordinateEntity{
- @Column(name= ShortName.STATETAG)
- protected BigInteger stateTag;
- @Column(name= ShortName.CREATOR)
- protected String creator;
- @Column(name= ShortName.MAX_NR_OF_INSTANCES)
- protected BigInteger maxNrOfInstances;
- @Column(name= ShortName.MAX_BYTE_SIZE)
- protected BigInteger maxByteSize;
- @Column(name= ShortName.CURRENT_NUMBER_OF_INSTANCES)
- protected BigInteger currentNrOfInstances;
- @Column(name= ShortName.MAX_INSTANCE_AGE)
- protected BigInteger maxInstanceAge;
- @Column(name= ShortName.LOCATION_ID)
- protected String locationID;
- @Column(name= ShortName.ONTOLOGY_REF)
- protected String ontologyRef;
-
- @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.LAZY, mappedBy="parentCnt")
- @JoinTable(
- name = DBEntities.CNTSUB_JOIN,
- joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
- inverseJoinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
- )
- protected List<SubscriptionEntity> subscriptions;
-
- /** List of AccessControlPolicies */
- @OneToMany(fetch=FetchType.LAZY)
- @JoinTable(
- name = DBEntities.CNTACP_JOIN,
- joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
- inverseJoinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
- )
- protected List<AccessControlPolicyEntity> accessControlPolicies;
-
- /** List of DynamicAuthorizationConsultations*/
- @ManyToMany(fetch=FetchType.LAZY, mappedBy="linkedContainerEntities")
- @JoinTable(
- name = DBEntities.CNT_DAC_JOIN,
- joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
- inverseJoinColumns = { @JoinColumn(name = DBEntities.DAC_JOINID, referencedColumnName = ShortName.RESOURCE_ID) }
- )
- protected List<DynamicAuthorizationConsultationEntity> dynamicAuthorizationConsultations;
-
- /** List of child Container Entities */
- @OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
- @JoinTable(
- name=DBEntities.CNTCNTCHILD_JOIN,
- joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- inverseJoinColumns={@JoinColumn(name=DBEntities.CNTCH_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
- protected List<ContainerEntity> childContainers;
-
- /** List of child ContentInstances Entities */
- @OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
- @JoinTable(
- name=DBEntities.CNTCINCHILD_JOIN,
- joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- inverseJoinColumns={@JoinColumn(name=DBEntities.CINCH_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
- @OrderBy("creationTime")
- protected List<ContentInstanceEntity> childContentInstances;
-
- /** List of child FlexContainer entities */
- @OneToMany(fetch=FetchType.LAZY, cascade=CascadeType.ALL)
- @JoinTable(
- name=DBEntities.CNT_FCNTCHILD_JOIN,
- joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- inverseJoinColumns={@JoinColumn(name=DBEntities.FCNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
- protected List<FlexContainerEntity> childFlexContainers;
-
- // Database link to the possible parent Container
- @ManyToOne(fetch=FetchType.LAZY, targetEntity=ContainerEntity.class)
- @JoinTable(
- name=DBEntities.CNTCNTCHILD_JOIN,
- inverseJoinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- joinColumns={@JoinColumn(name=DBEntities.CNTCH_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
- protected ContainerEntity parentContainer;
-
- @ManyToOne(fetch=FetchType.LAZY, targetEntity=FlexContainerEntity.class)
- @JoinTable(
- name=DBEntities.FCNT_CNTCHILD_JOIN,
- inverseJoinColumns={@JoinColumn(name=DBEntities.FCNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
- protected FlexContainerEntity parentFlexContainer;
-
- // Database link to the possible parent Application Entity
- @ManyToOne(fetch=FetchType.LAZY, targetEntity=AeEntity.class)
- @JoinTable(
- name = DBEntities.AECNTCHILD_JOIN,
- inverseJoinColumns = { @JoinColumn(name = DBEntities.AE_JOINID, referencedColumnName = ShortName.RESOURCE_ID) },
- joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
- )
- protected AeEntity parentAE;
-
- // Database link to the possible parent CSEBase Entity
- @ManyToOne(fetch=FetchType.LAZY, targetEntity=CSEBaseEntity.class)
- @JoinTable(
- name=DBEntities.CSEB_CNT_JOIN,
- inverseJoinColumns={@JoinColumn(name=DBEntities.CSEB_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
- protected CSEBaseEntity parentCSEB;
-
- // Database link to the possible parent remote cse Entity
- @ManyToOne(fetch=FetchType.LAZY, targetEntity=RemoteCSEEntity.class)
- @JoinTable(
- name=DBEntities.CSRCNTCHILD_JOIN,
- inverseJoinColumns={@JoinColumn(name=DBEntities.CSR_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
- joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
- )
-
-
- public BigInteger getCurrentNrOfInstances() {
- return currentNrOfInstances;
- }
-
- public void setCurrentNrOfInstances(BigInteger currentNrOfInstances) {
- this.currentNrOfInstances = currentNrOfInstances;
- }
-
- protected RemoteCSEEntity parentCSR;
-
- /**
- * @return the parentContainer
- */
- public ContainerEntity getParentContainer() {
- return parentContainer;
- }
-
- /**
- * @param parentContainer the parentContainer to set
- */
- public void setParentContainer(ContainerEntity parentContainer) {
- this.parentContainer = parentContainer;
- }
-
- /**
- * @return the parentAE
- */
- public AeEntity getParentAE() {
- return parentAE;
- }
-
- /**
- * @param parentAE the parentAE to set
- */
- public void setParentAE(AeEntity parentAE) {
- this.parentAE = parentAE;
- }
-
- /**
- * @return the parentCSEB
- */
- public CSEBaseEntity getParentCSEB() {
- return parentCSEB;
- }
-
- /**
- * @param parentCSEB the parentCSEB to set
- */
- public void setParentCSEB(CSEBaseEntity parentCSEB) {
- this.parentCSEB = parentCSEB;
- }
-
- /**
- * @return the stateTag
- */
- public BigInteger getStateTag() {
- return stateTag;
- }
-
- /**
- * @param stateTag the stateTag to set
- */
- public void setStateTag(BigInteger stateTag) {
- this.stateTag = stateTag;
- }
-
- /**
- * @return the creator
- */
- public String getCreator() {
- return creator;
- }
-
- /**
- * @param creator the creator to set
- */
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- /**
- * @return the maxNrOfInstances
- */
- public BigInteger getMaxNrOfInstances() {
- return maxNrOfInstances;
- }
-
- /**
- * @param maxNrOfInstances the maxNrOfInstances to set
- */
- public void setMaxNrOfInstances(BigInteger maxNrOfInstances) {
- this.maxNrOfInstances = maxNrOfInstances;
- }
-
- /**
- * @return the maxByteSize
- */
- public BigInteger getMaxByteSize() {
- return maxByteSize;
- }
-
- /**
- * @param maxByteSize the maxByteSize to set
- */
- public void setMaxByteSize(BigInteger maxByteSize) {
- this.maxByteSize = maxByteSize;
- }
-
- /**
- * @return the maxInstanceAge
- */
- public BigInteger getMaxInstanceAge() {
- return maxInstanceAge;
- }
-
- /**
- * @param maxInstanceAge the maxInstanceAge to set
- */
- public void setMaxInstanceAge(BigInteger maxInstanceAge) {
- this.maxInstanceAge = maxInstanceAge;
- }
-
- /**
- * @return the locationID
- */
- public String getLocationID() {
- return locationID;
- }
-
- /**
- * @param locationID the locationID to set
- */
- public void setLocationID(String locationID) {
- this.locationID = locationID;
- }
-
- /**
- * @return the ontologyRef
- */
- public String getOntologyRef() {
- return ontologyRef;
- }
-
- /**
- * @param ontologyRef the ontologyRef to set
- */
- public void setOntologyRef(String ontologyRef) {
- this.ontologyRef = ontologyRef;
- }
-
- /**
- * @return the childContainers
- */
- public List<ContainerEntity> getChildContainers() {
- if (this.childContainers == null) {
- this.childContainers = new ArrayList<>();
- }
- return childContainers;
- }
-
- /**
- * @param childContainers the childContainers to set
- */
- public void setChildContainers(List<ContainerEntity> childContainers) {
- this.childContainers = childContainers;
- }
-
- /**
- * @return the childFlexContainers
- */
- public List<FlexContainerEntity> getChildFlexContainers() {
- if (this.childFlexContainers == null) {
- this.childFlexContainers = new ArrayList<>();
- }
- return childFlexContainers;
- }
-
- /**
- * @param childFlexContainers the childFlexContainers to set
- */
- public void setChildFlexContainers(List<FlexContainerEntity> childFlexContainers) {
- this.childFlexContainers = childFlexContainers;
- }
-
- /**
- * @return the accessControlPolicies
- */
- public List<AccessControlPolicyEntity> getAccessControlPolicies() {
- if (accessControlPolicies == null) {
- accessControlPolicies = new ArrayList<>();
- }
- return accessControlPolicies;
- }
-
- /**
- * @param accessControlPolicies the accessControlPolicies to set
- */
- public void setAccessControlPolicies(
- List<AccessControlPolicyEntity> accessControlPolicies) {
- this.accessControlPolicies = accessControlPolicies;
- }
-
- /**
- * @return the childContentInstances
- */
- public List<ContentInstanceEntity> getChildContentInstances() {
- if (childContentInstances == null) {
- this.childContentInstances = new ArrayList<>();
- }
- return childContentInstances;
- }
-
- /**
- * @param childContentInstances the childContentInstances to set
- */
- public void setChildContentInstances(
- List<ContentInstanceEntity> childContentInstances) {
- this.childContentInstances = childContentInstances;
- }
-
- /**
- * @return the parentCSR
- */
- public RemoteCSEEntity getParentCSR() {
- return parentCSR;
- }
-
- /**
- * @param parentCSR the parentCSR to set
- */
- public void setParentCSR(RemoteCSEEntity parentCSR) {
- this.parentCSR = parentCSR;
- }
-
- /**
- * @return the subscriptions
- */
- public List<SubscriptionEntity> getSubscriptions() {
- if (this.subscriptions == null) {
- this.subscriptions = new ArrayList<>();
- }
- return subscriptions;
- }
-
- /**
- * @param subscriptions the subscriptions to set
- */
- public void setSubscriptions(List<SubscriptionEntity> subscriptions) {
- this.subscriptions = subscriptions;
- }
-
- @Override
- /**
- * Retrieve linked dynamicAuthorizationConsultations
- */
- public List<DynamicAuthorizationConsultationEntity> getDynamicAuthorizationConsultations() {
- if (dynamicAuthorizationConsultations == null) {
- dynamicAuthorizationConsultations = new ArrayList<>();
- }
- return dynamicAuthorizationConsultations;
- }
-
- @Override
- /**
- * Set linked dynamicAuthorizationConsultations
- */
- public void setDynamicAuthorizationConsultations(List<DynamicAuthorizationConsultationEntity> list) {
- this.dynamicAuthorizationConsultations = list;
- }
-
- /**
- * Return the current byte size of summed content instance content size in bytes
- * @return
- */
- public int getCurrentByteSize() {
- int result = 0;
- for (ContentInstanceEntity cin : this.getChildContentInstances()) {
- result += cin.getByteSize();
- }
- return result;
- }
-
-}
+/*******************************************************************************
+
+ * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * 7 Colonel Roche 31077 Toulouse - France
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Initial Contributors:
+ * Thierry Monteil : Project manager, technical co-manager
+ * Mahdi Ben Alaya : Technical co-manager
+ * Samir Medjiah : Technical co-manager
+ * Khalil Drira : Strategy expert
+ * Guillaume Garzone : Developer
+ * François Aïssaoui : Developer
+ *
+ * New contributors :
+ *******************************************************************************/
+package org.eclipse.om2m.commons.entities;
+
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderBy;
+
+import org.eclipse.om2m.commons.constants.DBEntities;
+import org.eclipse.om2m.commons.constants.ShortName;
+
+/**
+ * Container JPA entity
+ *
+ */
+@Entity(name=DBEntities.CONTAINER_ENTITY)
+@Inheritance(strategy = InheritanceType.JOINED)
+public class ContainerEntity extends AnnounceableSubordinateEntity{
+ @Column(name= ShortName.STATETAG)
+ protected BigInteger stateTag;
+ @Column(name= ShortName.CREATOR)
+ protected String creator;
+ @Column(name= ShortName.MAX_NR_OF_INSTANCES)
+ protected BigInteger maxNrOfInstances;
+ @Column(name= ShortName.MAX_BYTE_SIZE)
+ protected BigInteger maxByteSize;
+ @Column(name= ShortName.CURRENT_NUMBER_OF_INSTANCES)
+ protected BigInteger currentNrOfInstances;
+ @Column(name= ShortName.MAX_INSTANCE_AGE)
+ protected BigInteger maxInstanceAge;
+ @Column(name= ShortName.LOCATION_ID)
+ protected String locationID;
+ @Column(name= ShortName.ONTOLOGY_REF)
+ protected String ontologyRef;
+
+ @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.LAZY, mappedBy="parentCnt")
+ @JoinTable(
+ name = DBEntities.CNTSUB_JOIN,
+ joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
+ inverseJoinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
+ )
+ protected List<SubscriptionEntity> subscriptions;
+
+ /** List of AccessControlPolicies */
+ @OneToMany(fetch=FetchType.LAZY)
+ @JoinTable(
+ name = DBEntities.CNTACP_JOIN,
+ joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
+ inverseJoinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
+ )
+ protected List<AccessControlPolicyEntity> accessControlPolicies;
+
+ /** List of DynamicAuthorizationConsultations*/
+ @ManyToMany(fetch=FetchType.LAZY, mappedBy="linkedContainerEntities")
+ @JoinTable(
+ name = DBEntities.CNT_DAC_JOIN,
+ joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
+ inverseJoinColumns = { @JoinColumn(name = DBEntities.DAC_JOINID, referencedColumnName = ShortName.RESOURCE_ID) }
+ )
+ protected List<DynamicAuthorizationConsultationEntity> dynamicAuthorizationConsultations;
+
+ /** List of child Container Entities */
+ @OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
+ @JoinTable(
+ name=DBEntities.CNTCNTCHILD_JOIN,
+ joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ inverseJoinColumns={@JoinColumn(name=DBEntities.CNTCH_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+ protected List<ContainerEntity> childContainers;
+
+ /** List of child ContentInstances Entities */
+ @OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
+ @JoinTable(
+ name=DBEntities.CNTCINCHILD_JOIN,
+ joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ inverseJoinColumns={@JoinColumn(name=DBEntities.CINCH_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+ @OrderBy("creationTime")
+ protected List<ContentInstanceEntity> childContentInstances;
+
+ /** List of child FlexContainer entities */
+ @OneToMany(fetch=FetchType.LAZY, cascade=CascadeType.ALL, mappedBy="parentContainer")
+ @JoinTable(
+ name=DBEntities.CNT_FCNTCHILD_JOIN,
+ joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ inverseJoinColumns={@JoinColumn(name=DBEntities.FCNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+ protected List<FlexContainerEntity> childFlexContainers;
+
+ // Database link to the possible parent Container
+ @ManyToOne(fetch=FetchType.LAZY, targetEntity=ContainerEntity.class)
+ @JoinTable(
+ name=DBEntities.CNTCNTCHILD_JOIN,
+ inverseJoinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ joinColumns={@JoinColumn(name=DBEntities.CNTCH_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+ protected ContainerEntity parentContainer;
+
+ @ManyToOne(fetch=FetchType.LAZY, targetEntity=FlexContainerEntity.class)
+ @JoinTable(
+ name=DBEntities.FCNT_CNTCHILD_JOIN,
+ inverseJoinColumns={@JoinColumn(name=DBEntities.FCNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+ protected FlexContainerEntity parentFlexContainer;
+
+ // Database link to the possible parent Application Entity
+ @ManyToOne(fetch=FetchType.LAZY, targetEntity=AeEntity.class)
+ @JoinTable(
+ name = DBEntities.AECNTCHILD_JOIN,
+ inverseJoinColumns = { @JoinColumn(name = DBEntities.AE_JOINID, referencedColumnName = ShortName.RESOURCE_ID) },
+ joinColumns = { @JoinColumn(name = DBEntities.CNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
+ )
+ protected AeEntity parentAE;
+
+ // Database link to the possible parent CSEBase Entity
+ @ManyToOne(fetch=FetchType.LAZY, targetEntity=CSEBaseEntity.class)
+ @JoinTable(
+ name=DBEntities.CSEB_CNT_JOIN,
+ inverseJoinColumns={@JoinColumn(name=DBEntities.CSEB_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+ protected CSEBaseEntity parentCSEB;
+
+ // Database link to the possible parent remote cse Entity
+ @ManyToOne(fetch=FetchType.LAZY, targetEntity=RemoteCSEEntity.class)
+ @JoinTable(
+ name=DBEntities.CSRCNTCHILD_JOIN,
+ inverseJoinColumns={@JoinColumn(name=DBEntities.CSR_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
+ joinColumns={@JoinColumn(name=DBEntities.CNT_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
+ )
+
+
+ public BigInteger getCurrentNrOfInstances() {
+ return currentNrOfInstances;
+ }
+
+ public void setCurrentNrOfInstances(BigInteger currentNrOfInstances) {
+ this.currentNrOfInstances = currentNrOfInstances;
+ }
+
+ protected RemoteCSEEntity parentCSR;
+
+ /**
+ * @return the parentContainer
+ */
+ public ContainerEntity getParentContainer() {
+ return parentContainer;
+ }
+
+ /**
+ * @param parentContainer the parentContainer to set
+ */
+ public void setParentContainer(ContainerEntity parentContainer) {
+ this.parentContainer = parentContainer;
+ }
+
+ /**
+ * @return the parentAE
+ */
+ public AeEntity getParentAE() {
+ return parentAE;
+ }
+
+ /**
+ * @param parentAE the parentAE to set
+ */
+ public void setParentAE(AeEntity parentAE) {
+ this.parentAE = parentAE;
+ }
+
+ /**
+ * @return the parentCSEB
+ */
+ public CSEBaseEntity getParentCSEB() {
+ return parentCSEB;
+ }
+
+ /**
+ * @param parentCSEB the parentCSEB to set
+ */
+ public void setParentCSEB(CSEBaseEntity parentCSEB) {
+ this.parentCSEB = parentCSEB;
+ }
+
+ /**
+ * @return the stateTag
+ */
+ public BigInteger getStateTag() {
+ return stateTag;
+ }
+
+ /**
+ * @param stateTag the stateTag to set
+ */
+ public void setStateTag(BigInteger stateTag) {
+ this.stateTag = stateTag;
+ }
+
+ /**
+ * @return the creator
+ */
+ public String getCreator() {
+ return creator;
+ }
+
+ /**
+ * @param creator the creator to set
+ */
+ public void setCreator(String creator) {
+ this.creator = creator;
+ }
+
+ /**
+ * @return the maxNrOfInstances
+ */
+ public BigInteger getMaxNrOfInstances() {
+ return maxNrOfInstances;
+ }
+
+ /**
+ * @param maxNrOfInstances the maxNrOfInstances to set
+ */
+ public void setMaxNrOfInstances(BigInteger maxNrOfInstances) {
+ this.maxNrOfInstances = maxNrOfInstances;
+ }
+
+ /**
+ * @return the maxByteSize
+ */
+ public BigInteger getMaxByteSize() {
+ return maxByteSize;
+ }
+
+ /**
+ * @param maxByteSize the maxByteSize to set
+ */
+ public void setMaxByteSize(BigInteger maxByteSize) {
+ this.maxByteSize = maxByteSize;
+ }
+
+ /**
+ * @return the maxInstanceAge
+ */
+ public BigInteger getMaxInstanceAge() {
+ return maxInstanceAge;
+ }
+
+ /**
+ * @param maxInstanceAge the maxInstanceAge to set
+ */
+ public void setMaxInstanceAge(BigInteger maxInstanceAge) {
+ this.maxInstanceAge = maxInstanceAge;
+ }
+
+ /**
+ * @return the locationID
+ */
+ public String getLocationID() {
+ return locationID;
+ }
+
+ /**
+ * @param locationID the locationID to set
+ */
+ public void setLocationID(String locationID) {
+ this.locationID = locationID;
+ }
+
+ /**
+ * @return the ontologyRef
+ */
+ public String getOntologyRef() {
+ return ontologyRef;
+ }
+
+ /**
+ * @param ontologyRef the ontologyRef to set
+ */
+ public void setOntologyRef(String ontologyRef) {
+ this.ontologyRef = ontologyRef;
+ }
+
+ /**
+ * @return the childContainers
+ */
+ public List<ContainerEntity> getChildContainers() {
+ if (this.childContainers == null) {
+ this.childContainers = new ArrayList<>();
+ }
+ return childContainers;
+ }
+
+ /**
+ * @param childContainers the childContainers to set
+ */
+ public void setChildContainers(List<ContainerEntity> childContainers) {
+ this.childContainers = childContainers;
+ }
+
+ /**
+ * @return the childFlexContainers
+ */
+ public List<FlexContainerEntity> getChildFlexContainers() {
+ if (this.childFlexContainers == null) {
+ this.childFlexContainers = new ArrayList<>();
+ }
+ return childFlexContainers;
+ }
+
+ /**
+ * @param childFlexContainers the childFlexContainers to set
+ */
+ public void setChildFlexContainers(List<FlexContainerEntity> childFlexContainers) {
+ this.childFlexContainers = childFlexContainers;
+ }
+
+ /**
+ * @return the accessControlPolicies
+ */
+ public List<AccessControlPolicyEntity> getAccessControlPolicies() {
+ if (accessControlPolicies == null) {
+ accessControlPolicies = new ArrayList<>();
+ }
+ return accessControlPolicies;
+ }
+
+ /**
+ * @param accessControlPolicies the accessControlPolicies to set
+ */
+ public void setAccessControlPolicies(
+ List<AccessControlPolicyEntity> accessControlPolicies) {
+ this.accessControlPolicies = accessControlPolicies;
+ }
+
+ /**
+ * @return the childContentInstances
+ */
+ public List<ContentInstanceEntity> getChildContentInstances() {
+ if (childContentInstances == null) {
+ this.childContentInstances = new ArrayList<>();
+ }
+ return childContentInstances;
+ }
+
+ /**
+ * @param childContentInstances the childContentInstances to set
+ */
+ public void setChildContentInstances(
+ List<ContentInstanceEntity> childContentInstances) {
+ this.childContentInstances = childContentInstances;
+ }
+
+ /**
+ * @return the parentCSR
+ */
+ public RemoteCSEEntity getParentCSR() {
+ return parentCSR;
+ }
+
+ /**
+ * @param parentCSR the parentCSR to set
+ */
+ public void setParentCSR(RemoteCSEEntity parentCSR) {
+ this.parentCSR = parentCSR;
+ }
+
+ /**
+ * @return the subscriptions
+ */
+ public List<SubscriptionEntity> getSubscriptions() {
+ if (this.subscriptions == null) {
+ this.subscriptions = new ArrayList<>();
+ }
+ return subscriptions;
+ }
+
+ /**
+ * @param subscriptions the subscriptions to set
+ */
+ public void setSubscriptions(List<SubscriptionEntity> subscriptions) {
+ this.subscriptions = subscriptions;
+ }
+
+ @Override
+ /**
+ * Retrieve linked dynamicAuthorizationConsultations
+ */
+ public List<DynamicAuthorizationConsultationEntity> getDynamicAuthorizationConsultations() {
+ if (dynamicAuthorizationConsultations == null) {
+ dynamicAuthorizationConsultations = new ArrayList<>();
+ }
+ return dynamicAuthorizationConsultations;
+ }
+
+ @Override
+ /**
+ * Set linked dynamicAuthorizationConsultations
+ */
+ public void setDynamicAuthorizationConsultations(List<DynamicAuthorizationConsultationEntity> list) {
+ this.dynamicAuthorizationConsultations = list;
+ }
+
+ /**
+ * Return the current byte size of summed content instance content size in bytes
+ * @return
+ */
+ public int getCurrentByteSize() {
+ int result = 0;
+ for (ContentInstanceEntity cin : this.getChildContentInstances()) {
+ result += cin.getByteSize();
+ }
+ return result;
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java
index b2781422..cc03f727 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/CustomAttributeEntity.java
@@ -27,14 +27,17 @@ public class CustomAttributeEntity {
@Id
@GeneratedValue(strategy=GenerationType.AUTO)
- @Column(name=ShortName.RESOURCE_ID)
+ @Column(name = ShortName.RESOURCE_ID)
protected long resourceID;
- @Column(name= ShortName.CUSTOM_ATTRIBUTE_NAME)
- protected String customAttributeName;
+ @Column(name = ShortName.CUSTOM_ATTRIBUTE_NAME)
+ protected String name;
+
+ @Column(name = ShortName.CUSTOM_ATTRIBUTE_TYPE)
+ protected String type;
@Column(name = ShortName.CUSTOM_ATTRIBUTE_VALUE)
- protected String customAttributeValue;
+ protected String value;
@ManyToOne(targetEntity = FlexContainerEntity.class)
@JoinTable(name = DBEntities.FCNT_CA_JOIN, joinColumns = {
@@ -42,20 +45,28 @@ public class CustomAttributeEntity {
@JoinColumn(name = DBEntities.FCNT_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) })
protected FlexContainerEntity parentFlexContainer;
- public String getCustomAttributeName() {
- return customAttributeName;
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
}
- public void setCustomAttributeName(String customAttributeName) {
- this.customAttributeName = customAttributeName;
+ public void setType(String type) {
+ this.type = type;
}
- public String getCustomAttributeValue() {
- return customAttributeValue;
+ public String getValue() {
+ return value;
}
- public void setCustomAttributeValue(String customAttributeValue) {
- this.customAttributeValue = customAttributeValue;
+ public void setValue(String value) {
+ this.value = value;
}
public FlexContainerEntity getParentFlexContainer() {
@@ -73,8 +84,10 @@ public class CustomAttributeEntity {
public void setResourceID(long resourceID) {
this.resourceID = resourceID;
}
-
-
-
+
+ @Override
+ public String toString() {
+ return "<CustomAttributeEntity " + name + "/" + type + "/" + value + "/>";
+ }
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java
index 50e7d97b..8d0b70bc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/FlexContainerEntity.java
@@ -426,10 +426,10 @@ public class FlexContainerEntity extends AnnounceableSubordinateEntity{
this.customAttributes = customAttributes;
}
- public void createOrUpdateCustomAttribute(String name, Object value) {
+ public void createOrUpdateCustomAttribute(String name, Object value, String type) {
CustomAttributeEntity attToCreateOrUpdate = null;
for(CustomAttributeEntity cae : getCustomAttributes()) {
- if (cae.getCustomAttributeName().equals(name)) {
+ if (cae.getName().equals(name)) {
attToCreateOrUpdate = cae;
break;
}
@@ -437,11 +437,11 @@ public class FlexContainerEntity extends AnnounceableSubordinateEntity{
if (attToCreateOrUpdate == null) {
attToCreateOrUpdate = new CustomAttributeEntity();
- attToCreateOrUpdate.setCustomAttributeName(name);
+ attToCreateOrUpdate.setName(name);
getCustomAttributes().add(attToCreateOrUpdate);
}
- attToCreateOrUpdate.setCustomAttributeValue((value != null) ? value.toString() : null);
-
+ attToCreateOrUpdate.setValue((value != null) ? value.toString() : null);
+ attToCreateOrUpdate.setType(type);
}
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java
index a76f0e4e..9c65e57f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/RemoteCSEEntity.java
@@ -113,7 +113,7 @@ public class RemoteCSEEntity extends AnnounceableSubordinateEntity {
)
protected List<ContainerEntity> childCnt;
- @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL)
+ @OneToMany(fetch=FetchType.LAZY, cascade = CascadeType.ALL, mappedBy="parentCSR")
@JoinTable(
name = DBEntities.CSR_FCNTCHILD_JOIN,
joinColumns = { @JoinColumn(name = DBEntities.CSR_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) },
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java
index e7c8092c..aaecec6b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/ResourceEntity.java
@@ -23,6 +23,7 @@ import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
+import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.FetchType;
import javax.persistence.Id;
@@ -43,19 +44,26 @@ public class ResourceEntity {
@Id
@Column(name=ShortName.RESOURCE_ID)
protected String resourceID;
+
@Column(name = ShortName.RESOURCE_TYPE)
protected BigInteger resourceType;
+
@Column(name=ShortName.PARENT_ID)
protected String parentID;
+
@Column(name=ShortName.CREATION_TIME)
protected String creationTime;
+
@Column(name=ShortName.LAST_MODIFIED_TIME)
protected String lastModifiedTime;
- @ManyToMany(targetEntity = LabelEntity.class, fetch = FetchType.LAZY)
- protected List<LabelEntity> labelsEntities;
+ @ManyToMany(targetEntity = LabelEntity.class, fetch = FetchType.LAZY,
+ cascade = {CascadeType.PERSIST})
+ protected List<LabelEntity> labelsEntities;
+
@Column(name=ShortName.RESOURCE_NAME)
protected String name;
+
@Column(name=DBEntities.HIERARCHICAL_URI)
protected String hierarchicalURI;
@@ -221,10 +229,16 @@ public class ResourceEntity {
*/
public void setLabelsEntitiesFromSring(List<String> labelsStrings) {
this.getLabelsEntities().clear();
- for (String s: labelsStrings) {
- LabelEntity toAdd = new LabelEntity(s);
- if(!this.getLabelsEntities().contains(toAdd)){
- this.getLabelsEntities().add(new LabelEntity(s));
+ for (String s : labelsStrings) {
+ boolean found = false;
+ for (LabelEntity label : this.getLabelsEntities()) {
+ if (s.equals(label.getLabel())) {
+ found = true;
+ break;
+ }
+ }
+ if (! found) {
+ this.getLabelsEntities().add(new LabelEntity(s));
}
}
}
@@ -233,5 +247,4 @@ public class ResourceEntity {
this.resourceType = BigInteger.valueOf(value);
}
-
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java
index a7aac743..89ccc058 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/exceptions/AccessDeniedException.java
@@ -1,44 +1,62 @@
-/*******************************************************************************
- * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
- * 7 Colonel Roche 31077 Toulouse - France
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Initial Contributors:
- * Thierry Monteil : Project manager, technical co-manager
- * Mahdi Ben Alaya : Technical co-manager
- * Samir Medjiah : Technical co-manager
- * Khalil Drira : Strategy expert
- * Guillaume Garzone : Developer
- * François Aïssaoui : Developer
- *
- * New contributors :
- *******************************************************************************/
-package org.eclipse.om2m.commons.exceptions;
-
-import org.eclipse.om2m.commons.constants.ResponseStatusCode;
-
-public class AccessDeniedException extends Om2mException {
-
- /**
- *
- */
- private static final long serialVersionUID = -2488820054507430948L;
-
- public AccessDeniedException(){
- super("Unknown or unauthorized originator", ResponseStatusCode.ACCESS_DENIED);
- }
-
- public AccessDeniedException(String message){
- super(message, ResponseStatusCode.ACCESS_DENIED);
- }
-
- public AccessDeniedException(String message, Throwable cause){
- super(message, cause, ResponseStatusCode.ACCESS_DENIED);
- }
-
-}
-
+/*******************************************************************************
+ * Copyright (c) 2013-2016 LAAS-CNRS (www.laas.fr)
+ * 7 Colonel Roche 31077 Toulouse - France
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Initial Contributors:
+ * Thierry Monteil : Project manager, technical co-manager
+ * Mahdi Ben Alaya : Technical co-manager
+ * Samir Medjiah : Technical co-manager
+ * Khalil Drira : Strategy expert
+ * Guillaume Garzone : Developer
+ * François Aïssaoui : Developer
+ *
+ * New contributors :
+ *******************************************************************************/
+package org.eclipse.om2m.commons.exceptions;
+
+import org.eclipse.om2m.commons.constants.ResponseStatusCode;
+import org.eclipse.om2m.commons.resource.DynAuthTokenReqInfo;
+
+public class AccessDeniedException extends Om2mException {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -2488820054507430948L;
+
+ private DynAuthTokenReqInfo dynAuthTokenReqInfo = null;
+
+ public AccessDeniedException(){
+ super("Unknown or unauthorized originator", ResponseStatusCode.ACCESS_DENIED);
+ }
+
+ public AccessDeniedException(DynAuthTokenReqInfo pDynAuthTokenReqInfo){
+ super("Unknown or unauthorized originator", ResponseStatusCode.ACCESS_DENIED);
+ dynAuthTokenReqInfo = pDynAuthTokenReqInfo;
+ }
+
+ public AccessDeniedException(String message){
+ super(message, ResponseStatusCode.ACCESS_DENIED);
+ }
+
+ public AccessDeniedException(String message, Throwable cause){
+ super(message, cause, ResponseStatusCode.ACCESS_DENIED);
+ }
+
+ public DynAuthTokenReqInfo getDynAuthTokenReqInfo() {
+ return dynAuthTokenReqInfo;
+ }
+
+ public void setDynAuthTokenReqInfo(DynAuthTokenReqInfo dynAuthTokenReqInfo) {
+ this.dynAuthTokenReqInfo = dynAuthTokenReqInfo;
+ }
+
+
+
+}
+
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java
index efade70b..148e4bd5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AE.java
@@ -39,99 +39,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.om2m.commons.constants.ShortName;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ActivateClockTimerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AlarmSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AlarmSpeakerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AtmosphericPressureSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AudioVideoInputFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AudioVolumeFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BatteryFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BinarySwitchFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BioElectricalImpedanceAnalysisFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BoilerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BrewingFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BrightnessFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ClockFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ColourFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ColourSaturationFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ContactSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeactivateClockTimerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DecrementNumberValueFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceAirConditionerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceCameraFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceClothesWasherFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceCoffeeMachineFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceContactDetectorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceDoorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceElectricVehicleChargerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceFloodDetectorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceGasValveFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceLightFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceMicrogenerationFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceMotionDetectorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceNumberDeviceFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceOvenFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceRefrigeratorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceRobotCleanerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSmartElectricMeterFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSmokeDetectorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSmokeExtractorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceStorageBatteryFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSwitchButtonFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceTelevisionFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceTemperatureDetectorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceThermostatFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWarningDeviceFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWaterHeaterFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWaterValveFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWeatherStationFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DoorStatusFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DownChannelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DownVolumeFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ElectricVehicleConnectorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.EnergyConsumptionFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.EnergyGenerationFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ExtendedCarbonDioxideSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.FaultDetectionFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.FoamingFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.GrinderFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.HeightFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.HotWaterSupplyFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.IncrementNumberValueFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.KeepWarmFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.KeypadFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.LiquidLevelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.LockFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.MotionSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.NoiseFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.NumberValueFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.OximeterFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.PersonSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.PowerSaveFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.PushButtonFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RecorderFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RefrigerationFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RelativeHumidityFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ResetNumberValueFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RinseLevelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RunModeFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.SignalStrengthFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.SmokeSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.SpinLevelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.StreamingFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TelevisionChannelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TemperatureAlarmFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TemperatureFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TimerFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ToggleFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TurboFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.UpChannelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.UpVolumeFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WaterFlowFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WaterLevelFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WaterSensorFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WeightFlexContainer;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WindFlexContainer;
+import org.eclipse.om2m.commons.resource.flexcontainerspec.*;
/**
* <p>
@@ -208,100 +116,155 @@ public class AE extends AnnounceableResource {
@XmlElement(name = ShortName.ACP, namespace = "http://www.onem2m.org/xml/protocols", type = AccessControlPolicy.class),
@XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class),
@XmlElement(name = ShortName.PCH, namespace = "http://www.onem2m.org/xml/protocols", type = PollingChannel.class),
- @XmlElement(name = ShortName.FCNT, type = AbstractFlexContainer.class),
- @XmlElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainer.class),
- @XmlElement(name = AudioVideoInputFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AudioVideoInputFlexContainer.class),
- @XmlElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainer.class),
- @XmlElement(name = UpVolumeFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = UpVolumeFlexContainer.class),
- @XmlElement(name = DownVolumeFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DownVolumeFlexContainer.class),
- @XmlElement(name = BatteryFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainer.class),
- @XmlElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainer.class),
- @XmlElement(name = ToggleFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ToggleFlexContainer.class),
- @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainer.class),
- @XmlElement(name = BoilerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainer.class),
- @XmlElement(name = BrightnessFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainer.class),
- @XmlElement(name = ClockFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainer.class),
- @XmlElement(name = ColourFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainer.class),
- @XmlElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainer.class),
- @XmlElement(name = DoorStatusFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainer.class),
- @XmlElement(name = ElectricVehicleConnectorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainer.class),
- @XmlElement(name = EnergyConsumptionFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainer.class),
- @XmlElement(name = EnergyGenerationFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainer.class),
- @XmlElement(name = FaultDetectionFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainer.class),
- @XmlElement(name = HeightFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainer.class),
- @XmlElement(name = HotWaterSupplyFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainer.class),
- @XmlElement(name = KeypadFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainer.class),
- @XmlElement(name = MotionSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainer.class),
- @XmlElement(name = OximeterFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainer.class),
- @XmlElement(name = PowerSaveFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainer.class),
- @XmlElement(name = PushButtonFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainer.class),
- @XmlElement(name = RecorderFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainer.class),
- @XmlElement(name = RefrigerationFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainer.class),
- @XmlElement(name = RelativeHumidityFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainer.class),
- @XmlElement(name = RinseLevelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RinseLevelFlexContainer.class),
- @XmlElement(name = RunModeFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RunModeFlexContainer.class),
- @XmlElement(name = SignalStrengthFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainer.class),
- @XmlElement(name = SmokeSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainer.class),
- @XmlElement(name = SpinLevelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainer.class),
- @XmlElement(name = TelevisionChannelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainer.class),
- @XmlElement(name = UpChannelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = UpChannelFlexContainer.class),
- @XmlElement(name = DownChannelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DownChannelFlexContainer.class),
- @XmlElement(name = TemperatureFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainer.class),
- @XmlElement(name = TemperatureAlarmFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainer.class),
- @XmlElement(name = TimerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainer.class),
- @XmlElement(name = ActivateClockTimerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ActivateClockTimerFlexContainer.class),
- @XmlElement(name = DeactivateClockTimerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeactivateClockTimerFlexContainer.class),
- @XmlElement(name = TurboFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainer.class),
- @XmlElement(name = WaterFlowFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainer.class),
- @XmlElement(name = WaterLevelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterLevelFlexContainer.class),
- @XmlElement(name = WaterSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainer.class),
- @XmlElement(name = WeightFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainer.class),
- @XmlElement(name = WindFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WindFlexContainer.class),
- @XmlElement(name = StreamingFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = StreamingFlexContainer.class),
- @XmlElement(name = PersonSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainer.class),
- @XmlElement(name = BrewingFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainer.class),
- @XmlElement(name = LiquidLevelFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainer.class),
- @XmlElement(name = GrinderFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainer.class),
- @XmlElement(name = FoamingFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainer.class),
- @XmlElement(name = KeepWarmFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainer.class),
- @XmlElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainer.class),
- @XmlElement(name = AlarmSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSensorFlexContainer.class),
- @XmlElement(name = LockFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainer.class),
- @XmlElement(name = AtmosphericPressureSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AtmosphericPressureSensorFlexContainer.class),
- @XmlElement(name = NoiseFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = NoiseFlexContainer.class),
- @XmlElement(name = ExtendedCarbonDioxideSensorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ExtendedCarbonDioxideSensorFlexContainer.class),
- @XmlElement(name = NumberValueFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainer.class),
- @XmlElement(name = DecrementNumberValueFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DecrementNumberValueFlexContainer.class),
- @XmlElement(name = IncrementNumberValueFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = IncrementNumberValueFlexContainer.class),
- @XmlElement(name = ResetNumberValueFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ResetNumberValueFlexContainer.class),
- @XmlElement(name = DeviceAirConditionerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainer.class),
- @XmlElement(name = DeviceClothesWasherFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainer.class),
- @XmlElement(name = DeviceElectricVehicleChargerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainer.class),
- @XmlElement(name = DeviceLightFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainer.class),
- @XmlElement(name = DeviceMicrogenerationFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainer.class),
- @XmlElement(name = DeviceOvenFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainer.class),
- @XmlElement(name = DeviceRefrigeratorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainer.class),
- @XmlElement(name = DeviceRobotCleanerFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainer.class),
- @XmlElement(name = DeviceSmartElectricMeterFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainer.class),
- @XmlElement(name = DeviceStorageBatteryFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainer.class),
- @XmlElement(name = DeviceTelevisionFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainer.class),
- @XmlElement(name = DeviceThermostatFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainer.class),
- @XmlElement(name = DeviceWaterHeaterFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainer.class),
- @XmlElement(name = DeviceCameraFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainer.class),
- @XmlElement(name = DeviceCoffeeMachineFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainer.class),
- @XmlElement(name = DeviceContactDetectorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainer.class),
- @XmlElement(name = DeviceDoorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainer.class),
- @XmlElement(name = DeviceFloodDetectorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainer.class),
- @XmlElement(name = DeviceGasValveFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainer.class),
- @XmlElement(name = DeviceMotionDetectorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainer.class),
- @XmlElement(name = DeviceSmokeDetectorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainer.class),
- @XmlElement(name = DeviceSmokeExtractorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeExtractorFlexContainer.class),
- @XmlElement(name = DeviceSwitchButtonFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchButtonFlexContainer.class),
- @XmlElement(name = DeviceTemperatureDetectorFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainer.class),
- @XmlElement(name = DeviceWarningDeviceFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningDeviceFlexContainer.class),
- @XmlElement(name = DeviceWaterValveFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainer.class),
- @XmlElement(name = DeviceWeatherStationFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainer.class),
- @XmlElement(name = DeviceNumberDeviceFlexContainer.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceNumberDeviceFlexContainer.class)
+ @XmlElement(name = ShortName.FCNT, type = AbstractFlexContainer.class),
+ @XmlElement(name = DeviceThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThreeDPrinterFlexContainer.class),
+ @XmlElement(name = DeviceAirConditionerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainer.class),
+ @XmlElement(name = DeviceAirPurifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirPurifierFlexContainer.class),
+ @XmlElement(name = DeviceAirQualityMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirQualityMonitorFlexContainer.class),
+ @XmlElement(name = DeviceAudioReceiverFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAudioReceiverFlexContainer.class),
+ @XmlElement(name = DeviceBloodPressureMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceBloodPressureMonitorFlexContainer.class),
+ @XmlElement(name = DeviceCameraFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainer.class),
+ @XmlElement(name = DeviceClothesDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesDryerFlexContainer.class),
+ @XmlElement(name = DeviceClothesWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainer.class),
+ @XmlElement(name = DeviceClothesWasherDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherDryerFlexContainer.class),
+ @XmlElement(name = DeviceCoffeeMachineFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainer.class),
+ @XmlElement(name = DeviceCookerHoodFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCookerHoodFlexContainer.class),
+ @XmlElement(name = DeviceCooktopFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCooktopFlexContainer.class),
+ @XmlElement(name = DeviceDehumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDehumidifierFlexContainer.class),
+ @XmlElement(name = DeviceDishWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDishWasherFlexContainer.class),
+ @XmlElement(name = DeviceDoorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainer.class),
+ @XmlElement(name = DeviceDoorLockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorLockFlexContainer.class),
+ @XmlElement(name = DeviceElectricVehicleChargerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainer.class),
+ @XmlElement(name = DeviceFanFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFanFlexContainer.class),
+ @XmlElement(name = DeviceFoodProbeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFoodProbeFlexContainer.class),
+ @XmlElement(name = DeviceFreezerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFreezerFlexContainer.class),
+ @XmlElement(name = DeviceGlucosemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGlucosemeterFlexContainer.class),
+ @XmlElement(name = DeviceHeartRateMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHeartRateMonitorFlexContainer.class),
+ @XmlElement(name = DeviceHomeCCTVFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHomeCCTVFlexContainer.class),
+ @XmlElement(name = DeviceHumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHumidifierFlexContainer.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainer.class),
+ @XmlElement(name = DeviceLightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainer.class),
+ @XmlElement(name = DeviceMicrogenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainer.class),
+ @XmlElement(name = DeviceMultiFunctionPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMultiFunctionPrinterFlexContainer.class),
+ @XmlElement(name = DeviceOutdoorLampFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOutdoorLampFlexContainer.class),
+ @XmlElement(name = DeviceOvenFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainer.class),
+ @XmlElement(name = DevicePrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePrinterFlexContainer.class),
+ @XmlElement(name = DevicePulseOximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePulseOximeterFlexContainer.class),
+ @XmlElement(name = DeviceRefrigeratorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainer.class),
+ @XmlElement(name = DeviceRobotCleanerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainer.class),
+ @XmlElement(name = DeviceScannerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceScannerFlexContainer.class),
+ @XmlElement(name = DeviceSecurityPanelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSecurityPanelFlexContainer.class),
+ @XmlElement(name = DeviceSetTopBoxFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSetTopBoxFlexContainer.class),
+ @XmlElement(name = DeviceSmartElectricMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainer.class),
+ @XmlElement(name = DeviceSmartPlugFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartPlugFlexContainer.class),
+ @XmlElement(name = DeviceSteamClosetFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSteamClosetFlexContainer.class),
+ @XmlElement(name = DeviceStorageBatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainer.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainer.class),
+ @XmlElement(name = DeviceTelevisionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainer.class),
+ @XmlElement(name = DeviceThermometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermometerFlexContainer.class),
+ @XmlElement(name = DeviceThermostatFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainer.class),
+ @XmlElement(name = DeviceWaterHeaterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainer.class),
+ @XmlElement(name = DeviceWaterValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainer.class),
+ @XmlElement(name = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.class),
+ @XmlElement(name = DeviceWindowShadeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWindowShadeFlexContainer.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainer.class),
+ @XmlElement(name = DeviceSmokeDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainer.class),
+ @XmlElement(name = DeviceContactDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainer.class),
+ @XmlElement(name = DeviceMotionDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainer.class),
+ @XmlElement(name = DeviceFloodDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainer.class),
+ @XmlElement(name = DeviceTemperatureDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainer.class),
+ @XmlElement(name = DeviceWeatherStationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainer.class),
+ @XmlElement(name = DeviceGasValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainer.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainer.class),
+ @XmlElement(name = DeviceWarningFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningFlexContainer.class),
+ @XmlElement(name = LiquidLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainer.class),
+ @XmlElement(name = TemperatureAlarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainer.class),
+ @XmlElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainer.class),
+ @XmlElement(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesDryerJobModeFlexContainer.class),
+ @XmlElement(name = OximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainer.class),
+ @XmlElement(name = TurboFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainer.class),
+ @XmlElement(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirConJobModeFlexContainer.class),
+ @XmlElement(name = EnergyGenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainer.class),
+ @XmlElement(name = KeypadFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainer.class),
+ @XmlElement(name = MotionSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainer.class),
+ @XmlElement(name = SmokeSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainer.class),
+ @XmlElement(name = MediaSelectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MediaSelectFlexContainer.class),
+ @XmlElement(name = ElectricVehicleConnectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainer.class),
+ @XmlElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainer.class),
+ @XmlElement(name = LockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainer.class),
+ @XmlElement(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirPurifierJobModeFlexContainer.class),
+ @XmlElement(name = GlucometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GlucometerFlexContainer.class),
+ @XmlElement(name = RemoteControlEnableFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RemoteControlEnableFlexContainer.class),
+ @XmlElement(name = HeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainer.class),
+ @XmlElement(name = SpinLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainer.class),
+ @XmlElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainer.class),
+ @XmlElement(name = FoamingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainer.class),
+ @XmlElement(name = OvercurrentSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OvercurrentSensorFlexContainer.class),
+ @XmlElement(name = WeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainer.class),
+ @XmlElement(name = SecurityModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SecurityModeFlexContainer.class),
+ @XmlElement(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BodyCompositionAnalyserFlexContainer.class),
+ @XmlElement(name = ClockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainer.class),
+ @XmlElement(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherDryerJobModeFlexContainer.class),
+ @XmlElement(name = FilterInfoFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FilterInfoFlexContainer.class),
+ @XmlElement(name = PushButtonFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainer.class),
+ @XmlElement(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeOptionFlexContainer.class),
+ @XmlElement(name = KeepWarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainer.class),
+ @XmlElement(name = PersonSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainer.class),
+ @XmlElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainer.class),
+ @XmlElement(name = ImpactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ImpactSensorFlexContainer.class),
+ @XmlElement(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeFlexContainer.class),
+ @XmlElement(name = RunStateFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RunStateFlexContainer.class),
+ @XmlElement(name = TextMessageFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TextMessageFlexContainer.class),
+ @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainer.class),
+ @XmlElement(name = OpenLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OpenLevelFlexContainer.class),
+ @XmlElement(name = CredentialsFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CredentialsFlexContainer.class),
+ @XmlElement(name = HotWaterSupplyFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainer.class),
+ @XmlElement(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirFlowFlexContainer.class),
+ @XmlElement(name = BatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainer.class),
+ @XmlElement(name = PulsemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PulsemeterFlexContainer.class),
+ @XmlElement(name = RobotCleanerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RobotCleanerJobModeFlexContainer.class),
+ @XmlElement(name = LiquidRemainingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidRemainingFlexContainer.class),
+ @XmlElement(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirQualitySensorFlexContainer.class),
+ @XmlElement(name = PhoneCallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PhoneCallFlexContainer.class),
+ @XmlElement(name = WaterFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainer.class),
+ @XmlElement(name = TimerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainer.class),
+ @XmlElement(name = BrewingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainer.class),
+ @XmlElement(name = DishWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DishWasherJobModeFlexContainer.class),
+ @XmlElement(name = OperationModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OperationModeFlexContainer.class),
+ @XmlElement(name = FaultDetectionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainer.class),
+ @XmlElement(name = BoilerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainer.class),
+ @XmlElement(name = UvSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = UvSensorFlexContainer.class),
+ @XmlElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainer.class),
+ @XmlElement(name = WaterSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainer.class),
+ @XmlElement(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AcousticSensorFlexContainer.class),
+ @XmlElement(name = TemperatureFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainer.class),
+ @XmlElement(name = NumberValueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainer.class),
+ @XmlElement(name = DehumidifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DehumidifierJobModeFlexContainer.class),
+ @XmlElement(name = EnergyConsumptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainer.class),
+ @XmlElement(name = RecorderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainer.class),
+ @XmlElement(name = SphygmomanometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SphygmomanometerFlexContainer.class),
+ @XmlElement(name = GrinderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainer.class),
+ @XmlElement(name = PlayerControlFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PlayerControlFlexContainer.class),
+ @XmlElement(name = OzoneMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OzoneMeterFlexContainer.class),
+ @XmlElement(name = PrintQueueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PrintQueueFlexContainer.class),
+ @XmlElement(name = SessionDescriptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SessionDescriptionFlexContainer.class),
+ @XmlElement(name = SignalStrengthFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainer.class),
+ @XmlElement(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinaryObjectFlexContainer.class),
+ @XmlElement(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BarometerFlexContainer.class),
+ @XmlElement(name = HeatingZoneFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeatingZoneFlexContainer.class),
+ @XmlElement(name = CookerHoodJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CookerHoodJobModeFlexContainer.class),
+ @XmlElement(name = ColourFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainer.class),
+ @XmlElement(name = BrightnessFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainer.class),
+ @XmlElement(name = RefrigerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainer.class),
+ @XmlElement(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AutoDocumentFeederFlexContainer.class),
+ @XmlElement(name = TelevisionChannelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainer.class),
+ @XmlElement(name = ThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ThreeDPrinterFlexContainer.class),
+ @XmlElement(name = GeoLocationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GeoLocationFlexContainer.class),
+ @XmlElement(name = DoorStatusFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainer.class),
+ @XmlElement(name = RelativeHumidityFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainer.class),
+ @XmlElement(name = SteamClosetJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SteamClosetJobModeFlexContainer.class),
+ @XmlElement(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AnemometerFlexContainer.class),
+ @XmlElement(name = PowerSaveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainer.class),
})
protected List<Resource> containerOrGroupOrAccessControlPolicy;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java
index 8080a2ef..c9d683fc 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AEAnnc.java
@@ -39,99 +39,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.om2m.commons.constants.ShortName;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ActivateClockTimerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AlarmSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AlarmSpeakerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AtmosphericPressureSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AudioVideoInputFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.AudioVolumeFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BatteryFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BinarySwitchFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BioElectricalImpedanceAnalysisFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BoilerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BrewingFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.BrightnessFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ClockFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ColourFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ColourSaturationFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ContactSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeactivateClockTimerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DecrementNumberValueFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceAirConditionerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceCameraFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceClothesWasherFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceCoffeeMachineFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceContactDetectorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceDoorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceElectricVehicleChargerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceFloodDetectorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceGasValveFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceLightFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceMicrogenerationFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceMotionDetectorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceNumberDeviceFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceOvenFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceRefrigeratorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceRobotCleanerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSmartElectricMeterFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSmokeDetectorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSmokeExtractorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceStorageBatteryFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceSwitchButtonFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceTelevisionFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceTemperatureDetectorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceThermostatFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWarningDeviceFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWaterHeaterFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWaterValveFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DeviceWeatherStationFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DoorStatusFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DownChannelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.DownVolumeFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ElectricVehicleConnectorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.EnergyConsumptionFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.EnergyGenerationFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ExtendedCarbonDioxideSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.FaultDetectionFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.FoamingFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.GrinderFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.HeightFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.HotWaterSupplyFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.IncrementNumberValueFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.KeepWarmFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.KeypadFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.LiquidLevelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.LockFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.MotionSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.NoiseFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.NumberValueFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.OximeterFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.PersonSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.PowerSaveFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.PushButtonFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RecorderFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RefrigerationFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RelativeHumidityFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ResetNumberValueFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RinseLevelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.RunModeFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.SignalStrengthFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.SmokeSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.SpinLevelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.StreamingFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TelevisionChannelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TemperatureAlarmFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TemperatureFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TimerFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.ToggleFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.TurboFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.UpChannelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.UpVolumeFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WaterFlowFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WaterLevelFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WaterSensorFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WeightFlexContainerAnnc;
-import org.eclipse.om2m.commons.resource.flexcontainerspec.WindFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.flexcontainerspec.*;
/**
* <p>
@@ -212,99 +120,154 @@ public class AEAnnc extends AnnouncedResource {
@XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class),
@XmlElement(name = ShortName.PCH, namespace = "http://www.onem2m.org/xml/protocols", type = PollingChannel.class),
@XmlElement(name = ShortName.FCNTA, namespace = "http://www.onem2m.org/xml/protocols", type = AbstractFlexContainerAnnc.class),
- @XmlElement(name = AlarmSpeakerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainerAnnc.class),
- @XmlElement(name = AudioVideoInputFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AudioVideoInputFlexContainerAnnc.class),
- @XmlElement(name = AudioVolumeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainerAnnc.class),
- @XmlElement(name = UpVolumeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = UpVolumeFlexContainerAnnc.class),
- @XmlElement(name = DownVolumeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DownVolumeFlexContainerAnnc.class),
- @XmlElement(name = BatteryFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainerAnnc.class),
- @XmlElement(name = BinarySwitchFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainerAnnc.class),
- @XmlElement(name = ToggleFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ToggleFlexContainerAnnc.class),
- @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainerAnnc.class),
- @XmlElement(name = BoilerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainerAnnc.class),
- @XmlElement(name = BrightnessFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainerAnnc.class),
- @XmlElement(name = ClockFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainerAnnc.class),
- @XmlElement(name = ColourFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainerAnnc.class),
- @XmlElement(name = ColourSaturationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainerAnnc.class),
- @XmlElement(name = DoorStatusFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainerAnnc.class),
- @XmlElement(name = ElectricVehicleConnectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainerAnnc.class),
- @XmlElement(name = EnergyConsumptionFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainerAnnc.class),
- @XmlElement(name = EnergyGenerationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainerAnnc.class),
- @XmlElement(name = FaultDetectionFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainerAnnc.class),
- @XmlElement(name = HeightFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainerAnnc.class),
- @XmlElement(name = HotWaterSupplyFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainerAnnc.class),
- @XmlElement(name = KeypadFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainerAnnc.class),
- @XmlElement(name = MotionSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainerAnnc.class),
- @XmlElement(name = OximeterFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainerAnnc.class),
- @XmlElement(name = PowerSaveFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainerAnnc.class),
- @XmlElement(name = PushButtonFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainerAnnc.class),
- @XmlElement(name = RecorderFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainerAnnc.class),
- @XmlElement(name = RefrigerationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainerAnnc.class),
- @XmlElement(name = RelativeHumidityFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainerAnnc.class),
- @XmlElement(name = RinseLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RinseLevelFlexContainerAnnc.class),
- @XmlElement(name = RunModeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RunModeFlexContainerAnnc.class),
- @XmlElement(name = SignalStrengthFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainerAnnc.class),
- @XmlElement(name = SmokeSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainerAnnc.class),
- @XmlElement(name = SpinLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainerAnnc.class),
- @XmlElement(name = TelevisionChannelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainerAnnc.class),
- @XmlElement(name = UpChannelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = UpChannelFlexContainerAnnc.class),
- @XmlElement(name = DownChannelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DownChannelFlexContainerAnnc.class),
- @XmlElement(name = TemperatureFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainerAnnc.class),
- @XmlElement(name = TemperatureAlarmFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainerAnnc.class),
- @XmlElement(name = TimerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainerAnnc.class),
- @XmlElement(name = ActivateClockTimerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ActivateClockTimerFlexContainerAnnc.class),
- @XmlElement(name = DeactivateClockTimerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeactivateClockTimerFlexContainerAnnc.class),
- @XmlElement(name = TurboFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainerAnnc.class),
- @XmlElement(name = WaterFlowFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainerAnnc.class),
- @XmlElement(name = WaterLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterLevelFlexContainerAnnc.class),
- @XmlElement(name = WaterSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainerAnnc.class),
- @XmlElement(name = WeightFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainerAnnc.class),
- @XmlElement(name = WindFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WindFlexContainerAnnc.class),
- @XmlElement(name = StreamingFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = StreamingFlexContainerAnnc.class),
- @XmlElement(name = PersonSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainerAnnc.class),
- @XmlElement(name = BrewingFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainerAnnc.class),
- @XmlElement(name = LiquidLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainerAnnc.class),
- @XmlElement(name = GrinderFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainerAnnc.class),
- @XmlElement(name = FoamingFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainerAnnc.class),
- @XmlElement(name = KeepWarmFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainerAnnc.class),
- @XmlElement(name = ContactSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainerAnnc.class),
- @XmlElement(name = AlarmSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSensorFlexContainerAnnc.class),
- @XmlElement(name = LockFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainerAnnc.class),
- @XmlElement(name = AtmosphericPressureSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AtmosphericPressureSensorFlexContainerAnnc.class),
- @XmlElement(name = NoiseFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = NoiseFlexContainerAnnc.class),
- @XmlElement(name = ExtendedCarbonDioxideSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ExtendedCarbonDioxideSensorFlexContainerAnnc.class),
- @XmlElement(name = NumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainerAnnc.class),
- @XmlElement(name = DecrementNumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DecrementNumberValueFlexContainerAnnc.class),
- @XmlElement(name = IncrementNumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = IncrementNumberValueFlexContainerAnnc.class),
- @XmlElement(name = ResetNumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ResetNumberValueFlexContainerAnnc.class),
- @XmlElement(name = DeviceAirConditionerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainerAnnc.class),
- @XmlElement(name = DeviceClothesWasherFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainerAnnc.class),
- @XmlElement(name = DeviceElectricVehicleChargerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainerAnnc.class),
- @XmlElement(name = DeviceLightFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainerAnnc.class),
- @XmlElement(name = DeviceMicrogenerationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainerAnnc.class),
- @XmlElement(name = DeviceOvenFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainerAnnc.class),
- @XmlElement(name = DeviceRefrigeratorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainerAnnc.class),
- @XmlElement(name = DeviceRobotCleanerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainerAnnc.class),
- @XmlElement(name = DeviceSmartElectricMeterFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainerAnnc.class),
- @XmlElement(name = DeviceStorageBatteryFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainerAnnc.class),
- @XmlElement(name = DeviceTelevisionFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainerAnnc.class),
- @XmlElement(name = DeviceThermostatFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainerAnnc.class),
- @XmlElement(name = DeviceWaterHeaterFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainerAnnc.class),
- @XmlElement(name = DeviceCameraFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainerAnnc.class),
- @XmlElement(name = DeviceCoffeeMachineFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainerAnnc.class),
- @XmlElement(name = DeviceContactDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceDoorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainerAnnc.class),
- @XmlElement(name = DeviceFloodDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceGasValveFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainerAnnc.class),
- @XmlElement(name = DeviceMotionDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceSmokeDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceSmokeExtractorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeExtractorFlexContainerAnnc.class),
- @XmlElement(name = DeviceSwitchButtonFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchButtonFlexContainerAnnc.class),
- @XmlElement(name = DeviceTemperatureDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceWarningDeviceFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningDeviceFlexContainerAnnc.class),
- @XmlElement(name = DeviceWaterValveFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainerAnnc.class),
- @XmlElement(name = DeviceWeatherStationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainerAnnc.class),
- @XmlElement(name = DeviceNumberDeviceFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceNumberDeviceFlexContainerAnnc.class)
+ @XmlElement(name = DeviceThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThreeDPrinterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAirConditionerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAirPurifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirPurifierFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAirQualityMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirQualityMonitorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAudioReceiverFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAudioReceiverFlexContainerAnnc.class),
+ @XmlElement(name = DeviceBloodPressureMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceBloodPressureMonitorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCameraFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainerAnnc.class),
+ @XmlElement(name = DeviceClothesDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesDryerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceClothesWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainerAnnc.class),
+ @XmlElement(name = DeviceClothesWasherDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherDryerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCoffeeMachineFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCookerHoodFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCookerHoodFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCooktopFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCooktopFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDehumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDehumidifierFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDishWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDishWasherFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDoorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDoorLockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorLockFlexContainerAnnc.class),
+ @XmlElement(name = DeviceElectricVehicleChargerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFanFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFanFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFoodProbeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFoodProbeFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFreezerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFreezerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceGlucosemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGlucosemeterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceHeartRateMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHeartRateMonitorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceHomeCCTVFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHomeCCTVFlexContainerAnnc.class),
+ @XmlElement(name = DeviceHumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHumidifierFlexContainerAnnc.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainerAnnc.class),
+ @XmlElement(name = DeviceLightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainerAnnc.class),
+ @XmlElement(name = DeviceMicrogenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainerAnnc.class),
+ @XmlElement(name = DeviceMultiFunctionPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMultiFunctionPrinterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceOutdoorLampFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOutdoorLampFlexContainerAnnc.class),
+ @XmlElement(name = DeviceOvenFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainerAnnc.class),
+ @XmlElement(name = DevicePrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePrinterFlexContainerAnnc.class),
+ @XmlElement(name = DevicePulseOximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePulseOximeterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceRefrigeratorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceRobotCleanerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceScannerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceScannerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSecurityPanelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSecurityPanelFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSetTopBoxFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSetTopBoxFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSmartElectricMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSmartPlugFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartPlugFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSteamClosetFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSteamClosetFlexContainerAnnc.class),
+ @XmlElement(name = DeviceStorageBatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainerAnnc.class),
+ @XmlElement(name = DeviceTelevisionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainerAnnc.class),
+ @XmlElement(name = DeviceThermometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermometerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceThermostatFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWaterHeaterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWaterValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWindowShadeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWindowShadeFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSmokeDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceContactDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceMotionDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFloodDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceTemperatureDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWeatherStationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainerAnnc.class),
+ @XmlElement(name = DeviceGasValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainerAnnc.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWarningFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningFlexContainerAnnc.class),
+ @XmlElement(name = LiquidLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainerAnnc.class),
+ @XmlElement(name = TemperatureAlarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainerAnnc.class),
+ @XmlElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainerAnnc.class),
+ @XmlElement(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesDryerJobModeFlexContainerAnnc.class),
+ @XmlElement(name = OximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainerAnnc.class),
+ @XmlElement(name = TurboFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainerAnnc.class),
+ @XmlElement(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirConJobModeFlexContainerAnnc.class),
+ @XmlElement(name = EnergyGenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainerAnnc.class),
+ @XmlElement(name = KeypadFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainerAnnc.class),
+ @XmlElement(name = MotionSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainerAnnc.class),
+ @XmlElement(name = SmokeSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainerAnnc.class),
+ @XmlElement(name = MediaSelectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MediaSelectFlexContainerAnnc.class),
+ @XmlElement(name = ElectricVehicleConnectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainerAnnc.class),
+ @XmlElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainerAnnc.class),
+ @XmlElement(name = LockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainerAnnc.class),
+ @XmlElement(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirPurifierJobModeFlexContainerAnnc.class),
+ @XmlElement(name = GlucometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GlucometerFlexContainerAnnc.class),
+ @XmlElement(name = RemoteControlEnableFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RemoteControlEnableFlexContainerAnnc.class),
+ @XmlElement(name = HeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainerAnnc.class),
+ @XmlElement(name = SpinLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainerAnnc.class),
+ @XmlElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainerAnnc.class),
+ @XmlElement(name = FoamingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainerAnnc.class),
+ @XmlElement(name = OvercurrentSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OvercurrentSensorFlexContainerAnnc.class),
+ @XmlElement(name = WeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainerAnnc.class),
+ @XmlElement(name = SecurityModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SecurityModeFlexContainerAnnc.class),
+ @XmlElement(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BodyCompositionAnalyserFlexContainerAnnc.class),
+ @XmlElement(name = ClockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainerAnnc.class),
+ @XmlElement(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherDryerJobModeFlexContainerAnnc.class),
+ @XmlElement(name = FilterInfoFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FilterInfoFlexContainerAnnc.class),
+ @XmlElement(name = PushButtonFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainerAnnc.class),
+ @XmlElement(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeOptionFlexContainerAnnc.class),
+ @XmlElement(name = KeepWarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainerAnnc.class),
+ @XmlElement(name = PersonSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainerAnnc.class),
+ @XmlElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainerAnnc.class),
+ @XmlElement(name = ImpactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ImpactSensorFlexContainerAnnc.class),
+ @XmlElement(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeFlexContainerAnnc.class),
+ @XmlElement(name = RunStateFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RunStateFlexContainerAnnc.class),
+ @XmlElement(name = TextMessageFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TextMessageFlexContainerAnnc.class),
+ @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainerAnnc.class),
+ @XmlElement(name = OpenLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OpenLevelFlexContainerAnnc.class),
+ @XmlElement(name = CredentialsFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CredentialsFlexContainerAnnc.class),
+ @XmlElement(name = HotWaterSupplyFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainerAnnc.class),
+ @XmlElement(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirFlowFlexContainerAnnc.class),
+ @XmlElement(name = BatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainerAnnc.class),
+ @XmlElement(name = PulsemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PulsemeterFlexContainerAnnc.class),
+ @XmlElement(name = RobotCleanerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RobotCleanerJobModeFlexContainerAnnc.class),
+ @XmlElement(name = LiquidRemainingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidRemainingFlexContainerAnnc.class),
+ @XmlElement(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirQualitySensorFlexContainerAnnc.class),
+ @XmlElement(name = PhoneCallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PhoneCallFlexContainerAnnc.class),
+ @XmlElement(name = WaterFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainerAnnc.class),
+ @XmlElement(name = TimerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainerAnnc.class),
+ @XmlElement(name = BrewingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainerAnnc.class),
+ @XmlElement(name = DishWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DishWasherJobModeFlexContainerAnnc.class),
+ @XmlElement(name = OperationModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OperationModeFlexContainerAnnc.class),
+ @XmlElement(name = FaultDetectionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainerAnnc.class),
+ @XmlElement(name = BoilerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainerAnnc.class),
+ @XmlElement(name = UvSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = UvSensorFlexContainerAnnc.class),
+ @XmlElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainerAnnc.class),
+ @XmlElement(name = WaterSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainerAnnc.class),
+ @XmlElement(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AcousticSensorFlexContainerAnnc.class),
+ @XmlElement(name = TemperatureFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainerAnnc.class),
+ @XmlElement(name = NumberValueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainerAnnc.class),
+ @XmlElement(name = DehumidifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DehumidifierJobModeFlexContainerAnnc.class),
+ @XmlElement(name = EnergyConsumptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainerAnnc.class),
+ @XmlElement(name = RecorderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainerAnnc.class),
+ @XmlElement(name = SphygmomanometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SphygmomanometerFlexContainerAnnc.class),
+ @XmlElement(name = GrinderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainerAnnc.class),
+ @XmlElement(name = PlayerControlFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PlayerControlFlexContainerAnnc.class),
+ @XmlElement(name = OzoneMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OzoneMeterFlexContainerAnnc.class),
+ @XmlElement(name = PrintQueueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PrintQueueFlexContainerAnnc.class),
+ @XmlElement(name = SessionDescriptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SessionDescriptionFlexContainerAnnc.class),
+ @XmlElement(name = SignalStrengthFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainerAnnc.class),
+ @XmlElement(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinaryObjectFlexContainerAnnc.class),
+ @XmlElement(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BarometerFlexContainerAnnc.class),
+ @XmlElement(name = HeatingZoneFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeatingZoneFlexContainerAnnc.class),
+ @XmlElement(name = CookerHoodJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CookerHoodJobModeFlexContainerAnnc.class),
+ @XmlElement(name = ColourFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainerAnnc.class),
+ @XmlElement(name = BrightnessFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainerAnnc.class),
+ @XmlElement(name = RefrigerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainerAnnc.class),
+ @XmlElement(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AutoDocumentFeederFlexContainerAnnc.class),
+ @XmlElement(name = TelevisionChannelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainerAnnc.class),
+ @XmlElement(name = ThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ThreeDPrinterFlexContainerAnnc.class),
+ @XmlElement(name = GeoLocationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GeoLocationFlexContainerAnnc.class),
+ @XmlElement(name = DoorStatusFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainerAnnc.class),
+ @XmlElement(name = RelativeHumidityFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainerAnnc.class),
+ @XmlElement(name = SteamClosetJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SteamClosetJobModeFlexContainerAnnc.class),
+ @XmlElement(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AnemometerFlexContainerAnnc.class),
+ @XmlElement(name = PowerSaveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainerAnnc.class),
})
protected List<Resource> containerOrContainerAnncOrGroup;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java
index a6879a75..51bba40e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainer.java
@@ -17,11 +17,11 @@ import javax.xml.bind.annotation.XmlAnyElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlTransient;
import org.eclipse.om2m.commons.constants.ShortName;
import org.eclipse.om2m.commons.resource.flexcontainerspec.*;
+import org.eclipse.om2m.commons.utils.CustomAttributList;
/**
* <p>
@@ -96,12 +96,161 @@ public abstract class AbstractFlexContainer extends AnnounceableResource {
@XmlElements({
@XmlElement(name = ShortName.CNT, namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),
- @XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class)
+ @XmlElement(name = ShortName.FCNT, namespace = "http://www.onem2m.org/xml/protocols", type = AbstractFlexContainer.class),
+ @XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class),
+ @XmlElement(name = DeviceThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThreeDPrinterFlexContainer.class),
+ @XmlElement(name = DeviceAirConditionerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainer.class),
+ @XmlElement(name = DeviceAirPurifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirPurifierFlexContainer.class),
+ @XmlElement(name = DeviceAirQualityMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirQualityMonitorFlexContainer.class),
+ @XmlElement(name = DeviceAudioReceiverFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAudioReceiverFlexContainer.class),
+ @XmlElement(name = DeviceBloodPressureMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceBloodPressureMonitorFlexContainer.class),
+ @XmlElement(name = DeviceCameraFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainer.class),
+ @XmlElement(name = DeviceClothesDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesDryerFlexContainer.class),
+ @XmlElement(name = DeviceClothesWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainer.class),
+ @XmlElement(name = DeviceClothesWasherDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherDryerFlexContainer.class),
+ @XmlElement(name = DeviceCoffeeMachineFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainer.class),
+ @XmlElement(name = DeviceCookerHoodFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCookerHoodFlexContainer.class),
+ @XmlElement(name = DeviceCooktopFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCooktopFlexContainer.class),
+ @XmlElement(name = DeviceDehumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDehumidifierFlexContainer.class),
+ @XmlElement(name = DeviceDishWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDishWasherFlexContainer.class),
+ @XmlElement(name = DeviceDoorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainer.class),
+ @XmlElement(name = DeviceDoorLockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorLockFlexContainer.class),
+ @XmlElement(name = DeviceElectricVehicleChargerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainer.class),
+ @XmlElement(name = DeviceFanFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFanFlexContainer.class),
+ @XmlElement(name = DeviceFoodProbeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFoodProbeFlexContainer.class),
+ @XmlElement(name = DeviceFreezerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFreezerFlexContainer.class),
+ @XmlElement(name = DeviceGlucosemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGlucosemeterFlexContainer.class),
+ @XmlElement(name = DeviceHeartRateMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHeartRateMonitorFlexContainer.class),
+ @XmlElement(name = DeviceHomeCCTVFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHomeCCTVFlexContainer.class),
+ @XmlElement(name = DeviceHumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHumidifierFlexContainer.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainer.class),
+ @XmlElement(name = DeviceLightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainer.class),
+ @XmlElement(name = DeviceMicrogenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainer.class),
+ @XmlElement(name = DeviceMultiFunctionPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMultiFunctionPrinterFlexContainer.class),
+ @XmlElement(name = DeviceOutdoorLampFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOutdoorLampFlexContainer.class),
+ @XmlElement(name = DeviceOvenFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainer.class),
+ @XmlElement(name = DevicePrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePrinterFlexContainer.class),
+ @XmlElement(name = DevicePulseOximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePulseOximeterFlexContainer.class),
+ @XmlElement(name = DeviceRefrigeratorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainer.class),
+ @XmlElement(name = DeviceRobotCleanerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainer.class),
+ @XmlElement(name = DeviceScannerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceScannerFlexContainer.class),
+ @XmlElement(name = DeviceSecurityPanelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSecurityPanelFlexContainer.class),
+ @XmlElement(name = DeviceSetTopBoxFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSetTopBoxFlexContainer.class),
+ @XmlElement(name = DeviceSmartElectricMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainer.class),
+ @XmlElement(name = DeviceSmartPlugFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartPlugFlexContainer.class),
+ @XmlElement(name = DeviceSteamClosetFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSteamClosetFlexContainer.class),
+ @XmlElement(name = DeviceStorageBatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainer.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainer.class),
+ @XmlElement(name = DeviceTelevisionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainer.class),
+ @XmlElement(name = DeviceThermometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermometerFlexContainer.class),
+ @XmlElement(name = DeviceThermostatFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainer.class),
+ @XmlElement(name = DeviceWaterHeaterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainer.class),
+ @XmlElement(name = DeviceWaterValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainer.class),
+ @XmlElement(name = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.class),
+ @XmlElement(name = DeviceWindowShadeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWindowShadeFlexContainer.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainer.class),
+ @XmlElement(name = DeviceSmokeDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainer.class),
+ @XmlElement(name = DeviceContactDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainer.class),
+ @XmlElement(name = DeviceMotionDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainer.class),
+ @XmlElement(name = DeviceFloodDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainer.class),
+ @XmlElement(name = DeviceTemperatureDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainer.class),
+ @XmlElement(name = DeviceWeatherStationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainer.class),
+ @XmlElement(name = DeviceGasValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainer.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainer.class),
+ @XmlElement(name = DeviceWarningFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningFlexContainer.class),
+ @XmlElement(name = LiquidLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainer.class),
+ @XmlElement(name = TemperatureAlarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainer.class),
+ @XmlElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainer.class),
+ @XmlElement(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesDryerJobModeFlexContainer.class),
+ @XmlElement(name = OximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainer.class),
+ @XmlElement(name = TurboFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainer.class),
+ @XmlElement(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirConJobModeFlexContainer.class),
+ @XmlElement(name = EnergyGenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainer.class),
+ @XmlElement(name = KeypadFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainer.class),
+ @XmlElement(name = MotionSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainer.class),
+ @XmlElement(name = SmokeSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainer.class),
+ @XmlElement(name = MediaSelectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MediaSelectFlexContainer.class),
+ @XmlElement(name = ElectricVehicleConnectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainer.class),
+ @XmlElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainer.class),
+ @XmlElement(name = LockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainer.class),
+ @XmlElement(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirPurifierJobModeFlexContainer.class),
+ @XmlElement(name = GlucometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GlucometerFlexContainer.class),
+ @XmlElement(name = RemoteControlEnableFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RemoteControlEnableFlexContainer.class),
+ @XmlElement(name = HeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainer.class),
+ @XmlElement(name = SpinLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainer.class),
+ @XmlElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainer.class),
+ @XmlElement(name = FoamingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainer.class),
+ @XmlElement(name = OvercurrentSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OvercurrentSensorFlexContainer.class),
+ @XmlElement(name = WeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainer.class),
+ @XmlElement(name = SecurityModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SecurityModeFlexContainer.class),
+ @XmlElement(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BodyCompositionAnalyserFlexContainer.class),
+ @XmlElement(name = ClockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainer.class),
+ @XmlElement(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherDryerJobModeFlexContainer.class),
+ @XmlElement(name = FilterInfoFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FilterInfoFlexContainer.class),
+ @XmlElement(name = PushButtonFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainer.class),
+ @XmlElement(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeOptionFlexContainer.class),
+ @XmlElement(name = KeepWarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainer.class),
+ @XmlElement(name = PersonSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainer.class),
+ @XmlElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainer.class),
+ @XmlElement(name = ImpactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ImpactSensorFlexContainer.class),
+ @XmlElement(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeFlexContainer.class),
+ @XmlElement(name = RunStateFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RunStateFlexContainer.class),
+ @XmlElement(name = TextMessageFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TextMessageFlexContainer.class),
+ @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainer.class),
+ @XmlElement(name = OpenLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OpenLevelFlexContainer.class),
+ @XmlElement(name = CredentialsFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CredentialsFlexContainer.class),
+ @XmlElement(name = HotWaterSupplyFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainer.class),
+ @XmlElement(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirFlowFlexContainer.class),
+ @XmlElement(name = BatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainer.class),
+ @XmlElement(name = PulsemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PulsemeterFlexContainer.class),
+ @XmlElement(name = RobotCleanerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RobotCleanerJobModeFlexContainer.class),
+ @XmlElement(name = LiquidRemainingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidRemainingFlexContainer.class),
+ @XmlElement(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirQualitySensorFlexContainer.class),
+ @XmlElement(name = PhoneCallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PhoneCallFlexContainer.class),
+ @XmlElement(name = WaterFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainer.class),
+ @XmlElement(name = TimerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainer.class),
+ @XmlElement(name = BrewingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainer.class),
+ @XmlElement(name = DishWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DishWasherJobModeFlexContainer.class),
+ @XmlElement(name = OperationModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OperationModeFlexContainer.class),
+ @XmlElement(name = FaultDetectionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainer.class),
+ @XmlElement(name = BoilerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainer.class),
+ @XmlElement(name = UvSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = UvSensorFlexContainer.class),
+ @XmlElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainer.class),
+ @XmlElement(name = WaterSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainer.class),
+ @XmlElement(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AcousticSensorFlexContainer.class),
+ @XmlElement(name = TemperatureFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainer.class),
+ @XmlElement(name = NumberValueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainer.class),
+ @XmlElement(name = DehumidifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DehumidifierJobModeFlexContainer.class),
+ @XmlElement(name = EnergyConsumptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainer.class),
+ @XmlElement(name = RecorderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainer.class),
+ @XmlElement(name = SphygmomanometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SphygmomanometerFlexContainer.class),
+ @XmlElement(name = GrinderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainer.class),
+ @XmlElement(name = PlayerControlFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PlayerControlFlexContainer.class),
+ @XmlElement(name = OzoneMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OzoneMeterFlexContainer.class),
+ @XmlElement(name = PrintQueueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PrintQueueFlexContainer.class),
+ @XmlElement(name = SessionDescriptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SessionDescriptionFlexContainer.class),
+ @XmlElement(name = SignalStrengthFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainer.class),
+ @XmlElement(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinaryObjectFlexContainer.class),
+ @XmlElement(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BarometerFlexContainer.class),
+ @XmlElement(name = HeatingZoneFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeatingZoneFlexContainer.class),
+ @XmlElement(name = CookerHoodJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CookerHoodJobModeFlexContainer.class),
+ @XmlElement(name = ColourFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainer.class),
+ @XmlElement(name = BrightnessFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainer.class),
+ @XmlElement(name = RefrigerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainer.class),
+ @XmlElement(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AutoDocumentFeederFlexContainer.class),
+ @XmlElement(name = TelevisionChannelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainer.class),
+ @XmlElement(name = ThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ThreeDPrinterFlexContainer.class),
+ @XmlElement(name = GeoLocationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GeoLocationFlexContainer.class),
+ @XmlElement(name = DoorStatusFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainer.class),
+ @XmlElement(name = RelativeHumidityFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainer.class),
+ @XmlElement(name = SteamClosetJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SteamClosetJobModeFlexContainer.class),
+ @XmlElement(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AnemometerFlexContainer.class),
+ @XmlElement(name = PowerSaveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainer.class),
})
protected List<Resource> flexContainerOrContainerOrSubscription;
@XmlAnyElement()
- protected List<CustomAttribute> customAttributes;
+ protected CustomAttributList customAttributes;
/**
* @return the shortName
@@ -133,21 +282,20 @@ public abstract class AbstractFlexContainer extends AnnounceableResource {
public List<CustomAttribute> getCustomAttributes() {
if (customAttributes == null) {
- customAttributes = new ArrayList<CustomAttribute>();
+ customAttributes = new CustomAttributList();
}
return customAttributes;
}
- public void setCustomAttributes(List<CustomAttribute> customAttributes) {
- this.customAttributes = customAttributes;
- }
+// public void setCustomAttributes(List<CustomAttribute> customAttributes) {
+// this.customAttributes = customAttributes;
+// }
@XmlTransient
public List<String> getCustomAttributeNames() {
List<String> names = new ArrayList<String>();
-
for(CustomAttribute ca : getCustomAttributes()) {
- names.add(ca.getCustomAttributeName());
+ names.add(ca.getShortName());
}
return names;
@@ -156,7 +304,7 @@ public abstract class AbstractFlexContainer extends AnnounceableResource {
@XmlTransient
public CustomAttribute getCustomAttribute(String name) {
for(CustomAttribute ca : getCustomAttributes()) {
- if (ca.getCustomAttributeName().equals(name)) {
+ if (ca.getShortName().equals(name)) {
return ca;
}
}
@@ -341,4 +489,5 @@ public abstract class AbstractFlexContainer extends AnnounceableResource {
}
return null;
}
+
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java
index 5c948b13..1b87924b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AbstractFlexContainerAnnc.java
@@ -57,100 +57,155 @@ public class AbstractFlexContainerAnnc extends AnnouncedResource {
@XmlElement(name = ShortName.CNT, namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),
@XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class),
@XmlElement(name = ShortName.FCNT, namespace = "http://www.onem2m.org/xml/protocols", type = AbstractFlexContainer.class),
- @XmlElement(name = ShortName.FCNTA, namespace = "http://www.onem2m.org/xml/protocols", type = AbstractFlexContainerAnnc.class),
- @XmlElement(name = AlarmSpeakerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainerAnnc.class),
- @XmlElement(name = AudioVideoInputFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AudioVideoInputFlexContainerAnnc.class),
- @XmlElement(name = AudioVolumeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainerAnnc.class),
- @XmlElement(name = UpVolumeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = UpVolumeFlexContainerAnnc.class),
- @XmlElement(name = DownVolumeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DownVolumeFlexContainerAnnc.class),
- @XmlElement(name = BatteryFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainerAnnc.class),
- @XmlElement(name = BinarySwitchFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainerAnnc.class),
- @XmlElement(name = ToggleFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ToggleFlexContainerAnnc.class),
- @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainerAnnc.class),
- @XmlElement(name = BoilerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainerAnnc.class),
- @XmlElement(name = BrightnessFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainerAnnc.class),
- @XmlElement(name = ClockFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainerAnnc.class),
- @XmlElement(name = ColourFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainerAnnc.class),
- @XmlElement(name = ColourSaturationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainerAnnc.class),
- @XmlElement(name = DoorStatusFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainerAnnc.class),
- @XmlElement(name = ElectricVehicleConnectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainerAnnc.class),
- @XmlElement(name = EnergyConsumptionFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainerAnnc.class),
- @XmlElement(name = EnergyGenerationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainerAnnc.class),
- @XmlElement(name = FaultDetectionFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainerAnnc.class),
- @XmlElement(name = HeightFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainerAnnc.class),
- @XmlElement(name = HotWaterSupplyFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainerAnnc.class),
- @XmlElement(name = KeypadFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainerAnnc.class),
- @XmlElement(name = MotionSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainerAnnc.class),
- @XmlElement(name = OximeterFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainerAnnc.class),
- @XmlElement(name = PowerSaveFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainerAnnc.class),
- @XmlElement(name = PushButtonFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainerAnnc.class),
- @XmlElement(name = RecorderFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainerAnnc.class),
- @XmlElement(name = RefrigerationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainerAnnc.class),
- @XmlElement(name = RelativeHumidityFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainerAnnc.class),
- @XmlElement(name = RinseLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RinseLevelFlexContainerAnnc.class),
- @XmlElement(name = RunModeFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = RunModeFlexContainerAnnc.class),
- @XmlElement(name = SignalStrengthFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainerAnnc.class),
- @XmlElement(name = SmokeSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainerAnnc.class),
- @XmlElement(name = SpinLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainerAnnc.class),
- @XmlElement(name = TelevisionChannelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainerAnnc.class),
- @XmlElement(name = UpChannelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = UpChannelFlexContainerAnnc.class),
- @XmlElement(name = DownChannelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DownChannelFlexContainerAnnc.class),
- @XmlElement(name = TemperatureFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainerAnnc.class),
- @XmlElement(name = TemperatureAlarmFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainerAnnc.class),
- @XmlElement(name = TimerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainerAnnc.class),
- @XmlElement(name = ActivateClockTimerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ActivateClockTimerFlexContainerAnnc.class),
- @XmlElement(name = DeactivateClockTimerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeactivateClockTimerFlexContainerAnnc.class),
- @XmlElement(name = TurboFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainerAnnc.class),
- @XmlElement(name = WaterFlowFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainerAnnc.class),
- @XmlElement(name = WaterLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterLevelFlexContainerAnnc.class),
- @XmlElement(name = WaterSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainerAnnc.class),
- @XmlElement(name = WeightFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainerAnnc.class),
- @XmlElement(name = WindFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = WindFlexContainerAnnc.class),
- @XmlElement(name = StreamingFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = StreamingFlexContainerAnnc.class),
- @XmlElement(name = PersonSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainerAnnc.class),
- @XmlElement(name = BrewingFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainerAnnc.class),
- @XmlElement(name = LiquidLevelFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainerAnnc.class),
- @XmlElement(name = GrinderFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainerAnnc.class),
- @XmlElement(name = FoamingFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainerAnnc.class),
- @XmlElement(name = KeepWarmFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainerAnnc.class),
- @XmlElement(name = ContactSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainerAnnc.class),
- @XmlElement(name = AlarmSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSensorFlexContainerAnnc.class),
- @XmlElement(name = LockFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainerAnnc.class),
- @XmlElement(name = AtmosphericPressureSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = AtmosphericPressureSensorFlexContainerAnnc.class),
- @XmlElement(name = NoiseFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = NoiseFlexContainerAnnc.class),
- @XmlElement(name = ExtendedCarbonDioxideSensorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ExtendedCarbonDioxideSensorFlexContainerAnnc.class),
- @XmlElement(name = NumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainerAnnc.class),
- @XmlElement(name = DecrementNumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DecrementNumberValueFlexContainerAnnc.class),
- @XmlElement(name = IncrementNumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = IncrementNumberValueFlexContainerAnnc.class),
- @XmlElement(name = ResetNumberValueFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = ResetNumberValueFlexContainerAnnc.class),
- @XmlElement(name = DeviceAirConditionerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainerAnnc.class),
- @XmlElement(name = DeviceClothesWasherFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainerAnnc.class),
- @XmlElement(name = DeviceElectricVehicleChargerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainerAnnc.class),
- @XmlElement(name = DeviceLightFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainerAnnc.class),
- @XmlElement(name = DeviceMicrogenerationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainerAnnc.class),
- @XmlElement(name = DeviceOvenFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainerAnnc.class),
- @XmlElement(name = DeviceRefrigeratorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainerAnnc.class),
- @XmlElement(name = DeviceRobotCleanerFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainerAnnc.class),
- @XmlElement(name = DeviceSmartElectricMeterFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainerAnnc.class),
- @XmlElement(name = DeviceStorageBatteryFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainerAnnc.class),
- @XmlElement(name = DeviceTelevisionFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainerAnnc.class),
- @XmlElement(name = DeviceThermostatFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainerAnnc.class),
- @XmlElement(name = DeviceWaterHeaterFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainerAnnc.class),
- @XmlElement(name = DeviceCameraFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainerAnnc.class),
- @XmlElement(name = DeviceCoffeeMachineFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainerAnnc.class),
- @XmlElement(name = DeviceContactDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceDoorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainerAnnc.class),
- @XmlElement(name = DeviceFloodDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceGasValveFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainerAnnc.class),
- @XmlElement(name = DeviceMotionDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceSmokeDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceSmokeExtractorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeExtractorFlexContainerAnnc.class),
- @XmlElement(name = DeviceSwitchButtonFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchButtonFlexContainerAnnc.class),
- @XmlElement(name = DeviceTemperatureDetectorFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainerAnnc.class),
- @XmlElement(name = DeviceWarningDeviceFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningDeviceFlexContainerAnnc.class),
- @XmlElement(name = DeviceWaterValveFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainerAnnc.class),
- @XmlElement(name = DeviceWeatherStationFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainerAnnc.class),
- @XmlElement(name = DeviceNumberDeviceFlexContainerAnnc.SHORT_NAME, namespace="http://www.onem2m.org/xml/protocols/homedomain", type = DeviceNumberDeviceFlexContainerAnnc.class)
+ @XmlElement(name = ShortName.FCNTA, namespace = "http://www.onem2m.org/xml/protocols", type = AbstractFlexContainerAnnc.class),
+ @XmlElement(name = DeviceThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThreeDPrinterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAirConditionerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAirPurifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirPurifierFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAirQualityMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirQualityMonitorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceAudioReceiverFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAudioReceiverFlexContainerAnnc.class),
+ @XmlElement(name = DeviceBloodPressureMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceBloodPressureMonitorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCameraFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainerAnnc.class),
+ @XmlElement(name = DeviceClothesDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesDryerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceClothesWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainerAnnc.class),
+ @XmlElement(name = DeviceClothesWasherDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherDryerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCoffeeMachineFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCookerHoodFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCookerHoodFlexContainerAnnc.class),
+ @XmlElement(name = DeviceCooktopFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCooktopFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDehumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDehumidifierFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDishWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDishWasherFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDoorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceDoorLockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorLockFlexContainerAnnc.class),
+ @XmlElement(name = DeviceElectricVehicleChargerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFanFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFanFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFoodProbeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFoodProbeFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFreezerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFreezerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceGlucosemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGlucosemeterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceHeartRateMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHeartRateMonitorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceHomeCCTVFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHomeCCTVFlexContainerAnnc.class),
+ @XmlElement(name = DeviceHumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHumidifierFlexContainerAnnc.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainerAnnc.class),
+ @XmlElement(name = DeviceLightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainerAnnc.class),
+ @XmlElement(name = DeviceMicrogenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainerAnnc.class),
+ @XmlElement(name = DeviceMultiFunctionPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMultiFunctionPrinterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceOutdoorLampFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOutdoorLampFlexContainerAnnc.class),
+ @XmlElement(name = DeviceOvenFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainerAnnc.class),
+ @XmlElement(name = DevicePrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePrinterFlexContainerAnnc.class),
+ @XmlElement(name = DevicePulseOximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePulseOximeterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceRefrigeratorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceRobotCleanerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceScannerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceScannerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSecurityPanelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSecurityPanelFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSetTopBoxFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSetTopBoxFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSmartElectricMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSmartPlugFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartPlugFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSteamClosetFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSteamClosetFlexContainerAnnc.class),
+ @XmlElement(name = DeviceStorageBatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainerAnnc.class),
+ @XmlElement(name = DeviceTelevisionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainerAnnc.class),
+ @XmlElement(name = DeviceThermometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermometerFlexContainerAnnc.class),
+ @XmlElement(name = DeviceThermostatFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWaterHeaterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWaterValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWindowShadeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWindowShadeFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainerAnnc.class),
+ @XmlElement(name = DeviceSmokeDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceContactDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceMotionDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceFloodDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceTemperatureDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWeatherStationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainerAnnc.class),
+ @XmlElement(name = DeviceGasValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainerAnnc.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainerAnnc.class),
+ @XmlElement(name = DeviceWarningFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningFlexContainerAnnc.class),
+ @XmlElement(name = LiquidLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainerAnnc.class),
+ @XmlElement(name = TemperatureAlarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainerAnnc.class),
+ @XmlElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainerAnnc.class),
+ @XmlElement(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesDryerJobModeFlexContainerAnnc.class),
+ @XmlElement(name = OximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainerAnnc.class),
+ @XmlElement(name = TurboFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainerAnnc.class),
+ @XmlElement(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirConJobModeFlexContainerAnnc.class),
+ @XmlElement(name = EnergyGenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainerAnnc.class),
+ @XmlElement(name = KeypadFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainerAnnc.class),
+ @XmlElement(name = MotionSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainerAnnc.class),
+ @XmlElement(name = SmokeSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainerAnnc.class),
+ @XmlElement(name = MediaSelectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MediaSelectFlexContainerAnnc.class),
+ @XmlElement(name = ElectricVehicleConnectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainerAnnc.class),
+ @XmlElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainerAnnc.class),
+ @XmlElement(name = LockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainerAnnc.class),
+ @XmlElement(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirPurifierJobModeFlexContainerAnnc.class),
+ @XmlElement(name = GlucometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GlucometerFlexContainerAnnc.class),
+ @XmlElement(name = RemoteControlEnableFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RemoteControlEnableFlexContainerAnnc.class),
+ @XmlElement(name = HeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainerAnnc.class),
+ @XmlElement(name = SpinLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainerAnnc.class),
+ @XmlElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainerAnnc.class),
+ @XmlElement(name = FoamingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainerAnnc.class),
+ @XmlElement(name = OvercurrentSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OvercurrentSensorFlexContainerAnnc.class),
+ @XmlElement(name = WeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainerAnnc.class),
+ @XmlElement(name = SecurityModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SecurityModeFlexContainerAnnc.class),
+ @XmlElement(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BodyCompositionAnalyserFlexContainerAnnc.class),
+ @XmlElement(name = ClockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainerAnnc.class),
+ @XmlElement(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherDryerJobModeFlexContainerAnnc.class),
+ @XmlElement(name = FilterInfoFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FilterInfoFlexContainerAnnc.class),
+ @XmlElement(name = PushButtonFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainerAnnc.class),
+ @XmlElement(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeOptionFlexContainerAnnc.class),
+ @XmlElement(name = KeepWarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainerAnnc.class),
+ @XmlElement(name = PersonSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainerAnnc.class),
+ @XmlElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainerAnnc.class),
+ @XmlElement(name = ImpactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ImpactSensorFlexContainerAnnc.class),
+ @XmlElement(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeFlexContainerAnnc.class),
+ @XmlElement(name = RunStateFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RunStateFlexContainerAnnc.class),
+ @XmlElement(name = TextMessageFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TextMessageFlexContainerAnnc.class),
+ @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainerAnnc.class),
+ @XmlElement(name = OpenLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OpenLevelFlexContainerAnnc.class),
+ @XmlElement(name = CredentialsFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CredentialsFlexContainerAnnc.class),
+ @XmlElement(name = HotWaterSupplyFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainerAnnc.class),
+ @XmlElement(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirFlowFlexContainerAnnc.class),
+ @XmlElement(name = BatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainerAnnc.class),
+ @XmlElement(name = PulsemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PulsemeterFlexContainerAnnc.class),
+ @XmlElement(name = RobotCleanerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RobotCleanerJobModeFlexContainerAnnc.class),
+ @XmlElement(name = LiquidRemainingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidRemainingFlexContainerAnnc.class),
+ @XmlElement(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirQualitySensorFlexContainerAnnc.class),
+ @XmlElement(name = PhoneCallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PhoneCallFlexContainerAnnc.class),
+ @XmlElement(name = WaterFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainerAnnc.class),
+ @XmlElement(name = TimerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainerAnnc.class),
+ @XmlElement(name = BrewingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainerAnnc.class),
+ @XmlElement(name = DishWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DishWasherJobModeFlexContainerAnnc.class),
+ @XmlElement(name = OperationModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OperationModeFlexContainerAnnc.class),
+ @XmlElement(name = FaultDetectionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainerAnnc.class),
+ @XmlElement(name = BoilerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainerAnnc.class),
+ @XmlElement(name = UvSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = UvSensorFlexContainerAnnc.class),
+ @XmlElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainerAnnc.class),
+ @XmlElement(name = WaterSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainerAnnc.class),
+ @XmlElement(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AcousticSensorFlexContainerAnnc.class),
+ @XmlElement(name = TemperatureFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainerAnnc.class),
+ @XmlElement(name = NumberValueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainerAnnc.class),
+ @XmlElement(name = DehumidifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DehumidifierJobModeFlexContainerAnnc.class),
+ @XmlElement(name = EnergyConsumptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainerAnnc.class),
+ @XmlElement(name = RecorderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainerAnnc.class),
+ @XmlElement(name = SphygmomanometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SphygmomanometerFlexContainerAnnc.class),
+ @XmlElement(name = GrinderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainerAnnc.class),
+ @XmlElement(name = PlayerControlFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PlayerControlFlexContainerAnnc.class),
+ @XmlElement(name = OzoneMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OzoneMeterFlexContainerAnnc.class),
+ @XmlElement(name = PrintQueueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PrintQueueFlexContainerAnnc.class),
+ @XmlElement(name = SessionDescriptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SessionDescriptionFlexContainerAnnc.class),
+ @XmlElement(name = SignalStrengthFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainerAnnc.class),
+ @XmlElement(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinaryObjectFlexContainerAnnc.class),
+ @XmlElement(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BarometerFlexContainerAnnc.class),
+ @XmlElement(name = HeatingZoneFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeatingZoneFlexContainerAnnc.class),
+ @XmlElement(name = CookerHoodJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CookerHoodJobModeFlexContainerAnnc.class),
+ @XmlElement(name = ColourFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainerAnnc.class),
+ @XmlElement(name = BrightnessFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainerAnnc.class),
+ @XmlElement(name = RefrigerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainerAnnc.class),
+ @XmlElement(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AutoDocumentFeederFlexContainerAnnc.class),
+ @XmlElement(name = TelevisionChannelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainerAnnc.class),
+ @XmlElement(name = ThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ThreeDPrinterFlexContainerAnnc.class),
+ @XmlElement(name = GeoLocationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GeoLocationFlexContainerAnnc.class),
+ @XmlElement(name = DoorStatusFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainerAnnc.class),
+ @XmlElement(name = RelativeHumidityFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainerAnnc.class),
+ @XmlElement(name = SteamClosetJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SteamClosetJobModeFlexContainerAnnc.class),
+ @XmlElement(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AnemometerFlexContainerAnnc.class),
+ @XmlElement(name = PowerSaveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainerAnnc.class),
})
protected List<Resource> flexContainerOrContainerOrSubscription;
@@ -201,18 +256,16 @@ public class AbstractFlexContainerAnnc extends AnnouncedResource {
@XmlTransient
public List<String> getCustomAttributeNames() {
List<String> names = new ArrayList<String>();
-
for (CustomAttribute ca : getCustomAttributes()) {
- names.add(ca.getCustomAttributeName());
+ names.add(ca.getShortName());
}
-
return names;
}
@XmlTransient
public CustomAttribute getCustomAttribute(String name) {
for (CustomAttribute ca : getCustomAttributes()) {
- if (ca.getCustomAttributeName().equals(name)) {
+ if (ca.getShortName().equals(name)) {
return ca;
}
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java
index 555e7602..76b3fa76 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Container.java
@@ -39,6 +39,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
import javax.xml.bind.annotation.XmlType;
import org.eclipse.om2m.commons.constants.ShortName;
+import org.eclipse.om2m.commons.resource.flexcontainerspec.*;
/**
* <p>
@@ -88,40 +89,203 @@ public class Container extends AnnounceableResource {
@XmlElement(name = ShortName.STATETAG, required = true, namespace="")
@XmlSchemaType(name = "nonNegativeInteger")
protected BigInteger stateTag;
+
@XmlElement(name = ShortName.CREATOR, required = true, namespace="")
protected String creator;
+
@XmlSchemaType(name = "nonNegativeInteger")
@XmlElement(name = ShortName.MAX_NR_OF_INSTANCES, namespace="")
protected BigInteger maxNrOfInstances;
+
@XmlSchemaType(name = "nonNegativeInteger")
@XmlElement(name = ShortName.MAX_BYTE_SIZE, namespace="")
protected BigInteger maxByteSize;
+
@XmlSchemaType(name = "nonNegativeInteger")
@XmlElement(name = ShortName.MAX_INSTANCE_AGE, namespace="")
protected BigInteger maxInstanceAge;
+
@XmlElement(name = ShortName.CURRENT_NUMBER_OF_INSTANCES, required = true, namespace="")
@XmlSchemaType(name = "nonNegativeInteger")
protected BigInteger currentNrOfInstances;
+
@XmlElement(name = ShortName.CURRENT_BYTE_SIZE, required = true, namespace="")
@XmlSchemaType(name = "nonNegativeInteger")
protected BigInteger currentByteSize;
+
@XmlSchemaType(name = "anyURI")
@XmlElement(name = ShortName.LOCATION_ID, namespace="")
protected String locationID;
+
@XmlSchemaType(name = "anyURI")
@XmlElement(name = ShortName.ONTOLOGY_REF, namespace="")
protected String ontologyRef;
+
@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")
protected List<ChildResourceRef> childResource;
+
@XmlElements({
@XmlElement(name = ShortName.CIN, namespace = "http://www.onem2m.org/xml/protocols", type = ContentInstance.class),
@XmlElement(name = ShortName.CNT, namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),
- @XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class) })
+ @XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols", type = Subscription.class),
+ @XmlElement(name = ShortName.FCNT, type = AbstractFlexContainer.class),
+ @XmlElement(name = DeviceThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThreeDPrinterFlexContainer.class),
+ @XmlElement(name = DeviceAirConditionerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirConditionerFlexContainer.class),
+ @XmlElement(name = DeviceAirPurifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirPurifierFlexContainer.class),
+ @XmlElement(name = DeviceAirQualityMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAirQualityMonitorFlexContainer.class),
+ @XmlElement(name = DeviceAudioReceiverFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceAudioReceiverFlexContainer.class),
+ @XmlElement(name = DeviceBloodPressureMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceBloodPressureMonitorFlexContainer.class),
+ @XmlElement(name = DeviceCameraFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCameraFlexContainer.class),
+ @XmlElement(name = DeviceClothesDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesDryerFlexContainer.class),
+ @XmlElement(name = DeviceClothesWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherFlexContainer.class),
+ @XmlElement(name = DeviceClothesWasherDryerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceClothesWasherDryerFlexContainer.class),
+ @XmlElement(name = DeviceCoffeeMachineFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCoffeeMachineFlexContainer.class),
+ @XmlElement(name = DeviceCookerHoodFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCookerHoodFlexContainer.class),
+ @XmlElement(name = DeviceCooktopFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceCooktopFlexContainer.class),
+ @XmlElement(name = DeviceDehumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDehumidifierFlexContainer.class),
+ @XmlElement(name = DeviceDishWasherFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDishWasherFlexContainer.class),
+ @XmlElement(name = DeviceDoorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorFlexContainer.class),
+ @XmlElement(name = DeviceDoorLockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceDoorLockFlexContainer.class),
+ @XmlElement(name = DeviceElectricVehicleChargerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceElectricVehicleChargerFlexContainer.class),
+ @XmlElement(name = DeviceFanFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFanFlexContainer.class),
+ @XmlElement(name = DeviceFoodProbeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFoodProbeFlexContainer.class),
+ @XmlElement(name = DeviceFreezerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFreezerFlexContainer.class),
+ @XmlElement(name = DeviceGlucosemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGlucosemeterFlexContainer.class),
+ @XmlElement(name = DeviceHeartRateMonitorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHeartRateMonitorFlexContainer.class),
+ @XmlElement(name = DeviceHomeCCTVFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHomeCCTVFlexContainer.class),
+ @XmlElement(name = DeviceHumidifierFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceHumidifierFlexContainer.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainer.class),
+ @XmlElement(name = DeviceLightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceLightFlexContainer.class),
+ @XmlElement(name = DeviceMicrogenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMicrogenerationFlexContainer.class),
+ @XmlElement(name = DeviceMultiFunctionPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMultiFunctionPrinterFlexContainer.class),
+ @XmlElement(name = DeviceOutdoorLampFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOutdoorLampFlexContainer.class),
+ @XmlElement(name = DeviceOvenFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceOvenFlexContainer.class),
+ @XmlElement(name = DevicePrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePrinterFlexContainer.class),
+ @XmlElement(name = DevicePulseOximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DevicePulseOximeterFlexContainer.class),
+ @XmlElement(name = DeviceRefrigeratorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRefrigeratorFlexContainer.class),
+ @XmlElement(name = DeviceRobotCleanerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceRobotCleanerFlexContainer.class),
+ @XmlElement(name = DeviceScannerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceScannerFlexContainer.class),
+ @XmlElement(name = DeviceSecurityPanelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSecurityPanelFlexContainer.class),
+ @XmlElement(name = DeviceSetTopBoxFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSetTopBoxFlexContainer.class),
+ @XmlElement(name = DeviceSmartElectricMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartElectricMeterFlexContainer.class),
+ @XmlElement(name = DeviceSmartPlugFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmartPlugFlexContainer.class),
+ @XmlElement(name = DeviceSteamClosetFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSteamClosetFlexContainer.class),
+ @XmlElement(name = DeviceStorageBatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceStorageBatteryFlexContainer.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainer.class),
+ @XmlElement(name = DeviceTelevisionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTelevisionFlexContainer.class),
+ @XmlElement(name = DeviceThermometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermometerFlexContainer.class),
+ @XmlElement(name = DeviceThermostatFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceThermostatFlexContainer.class),
+ @XmlElement(name = DeviceWaterHeaterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterHeaterFlexContainer.class),
+ @XmlElement(name = DeviceWaterValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWaterValveFlexContainer.class),
+ @XmlElement(name = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeightScaleAndBodyCompositionAnalyserFlexContainer.class),
+ @XmlElement(name = DeviceWindowShadeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWindowShadeFlexContainer.class),
+ @XmlElement(name = DeviceSwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSwitchFlexContainer.class),
+ @XmlElement(name = DeviceSmokeDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceSmokeDetectorFlexContainer.class),
+ @XmlElement(name = DeviceContactDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceContactDetectorFlexContainer.class),
+ @XmlElement(name = DeviceMotionDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceMotionDetectorFlexContainer.class),
+ @XmlElement(name = DeviceFloodDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceFloodDetectorFlexContainer.class),
+ @XmlElement(name = DeviceTemperatureDetectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceTemperatureDetectorFlexContainer.class),
+ @XmlElement(name = DeviceWeatherStationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWeatherStationFlexContainer.class),
+ @XmlElement(name = DeviceGasValveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceGasValveFlexContainer.class),
+ @XmlElement(name = DeviceKettleFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceKettleFlexContainer.class),
+ @XmlElement(name = DeviceWarningFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DeviceWarningFlexContainer.class),
+ @XmlElement(name = LiquidLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidLevelFlexContainer.class),
+ @XmlElement(name = TemperatureAlarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureAlarmFlexContainer.class),
+ @XmlElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ContactSensorFlexContainer.class),
+ @XmlElement(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesDryerJobModeFlexContainer.class),
+ @XmlElement(name = OximeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OximeterFlexContainer.class),
+ @XmlElement(name = TurboFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TurboFlexContainer.class),
+ @XmlElement(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirConJobModeFlexContainer.class),
+ @XmlElement(name = EnergyGenerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyGenerationFlexContainer.class),
+ @XmlElement(name = KeypadFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeypadFlexContainer.class),
+ @XmlElement(name = MotionSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MotionSensorFlexContainer.class),
+ @XmlElement(name = SmokeSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SmokeSensorFlexContainer.class),
+ @XmlElement(name = MediaSelectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = MediaSelectFlexContainer.class),
+ @XmlElement(name = ElectricVehicleConnectorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ElectricVehicleConnectorFlexContainer.class),
+ @XmlElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AlarmSpeakerFlexContainer.class),
+ @XmlElement(name = LockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LockFlexContainer.class),
+ @XmlElement(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirPurifierJobModeFlexContainer.class),
+ @XmlElement(name = GlucometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GlucometerFlexContainer.class),
+ @XmlElement(name = RemoteControlEnableFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RemoteControlEnableFlexContainer.class),
+ @XmlElement(name = HeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeightFlexContainer.class),
+ @XmlElement(name = SpinLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SpinLevelFlexContainer.class),
+ @XmlElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AudioVolumeFlexContainer.class),
+ @XmlElement(name = FoamingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FoamingFlexContainer.class),
+ @XmlElement(name = OvercurrentSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OvercurrentSensorFlexContainer.class),
+ @XmlElement(name = WeightFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WeightFlexContainer.class),
+ @XmlElement(name = SecurityModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SecurityModeFlexContainer.class),
+ @XmlElement(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BodyCompositionAnalyserFlexContainer.class),
+ @XmlElement(name = ClockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClockFlexContainer.class),
+ @XmlElement(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherDryerJobModeFlexContainer.class),
+ @XmlElement(name = FilterInfoFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FilterInfoFlexContainer.class),
+ @XmlElement(name = PushButtonFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PushButtonFlexContainer.class),
+ @XmlElement(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeOptionFlexContainer.class),
+ @XmlElement(name = KeepWarmFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = KeepWarmFlexContainer.class),
+ @XmlElement(name = PersonSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PersonSensorFlexContainer.class),
+ @XmlElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourSaturationFlexContainer.class),
+ @XmlElement(name = ImpactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ImpactSensorFlexContainer.class),
+ @XmlElement(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ClothesWasherJobModeFlexContainer.class),
+ @XmlElement(name = RunStateFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RunStateFlexContainer.class),
+ @XmlElement(name = TextMessageFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TextMessageFlexContainer.class),
+ @XmlElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BioElectricalImpedanceAnalysisFlexContainer.class),
+ @XmlElement(name = OpenLevelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OpenLevelFlexContainer.class),
+ @XmlElement(name = CredentialsFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CredentialsFlexContainer.class),
+ @XmlElement(name = HotWaterSupplyFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HotWaterSupplyFlexContainer.class),
+ @XmlElement(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirFlowFlexContainer.class),
+ @XmlElement(name = BatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BatteryFlexContainer.class),
+ @XmlElement(name = PulsemeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PulsemeterFlexContainer.class),
+ @XmlElement(name = RobotCleanerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RobotCleanerJobModeFlexContainer.class),
+ @XmlElement(name = LiquidRemainingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = LiquidRemainingFlexContainer.class),
+ @XmlElement(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AirQualitySensorFlexContainer.class),
+ @XmlElement(name = PhoneCallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PhoneCallFlexContainer.class),
+ @XmlElement(name = WaterFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterFlowFlexContainer.class),
+ @XmlElement(name = TimerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TimerFlexContainer.class),
+ @XmlElement(name = BrewingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrewingFlexContainer.class),
+ @XmlElement(name = DishWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DishWasherJobModeFlexContainer.class),
+ @XmlElement(name = OperationModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OperationModeFlexContainer.class),
+ @XmlElement(name = FaultDetectionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = FaultDetectionFlexContainer.class),
+ @XmlElement(name = BoilerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BoilerFlexContainer.class),
+ @XmlElement(name = UvSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = UvSensorFlexContainer.class),
+ @XmlElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinarySwitchFlexContainer.class),
+ @XmlElement(name = WaterSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = WaterSensorFlexContainer.class),
+ @XmlElement(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AcousticSensorFlexContainer.class),
+ @XmlElement(name = TemperatureFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TemperatureFlexContainer.class),
+ @XmlElement(name = NumberValueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = NumberValueFlexContainer.class),
+ @XmlElement(name = DehumidifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DehumidifierJobModeFlexContainer.class),
+ @XmlElement(name = EnergyConsumptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = EnergyConsumptionFlexContainer.class),
+ @XmlElement(name = RecorderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RecorderFlexContainer.class),
+ @XmlElement(name = SphygmomanometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SphygmomanometerFlexContainer.class),
+ @XmlElement(name = GrinderFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GrinderFlexContainer.class),
+ @XmlElement(name = PlayerControlFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PlayerControlFlexContainer.class),
+ @XmlElement(name = OzoneMeterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = OzoneMeterFlexContainer.class),
+ @XmlElement(name = PrintQueueFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PrintQueueFlexContainer.class),
+ @XmlElement(name = SessionDescriptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SessionDescriptionFlexContainer.class),
+ @XmlElement(name = SignalStrengthFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SignalStrengthFlexContainer.class),
+ @XmlElement(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BinaryObjectFlexContainer.class),
+ @XmlElement(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BarometerFlexContainer.class),
+ @XmlElement(name = HeatingZoneFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = HeatingZoneFlexContainer.class),
+ @XmlElement(name = CookerHoodJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = CookerHoodJobModeFlexContainer.class),
+ @XmlElement(name = ColourFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ColourFlexContainer.class),
+ @XmlElement(name = BrightnessFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = BrightnessFlexContainer.class),
+ @XmlElement(name = RefrigerationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RefrigerationFlexContainer.class),
+ @XmlElement(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AutoDocumentFeederFlexContainer.class),
+ @XmlElement(name = TelevisionChannelFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = TelevisionChannelFlexContainer.class),
+ @XmlElement(name = ThreeDPrinterFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = ThreeDPrinterFlexContainer.class),
+ @XmlElement(name = GeoLocationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = GeoLocationFlexContainer.class),
+ @XmlElement(name = DoorStatusFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = DoorStatusFlexContainer.class),
+ @XmlElement(name = RelativeHumidityFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = RelativeHumidityFlexContainer.class),
+ @XmlElement(name = SteamClosetJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = SteamClosetJobModeFlexContainer.class),
+ @XmlElement(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = AnemometerFlexContainer.class),
+ @XmlElement(name = PowerSaveFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain", type = PowerSaveFlexContainer.class),
+ })
protected List<Resource> contentInstanceOrContainerOrSubscription;
+
@XmlElement(name = ShortName.OLDEST, namespace="")
protected String oldest;
+
@XmlElement(name = ShortName.LATEST, namespace="")
protected String latest;
+
/**
* Gets the value of the stateTag property.
*
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java
index 1d6c1d4a..7c75a21e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttribute.java
@@ -15,31 +15,47 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@XmlJavaTypeAdapter(CustomAttributeAdapter.class)
public class CustomAttribute {
- private String customAttributeName;
+ private String shortName;
+ private String longName;
+ private String value;
+ private String type;
- private String customAttributeValue;
+ public String getLongName() {
+ return longName;
+ }
+
+ public void setLongName(String name) {
+ this.longName = name;
+ }
- public String getCustomAttributeName() {
- return customAttributeName;
+ public String getShortName() {
+ return shortName;
}
- public void setCustomAttributeName(String customAttributeName) {
- this.customAttributeName = customAttributeName;
+ public void setShortName(String shortName) {
+ this.shortName = shortName;
}
- public String getCustomAttributeValue() {
- return customAttributeValue;
+ public String getValue() {
+ return value;
}
- public void setCustomAttributeValue(String customAttributeValue) {
- this.customAttributeValue = customAttributeValue;
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ public String getType() {
+ return type;
}
+ public void setType(String type) {
+ this.type = type;
+ }
@Override
public String toString() {
- return "<CustomAttribute " + customAttributeName + "/" +
- customAttributeValue + "/>";
+ return "<CustomAttribute " + shortName + "/" + longName + "/" + type + "/" +
+ value + "/>";
}
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java
index 9fa5b468..79741331 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CustomAttributeAdapter.java
@@ -11,53 +11,50 @@ import javax.xml.bind.annotation.adapters.XmlAdapter;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
public class CustomAttributeAdapter extends XmlAdapter<Element, CustomAttribute> {
+ private static Log LOGGER = LogFactory.getLog(CustomAttributeAdapter.class);
+
private DocumentBuilder documentBuilder;
@Override
- public CustomAttribute unmarshal(Element v) throws Exception {
- CustomAttribute customAttribute = new CustomAttribute();
-
- String value = null;
- Attr att = v.getAttributeNode("val");
- if (att != null) {
- // json case
- value = v.getAttribute("val");
- } else {
- // xml case
- value = v.getTextContent();
- }
- customAttribute.setCustomAttributeName(v.getTagName());
- customAttribute.setCustomAttributeValue(value);
-
- return customAttribute;
+ public CustomAttribute unmarshal(Element elt) throws Exception {
+ CustomAttribute ca = new CustomAttribute();
+ Attr attr = elt.getAttributeNode("val");
+ String value = (attr == null) ? elt.getTextContent() // xml case
+ : elt.getAttribute("val"); // json case
+ ca.setShortName(elt.getTagName());
+ ca.setValue(value);
+// try {
+// ca.setType(elt.getAttributeNode("type").getValue());
+// } catch (Exception e) {
+// LOGGER.info("error getting type " + elt, e);
+// }
+ LOGGER.info("unmarshal: " + print(elt) + " -> " + ca);
+ return ca;
}
@Override
- public Element marshal(CustomAttribute v) throws Exception {
-
- if (null == v) {
- return null;
- }
-
- Object value = v.getCustomAttributeValue();
-
- Element e = null;
+ public Element marshal(CustomAttribute ca) throws Exception {
try {
Document document = getDocumentBuilder().newDocument();
- e = document.createElement(v.getCustomAttributeName());
- e.setTextContent((value != null ? value.toString() : ""));
-
+ Element elt = document.createElement(ca.getShortName());
+ String value = ca.getValue();
+// elt.setAttribute("type", ca.getType());
+ elt.setTextContent((value != null ? value : ""));
+ return elt;
} catch (Throwable t) {
- t.printStackTrace();
+ LOGGER.info("error marshalling " + ca, t);
+ return null;
}
-
- return e;
}
private DocumentBuilder getDocumentBuilder() throws Exception {
@@ -68,6 +65,15 @@ public class CustomAttributeAdapter extends XmlAdapter<Element, CustomAttribute>
}
return documentBuilder;
}
-
+
+ private String print(Element elt) {
+ String ret = "<Elt " + elt.getTagName();
+ NamedNodeMap map = elt.getAttributes();
+ for (int i = 0; i < map.getLength(); i++) {
+ Node n = map.item(i);
+ ret += " " + ((n instanceof Element) ? print((Element)n) : n);
+ }
+ return ret + ">" + elt.getTextContent() + "</Elt>";
+ }
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DasInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DasInfo.java
new file mode 100644
index 00000000..5b8e1092
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DasInfo.java
@@ -0,0 +1,38 @@
+package org.eclipse.om2m.commons.resource;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.constants.ShortName;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(propOrder = { "URI", "dasRequest" })
+public class DasInfo {
+
+ @XmlElement(required = true, name=ShortName.URI)
+ @XmlSchemaType(name = "anyURI")
+ private String URI;
+
+ @XmlElement(nillable = true, type = DynAuthDasRequest.class, name=ShortName.DAS_REQUEST)
+ private DynAuthDasRequest dasRequest;
+ // private DynAuthJWT securedDasRequest;
+
+ public String getURI() {
+ return URI;
+ }
+
+ public void setURI(String uRI) {
+ URI = uRI;
+ }
+
+ public DynAuthDasRequest getDasRequest() {
+ return dasRequest;
+ }
+
+ public void setDasRequest(DynAuthDasRequest dasRequest) {
+ this.dasRequest = dasRequest;
+ }
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java
index b4c119bf..8032faf0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthDasRequest.java
@@ -20,6 +20,8 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.eclipse.om2m.commons.constants.ShortName;
+
/**
* <p>Classe Java pour dynAuthDasRequest complex type.
@@ -104,26 +106,34 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
})
public class DynAuthDasRequest {
- @XmlElement(required = true)
+ @XmlElement(required = true, name=ShortName.ORIGINATOR)
@XmlSchemaType(name = "anyURI")
protected String originator;
- @XmlElement(required = true)
+ @XmlElement(required = true, name = ShortName.TARGETED_RESOURCE_TYPE)
protected BigInteger targetedResourceType;
- @XmlElement(required = true)
+ @XmlElement(required = true, name=ShortName.OPERATION)
protected BigInteger operation;
+ @XmlElement(name=ShortName.ORIGINATOR_IP)
protected DynAuthDasRequest.OriginatorIP originatorIP;
+ @XmlElement(name=ShortName.ORIGINATOR_LOCATION)
protected LocationRegion originatorLocation;
@XmlList
+ @XmlElement(name=ShortName.ORIGINATOR_ROLE_IDS)
protected List<String> originatorRoleIDs;
@XmlSchemaType(name = "anySimpleType")
+ @XmlElement(name=ShortName.REQUEST_TIMESTAMP)
protected String requestTimestamp;
@XmlSchemaType(name = "anyURI")
+ @XmlElement(name=ShortName.TARGETED_RESOURCE_ID)
protected String targetedResourceID;
@XmlSchemaType(name = "anySimpleType")
+ @XmlElement(name=ShortName.PROPOSED_PRIVILEDGES_LIFETIME)
protected String proposedPrivilegesLifetime;
@XmlList
+ @XmlElement(name=ShortName.ROLE_IDS_FROM_ACPS)
protected List<String> roleIDsFromACPs;
@XmlList
+ @XmlElement(name=ShortName.TOKEN_IDS)
protected List<String> tokenIDs;
/**
@@ -435,9 +445,11 @@ public class DynAuthDasRequest {
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlSchemaType(name = "token")
+ @XmlElement(name=ShortName.IPV4)
protected String ipv4Address;
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlSchemaType(name = "token")
+ @XmlElement(name=ShortName.IPV6)
protected String ipv6Address;
/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthTokenReqInfo.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthTokenReqInfo.java
new file mode 100644
index 00000000..e0a0dd7f
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynAuthTokenReqInfo.java
@@ -0,0 +1,37 @@
+package org.eclipse.om2m.commons.resource;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElements;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.constants.ShortName;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ShortName.DYNAMIC_AUTHORIZATION_TOKEN_REQ_INFO, namespace = "http://www.onem2m.org/xml/protocols", propOrder = {
+ "dasInfo" })
+@XmlRootElement(name = ShortName.DYNAMIC_AUTHORIZATION_TOKEN_REQ_INFO, namespace = "http://www.onem2m.org/xml/protocols")
+public class DynAuthTokenReqInfo {
+
+ @XmlElements({
+ @XmlElement(name = ShortName.DAS_INFO, type = DasInfo.class) })
+ private List<DasInfo> dasInfo;
+
+ public List<DasInfo> getDasInfo() {
+ if (dasInfo == null) {
+ dasInfo = new ArrayList<>();
+ }
+ return dasInfo;
+ }
+
+ public void setDasInfo(List<DasInfo> dasInfo) {
+ this.dasInfo = dasInfo;
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java
index 8565f478..94924a69 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RequestPrimitive.java
@@ -27,6 +27,7 @@
package org.eclipse.om2m.commons.resource;
import java.math.BigInteger;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -128,6 +129,8 @@ public class RequestPrimitive {
@XmlElement(name = ShortName.DISCOVERY_RESULT_TYPE)
protected BigInteger discoveryResultType;
@XmlTransient
+ protected List<String> tokens;
+ @XmlTransient
protected String returnContentType;
@XmlTransient
protected String requestContentType;
@@ -607,6 +610,13 @@ public class RequestPrimitive {
}
return httpHeaders;
}
+
+ public List<String> getTokens() {
+ if (tokens == null) {
+ tokens = new ArrayList<String>();
+ }
+ return tokens;
+ }
/* (non-Javadoc)
* @see java.lang.Object#toString()
@@ -652,7 +662,8 @@ public class RequestPrimitive {
+ returnContentType + ",\n " : "")
+ (requestContentType != null ? "requestContentType="
+ requestContentType + ",\n ": "")
- + (queryStrings != null ? "queryStrings=" + queryStrings : "")
+ + (queryStrings != null ? "queryStrings=" + queryStrings : "") + ", \n"
+ + ",tokens=" + (tokens != null ? tokens.toString() : "null")
+ "]";
}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java
index 646078c0..c94e877a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ResponsePrimitive.java
@@ -91,6 +91,8 @@ public class ResponsePrimitive implements Constants {
protected String resultExpirationTimestamp;
@XmlElement(name = ShortName.EVENT_CATEGORY)
protected String eventCategory;
+ @XmlElement(name= ShortName.TOKEN_REQ_INFO)
+ protected DynAuthTokenReqInfo tokenReqInfo;
@XmlTransient
protected String location;
@XmlTransient
@@ -301,6 +303,16 @@ public class ResponsePrimitive implements Constants {
public void setLocation(String location) {
this.location = location;
}
+
+
+
+ public DynAuthTokenReqInfo getTokenReqInfo() {
+ return tokenReqInfo;
+ }
+
+ public void setTokenReqInfo(DynAuthTokenReqInfo tokenReqInfo) {
+ this.tokenReqInfo = tokenReqInfo;
+ }
/* (non-Javadoc)
* @see java.lang.Object#toString()
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java
new file mode 100644
index 00000000..660e8899
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainer.java
@@ -0,0 +1,58 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AcousticSensor
+
+This ModuleClass provides capabilities for an acoustic sensor.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AcousticSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AcousticSensorFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "acousticSensor";
+ public static final String SHORT_NAME = "acoSr";
+
+ public AcousticSensorFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AcousticSensorFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute loudness = new CustomAttribute();
+ loudness.setLongName("loudness");
+ loudness.setShortName("louds");
+ loudness.setType("xs:float");
+ getCustomAttributes().add(loudness);
+ CustomAttribute acousticStatus = new CustomAttribute();
+ acousticStatus.setLongName("acousticStatus");
+ acousticStatus.setShortName("acoSs");
+ acousticStatus.setType("xs:integer");
+ getCustomAttributes().add(acousticStatus);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java
new file mode 100644
index 00000000..bfc3f1c5
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AcousticSensorFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AcousticSensorAnnc
+
+This ModuleClass provides capabilities for an acoustic sensor.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AcousticSensorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AcousticSensorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AcousticSensorFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "acousticSensorAnnc";
+ public static final String SHORT_NAME = "acoSrAnnc";
+
+ public AcousticSensorFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AcousticSensorFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java
index 88ae863f..0cee1cc6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainer.java
@@ -1,29 +1,27 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
********************************************************************************
-Action : activateClockTimer
+Action : ActivateClockTimer
Activate current clock timer.
-Created: 2018-06-11 12:14:18
+Created: 2018-06-29 17:19:54
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
@XmlRootElement(name = ActivateClockTimerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -39,11 +37,10 @@ public class ActivateClockTimerFlexContainer extends AbstractFlexContainer {
setShortName(SHORT_NAME);
}
-
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java
index 61ef166f..ef3c9922 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ActivateClockTimerFlexContainerAnnc.java
@@ -1,29 +1,27 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
********************************************************************************
-Action : activateClockTimer
+Action : ActivateClockTimerAnnc
Activate current clock timer.
-Created: 2018-06-11 12:14:18
+Created: 2018-06-29 17:19:54
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = ActivateClockTimerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -39,11 +37,10 @@ public class ActivateClockTimerFlexContainerAnnc extends AbstractFlexContainerAn
setShortName(SHORT_NAME);
}
-
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java
new file mode 100644
index 00000000..7b4ad330
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainer.java
@@ -0,0 +1,63 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirConJobMode
+
+This ModuleClasses provides capabilities to control and monitor the job modes of an air conditioner.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirConJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirConJobModeFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "airConJobMode";
+ public static final String SHORT_NAME = "aCJMe";
+
+ public AirConJobModeFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirConJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute currentJobModeName = new CustomAttribute();
+ currentJobModeName.setLongName("currentJobModeName");
+ currentJobModeName.setShortName("cJMNe");
+ currentJobModeName.setType("xs:string");
+ getCustomAttributes().add(currentJobModeName);
+ CustomAttribute currentJobMode = new CustomAttribute();
+ currentJobMode.setLongName("currentJobMode");
+ currentJobMode.setShortName("cuJMe");
+ currentJobMode.setType("hd:enumAirConJobMode");
+ getCustomAttributes().add(currentJobMode);
+ CustomAttribute jobModes = new CustomAttribute();
+ jobModes.setLongName("jobModes");
+ jobModes.setShortName("jobMs");
+ jobModes.setType("[hd:enumAirConJobMode]");
+ getCustomAttributes().add(jobModes);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java
new file mode 100644
index 00000000..dbf630f0
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirConJobModeFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirConJobModeAnnc
+
+This ModuleClasses provides capabilities to control and monitor the job modes of an air conditioner.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AirConJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirConJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirConJobModeFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "airConJobModeAnnc";
+ public static final String SHORT_NAME = "aCJMeAnnc";
+
+ public AirConJobModeFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirConJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java
new file mode 100644
index 00000000..fc841467
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainer.java
@@ -0,0 +1,88 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirFlow
+
+This ModuleClass provides capabilities for controlling the air flow of a device.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirFlowFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirFlowFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "airFlow";
+ public static final String SHORT_NAME = "airFw";
+
+ public AirFlowFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirFlowFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute horizontalDirection = new CustomAttribute();
+ horizontalDirection.setLongName("horizontalDirection");
+ horizontalDirection.setShortName("horDn");
+ horizontalDirection.setType("hd:enumHorizontalDirection");
+ getCustomAttributes().add(horizontalDirection);
+ CustomAttribute verticalDirection = new CustomAttribute();
+ verticalDirection.setLongName("verticalDirection");
+ verticalDirection.setShortName("verDn");
+ verticalDirection.setType("hd:enumVerticalDirection");
+ getCustomAttributes().add(verticalDirection);
+ CustomAttribute supportedHorizontalDirection = new CustomAttribute();
+ supportedHorizontalDirection.setLongName("supportedHorizontalDirection");
+ supportedHorizontalDirection.setShortName("suHDn");
+ supportedHorizontalDirection.setType("[hd:enumHorizontalDirection]");
+ getCustomAttributes().add(supportedHorizontalDirection);
+ CustomAttribute maxSpeed = new CustomAttribute();
+ maxSpeed.setLongName("maxSpeed");
+ maxSpeed.setShortName("maxSd");
+ maxSpeed.setType("xs:integer");
+ getCustomAttributes().add(maxSpeed);
+ CustomAttribute supportedVerticalDirection = new CustomAttribute();
+ supportedVerticalDirection.setLongName("supportedVerticalDirection");
+ supportedVerticalDirection.setShortName("suVDn");
+ supportedVerticalDirection.setType("[hd:enumVerticalDirection]");
+ getCustomAttributes().add(supportedVerticalDirection);
+ CustomAttribute minSpeed = new CustomAttribute();
+ minSpeed.setLongName("minSpeed");
+ minSpeed.setShortName("minSd");
+ minSpeed.setType("xs:integer");
+ getCustomAttributes().add(minSpeed);
+ CustomAttribute speed = new CustomAttribute();
+ speed.setLongName("speed");
+ speed.setShortName("speed");
+ speed.setType("xs:integer");
+ getCustomAttributes().add(speed);
+ CustomAttribute automode = new CustomAttribute();
+ automode.setLongName("automode");
+ automode.setShortName("autoe");
+ automode.setType("xs:boolean");
+ getCustomAttributes().add(automode);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java
new file mode 100644
index 00000000..23259f73
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirFlowFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirFlowAnnc
+
+This ModuleClass provides capabilities for controlling the air flow of a device.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AirFlowFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirFlowFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirFlowFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "airFlowAnnc";
+ public static final String SHORT_NAME = "airFwAnnc";
+
+ public AirFlowFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirFlowFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java
new file mode 100644
index 00000000..f9d1d268
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainer.java
@@ -0,0 +1,63 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirPurifierJobMode
+
+This ModuleClasses provides capabilities to control and monitor the job modes of an airPurifier.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirPurifierJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirPurifierJobModeFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "airPurifierJobMode";
+ public static final String SHORT_NAME = "aPJMe";
+
+ public AirPurifierJobModeFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirPurifierJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute currentJobModeName = new CustomAttribute();
+ currentJobModeName.setLongName("currentJobModeName");
+ currentJobModeName.setShortName("cJMNe");
+ currentJobModeName.setType("xs:string");
+ getCustomAttributes().add(currentJobModeName);
+ CustomAttribute currentJobMode = new CustomAttribute();
+ currentJobMode.setLongName("currentJobMode");
+ currentJobMode.setShortName("cuJMe");
+ currentJobMode.setType("hd:enumAirPurifierJobMode");
+ getCustomAttributes().add(currentJobMode);
+ CustomAttribute jobModes = new CustomAttribute();
+ jobModes.setLongName("jobModes");
+ jobModes.setShortName("jobMs");
+ jobModes.setType("[hd:enumAirPurifierJobMode]");
+ getCustomAttributes().add(jobModes);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java
new file mode 100644
index 00000000..962092b8
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirPurifierJobModeFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirPurifierJobModeAnnc
+
+This ModuleClasses provides capabilities to control and monitor the job modes of an airPurifier.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AirPurifierJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirPurifierJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirPurifierJobModeFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "airPurifierJobModeAnnc";
+ public static final String SHORT_NAME = "aPJMeAnnc";
+
+ public AirPurifierJobModeFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirPurifierJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java
new file mode 100644
index 00000000..32683741
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainer.java
@@ -0,0 +1,98 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirQualitySensor
+
+ThThis ModuleClass provides capabilities for a monitoring sensor that measures the air quality.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirQualitySensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirQualitySensorFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "airQualitySensor";
+ public static final String SHORT_NAME = "aiQSr";
+
+ public AirQualitySensorFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirQualitySensorFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute sensorOdor = new CustomAttribute();
+ sensorOdor.setLongName("sensorOdor");
+ sensorOdor.setShortName("senOr");
+ sensorOdor.setType("xs:integer");
+ getCustomAttributes().add(sensorOdor);
+ CustomAttribute sensorPM10 = new CustomAttribute();
+ sensorPM10.setLongName("sensorPM10");
+ sensorPM10.setShortName("sePM0");
+ sensorPM10.setType("xs:integer");
+ getCustomAttributes().add(sensorPM10);
+ CustomAttribute sensorHumidity = new CustomAttribute();
+ sensorHumidity.setLongName("sensorHumidity");
+ sensorHumidity.setShortName("senHy");
+ sensorHumidity.setType("xs:integer");
+ getCustomAttributes().add(sensorHumidity);
+ CustomAttribute co2 = new CustomAttribute();
+ co2.setLongName("co2");
+ co2.setShortName("co2");
+ co2.setType("xs:integer");
+ getCustomAttributes().add(co2);
+ CustomAttribute sensorPM1 = new CustomAttribute();
+ sensorPM1.setLongName("sensorPM1");
+ sensorPM1.setShortName("sePM1");
+ sensorPM1.setType("xs:integer");
+ getCustomAttributes().add(sensorPM1);
+ CustomAttribute sensorPM2 = new CustomAttribute();
+ sensorPM2.setLongName("sensorPM2");
+ sensorPM2.setShortName("sePM2");
+ sensorPM2.setType("xs:integer");
+ getCustomAttributes().add(sensorPM2);
+ CustomAttribute voc = new CustomAttribute();
+ voc.setLongName("voc");
+ voc.setShortName("voc");
+ voc.setType("xs:integer");
+ getCustomAttributes().add(voc);
+ CustomAttribute co = new CustomAttribute();
+ co.setLongName("co");
+ co.setShortName("co");
+ co.setType("xs:integer");
+ getCustomAttributes().add(co);
+ CustomAttribute ch2o = new CustomAttribute();
+ ch2o.setLongName("ch2o");
+ ch2o.setShortName("ch2o");
+ ch2o.setType("xs:integer");
+ getCustomAttributes().add(ch2o);
+ CustomAttribute monitoringEnabled = new CustomAttribute();
+ monitoringEnabled.setLongName("monitoringEnabled");
+ monitoringEnabled.setShortName("monEd");
+ monitoringEnabled.setType("xs:boolean");
+ getCustomAttributes().add(monitoringEnabled);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java
new file mode 100644
index 00000000..ff01de19
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AirQualitySensorFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AirQualitySensorAnnc
+
+ThThis ModuleClass provides capabilities for a monitoring sensor that measures the air quality.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AirQualitySensorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AirQualitySensorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AirQualitySensorFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "airQualitySensorAnnc";
+ public static final String SHORT_NAME = "aiQSrAnnc";
+
+ public AirQualitySensorFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AirQualitySensorFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java
index 572e5186..153cfb70 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : AlarmSpeaker
-This ModuleClass provides the capability to initiate an alarm.
+This ModuleClass provides the capabilites to initiate and monitor an alarm.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = AlarmSpeakerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,33 @@ public class AlarmSpeakerFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "alarmSpeaker";
public static final String SHORT_NAME = "alaSr";
-
+
public AlarmSpeakerFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + AlarmSpeakerFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute alarmStatus = new CustomAttribute();
+ alarmStatus.setLongName("alarmStatus");
+ alarmStatus.setShortName("alaSs");
+ alarmStatus.setType("xs:boolean");
+ getCustomAttributes().add(alarmStatus);
+ CustomAttribute tone = new CustomAttribute();
+ tone.setLongName("tone");
+ tone.setShortName("tone");
+ tone.setType("hd:enumTone");
+ getCustomAttributes().add(tone);
+ CustomAttribute light = new CustomAttribute();
+ light.setLongName("light");
+ light.setShortName("light");
+ light.setType("hd:enumAlertColourCode");
+ getCustomAttributes().add(light);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java
index a1a10c20..9dd93420 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AlarmSpeakerFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : AlarmSpeakerAnnc
-This ModuleClass provides the capability to initiate an alarm.
+This ModuleClass provides the capabilites to initiate and monitor an alarm.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = AlarmSpeakerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class AlarmSpeakerFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java
new file mode 100644
index 00000000..36b544b0
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainer.java
@@ -0,0 +1,53 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : Anemometer
+
+This ModuleClass provides the capabilities to indicate the measure of the wind speed.
+
+Created: 2018-07-04 10:25:08
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AnemometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AnemometerFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "anemometer";
+ public static final String SHORT_NAME = "anemr";
+
+ public AnemometerFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AnemometerFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute speed = new CustomAttribute();
+ speed.setLongName("speed");
+ speed.setShortName("speed");
+ speed.setType("xs:float");
+ getCustomAttributes().add(speed);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java
new file mode 100644
index 00000000..2007cfd5
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnemometerFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AnemometerAnnc
+
+This ModuleClass provides the capabilities to indicate the measure of the wind speed.
+
+Created: 2018-07-04 10:25:08
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AnemometerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AnemometerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AnemometerFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "anemometerAnnc";
+ public static final String SHORT_NAME = "anemrAnnc";
+
+ public AnemometerFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AnemometerFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java
new file mode 100644
index 00000000..3d3cab90
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainer.java
@@ -0,0 +1,46 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+Action : Answer
+
+Answer (pickup) an incoming call.
+
+Created: 2018-06-29 17:19:53
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+
+@XmlRootElement(name = AnswerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AnswerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AnswerFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "answer";
+ public static final String SHORT_NAME = "answr";
+
+ public AnswerFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass.phonecall." + AnswerFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java
new file mode 100644
index 00000000..e510c991
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AnswerFlexContainerAnnc.java
@@ -0,0 +1,46 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+Action : AnswerAnnc
+
+Answer (pickup) an incoming call.
+
+Created: 2018-06-29 17:19:53
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AnswerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AnswerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AnswerFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "answerAnnc";
+ public static final String SHORT_NAME = "answrAnnc";
+
+ public AnswerFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass.phonecall." + AnswerFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java
index fcdc38d0..a6330ed5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,9 +9,9 @@
ModuleClass : AudioVolume
-This ModuleClass provides capabilities to control and monitor volume.
+This ModuleClass provides capabilities to control and monitor volume.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
@@ -21,9 +21,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = AudioVolumeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,53 +32,72 @@ public class AudioVolumeFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "audioVolume";
public static final String SHORT_NAME = "audVe";
-
+
public AudioVolumeFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + AudioVolumeFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute volumePercentage = new CustomAttribute();
+ volumePercentage.setLongName("volumePercentage");
+ volumePercentage.setShortName("volPe");
+ volumePercentage.setType("xs:integer");
+ getCustomAttributes().add(volumePercentage);
+ CustomAttribute stepValue = new CustomAttribute();
+ stepValue.setLongName("stepValue");
+ stepValue.setShortName("steVe");
+ stepValue.setType("xs:integer");
+ getCustomAttributes().add(stepValue);
+ CustomAttribute maxValue = new CustomAttribute();
+ maxValue.setLongName("maxValue");
+ maxValue.setShortName("maxVe");
+ maxValue.setType("xs:integer");
+ getCustomAttributes().add(maxValue);
+ CustomAttribute muteEnabled = new CustomAttribute();
+ muteEnabled.setLongName("muteEnabled");
+ muteEnabled.setShortName("mutEd");
+ muteEnabled.setType("xs:boolean");
+ getCustomAttributes().add(muteEnabled);
}
-
- public void finalizeSerialization() {
- getUpVolume();
- getDownVolume();
- }
-
- public void finalizeDeserialization() {
- if (this.upVolume != null) {
- setUpVolume(upVolume);
- }
- if (this.downVolume != null) {
- setDownVolume(downVolume);
- }
- }
-
+
+
@XmlElement(name=UpVolumeFlexContainer.SHORT_NAME, required=true, type=UpVolumeFlexContainer.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
private UpVolumeFlexContainer upVolume;
-
- public void setUpVolume(UpVolumeFlexContainer upVolume) {
- this.upVolume = upVolume;
- getFlexContainerOrContainerOrSubscription().add(upVolume);
- }
-
public UpVolumeFlexContainer getUpVolume() {
this.upVolume = (UpVolumeFlexContainer) getResourceByName(UpVolumeFlexContainer.SHORT_NAME);
return upVolume;
}
+ public void setUpVolume(UpVolumeFlexContainer newAction) {
+ this.upVolume = newAction;
+ getFlexContainerOrContainerOrSubscription().add(upVolume);
+ }
+
@XmlElement(name=DownVolumeFlexContainer.SHORT_NAME, required=true, type=DownVolumeFlexContainer.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
private DownVolumeFlexContainer downVolume;
+ public DownVolumeFlexContainer getDownVolume() {
+ this.downVolume = (DownVolumeFlexContainer) getResourceByName(DownVolumeFlexContainer.SHORT_NAME);
+ return downVolume;
+ }
- public void setDownVolume(DownVolumeFlexContainer downVolume) {
- this.downVolume = downVolume;
+ public void setDownVolume(DownVolumeFlexContainer newAction) {
+ this.downVolume = newAction;
getFlexContainerOrContainerOrSubscription().add(downVolume);
}
+
+ public void finalizeSerialization() {
+ getUpVolume();
+ getDownVolume();
+ }
- public DownVolumeFlexContainer getDownVolume() {
- this.downVolume = (DownVolumeFlexContainer) getResourceByName(DownVolumeFlexContainer.SHORT_NAME);
- return downVolume;
+ public void finalizeDeserialization() {
+ if (this.upVolume != null) {
+ setUpVolume(this.upVolume);
+ }
+ if (this.downVolume != null) {
+ setDownVolume(this.downVolume);
+ }
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java
index 499444d7..9c33748e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AudioVolumeFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,9 +9,9 @@
ModuleClass : AudioVolumeAnnc
-This ModuleClass provides capabilities to control and monitor volume.
+This ModuleClass provides capabilities to control and monitor volume.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
@@ -21,9 +21,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = AudioVolumeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,24 +37,23 @@ public class AudioVolumeFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
- getUpVolumeAnnc();
- getDownVolumeAnnc();
+ getUpVolumeAnnc();
+ getDownVolumeAnnc();
}
public void finalizeDeserialization() {
- if (this.upVolumeAnnc != null) {
- setUpVolumeAnnc(upVolumeAnnc);
+ if (this.upVolumeAnnc != null){
+ setUpVolumeAnnc(upVolumeAnnc);
}
- if (this.downVolumeAnnc != null) {
- setDownVolumeAnnc(downVolumeAnnc);
+ if (this.downVolumeAnnc != null){
+ setDownVolumeAnnc(downVolumeAnnc);
}
}
@XmlElement(name=UpVolumeFlexContainerAnnc.SHORT_NAME, required=true, type=UpVolumeFlexContainerAnnc.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
- private UpVolumeFlexContainerAnnc upVolumeAnnc;
-
+ private UpVolumeFlexContainerAnnc upVolumeAnnc;
public void setUpVolumeAnnc(UpVolumeFlexContainerAnnc upVolumeAnnc) {
this.upVolumeAnnc = upVolumeAnnc;
@@ -66,10 +64,8 @@ public class AudioVolumeFlexContainerAnnc extends AbstractFlexContainerAnnc {
this.upVolumeAnnc = (UpVolumeFlexContainerAnnc) getResourceByName(UpVolumeFlexContainerAnnc.SHORT_NAME);
return upVolumeAnnc;
}
-
@XmlElement(name=DownVolumeFlexContainerAnnc.SHORT_NAME, required=true, type=DownVolumeFlexContainerAnnc.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
- private DownVolumeFlexContainerAnnc downVolumeAnnc;
-
+ private DownVolumeFlexContainerAnnc downVolumeAnnc;
public void setDownVolumeAnnc(DownVolumeFlexContainerAnnc downVolumeAnnc) {
this.downVolumeAnnc = downVolumeAnnc;
@@ -81,4 +77,4 @@ public class AudioVolumeFlexContainerAnnc extends AbstractFlexContainerAnnc {
return downVolumeAnnc;
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java
new file mode 100644
index 00000000..2130e3b7
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainer.java
@@ -0,0 +1,58 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AutoDocumentFeeder
+
+This ModuleClasses provides capabilities to monitor the state of autoDocumentFeeder (ADF). ADF is a feature which takes several pages and feeds the paper one page at a time into a scanner or printer, allowing the user to scan, print or fax, multiple-page documents without having to manually replace each page.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AutoDocumentFeederFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AutoDocumentFeederFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "autoDocumentFeeder";
+ public static final String SHORT_NAME = "auDFr";
+
+ public AutoDocumentFeederFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AutoDocumentFeederFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute adfStates = new CustomAttribute();
+ adfStates.setLongName("adfStates");
+ adfStates.setShortName("adfSs");
+ adfStates.setType("[hd:enumAdfState]");
+ getCustomAttributes().add(adfStates);
+ CustomAttribute currentAdfState = new CustomAttribute();
+ currentAdfState.setLongName("currentAdfState");
+ currentAdfState.setShortName("cuASe");
+ currentAdfState.setType("hd:enumAdfState");
+ getCustomAttributes().add(currentAdfState);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java
new file mode 100644
index 00000000..188792a5
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/AutoDocumentFeederFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : AutoDocumentFeederAnnc
+
+This ModuleClasses provides capabilities to monitor the state of autoDocumentFeeder (ADF). ADF is a feature which takes several pages and feeds the paper one page at a time into a scanner or printer, allowing the user to scan, print or fax, multiple-page documents without having to manually replace each page.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = AutoDocumentFeederFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = AutoDocumentFeederFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class AutoDocumentFeederFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "autoDocumentFeederAnnc";
+ public static final String SHORT_NAME = "auDFrAnnc";
+
+ public AutoDocumentFeederFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + AutoDocumentFeederFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java
new file mode 100644
index 00000000..87784bac
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainer.java
@@ -0,0 +1,68 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : Barometer
+
+This ModuleClass provides the capabilities to measure the atomospheric pressure and indicate the detection of abnormal pressures and raises an alarm if the triggering criterion is met.
+
+Created: 2018-07-04 10:25:08
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = BarometerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class BarometerFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "barometer";
+ public static final String SHORT_NAME = "baror";
+
+ public BarometerFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + BarometerFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute minPressureThreshhold = new CustomAttribute();
+ minPressureThreshhold.setLongName("minPressureThreshhold");
+ minPressureThreshhold.setShortName("miPTd");
+ minPressureThreshhold.setType("xs:integer");
+ getCustomAttributes().add(minPressureThreshhold);
+ CustomAttribute unit = new CustomAttribute();
+ unit.setLongName("unit");
+ unit.setShortName("unit");
+ unit.setType("xs:string");
+ getCustomAttributes().add(unit);
+ CustomAttribute maxPressureThreshhold = new CustomAttribute();
+ maxPressureThreshhold.setLongName("maxPressureThreshhold");
+ maxPressureThreshhold.setShortName("maPTd");
+ maxPressureThreshhold.setType("xs:integer");
+ getCustomAttributes().add(maxPressureThreshhold);
+ CustomAttribute atmosphericPressure = new CustomAttribute();
+ atmosphericPressure.setLongName("atmosphericPressure");
+ atmosphericPressure.setShortName("atmPe");
+ atmosphericPressure.setType("xs:float");
+ getCustomAttributes().add(atmosphericPressure);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java
new file mode 100644
index 00000000..ffd4092f
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BarometerFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : BarometerAnnc
+
+This ModuleClass provides the capabilities to measure the atomospheric pressure and indicate the detection of abnormal pressures and raises an alarm if the triggering criterion is met.
+
+Created: 2018-07-04 10:25:08
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = BarometerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = BarometerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class BarometerFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "barometerAnnc";
+ public static final String SHORT_NAME = "barorAnnc";
+
+ public BarometerFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + BarometerFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java
index 9ae6d870..d6740852 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : Battery
-Battery indicates the detection of low battery and gives an alarm if triggering criterion is met. The charge value in the module shows the current battery charge level.
+This ModuleClass provides capabilities to indicate the detection of low battery and gives an alarm if triggering criterion is met. The level data point in the module represents the current battery charge level.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = BatteryFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -31,18 +30,64 @@ import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
public class BatteryFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "battery";
- public static final String SHORT_NAME = "batty";
-
+ public static final String SHORT_NAME = "bat";
+
public BatteryFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + BatteryFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute discharging = new CustomAttribute();
+ discharging.setLongName("discharging");
+ discharging.setShortName("discg");
+ discharging.setType("xs:boolean");
+ getCustomAttributes().add(discharging);
+ CustomAttribute lowBattery = new CustomAttribute();
+ lowBattery.setLongName("lowBattery");
+ lowBattery.setShortName("lowBy");
+ lowBattery.setType("xs:boolean");
+ getCustomAttributes().add(lowBattery);
+ CustomAttribute material = new CustomAttribute();
+ material.setLongName("material");
+ material.setShortName("matel");
+ material.setType("xs:string");
+ getCustomAttributes().add(material);
+ CustomAttribute level = new CustomAttribute();
+ level.setLongName("level");
+ level.setShortName("lvl");
+ level.setType("xs:integer");
+ getCustomAttributes().add(level);
+ CustomAttribute charging = new CustomAttribute();
+ charging.setLongName("charging");
+ charging.setShortName("charg");
+ charging.setType("xs:boolean");
+ getCustomAttributes().add(charging);
+ CustomAttribute electricEnergy = new CustomAttribute();
+ electricEnergy.setLongName("electricEnergy");
+ electricEnergy.setShortName("eleEy");
+ electricEnergy.setType("xs:integer");
+ getCustomAttributes().add(electricEnergy);
+ CustomAttribute batteryThreshold = new CustomAttribute();
+ batteryThreshold.setLongName("batteryThreshold");
+ batteryThreshold.setShortName("batTd");
+ batteryThreshold.setType("xs:integer");
+ getCustomAttributes().add(batteryThreshold);
+ CustomAttribute capacity = new CustomAttribute();
+ capacity.setLongName("capacity");
+ capacity.setShortName("capay");
+ capacity.setType("xs:integer");
+ getCustomAttributes().add(capacity);
+ CustomAttribute voltage = new CustomAttribute();
+ voltage.setLongName("voltage");
+ voltage.setShortName("volte");
+ voltage.setType("xs:integer");
+ getCustomAttributes().add(voltage);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java
index 282e5944..8310a6fb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BatteryFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : BatteryAnnc
-Battery indicates the detection of low battery and gives an alarm if triggering criterion is met. The charge value in the module shows the current battery charge level.
+This ModuleClass provides capabilities to indicate the detection of low battery and gives an alarm if triggering criterion is met. The level data point in the module represents the current battery charge level.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = BatteryFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -31,18 +29,19 @@ import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
public class BatteryFlexContainerAnnc extends AbstractFlexContainerAnnc {
public static final String LONG_NAME = "batteryAnnc";
- public static final String SHORT_NAME = "battyAnnc";
+ public static final String SHORT_NAME = "batAnnc";
public BatteryFlexContainerAnnc () {
setContainerDefinition("org.onem2m.home.moduleclass." + BatteryFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java
new file mode 100644
index 00000000..de3ce8aa
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainer.java
@@ -0,0 +1,68 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : BinaryObject
+
+This ModuleClass describes the handling of a binary object (blob).
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = BinaryObjectFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class BinaryObjectFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "binaryObject";
+ public static final String SHORT_NAME = "binOt";
+
+ public BinaryObjectFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + BinaryObjectFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute size = new CustomAttribute();
+ size.setLongName("size");
+ size.setShortName("size");
+ size.setType("xs:integer");
+ getCustomAttributes().add(size);
+ CustomAttribute hash = new CustomAttribute();
+ hash.setLongName("hash");
+ hash.setShortName("hash");
+ hash.setType("xs:string");
+ getCustomAttributes().add(hash);
+ CustomAttribute object = new CustomAttribute();
+ object.setLongName("object");
+ object.setShortName("objet");
+ object.setType("xs:string");
+ getCustomAttributes().add(object);
+ CustomAttribute objectType = new CustomAttribute();
+ objectType.setLongName("objectType");
+ objectType.setShortName("objTe");
+ objectType.setType("xs:string");
+ getCustomAttributes().add(objectType);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java
new file mode 100644
index 00000000..cce95bbb
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinaryObjectFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : BinaryObjectAnnc
+
+This ModuleClass describes the handling of a binary object (blob).
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = BinaryObjectFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = BinaryObjectFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class BinaryObjectFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "binaryObjectAnnc";
+ public static final String SHORT_NAME = "binOtAnnc";
+
+ public BinaryObjectFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + BinaryObjectFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java
index a18b8a97..00b0c77c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,9 +9,9 @@
ModuleClass : BinarySwitch
-This ModuleClass provides capabilities to control and monitor the state of power.
+This ModuleClass provides capabilities to control and monitor the state of power.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
@@ -21,9 +21,9 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = BinarySwitchFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,35 +32,40 @@ public class BinarySwitchFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "binarySwitch";
public static final String SHORT_NAME = "binSh";
-
+
public BinarySwitchFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + BinarySwitchFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute powerState = new CustomAttribute();
+ powerState.setLongName("powerState");
+ powerState.setShortName("powSe");
+ powerState.setType("xs:boolean");
+ getCustomAttributes().add(powerState);
}
+
+
+ @XmlElement(name=ToggleFlexContainer.SHORT_NAME, required=true, type=ToggleFlexContainer.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
+ private ToggleFlexContainer toggle;
+ public ToggleFlexContainer getToggle() {
+ this.toggle = (ToggleFlexContainer) getResourceByName(ToggleFlexContainer.SHORT_NAME);
+ return toggle;
+ }
+
+ public void setToggle(ToggleFlexContainer newAction) {
+ this.toggle = newAction;
+ getFlexContainerOrContainerOrSubscription().add(toggle);
+ }
+
public void finalizeSerialization() {
getToggle();
}
public void finalizeDeserialization() {
if (this.toggle != null) {
- setToggle(toggle);
+ setToggle(this.toggle);
}
}
- @XmlElement(name=ToggleFlexContainer.SHORT_NAME, required=true, type=ToggleFlexContainer.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
- private ToggleFlexContainer toggle;
-
-
- public void setToggle(ToggleFlexContainer toggle) {
- this.toggle = toggle;
- getFlexContainerOrContainerOrSubscription().add(toggle);
- }
-
- public ToggleFlexContainer getToggle() {
- this.toggle = (ToggleFlexContainer) getResourceByName(ToggleFlexContainer.SHORT_NAME);
- return toggle;
- }
-
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java
index 4ec85806..8ab4fb01 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BinarySwitchFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,9 +9,9 @@
ModuleClass : BinarySwitchAnnc
-This ModuleClass provides capabilities to control and monitor the state of power.
+This ModuleClass provides capabilities to control and monitor the state of power.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
@@ -21,9 +21,8 @@ import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = BinarySwitchFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,20 +37,19 @@ public class BinarySwitchFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
- getToggleAnnc();
+ getToggleAnnc();
}
public void finalizeDeserialization() {
- if (this.toggleAnnc != null) {
- setToggleAnnc(toggleAnnc);
+ if (this.toggleAnnc != null){
+ setToggleAnnc(toggleAnnc);
}
}
@XmlElement(name=ToggleFlexContainerAnnc.SHORT_NAME, required=true, type=ToggleFlexContainerAnnc.class, namespace="http://www.onem2m.org/xml/protocols/homedomain")
- private ToggleFlexContainerAnnc toggleAnnc;
-
+ private ToggleFlexContainerAnnc toggleAnnc;
public void setToggleAnnc(ToggleFlexContainerAnnc toggleAnnc) {
this.toggleAnnc = toggleAnnc;
@@ -63,4 +61,4 @@ public class BinarySwitchFlexContainerAnnc extends AbstractFlexContainerAnnc {
return toggleAnnc;
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java
index 11a92c72..e304209f 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : BioElectricalImpedanceAnalysis
-ModuleClass provides the analysis of human body tissue based on impedance measurement.
+This ModuleClass provides the analysis of human body tissue based on impedance measurement.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = BioElectricalImpedanceAnalysisFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,53 @@ public class BioElectricalImpedanceAnalysisFlexContainer extends AbstractFlexCon
public static final String LONG_NAME = "bioElectricalImpedanceAnalysis";
public static final String SHORT_NAME = "bEIAs";
-
+
public BioElectricalImpedanceAnalysisFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + BioElectricalImpedanceAnalysisFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute visceraFat = new CustomAttribute();
+ visceraFat.setLongName("visceraFat");
+ visceraFat.setShortName("visFt");
+ visceraFat.setType("xs:float");
+ getCustomAttributes().add(visceraFat);
+ CustomAttribute kcal = new CustomAttribute();
+ kcal.setLongName("kcal");
+ kcal.setShortName("kcal");
+ kcal.setType("xs:float");
+ getCustomAttributes().add(kcal);
+ CustomAttribute muscle = new CustomAttribute();
+ muscle.setLongName("muscle");
+ muscle.setShortName("musce");
+ muscle.setType("xs:float");
+ getCustomAttributes().add(muscle);
+ CustomAttribute fat = new CustomAttribute();
+ fat.setLongName("fat");
+ fat.setShortName("fat");
+ fat.setType("xs:float");
+ getCustomAttributes().add(fat);
+ CustomAttribute bone = new CustomAttribute();
+ bone.setLongName("bone");
+ bone.setShortName("bone");
+ bone.setType("xs:float");
+ getCustomAttributes().add(bone);
+ CustomAttribute water = new CustomAttribute();
+ water.setLongName("water");
+ water.setShortName("water");
+ water.setType("xs:float");
+ getCustomAttributes().add(water);
+ CustomAttribute resistance = new CustomAttribute();
+ resistance.setLongName("resistance");
+ resistance.setShortName("resie");
+ resistance.setType("xs:boolean");
+ getCustomAttributes().add(resistance);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java
index 7cb0c69d..d5314c29 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BioElectricalImpedanceAnalysisFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : BioElectricalImpedanceAnalysisAnnc
-ModuleClass provides the analysis of human body tissue based on impedance measurement.
+This ModuleClass provides the analysis of human body tissue based on impedance measurement.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = BioElectricalImpedanceAnalysisFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class BioElectricalImpedanceAnalysisFlexContainerAnnc extends AbstractFle
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java
new file mode 100644
index 00000000..759a7e0a
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainer.java
@@ -0,0 +1,83 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : BodyCompositionAnalyser
+
+This ModuleClass provides the capability to report the measurement of a body composition analyser.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = BodyCompositionAnalyserFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class BodyCompositionAnalyserFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "bodyCompositionAnalyser";
+ public static final String SHORT_NAME = "boCAr";
+
+ public BodyCompositionAnalyserFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + BodyCompositionAnalyserFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute fatFreeMass = new CustomAttribute();
+ fatFreeMass.setLongName("fatFreeMass");
+ fatFreeMass.setShortName("faFMs");
+ fatFreeMass.setType("xs:float");
+ getCustomAttributes().add(fatFreeMass);
+ CustomAttribute softLeanMass = new CustomAttribute();
+ softLeanMass.setLongName("softLeanMass");
+ softLeanMass.setShortName("soLMs");
+ softLeanMass.setType("xs:float");
+ getCustomAttributes().add(softLeanMass);
+ CustomAttribute impedance = new CustomAttribute();
+ impedance.setLongName("impedance");
+ impedance.setShortName("impee");
+ impedance.setType("xs:float");
+ getCustomAttributes().add(impedance);
+ CustomAttribute bodyLength = new CustomAttribute();
+ bodyLength.setLongName("bodyLength");
+ bodyLength.setShortName("bodLh");
+ bodyLength.setType("xs:float");
+ getCustomAttributes().add(bodyLength);
+ CustomAttribute basalMetabolism = new CustomAttribute();
+ basalMetabolism.setLongName("basalMetabolism");
+ basalMetabolism.setShortName("basMm");
+ basalMetabolism.setType("xs:float");
+ getCustomAttributes().add(basalMetabolism);
+ CustomAttribute muscleMass = new CustomAttribute();
+ muscleMass.setLongName("muscleMass");
+ muscleMass.setShortName("musMs");
+ muscleMass.setType("xs:float");
+ getCustomAttributes().add(muscleMass);
+ CustomAttribute bmi = new CustomAttribute();
+ bmi.setLongName("bmi");
+ bmi.setShortName("bmi");
+ bmi.setType("xs:float");
+ getCustomAttributes().add(bmi);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java
new file mode 100644
index 00000000..45898532
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BodyCompositionAnalyserFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : BodyCompositionAnalyserAnnc
+
+This ModuleClass provides the capability to report the measurement of a body composition analyser.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = BodyCompositionAnalyserFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = BodyCompositionAnalyserFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class BodyCompositionAnalyserFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "bodyCompositionAnalyserAnnc";
+ public static final String SHORT_NAME = "boCArAnnc";
+
+ public BodyCompositionAnalyserFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + BodyCompositionAnalyserFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java
index 6b6bea62..de3e2ea5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : Boiler
-This ModuleClass provides the status of boiling function for water heaters.
+This ModuleClass provides the capabilities to control the status of the boiling functionality for water heaters.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = BoilerFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,23 @@ public class BoilerFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "boiler";
public static final String SHORT_NAME = "boilr";
-
+
public BoilerFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + BoilerFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute status = new CustomAttribute();
+ status.setLongName("status");
+ status.setShortName("sus");
+ status.setType("xs:boolean");
+ getCustomAttributes().add(status);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java
index f18b4b8d..221f9755 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BoilerFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : BoilerAnnc
-This ModuleClass provides the status of boiling function for water heaters.
+This ModuleClass provides the capabilities to control the status of the boiling functionality for water heaters.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = BoilerFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class BoilerFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java
index 0d70afe4..afb2200b 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : Brewing
-This ModuleClass manages brewing feature.
+This ModuleClass provides capabilities to control and monitor a brewing process. It is intended to be part of devices that prepare hot drinks such as a coffee or a tea.
-Created: 2018-06-11 12:14:18
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = BrewingFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,28 @@ public class BrewingFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "brewing";
public static final String SHORT_NAME = "brewg";
-
+
public BrewingFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + BrewingFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute strength = new CustomAttribute();
+ strength.setLongName("strength");
+ strength.setShortName("streh");
+ strength.setType("hd:enumTasteStrength");
+ getCustomAttributes().add(strength);
+ CustomAttribute cupsNumber = new CustomAttribute();
+ cupsNumber.setLongName("cupsNumber");
+ cupsNumber.setShortName("cupNr");
+ cupsNumber.setType("xs:integer");
+ getCustomAttributes().add(cupsNumber);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java
index 055cd121..23e0897a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrewingFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : BrewingAnnc
-This ModuleClass manages brewing feature.
+This ModuleClass provides capabilities to control and monitor a brewing process. It is intended to be part of devices that prepare hot drinks such as a coffee or a tea.
-Created: 2018-06-11 12:14:18
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = BrewingFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class BrewingFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java
index a35ed2e0..470bd404 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : Brightness
-This ModuleClass describes the brightness of a light, e.g. from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0% is the minimum brightness) and very bright (100% is the maximum brightness).
+This ModuleClass provides capabilities to control and monitor the brightness of a light for example from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0% is the minimum brightness) and very bright (100% is the maximum brightness).
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = BrightnessFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,23 @@ public class BrightnessFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "brightness";
public static final String SHORT_NAME = "brigs";
-
+
public BrightnessFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + BrightnessFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute brightness = new CustomAttribute();
+ brightness.setLongName("brightness");
+ brightness.setShortName("brigs");
+ brightness.setType("xs:integer");
+ getCustomAttributes().add(brightness);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java
index 9728500f..24163471 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/BrightnessFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : BrightnessAnnc
-This ModuleClass describes the brightness of a light, e.g. from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0% is the minimum brightness) and very bright (100% is the maximum brightness).
+This ModuleClass provides capabilities to control and monitor the brightness of a light for example from a lamp. Brightness is scaled as a percentage. A lamp or a monitor can be adjusted to a level of light between very dim (0% is the minimum brightness) and very bright (100% is the maximum brightness).
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = BrightnessFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class BrightnessFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java
new file mode 100644
index 00000000..6c695ff0
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainer.java
@@ -0,0 +1,46 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+Action : Call
+
+Initiate an outgoing call.
+
+Created: 2018-06-29 17:19:53
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+
+@XmlRootElement(name = CallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = CallFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class CallFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "call";
+ public static final String SHORT_NAME = "call";
+
+ public CallFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass.phonecall." + CallFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java
new file mode 100644
index 00000000..264be042
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CallFlexContainerAnnc.java
@@ -0,0 +1,46 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+Action : CallAnnc
+
+Initiate an outgoing call.
+
+Created: 2018-06-29 17:19:53
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = CallFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = CallFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class CallFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "callAnnc";
+ public static final String SHORT_NAME = "callAnnc";
+
+ public CallFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass.phonecall." + CallFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java
index 6f1f238b..4809d59c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : Clock
-This ModuleClass provides the information about current date and time.
+This ModuleClass provides capabilities to control and monitor time and date information.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = ClockFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,33 @@ public class ClockFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "clock";
public static final String SHORT_NAME = "clock";
-
+
public ClockFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + ClockFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute currentTime = new CustomAttribute();
+ currentTime.setLongName("currentTime");
+ currentTime.setShortName("curTe");
+ currentTime.setType("xs:time");
+ getCustomAttributes().add(currentTime);
+ CustomAttribute currentTimeZone = new CustomAttribute();
+ currentTimeZone.setLongName("currentTimeZone");
+ currentTimeZone.setShortName("cuTZe");
+ currentTimeZone.setType("xs:string");
+ getCustomAttributes().add(currentTimeZone);
+ CustomAttribute currentDate = new CustomAttribute();
+ currentDate.setLongName("currentDate");
+ currentDate.setShortName("curDe");
+ currentDate.setType("xs:date");
+ getCustomAttributes().add(currentDate);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java
index b78838cb..39477fe6 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClockFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : ClockAnnc
-This ModuleClass provides the information about current date and time.
+This ModuleClass provides capabilities to control and monitor time and date information.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:51
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = ClockFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class ClockFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java
new file mode 100644
index 00000000..d4964837
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainer.java
@@ -0,0 +1,46 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+Action : Close
+
+Decrease the open level by the amount of the "stepValue" down to the "minLevel".
+
+Created: 2018-06-29 17:19:53
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+
+@XmlRootElement(name = CloseFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = CloseFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class CloseFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "close";
+ public static final String SHORT_NAME = "close";
+
+ public CloseFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass.openlevel." + CloseFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java
new file mode 100644
index 00000000..b84d4e57
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/CloseFlexContainerAnnc.java
@@ -0,0 +1,46 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+Action : CloseAnnc
+
+Decrease the open level by the amount of the "stepValue" down to the "minLevel".
+
+Created: 2018-06-29 17:19:53
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = CloseFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = CloseFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class CloseFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "closeAnnc";
+ public static final String SHORT_NAME = "closeAnnc";
+
+ public CloseFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass.openlevel." + CloseFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java
new file mode 100644
index 00000000..f6ea3346
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainer.java
@@ -0,0 +1,58 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesDryerJobMode
+
+This ModuleClasses provides capabilities to control and monitor the job modes of a clothes dryer.
+
+Created: 2018-06-29 17:19:51
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesDryerJobModeFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "clothesDryerJobMode";
+ public static final String SHORT_NAME = "cDJMe";
+
+ public ClothesDryerJobModeFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesDryerJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute currentJobModeName = new CustomAttribute();
+ currentJobModeName.setLongName("currentJobModeName");
+ currentJobModeName.setShortName("cJMNe");
+ currentJobModeName.setType("xs:string");
+ getCustomAttributes().add(currentJobModeName);
+ CustomAttribute currentJobMode = new CustomAttribute();
+ currentJobMode.setLongName("currentJobMode");
+ currentJobMode.setShortName("cuJMe");
+ currentJobMode.setType("hd:enumClothesDryerJobMode");
+ getCustomAttributes().add(currentJobMode);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java
new file mode 100644
index 00000000..b30a9a1a
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesDryerJobModeFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesDryerJobModeAnnc
+
+This ModuleClasses provides capabilities to control and monitor the job modes of a clothes dryer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = ClothesDryerJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesDryerJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesDryerJobModeFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "clothesDryerJobModeAnnc";
+ public static final String SHORT_NAME = "cDJMeAnnc";
+
+ public ClothesDryerJobModeFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesDryerJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java
new file mode 100644
index 00000000..713c9e5c
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainer.java
@@ -0,0 +1,63 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesWasherDryerJobMode
+
+This ModuleClasses provides capabilities to control and monitor the job modes of clothesWasherDryer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesWasherDryerJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesWasherDryerJobModeFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "clothesWasherDryerJobMode";
+ public static final String SHORT_NAME = "cWDJM";
+
+ public ClothesWasherDryerJobModeFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesWasherDryerJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute currentJobModeName = new CustomAttribute();
+ currentJobModeName.setLongName("currentJobModeName");
+ currentJobModeName.setShortName("cJMNe");
+ currentJobModeName.setType("xs:string");
+ getCustomAttributes().add(currentJobModeName);
+ CustomAttribute currentJobMode = new CustomAttribute();
+ currentJobMode.setLongName("currentJobMode");
+ currentJobMode.setShortName("cuJMe");
+ currentJobMode.setType("hd:enumClothesWasherDryerJobMode");
+ getCustomAttributes().add(currentJobMode);
+ CustomAttribute jobModes = new CustomAttribute();
+ jobModes.setLongName("jobModes");
+ jobModes.setShortName("jobMs");
+ jobModes.setType("[hd:enumClothesWasherDryerJobMode]");
+ getCustomAttributes().add(jobModes);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java
new file mode 100644
index 00000000..9101d1aa
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherDryerJobModeFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesWasherDryerJobModeAnnc
+
+This ModuleClasses provides capabilities to control and monitor the job modes of clothesWasherDryer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = ClothesWasherDryerJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesWasherDryerJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesWasherDryerJobModeFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "clothesWasherDryerJobModeAnnc";
+ public static final String SHORT_NAME = "cWDJMAnnc";
+
+ public ClothesWasherDryerJobModeFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesWasherDryerJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java
new file mode 100644
index 00000000..c0a1c20b
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainer.java
@@ -0,0 +1,63 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesWasherJobMode
+
+This ModuleClasses provides capabilities to control and monitor the job mode of a washer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesWasherJobModeFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesWasherJobModeFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "clothesWasherJobMode";
+ public static final String SHORT_NAME = "cWJMe";
+
+ public ClothesWasherJobModeFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesWasherJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute currentJobModeName = new CustomAttribute();
+ currentJobModeName.setLongName("currentJobModeName");
+ currentJobModeName.setShortName("cJMNe");
+ currentJobModeName.setType("xs:string");
+ getCustomAttributes().add(currentJobModeName);
+ CustomAttribute currentJobMode = new CustomAttribute();
+ currentJobMode.setLongName("currentJobMode");
+ currentJobMode.setShortName("cuJMe");
+ currentJobMode.setType("hd:enumClothesWasherJobMode");
+ getCustomAttributes().add(currentJobMode);
+ CustomAttribute jobModes = new CustomAttribute();
+ jobModes.setLongName("jobModes");
+ jobModes.setShortName("jobMs");
+ jobModes.setType("[hd:enumClothesWasherJobMode]");
+ getCustomAttributes().add(jobModes);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java
new file mode 100644
index 00000000..0664acc9
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesWasherJobModeAnnc
+
+This ModuleClasses provides capabilities to control and monitor the job mode of a washer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = ClothesWasherJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesWasherJobModeFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesWasherJobModeFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "clothesWasherJobModeAnnc";
+ public static final String SHORT_NAME = "cWJMeAnnc";
+
+ public ClothesWasherJobModeFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesWasherJobModeFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java
new file mode 100644
index 00000000..218dc2ea
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainer.java
@@ -0,0 +1,88 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesWasherJobModeOption
+
+This ModuleClasses provides capabilities to control and monitor the washing job mode options of a washer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
+
+@XmlRootElement(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesWasherJobModeOptionFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesWasherJobModeOptionFlexContainer extends AbstractFlexContainer {
+
+ public static final String LONG_NAME = "clothesWasherJobModeOption";
+ public static final String SHORT_NAME = "cWJMO";
+
+ public ClothesWasherJobModeOptionFlexContainer () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesWasherJobModeOptionFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ CustomAttribute steamTreat = new CustomAttribute();
+ steamTreat.setLongName("steamTreat");
+ steamTreat.setShortName("steTt");
+ steamTreat.setType("xs:boolean");
+ getCustomAttributes().add(steamTreat);
+ CustomAttribute washTemp = new CustomAttribute();
+ washTemp.setLongName("washTemp");
+ washTemp.setShortName("wasTp");
+ washTemp.setType("hd:enumGeneralTemperature");
+ getCustomAttributes().add(washTemp);
+ CustomAttribute preWash = new CustomAttribute();
+ preWash.setLongName("preWash");
+ preWash.setShortName("preWh");
+ preWash.setType("xs:boolean");
+ getCustomAttributes().add(preWash);
+ CustomAttribute speedWash = new CustomAttribute();
+ speedWash.setLongName("speedWash");
+ speedWash.setShortName("speWh");
+ speedWash.setType("xs:boolean");
+ getCustomAttributes().add(speedWash);
+ CustomAttribute soilLevel = new CustomAttribute();
+ soilLevel.setLongName("soilLevel");
+ soilLevel.setShortName("soiLl");
+ soilLevel.setType("hd:enumGeneralLevel");
+ getCustomAttributes().add(soilLevel);
+ CustomAttribute coldWash = new CustomAttribute();
+ coldWash.setLongName("coldWash");
+ coldWash.setShortName("colWh");
+ coldWash.setType("xs:boolean");
+ getCustomAttributes().add(coldWash);
+ CustomAttribute extraRinse = new CustomAttribute();
+ extraRinse.setLongName("extraRinse");
+ extraRinse.setShortName("extRe");
+ extraRinse.setType("xs:boolean");
+ getCustomAttributes().add(extraRinse);
+ CustomAttribute spinSpeed = new CustomAttribute();
+ spinSpeed.setLongName("spinSpeed");
+ spinSpeed.setShortName("spiSd");
+ spinSpeed.setType("hd:enumGeneralSpeed");
+ getCustomAttributes().add(spinSpeed);
+ }
+
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java
new file mode 100644
index 00000000..c72cb13b
--- /dev/null
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ClothesWasherJobModeOptionFlexContainerAnnc.java
@@ -0,0 +1,47 @@
+/*
+********************************************************************************
+ * Copyright (c) 2014, 2018 Orange.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ ********************************************************************************
+
+ModuleClass : ClothesWasherJobModeOptionAnnc
+
+This ModuleClasses provides capabilities to control and monitor the washing job mode options of a washer.
+
+Created: 2018-06-29 17:19:52
+*/
+
+package org.eclipse.om2m.commons.resource.flexcontainerspec;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+
+@XmlRootElement(name = ClothesWasherJobModeOptionFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = ClothesWasherJobModeOptionFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
+public class ClothesWasherJobModeOptionFlexContainerAnnc extends AbstractFlexContainerAnnc {
+
+ public static final String LONG_NAME = "clothesWasherJobModeOptionAnnc";
+ public static final String SHORT_NAME = "cWJMOAnnc";
+
+ public ClothesWasherJobModeOptionFlexContainerAnnc () {
+ setContainerDefinition("org.onem2m.home.moduleclass." + ClothesWasherJobModeOptionFlexContainer.LONG_NAME);
+ setLongName(LONG_NAME);
+ setShortName(SHORT_NAME);
+ }
+
+ public void finalizeSerialization() {
+ }
+
+ public void finalizeDeserialization() {
+ }
+
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java
index 78477519..7d299419 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : Colour
-This ModuleClass provides the capabilities to set the value of Red, Green, Blue for the color device.
+This ModuleClass provides the capabilities to set the value of the Red, Green, and Blue colour channels for a colour device.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:52
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = ColourFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,33 @@ public class ColourFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "colour";
public static final String SHORT_NAME = "color";
-
+
public ColourFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + ColourFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute red = new CustomAttribute();
+ red.setLongName("red");
+ red.setShortName("red");
+ red.setType("xs:integer");
+ getCustomAttributes().add(red);
+ CustomAttribute green = new CustomAttribute();
+ green.setLongName("green");
+ green.setShortName("green");
+ green.setType("xs:integer");
+ getCustomAttributes().add(green);
+ CustomAttribute blue = new CustomAttribute();
+ blue.setLongName("blue");
+ blue.setShortName("blue");
+ blue.setType("xs:integer");
+ getCustomAttributes().add(blue);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java
index ccd35cbf..c68a1e99 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : ColourAnnc
-This ModuleClass provides the capabilities to set the value of Red, Green, Blue for the color device.
+This ModuleClass provides the capabilities to set the value of the Red, Green, and Blue colour channels for a colour device.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:52
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = ColourFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class ColourFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java
index 6ad73cbc..2666f156 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : ColourSaturation
-This ModuleClass describes a colour saturation value. The value is an integer. A colourSaturation has a range of [0,100]. A colourSaturation value of 0 means producing black and white images. A colourSaturation value of 50 means producing device specific normal colour images. A colourSaturation value of 100 means producing device very colourfull images.
+This ModuleClass provides cababilities to control and monitor a colour saturation value.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:52
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = ColourSaturationFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,23 @@ public class ColourSaturationFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "colourSaturation";
public static final String SHORT_NAME = "colSn";
-
+
public ColourSaturationFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + ColourSaturationFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute colourSaturation = new CustomAttribute();
+ colourSaturation.setLongName("colourSaturation");
+ colourSaturation.setShortName("colSn");
+ colourSaturation.setType("xs:integer");
+ getCustomAttributes().add(colourSaturation);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java
index 767e7204..9c6a23fa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ColourSaturationFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : ColourSaturationAnnc
-This ModuleClass describes a colour saturation value. The value is an integer. A colourSaturation has a range of [0,100]. A colourSaturation value of 0 means producing black and white images. A colourSaturation value of 50 means producing device specific normal colour images. A colourSaturation value of 100 means producing device very colourfull images.
+This ModuleClass provides cababilities to control and monitor a colour saturation value.
-Created: 2018-06-11 12:14:17
+Created: 2018-06-29 17:19:52
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = ColourSaturationFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class ColourSaturationFlexContainerAnnc extends AbstractFlexContainerAnnc
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
}
-
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java
index 5f25fbf5..7d1063c3 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainer.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,20 @@
ModuleClass : ContactSensor
-This ModuleClass manages alarmSensor feature.
+This ModuleClass provides the capabilities to indicate whether or not a contact has been sensed, and raising an alarm if the triggering criterion is met.
-Created: 2018-06-11 12:14:18
+Created: 2018-06-29 17:19:54
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
+import org.eclipse.om2m.commons.resource.CustomAttribute;
@XmlRootElement(name = ContactSensorFlexContainer.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -32,17 +31,23 @@ public class ContactSensorFlexContainer extends AbstractFlexContainer {
public static final String LONG_NAME = "contactSensor";
public static final String SHORT_NAME = "conSr";
-
+
public ContactSensorFlexContainer () {
setContainerDefinition("org.onem2m.home.moduleclass." + ContactSensorFlexContainer.LONG_NAME);
setLongName(LONG_NAME);
setShortName(SHORT_NAME);
+ CustomAttribute alarm = new CustomAttribute();
+ alarm.setLongName("alarm");
+ alarm.setShortName("alarm");
+ alarm.setType("xs:boolean");
+ getCustomAttributes().add(alarm);
}
-
+
+
public void finalizeSerialization() {
}
public void finalizeDeserialization() {
}
-} \ No newline at end of file
+}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java
index 80ce2414..57bf8a52 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/flexcontainerspec/ContactSensorFlexContainerAnnc.java
@@ -1,6 +1,6 @@
/*
********************************************************************************
- * Copyright (c) 2014, 2017 Orange.
+ * Copyright (c) 2014, 2018 Orange.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -9,21 +9,19 @@
ModuleClass : ContactSensorAnnc
-This ModuleClass manages alarmSensor feature.
+This ModuleClass provides the capabilities to indicate whether or not a contact has been sensed, and raising an alarm if the triggering criterion is met.
-Created: 2018-06-11 12:14:18
+Created: 2018-06-29 17:19:54
*/
package org.eclipse.om2m.commons.resource.flexcontainerspec;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainer;
-import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
+import org.eclipse.om2m.commons.resource.AbstractFlexContainerAnnc;
@XmlRootElement(name = ContactSensorFlexContainerAnnc.SHORT_NAME, namespace = "http://www.onem2m.org/xml/protocols/homedomain")
@XmlAccessorType(XmlAccessType.FIELD)
@@ -38,11 +36,12 @@ public class ContactSensorFlexContainerAnnc extends AbstractFlexContainerAnnc {
setLongName(LONG_NAME);