commons, core: cleaner tables & column names.

Signed-off-by: BOLLE Sebastien <sebastien.bolle@orange.com>
Signed-off-by: BAREAU Cyrille <cyrille.bareau@orange.com>

12 files changed, 71 insertions, 71 deletions

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java
index 54ee6546..5cd8540e 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/constants/DBEntities.java
@@ -113,6 +113,8 @@ public class DBEntities {
 
 	public static final String NODE_ENTITY = "NODE";
 
+	public static final String NODE_ANNC_ENTITY = "NODEA";
+
 	/**
 	 * Name used for the persisted (@link {@link CustomAttributeEntity} entity
 	 */
@@ -382,15 +384,22 @@ public class DBEntities {
 	public static final String REQ_JOIN_ID = "REQ_JOIN_ID";
 
 	// NODE - ACP
-	public static final String ACPNOD_JOIN = "NOD_ACP_JOIN";
+	public static final String ACP_NOD_JOIN = "NOD_ACP_JOIN";
 	public static final String NOD_JOIN_ID = "NOD_JOIN_ID";
-	public static final String CSBNOD_CH_JOIN = "CSB_NOD_CH_JOIN";
-	public static final String CSRNOD_CH_JOIN = "CSR_NOD_CH_JOIN";
-	public static final String NODSUB_JOIN = "NOD_SUB_JOIN";
+	public static final String CSB_NOD_CH_JOIN = "CSB_NOD_CH_JOIN";
+	public static final String CSR_NOD_CH_JOIN = "CSR_NOD_CH_JOIN";
+	public static final String NOD_SUB_JOIN = "NOD_SUB_JOIN";
+	
+	public static final String ACP_NODANNC_JOIN = "NODANNC_ACP_JOIN";
+	public static final String NODANNC_JOIN_ID = "NODANNC_JOIN_ID";
+	public static final String CSB_NODANNC_CH_JOIN = "CSB_NODANNC_CH_JOIN";
+	public static final String CSR_NODANNC_CH_JOIN = "CSR_NODANNC_CH_JOIN";
+	public static final String NODANNC_SUB_JOIN = "NODANNC_SUB_JOIN";
 	
 	// NODE - DAC
 	public static final String NOD_DAC_JOIN = "NOD_DAC_JOIN";
-	
+	public static final String NODANNC_DAC_JOIN = "NODANNC_DAC_JOIN";
+
 
 	// FCNT - CUSTOM_ATTRIBUTE
 	public static final String FCNT_CA_JOIN = "FCNT_CA_JOIN";
@@ -398,23 +407,26 @@ public class DBEntities {
 
 	// MGMT OBJ
 	// AreaNetworkInfo
-	public static final String ANISUB_JOIN = "ANI_SUB_JOIN";
-	public static final String ANIACP_JOIN = "ANI_ACP_JOIN";
+	public static final String ANI_ACP_JOIN = "ANI_ACP_JOIN";
 	public static final String ANI_DAC_JOIN = "ANI_DAC_JOIN";
 	public static final String ANI_JOIN_ID = "ANI_JOIN_ID";
-	public static final String ANINOD_JOIN = "ANI_NOD_JOIN";
+	public static final String ANI_SUB_JOIN = "ANI_SUB_JOIN";
+	public static final String ANI_NOD_JOIN = "ANI_NOD_JOIN";
+	public static final String ANI_NODANNC_JOIN = "ANI_NODANNC_JOIN";
 	// AreaNetworkDeviceInfo
-	public static final String ANDISUB_JOIN = "ANDI_SUB_JOIN";
-	public static final String ANDI_JOIN_ID = "ANDI_JOIN_ID";
-	public static final String ANDINOD_JOIN = "ANDI_NOD_JOIN";
-	public static final String ANDIACP_JOIN = "ANDI_ACP_JOIN";
+	public static final String ANDI_ACP_JOIN = "ANDI_ACP_JOIN";
 	public static final String ANDI_DAC_JOIN = "ANDI_DAC_JOIN";
+	public static final String ANDI_JOIN_ID = "ANDI_JOIN_ID";
+	public static final String ANDI_SUB_JOIN = "ANDI_SUB_JOIN";
+	public static final String ANDI_NOD_JOIN = "ANDI_NOD_JOIN";
+	public static final String ANDI_NODANNC_JOIN = "ANDI_NODANNC_JOIN";
 	// DeviceInfo
-	public static final String DVISUB_JOIN = "DVI_SUB_JOIN";
-	public static final String DVIACP_JOIN = "DVI_ACP_JOIN";
+	public static final String DVI_ACP_JOIN = "DVI_ACP_JOIN";
 	public static final String DVI_DAC_JOIN = "DVI_DAC_JOIN";
 	public static final String DVI_JOIN_ID = "DVI_JOIN_ID";
-	public static final String DVINOD_JOIN = "DVI_NOD_JOIN";
+	public static final String DVI_SUB_JOIN = "DVI_SUB_JOIN";
+	public static final String DVI_NOD_JOIN = "DVI_NOD_JOIN";
+	public static final String DVI_NODANNC_JOIN = "DVI_NODANNC_JOIN";
 
 	// ANNOUNCED RESOURCE
 	public static final String REMOTE_RESOURCE_ID = "REMOTE_RESOURCE_ID";
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 312e739d..fa2c0eb5 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
@@ -401,6 +401,17 @@ public class ShortName {
 	public static final String REBOOT = "rbo";
 	public static final String SOFTWARE = "swr";
 	
+	public static final String AREA_NWK_DEVICE_INFO_ANNC = "andiA";
+	public static final String AREA_NWK_INFO_ANNC = "aniA";
+	public static final String BATTERY_ANNC = "batA";
+	public static final String DEVICE_CAPABILITY_ANNC = "dvcA";
+	public static final String DEVICE_INFO_ANNC = "dviA";
+	public static final String EVENT_LOG_ANNC = "evlA";
+	public static final String FIRMWARE_ANNC = "fwrA";
+	public static final String MEMORY_ANNC = "memA";
+	public static final String REBOOT_ANNC = "rboA";
+	public static final String SOFTWARE_ANNC = "swrA";
+	
 	public static final String ACTIVE_CMDH_POLICY = "acmp";
 	public static final String CMDH_POLICY = "cmp";
 	public static final String CMDH_DEFAULTS = "cmdf";
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java
index 208c5b2a..729a0136 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AccessControlPolicyEntity.java
@@ -197,7 +197,7 @@ public class AccessControlPolicyEntity extends AnnounceableSubordinateEntity {
 	
 	@ManyToMany(fetch = FetchType.LAZY, targetEntity = NodeEntity.class)
 	@JoinTable(
-			name=DBEntities.ACPNOD_JOIN,
+			name=DBEntities.ACP_NOD_JOIN,
 			inverseJoinColumns={@JoinColumn(name=DBEntities.NOD_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
 			joinColumns={@JoinColumn(name=DBEntities.ACP_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
 			)
@@ -205,7 +205,7 @@ public class AccessControlPolicyEntity extends AnnounceableSubordinateEntity {
 	
 	@ManyToMany(fetch = FetchType.LAZY, targetEntity = AreaNwkInfoEntity.class)
 	@JoinTable(
-			name = DBEntities.ANIACP_JOIN,
+			name = DBEntities.ANI_ACP_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ANI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -213,7 +213,7 @@ public class AccessControlPolicyEntity extends AnnounceableSubordinateEntity {
 	
 	@ManyToMany(fetch = FetchType.LAZY, targetEntity = AreaNwkDeviceInfoEntity.class)
 	@JoinTable(
-			name = DBEntities.ANDIACP_JOIN,
+			name = DBEntities.ANDI_ACP_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ANDI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -221,7 +221,7 @@ public class AccessControlPolicyEntity extends AnnounceableSubordinateEntity {
 	
 	@ManyToMany(fetch = FetchType.LAZY, targetEntity = DeviceInfoEntity.class)
 	@JoinTable(
-			name = DBEntities.DVIACP_JOIN,
+			name = DBEntities.DVI_ACP_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.DVI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java
index df653d4f..37b844a7 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkDeviceInfoEntity.java
@@ -66,7 +66,7 @@ public class AreaNwkDeviceInfoEntity extends MgmtObjEntity {
 	/** AccessControlPolicies linked to the MgmtObj */
 	@ManyToMany(fetch=FetchType.LAZY)
 	@JoinTable(
-			name = DBEntities.ANDIACP_JOIN,
+			name = DBEntities.ANDI_ACP_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.ANDI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -85,7 +85,7 @@ public class AreaNwkDeviceInfoEntity extends MgmtObjEntity {
 	// Database link to Subscriptions
 	@OneToMany(fetch = FetchType.LAZY, targetEntity = SubscriptionEntity.class, mappedBy="parentAndi")
 	@JoinTable(
-			name = DBEntities.ANDISUB_JOIN,
+			name = DBEntities.ANDI_SUB_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.ANDI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -94,7 +94,7 @@ public class AreaNwkDeviceInfoEntity extends MgmtObjEntity {
 	// Database link to Node
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = NodeEntity.class)
 	@JoinTable(
-			name = DBEntities.ANDINOD_JOIN,
+			name = DBEntities.ANDI_NOD_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.ANDI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java
index 50886611..2d47ee3c 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/AreaNwkInfoEntity.java
@@ -56,7 +56,7 @@ public class AreaNwkInfoEntity extends MgmtObjEntity {
 	// Database link to ACP
 	@ManyToMany(fetch = FetchType.LAZY, targetEntity = AccessControlPolicyEntity.class)
 	@JoinTable(
-			name = DBEntities.ANIACP_JOIN,
+			name = DBEntities.ANI_ACP_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.ANI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -74,7 +74,7 @@ public class AreaNwkInfoEntity extends MgmtObjEntity {
 	// Database link to Subscriptions
 	@OneToMany(fetch = FetchType.LAZY, targetEntity = SubscriptionEntity.class, mappedBy="parentAni")
 	@JoinTable(
-			name = DBEntities.ANISUB_JOIN,
+			name = DBEntities.ANI_SUB_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.ANI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -83,7 +83,7 @@ public class AreaNwkInfoEntity extends MgmtObjEntity {
 	// Database link to Node
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = NodeEntity.class)
 	@JoinTable(
-			name = DBEntities.ANINOD_JOIN,
+			name = DBEntities.ANI_NOD_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.ANI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
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 cc66b27f..c4edc98d 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
@@ -80,7 +80,7 @@ public class CSEBaseEntity extends ResourceEntity {
 	/** List of Nodes */
 	@OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
 	@JoinTable(
-			name=DBEntities.CSBNOD_CH_JOIN,
+			name=DBEntities.CSB_NOD_CH_JOIN,
 			joinColumns={@JoinColumn(name=DBEntities.CSEB_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
 			inverseJoinColumns={@JoinColumn(name=DBEntities.NOD_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
 			)
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java
index 2ab992be..7ccbd2ca 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/DeviceInfoEntity.java
@@ -88,7 +88,7 @@ public class DeviceInfoEntity extends MgmtObjEntity {
 	/** AccessControlPolicies linked to the MgmtObj */
 	@ManyToMany(fetch=FetchType.LAZY)
 	@JoinTable(
-			name = DBEntities.DVIACP_JOIN,
+			name = DBEntities.DVI_ACP_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.DVI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -106,7 +106,7 @@ public class DeviceInfoEntity extends MgmtObjEntity {
 	// Database link to Subscriptions
 	@OneToMany(fetch = FetchType.LAZY, targetEntity = SubscriptionEntity.class, mappedBy="parentDvi")
 	@JoinTable(
-			name = DBEntities.DVISUB_JOIN,
+			name = DBEntities.DVI_SUB_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.DVI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -115,7 +115,7 @@ public class DeviceInfoEntity extends MgmtObjEntity {
 	// Database link to Node
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = NodeEntity.class)
 	@JoinTable(
-			name = DBEntities.DVINOD_JOIN,
+			name = DBEntities.DVI_NOD_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.DVI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -128,6 +128,7 @@ public class DeviceInfoEntity extends MgmtObjEntity {
 	/**
 	 * @return the subscriptions
 	 */
+	@Override
 	public List<SubscriptionEntity> getSubscriptions() {
 		if (this.subscriptions == null) {
 			this.subscriptions = new ArrayList<>();
@@ -145,6 +146,7 @@ public class DeviceInfoEntity extends MgmtObjEntity {
 	/**
 	 * @return the parentNode
 	 */
+	@Override
 	public NodeEntity getParentNode() {
 		return parentNode;
 	}
@@ -152,6 +154,7 @@ public class DeviceInfoEntity extends MgmtObjEntity {
 	/**
 	 * @param parentNode the parentNode to set
 	 */
+	@Override
 	public void setParentNode(NodeEntity parentNode) {
 		this.parentNode = parentNode;
 	}
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java
index 80c1842b..a075180d 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/MgmtObjEntity.java
@@ -133,5 +133,6 @@ public abstract class MgmtObjEntity extends AnnounceableSubordinateEntity {
 	abstract public NodeEntity getParentNode();
 	abstract public void setParentNode(NodeEntity parentNode);
 	abstract public List<AccessControlPolicyEntity> getAccessControlPolicies();
+	abstract public List<SubscriptionEntity> getSubscriptions();
 
 }
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java
index 7536e34f..967012ad 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/NodeEntity.java
@@ -46,7 +46,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 	// linked ACP
 	@ManyToMany(fetch=FetchType.LAZY)
 	@JoinTable(
-			name = DBEntities.ACPNOD_JOIN,
+			name = DBEntities.ACP_NOD_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ACP_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -75,7 +75,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinTable(
-			name = DBEntities.CSBNOD_CH_JOIN,
+			name = DBEntities.CSB_NOD_CH_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.CSEB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -83,7 +83,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 
 	@ManyToOne(fetch = FetchType.LAZY)
 	@JoinTable(
-			name = DBEntities.CSRNOD_CH_JOIN,
+			name = DBEntities.CSR_NOD_CH_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.CSR_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -91,7 +91,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 
 	@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
 	@JoinTable(
-			name = DBEntities.NODSUB_JOIN,
+			name = DBEntities.NOD_SUB_JOIN,
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -100,7 +100,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 	// Database link to AreaNwkInfo Entity
 	@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
 	@JoinTable(
-			name = DBEntities.ANINOD_JOIN,
+			name = DBEntities.ANI_NOD_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ANI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -109,7 +109,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 	// Database link to AreaNwkDeviceInfo entity
 	@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
 	@JoinTable(
-			name = DBEntities.ANDINOD_JOIN,
+			name = DBEntities.ANDI_NOD_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ANDI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -118,7 +118,7 @@ public class NodeEntity extends AnnounceableSubordinateEntity {
 	// Database link to DeviceInfo entity
 	@OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL})
 	@JoinTable(
-			name = DBEntities.DVINOD_JOIN,
+			name = DBEntities.DVI_NOD_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.DVI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
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 3aa9de1c..75960936 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
@@ -177,7 +177,7 @@ public class RemoteCSEEntity extends AnnounceableSubordinateEntity {
 	/** List of Nodes */
 	@OneToMany(fetch=FetchType.LAZY, cascade={CascadeType.ALL})
 	@JoinTable(
-			name=DBEntities.CSRNOD_CH_JOIN,
+			name=DBEntities.CSR_NOD_CH_JOIN,
 			joinColumns={@JoinColumn(name=DBEntities.CSR_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)},
 			inverseJoinColumns={@JoinColumn(name=DBEntities.NOD_JOIN_ID, referencedColumnName=ShortName.RESOURCE_ID)}
 			)
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java
index 8b56730f..aecfd744 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/entities/SubscriptionEntity.java
@@ -170,7 +170,7 @@ public class SubscriptionEntity extends RegularResourceEntity {
 	
 	@ManyToOne(targetEntity = NodeEntity.class, fetch = FetchType.LAZY)
 	@JoinTable(
-			name = DBEntities.NODSUB_JOIN,
+			name = DBEntities.NOD_SUB_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.NOD_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -180,7 +180,7 @@ public class SubscriptionEntity extends RegularResourceEntity {
 	// Database link to Subscriptions
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = AreaNwkInfoEntity.class)
 	@JoinTable(
-			name = DBEntities.ANISUB_JOIN,
+			name = DBEntities.ANI_SUB_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ANI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -188,7 +188,7 @@ public class SubscriptionEntity extends RegularResourceEntity {
 	
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = AreaNwkDeviceInfoEntity.class)
 	@JoinTable(
-			name = DBEntities.ANDISUB_JOIN,
+			name = DBEntities.ANDI_SUB_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.ANDI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
@@ -196,7 +196,7 @@ public class SubscriptionEntity extends RegularResourceEntity {
 	
 	@ManyToOne(fetch = FetchType.LAZY, targetEntity = DeviceInfoEntity.class)
 	@JoinTable(
-			name = DBEntities.DVISUB_JOIN,
+			name = DBEntities.DVI_SUB_JOIN,
 			inverseJoinColumns = { @JoinColumn(name = DBEntities.DVI_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }, 
 			joinColumns = { @JoinColumn(name = DBEntities.SUB_JOIN_ID, referencedColumnName = ShortName.RESOURCE_ID) }
 			)
diff --git a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java
index 26674a2a..73d59197 100644
--- a/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java
+++ b/org.eclipse.om2m.core/src/main/java/org/eclipse/om2m/core/controller/MgmtObjController.java
@@ -15,7 +15,6 @@ import org.apache.commons.logging.LogFactory;
 import org.eclipse.om2m.commons.constants.Constants;
 import org.eclipse.om2m.commons.constants.MgmtDefinitionTypes;
 import org.eclipse.om2m.commons.constants.MimeMediaType;
-import org.eclipse.om2m.commons.constants.Operation;
 import org.eclipse.om2m.commons.constants.ResourceStatus;
 import org.eclipse.om2m.commons.constants.ResourceType;
 import org.eclipse.om2m.commons.constants.ResponseStatusCode;
@@ -25,7 +24,6 @@ import org.eclipse.om2m.commons.entities.AreaNwkDeviceInfoEntity;
 import org.eclipse.om2m.commons.entities.AreaNwkInfoEntity;
 import org.eclipse.om2m.commons.entities.DeviceInfoEntity;
 import org.eclipse.om2m.commons.entities.DynamicAuthorizationConsultationEntity;
-import org.eclipse.om2m.commons.entities.FlexContainerEntity;
 import org.eclipse.om2m.commons.entities.MgmtObjEntity;
 import org.eclipse.om2m.commons.entities.NodeEntity;
 import org.eclipse.om2m.commons.entities.ResourceEntity;
@@ -439,35 +437,11 @@ public class MgmtObjController extends Controller {
 					&& ! mgmtObjEntity.getMgmtDefinition().equals(mgmtObj.getMgmtDefinition())) {
 				throw new BadRequestException("unable to change the mgmtDefinition value");
 			}
-
-		} else {
-			// content might be null for FlexContainer representing a SDT action
 		}
 
 		mgmtObjEntity.setLastModifiedTime(DateUtil.now());
 		modifiedMgmtObj.setLastModifiedTime(mgmtObjEntity.getLastModifiedTime());
 
-//		// in case of update operation
-//		if (!isInternalNotify) {
-//			LOGGER.info("flexContainer.getResourceID=" + mgmtObjEntity.getResourceID());
-//			// check if a FlexContainerService exist
-//			FlexContainerService fcs = FlexContainerSelector.getFlexContainerService(
-//					/* request.getTo() */ /* UriUtil.toCseRelativeUri( */mgmtObjEntity.getResourceID()/* ) */);
-//			if (fcs != null) {
-//				try {
-//					fcs.setCustomAttributeValues(modifiedMgmtObj.getCustomAttributes(), request);
-//					// at this modifiedAttributes.getCustomAttributes() list
-//					// contains the new values of CustomAttribute
-//
-//				} catch (Om2mException e) {
-//					throw e;
-//				}
-//			}
-//		}
-
-		// at this point, we are sure there was no error when setting custom
-		// attribute parameter
-
 		response.setContent(modifiedMgmtObj);
 		// update the resource in the database
 		dbs.getDAOFactory().getMgmtObjDAO().update(transaction, mgmtObjEntity);
@@ -475,8 +449,8 @@ public class MgmtObjController extends Controller {
 		// commit and release lock
 		transaction.commit();
 
-//		Notifier.notify(mgmtObjEntity.getSubscriptions(), mgmtObjEntity, modifiedMgmtObj,
-//				ResourceStatus.UPDATED);
+		Notifier.notify(mgmtObjEntity.getSubscriptions(), mgmtObjEntity, modifiedMgmtObj,
+				ResourceStatus.UPDATED);
 
 		// set response status code
 		response.setResponseStatusCode(ResponseStatusCode.UPDATED);
@@ -502,11 +476,10 @@ public class MgmtObjController extends Controller {
 		transaction.lock(mgmtObjEntity);
 		
 		// check access control policies
-//		checkACP(mgmtObjEntity.getAccessControlPolicies(), request.getFrom(), Operation.DELETE);
 		checkPermissions(request, mgmtObjEntity, mgmtObjEntity.getAccessControlPolicies());
 
 		UriMapper.deleteUri(mgmtObjEntity.getHierarchicalURI());
-//		Notifier.notifyDeletion(mgmtObjEntity.getSubscriptions(), mgmtObjEntity);
+		Notifier.notifyDeletion(mgmtObjEntity.getSubscriptions(), mgmtObjEntity);
 
 		// delete the resource in the database
 		dbs.getDAOFactory().getMgmtObjDAO().delete(transaction, mgmtObjEntity);