commons, datamapping: do not prefix attribute with namespace.

Signed-off-by: BOLLE Sebastien <sebastien.bolle@orange.com>
Signed-off-by: BONNARDEL Gregory <gbonnardel.ext@orange.com>

24 files changed, 156 insertions, 147 deletions

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 867b3d0d..e541ec82 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
@@ -133,24 +133,24 @@ import org.eclipse.om2m.commons.resource.flexcontainerspec.ModuleWaterSensorFlex
 @XmlType(name = "")
 @XmlRootElement(name = ShortName.AE)
 public class AE extends AnnounceableResource {
-	@XmlElement(name = ShortName.APP_NAME, required=false)
+	@XmlElement(name = ShortName.APP_NAME, required=false, namespace="")
 	protected String appName;
-	@XmlElement(name = ShortName.APP_ID, required = true)
+	@XmlElement(name = ShortName.APP_ID, required = true, namespace="")
 	protected String appID;
-	@XmlElement(name = ShortName.AE_ID, required = true)
+	@XmlElement(name = ShortName.AE_ID, required = true, namespace="")
 	protected String aeid;
 	@XmlList
-	@XmlElement(name = ShortName.POA, required=false)
+	@XmlElement(name = ShortName.POA, required=false, namespace="")
 	protected List<String> pointOfAccess;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.ONTOLOGY_REF, required=false)
+	@XmlElement(name = ShortName.ONTOLOGY_REF, required=false, namespace="")
 	protected String ontologyRef;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.NODE_LINK, required=false)
+	@XmlElement(name = ShortName.NODE_LINK, required=false, namespace="")
 	protected String nodeLink;
-	@XmlElement(name = ShortName.CHILD_RESOURCE)
+	@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
-	@XmlElement(name = ShortName.REQUEST_REACHABILITY, required=true)
+	@XmlElement(name = ShortName.REQUEST_REACHABILITY, required=true, namespace="")
 	protected Boolean requestReachability;
 	@XmlElements({
 			@XmlElement(name = ShortName.CNT, namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),
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 e9b81cab..8e3f43d6 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
@@ -84,22 +84,22 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlType(name = "")
 @XmlRootElement(name = ShortName.AEA)
 public class AEAnnc extends AnnouncedResource {
-	@XmlElement(name = ShortName.APP_NAME, required=false)
+	@XmlElement(name = ShortName.APP_NAME, required=false, namespace="")
 	protected String appName;
-	@XmlElement(name = ShortName.APP_ID, required = false)
+	@XmlElement(name = ShortName.APP_ID, required = false, namespace="")
 	protected String appID;
-	@XmlElement(name = ShortName.AE_ID, required = false)
+	@XmlElement(name = ShortName.AE_ID, required = false, namespace="")
 	protected String aeid;
 	@XmlList
-	@XmlElement(name = ShortName.POA, required=false)
+	@XmlElement(name = ShortName.POA, required=false, namespace="")
 	protected List<String> pointOfAccess;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.ONTOLOGY_REF, required=false)
+	@XmlElement(name = ShortName.ONTOLOGY_REF, required=false, namespace="")
 	protected String ontologyRef;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.NODE_LINK, required=false)
+	@XmlElement(name = ShortName.NODE_LINK, required=false, namespace="")
 	protected String nodeLink;
-	@XmlElement(name = ShortName.CHILD_RESOURCE)
+	@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 	@XmlElements({
 			@XmlElement(name = "container", namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),
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 11070d03..cd515738 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
@@ -156,18 +156,18 @@ public abstract class AbstractFlexContainer extends AnnounceableResource {
 	@XmlTransient
 	private String longName;
 	
-	@XmlElement(name = ShortName.STATETAG, required = true)
+	@XmlElement(name = ShortName.STATETAG, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger stateTag;
-	@XmlElement(name = ShortName.CREATOR, required = false)
+	@XmlElement(name = ShortName.CREATOR, required = false, namespace="")
 	protected String creator;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.ONTOLOGY_REF, required = false)
+	@XmlElement(name = ShortName.ONTOLOGY_REF, required = false, namespace="")
 	protected String ontologyRef;
 	@XmlSchemaType(name="anyURI")
-	@XmlElement(name = ShortName.CONTAINER_DEFINITION, required=true)
+	@XmlElement(name = ShortName.CONTAINER_DEFINITION, required=true, namespace="")
 	protected String containerDefinition;
-	@XmlElement(name = ShortName.CHILD_RESOURCE)
+	@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 	@XmlElements({
 			@XmlElement(name = ShortName.CNT, namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java
index 0659ca4d..d7e15ad5 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicy.java
@@ -68,11 +68,11 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlType(name = "")
 @XmlRootElement(name = ShortName.ACP)
 public class AccessControlPolicy extends AnnounceableSubordinateResource {
-	@XmlElement(name=ShortName.PRIVILEGES, required = true)
+	@XmlElement(name=ShortName.PRIVILEGES, required = true, namespace="")
 	protected SetOfAcrs privileges;
-	@XmlElement(name=ShortName.SELF_PRIVILEGES, required = true)
+	@XmlElement(name=ShortName.SELF_PRIVILEGES, required = true, namespace="")
 	protected SetOfAcrs selfPrivileges;
-	@XmlElement(name=ShortName.CHILD_RESOURCE)
+	@XmlElement(name=ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 	@XmlElement(name=ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols")
 	protected List<Subscription> subscription;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java
index f21a1af3..b8da3561 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlPolicyAnnc.java
@@ -68,9 +68,9 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "accessControlPolicyAnnc")
 public class AccessControlPolicyAnnc extends AnnouncedSubordinateResource {
 
-	@XmlElement(required = true)
+	@XmlElement(required = true, namespace="")
 	protected SetOfAcrs privileges;
-	@XmlElement(required = true)
+	@XmlElement(required = true, namespace="")
 	protected SetOfAcrs selfPrivileges;
 	protected List<ChildResourceRef> childResource;
 	@XmlElement(namespace = "http://www.onem2m.org/xml/protocols")
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java
index 4d8dbd62..1d4dd738 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AccessControlRule.java
@@ -98,11 +98,11 @@ import org.eclipse.om2m.commons.constants.ShortName;
 public class AccessControlRule {
 
 	@XmlList
-	@XmlElement(name = ShortName.ACOR, required = true)
+	@XmlElement(name = ShortName.ACOR, required = true, namespace="")
 	protected List<String> accessControlOriginators;
-	@XmlElement(name = ShortName.ACOP, required = true)
+	@XmlElement(name = ShortName.ACOP, required = true, namespace="")
 	protected BigInteger accessControlOperations;
-	@XmlElement(name = ShortName.ACCO)
+	@XmlElement(name = ShortName.ACCO, namespace="")
 	protected List<AccessControlRule.AccessControlContexts> accessControlContexts;
 
 	/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java
index 029ff759..996a1d13 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableResource.java
@@ -74,10 +74,10 @@ import org.eclipse.om2m.commons.constants.ShortName;
 public class AnnounceableResource extends RegularResource {
 
 	@XmlList
-	@XmlElement(name=ShortName.ANNOUNCE_TO, required=false)
+	@XmlElement(name=ShortName.ANNOUNCE_TO, required=false, namespace="")
 	protected List<String> announceTo;
 	@XmlList
-	@XmlElement(name=ShortName.ANNOUNCED_ATTRIBUTE, required=false)
+	@XmlElement(name=ShortName.ANNOUNCED_ATTRIBUTE, required=false, namespace="")
 	protected List<String> announcedAttribute;
 
 	/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java
index 77fc7d0a..b449eee2 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnounceableSubordinateResource.java
@@ -73,13 +73,13 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @MappedSuperclass
 public class AnnounceableSubordinateResource extends Resource {
 
-	@XmlElement(name=ShortName.EXPIRATION_TIME, required = true)
+	@XmlElement(name=ShortName.EXPIRATION_TIME, required = true, namespace="")
 	protected String expirationTime;
 	@XmlList
-	@XmlElement(name=ShortName.ANNOUNCE_TO, required=false)
+	@XmlElement(name=ShortName.ANNOUNCE_TO, required=false, namespace="")
 	protected List<String> announceTo;
 	@XmlList
-	@XmlElement(name=ShortName.ANNOUNCED_ATTRIBUTE, required=false)
+	@XmlElement(name=ShortName.ANNOUNCED_ATTRIBUTE, required=false, namespace="")
 	protected List<String> announcedAttribute;
 
 	/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java
index 1ee356a2..5d1eb6d0 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedResource.java
@@ -73,15 +73,15 @@ import org.eclipse.om2m.commons.constants.ShortName;
 public class AnnouncedResource extends Resource {
 
 	@XmlList
-	@XmlElement(name=ShortName.ACP_IDS, required=true)
+	@XmlElement(name=ShortName.ACP_IDS, required=true, namespace="")
 	protected List<String> accessControlPolicyIDs;
-	@XmlElement(name=ShortName.EXPIRATION_TIME, required = true)
+	@XmlElement(name=ShortName.EXPIRATION_TIME, required = true, namespace="")
 	protected String expirationTime;
-	@XmlElement(name=ShortName.LINK, required = true)
+	@XmlElement(name=ShortName.LINK, required = true, namespace="")
 	@XmlSchemaType(name = "anyURI")
 	protected String link;
 	@XmlList
-	@XmlElement(name=ShortName.DAC_IDS, required=false)
+	@XmlElement(name=ShortName.DAC_IDS, required=false, namespace="")
 	protected List<String> dynamicAuthorizationConsultationIDs;
 
 	/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java
index 9f4160d4..3a503464 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/AnnouncedSubordinateResource.java
@@ -63,9 +63,9 @@ import javax.xml.bind.annotation.XmlType;
 		ScheduleAnnc.class })
 public class AnnouncedSubordinateResource extends Resource {
 
-	@XmlElement(required = true)
+	@XmlElement(required = true, namespace="")
 	protected String expirationTime;
-	@XmlElement(required = true)
+	@XmlElement(required = true, namespace="")
 	@XmlSchemaType(name = "anyURI")
 	protected String link;
 
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java
index ba574853..13443d1a 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/CSEBase.java
@@ -102,25 +102,25 @@ import org.eclipse.om2m.commons.constants.ShortName;
 public class CSEBase extends Resource {
 
 	@XmlList
-	@XmlElement(name=ShortName.ACP_IDS, required=false)
+	@XmlElement(name=ShortName.ACP_IDS, required=false, namespace="")
 	protected List<String> accessControlPolicyIDs;
 	@XmlList
-	@XmlElement(name=ShortName.DAC_IDS, required=false)
+	@XmlElement(name=ShortName.DAC_IDS, required=false, namespace="")
 	protected List<String> dynamicAuthorizationConsultationIDs;
-	@XmlElement(name=ShortName.CSE_TYPE, required=false)
+	@XmlElement(name=ShortName.CSE_TYPE, required=false, namespace="")
 	protected BigInteger cseType;
-	@XmlElement(name = ShortName.CSE_ID, required = true)
+	@XmlElement(name = ShortName.CSE_ID, required = true, namespace="")
 	protected String cseid;
 	@XmlList
-	@XmlElement(name=ShortName.SRT, required = true)
+	@XmlElement(name=ShortName.SRT, required = true, namespace="")
 	protected List<BigInteger> supportedResourceType;
 	@XmlList
-	@XmlElement(name=ShortName.POA, required = true)
+	@XmlElement(name=ShortName.POA, required = true, namespace="")
 	protected List<String> pointOfAccess;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name=ShortName.NODE_LINK, required=false)
+	@XmlElement(name=ShortName.NODE_LINK, required=false, namespace="")
 	protected String nodeLink;
-	@XmlElement(name=ShortName.CHILD_RESOURCE)
+	@XmlElement(name=ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 
 	@XmlElements({
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 c5609ee7..555e7602 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
@@ -85,42 +85,42 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlRootElement(name = ShortName.CNT)
 public class Container extends AnnounceableResource {
 
-	@XmlElement(name = ShortName.STATETAG, required = true)
+	@XmlElement(name = ShortName.STATETAG, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger stateTag;
-	@XmlElement(name = ShortName.CREATOR, required = true)
+	@XmlElement(name = ShortName.CREATOR, required = true, namespace="")
 	protected String creator;
 	@XmlSchemaType(name = "nonNegativeInteger")
-	@XmlElement(name = ShortName.MAX_NR_OF_INSTANCES)
+	@XmlElement(name = ShortName.MAX_NR_OF_INSTANCES, namespace="")
 	protected BigInteger maxNrOfInstances;
 	@XmlSchemaType(name = "nonNegativeInteger")
-	@XmlElement(name = ShortName.MAX_BYTE_SIZE)
+	@XmlElement(name = ShortName.MAX_BYTE_SIZE, namespace="")
 	protected BigInteger maxByteSize;
 	@XmlSchemaType(name = "nonNegativeInteger")
-	@XmlElement(name = ShortName.MAX_INSTANCE_AGE)
+	@XmlElement(name = ShortName.MAX_INSTANCE_AGE, namespace="")
 	protected BigInteger maxInstanceAge;
-	@XmlElement(name = ShortName.CURRENT_NUMBER_OF_INSTANCES, required = true)
+	@XmlElement(name = ShortName.CURRENT_NUMBER_OF_INSTANCES, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger currentNrOfInstances;
-	@XmlElement(name = ShortName.CURRENT_BYTE_SIZE, required = true)
+	@XmlElement(name = ShortName.CURRENT_BYTE_SIZE, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger currentByteSize;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.LOCATION_ID)
+	@XmlElement(name = ShortName.LOCATION_ID, namespace="")
 	protected String locationID;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.ONTOLOGY_REF)
+	@XmlElement(name = ShortName.ONTOLOGY_REF, namespace="")
 	protected String ontologyRef;
-	@XmlElement(name = ShortName.CHILD_RESOURCE)
+	@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) })
 	protected List<Resource> contentInstanceOrContainerOrSubscription;
-	@XmlElement(name = ShortName.OLDEST)
+	@XmlElement(name = ShortName.OLDEST, namespace="")
 	protected String oldest;
-	@XmlElement(name = ShortName.LATEST)
+	@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/ContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java
index aff4685b..f12af099 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContainerAnnc.java
@@ -84,31 +84,31 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlRootElement(name = ShortName.CNT_ANNC)
 public class ContainerAnnc extends AnnouncedResource {
 
-	@XmlElement(required = true, name = ShortName.STATETAG)
+	@XmlElement(required = true, name = ShortName.STATETAG, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger stateTag;
 	@XmlSchemaType(name = "nonNegativeInteger")
-	@XmlElement(name = ShortName.MAX_NR_OF_INSTANCES)
+	@XmlElement(name = ShortName.MAX_NR_OF_INSTANCES, namespace="")
 	protected BigInteger maxNrOfInstances;
-	@XmlElement(name = ShortName.MAX_BYTE_SIZE)
+	@XmlElement(name = ShortName.MAX_BYTE_SIZE, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger maxByteSize;
-	@XmlElement(name = ShortName.MAX_INSTANCE_AGE)
+	@XmlElement(name = ShortName.MAX_INSTANCE_AGE, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger maxInstanceAge;
-	@XmlElement(required = true, name = ShortName.CURRENT_NUMBER_OF_INSTANCES)
+	@XmlElement(required = true, name = ShortName.CURRENT_NUMBER_OF_INSTANCES, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger currentNrOfInstances;
-	@XmlElement(required = true, name = ShortName.CURRENT_BYTE_SIZE)
+	@XmlElement(required = true, name = ShortName.CURRENT_BYTE_SIZE, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger currentByteSize;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.LOCATION_ID)
+	@XmlElement(name = ShortName.LOCATION_ID, namespace="")
 	protected String locationID;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.ONTOLOGY_REF)
+	@XmlElement(name = ShortName.ONTOLOGY_REF, namespace="")
 	protected String ontologyRef;
-	@XmlElement(name = ShortName.CHILD_RESOURCE)
+	@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 	@XmlElements({
 			@XmlElement(name = "contentInstance", namespace = "http://www.onem2m.org/xml/protocols", type = ContentInstance.class),
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java
index 35934987..774c7daa 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstance.java
@@ -69,20 +69,20 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlRootElement(name = ShortName.CIN)
 public class ContentInstance extends AnnounceableSubordinateResource {
 
-	@XmlElement(name = ShortName.STATETAG, required = true)
+	@XmlElement(name = ShortName.STATETAG, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger stateTag;
-	@XmlElement(name = ShortName.CREATOR)
+	@XmlElement(name = ShortName.CREATOR, namespace="")
 	protected String creator;
-	@XmlElement(name = ShortName.CONTENT_INFO)
+	@XmlElement(name = ShortName.CONTENT_INFO, namespace="")
 	protected String contentInfo;
-	@XmlElement(name = ShortName.CONTENT_SIZE, required = true)
+	@XmlElement(name = ShortName.CONTENT_SIZE, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger contentSize;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name = ShortName.ONTOLOGY_REF)
+	@XmlElement(name = ShortName.ONTOLOGY_REF, namespace="")
 	protected String ontologyRef;
-	@XmlElement(name = ShortName.CONTENT, required = true)
+	@XmlElement(name = ShortName.CONTENT, required = true, namespace="")
 	protected String content;
 
 	/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java
index a6f05c19..a927c838 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/ContentInstanceAnnc.java
@@ -67,7 +67,7 @@ import javax.xml.bind.annotation.XmlType;
 @XmlRootElement(name = "contentInstanceAnnc")
 public class ContentInstanceAnnc extends AnnouncedSubordinateResource {
 
-	@XmlElement(required = true)
+	@XmlElement(required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger stateTag;
 	protected String contentInfo;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java
index 8d4fd052..34e2a6ae 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/DynamicAuthorizationConsultation.java
@@ -17,14 +17,14 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlType(name = "")

 public class DynamicAuthorizationConsultation extends RegularResource {

 

-	@XmlElement(name = ShortName.DYNAMIC_AUTHORIZATION_ENABLED)

+	@XmlElement(name = ShortName.DYNAMIC_AUTHORIZATION_ENABLED, namespace="")

 	private Boolean dynamicAuthorizationEnabled;

 	

 	@XmlList

-	@XmlElement(name = ShortName.DYNAMIC_AUTHORIZATION_PoA)

+	@XmlElement(name = ShortName.DYNAMIC_AUTHORIZATION_PoA, namespace="")

 	private List<String> dynamicAuthorisationPoA;

 	

-	@XmlElement(name = ShortName.DYNAMIC_AUTHORIZATION_LIFETIME)

+	@XmlElement(name = ShortName.DYNAMIC_AUTHORIZATION_LIFETIME, namespace="")

 	private String dynamicAuthorizationLifetime;

 

 	public Boolean getDynamicAuthorizationEnabled() {

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java
index dbd791b5..dbd2b765 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/FlexContainerAnnc.java
@@ -20,18 +20,18 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlType(name = "")

 @XmlRootElement(name = ShortName.FCNTA)

 public class FlexContainerAnnc extends AnnouncedResource {

-	@XmlElement(name = ShortName.STATETAG, required = true)

+	@XmlElement(name = ShortName.STATETAG, required = true, namespace="")

 	@XmlSchemaType(name = "nonNegativeInteger")

 	protected BigInteger stateTag;

-	@XmlElement(name = ShortName.CREATOR, required = true)

+	@XmlElement(name = ShortName.CREATOR, required = true, namespace="")

 	protected String creator;

 	@XmlSchemaType(name = "anyURI")

-	@XmlElement(name = ShortName.ONTOLOGY_REF)

+	@XmlElement(name = ShortName.ONTOLOGY_REF, namespace="")

 	protected String ontologyRef;

 	@XmlSchemaType(name = "anyURI")

-	@XmlElement(name = ShortName.CONTAINER_DEFINITION)

+	@XmlElement(name = ShortName.CONTAINER_DEFINITION, namespace="")

 	protected String containerDefinition;

-	@XmlElement(name = ShortName.CHILD_RESOURCE)

+	@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")

 	protected List<ChildResourceRef> childResource;

 	@XmlElements({

 			@XmlElement(name = ShortName.CNT, namespace = "http://www.onem2m.org/xml/protocols", type = Container.class),

diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java
index bf4d8aef..5b44b641 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Group.java
@@ -84,32 +84,32 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlRootElement(name = ShortName.GROUP)
 public class Group extends AnnounceableResource {
 
-	@XmlElement(name = ShortName.CREATOR)
+	@XmlElement(name = ShortName.CREATOR, namespace="")
 	protected String creator;
-	@XmlElement(name = ShortName.MEMBER_TYPE, required = true)
+	@XmlElement(name = ShortName.MEMBER_TYPE, required = true, namespace="")
 	protected BigInteger memberType;
-	@XmlElement(name = ShortName.CURRENT_NUM_MEMBERS, required = true)
+	@XmlElement(name = ShortName.CURRENT_NUM_MEMBERS, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger currentNrOfMembers;
-	@XmlElement(name = ShortName.MAX_NUM_MEMBERS, required = true)
+	@XmlElement(name = ShortName.MAX_NUM_MEMBERS, required = true, namespace="")
 	@XmlSchemaType(name = "nonNegativeInteger")
 	protected BigInteger maxNrOfMembers;
 	@XmlList
-	@XmlElement(name = ShortName.MEMBER_ID, required = true)
+	@XmlElement(name = ShortName.MEMBER_ID, required = true, namespace="")
 	protected List<String> memberIDs;
 	@XmlList
-	@XmlElement(name = ShortName.MEMBER_ACP_ID)
+	@XmlElement(name = ShortName.MEMBER_ACP_ID, namespace="")
 	protected List<String> membersAccessControlPolicyIDs;
-	@XmlElement(name = ShortName.MEMBER_TYPE_VALIDATED)
+	@XmlElement(name = ShortName.MEMBER_TYPE_VALIDATED, namespace="")
 	protected Boolean memberTypeValidated;
-	@XmlElement(name = ShortName.CONSISTENCY_STRATEGY)
+	@XmlElement(name = ShortName.CONSISTENCY_STRATEGY, namespace="")
 	protected BigInteger consistencyStrategy;
-	@XmlElement(name = ShortName.GROUP_NAME)
+	@XmlElement(name = ShortName.GROUP_NAME, namespace="")
 	protected String groupName;
-	@XmlElement(name = ShortName.FANOUTPOINT, required = true)
+	@XmlElement(name = ShortName.FANOUTPOINT, required = true, namespace="")
 	@XmlSchemaType(name = "anyURI")
 	protected String fanOutPoint;
-	@XmlElement(name = ShortName.CHILD_RESOURCE)
+	@XmlElement(name = ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 	@XmlElement(name = ShortName.SUB, namespace = "http://www.onem2m.org/xml/protocols")
 	protected List<Subscription> subscription;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java
index b1d06ddf..703468eb 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RegularResource.java
@@ -75,12 +75,12 @@ import org.eclipse.om2m.commons.constants.ShortName;
 public class RegularResource extends Resource {
 
 	@XmlList
-	@XmlElement(name=ShortName.ACP_IDS, required=false)
+	@XmlElement(name=ShortName.ACP_IDS, required=false, namespace="")
 	protected List<String> accessControlPolicyIDs;
 	@XmlList
-	@XmlElement(name=ShortName.DAC_IDS, required=false)
+	@XmlElement(name=ShortName.DAC_IDS, required=false, namespace="")
 	protected List<String> dynamicAuthorizationConsultationIDs;
-	@XmlElement(name=ShortName.EXPIRATION_TIME, required = true)
+	@XmlElement(name=ShortName.EXPIRATION_TIME, required = true, namespace="")
 	protected String expirationTime;
 
 	/**
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java
index 7d2a1d1e..bfeb8923 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/RemoteCSE.java
@@ -88,27 +88,27 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlType(name = "")
 @XmlRootElement(name = ShortName.REMOTE_CSE)
 public class RemoteCSE extends AnnounceableResource {
-	@XmlElement(name=ShortName.CSE_TYPE, required=false)
+	@XmlElement(name=ShortName.CSE_TYPE, required=false, namespace="")
 	protected BigInteger cseType;
 	@XmlList
-	@XmlElement(name=ShortName.POA, required=false)
+	@XmlElement(name=ShortName.POA, required=false, namespace="")
 	protected List<String> pointOfAccess;
-	@XmlElement(name = ShortName.REMOTE_CSE_CSEBASE, required = true)
+	@XmlElement(name = ShortName.REMOTE_CSE_CSEBASE, required = true, namespace="")
 	@XmlSchemaType(name = "anyURI")
 	protected String cseBase;
-	@XmlElement(name = ShortName.CSE_ID, required = true)
+	@XmlElement(name = ShortName.CSE_ID, required = true, namespace="")
 	protected String cseid;
-	@XmlElement(name = ShortName.M2M_EXT_ID, required=false)
+	@XmlElement(name = ShortName.M2M_EXT_ID, required=false, namespace="")
 	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
 	protected String m2MExtID;
-	@XmlElement(name = ShortName.TRIGGER_RECIPIENT_ID, required=false)
+	@XmlElement(name = ShortName.TRIGGER_RECIPIENT_ID, required=false, namespace="")
 	protected Long triggerRecipientID;
-	@XmlElement(name=ShortName.REQUEST_REACHABILITY, required=true)
+	@XmlElement(name=ShortName.REQUEST_REACHABILITY, required=true, namespace="")
 	protected Boolean requestReachability;
 	@XmlSchemaType(name = "anyURI")
-	@XmlElement(name=ShortName.NODE_LINK, required=false)
+	@XmlElement(name=ShortName.NODE_LINK, required=false, namespace="")
 	protected String nodeLink;
-	@XmlElement(name=ShortName.CHILD_RESOURCE)
+	@XmlElement(name=ShortName.CHILD_RESOURCE, namespace="")
 	protected List<ChildResourceRef> childResource;
 	@XmlElements({
 			@XmlElement(name = ShortName.AE, namespace = "http://www.onem2m.org/xml/protocols", type = AE.class),
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java
index 8eee5273..3594b5df 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/Resource.java
@@ -81,21 +81,21 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @MappedSuperclass
 public class Resource {
 
-	@XmlElement(name=ShortName.RESOURCE_TYPE, required = true)
+	@XmlElement(name=ShortName.RESOURCE_TYPE, required = true, namespace="")
 	protected BigInteger resourceType;
-	@XmlElement(name=ShortName.RESOURCE_ID, required = true)
+	@XmlElement(name=ShortName.RESOURCE_ID, required = true, namespace="")
 	@Id
 	protected String resourceID;
-	@XmlElement(name=ShortName.PARENT_ID, required = true)
+	@XmlElement(name=ShortName.PARENT_ID, required = true, namespace="")
 	protected String parentID;
-	@XmlElement(name=ShortName.CREATION_TIME, required = true)
+	@XmlElement(name=ShortName.CREATION_TIME, required = true, namespace="")
 	protected String creationTime;
-	@XmlElement(name=ShortName.LAST_MODIFIED_TIME, required = true)
+	@XmlElement(name=ShortName.LAST_MODIFIED_TIME, required = true, namespace="")
 	protected String lastModifiedTime;
 	@XmlList
-	@XmlElement(name=ShortName.LABELS, required=false)
+	@XmlElement(name=ShortName.LABELS, required=false, namespace="")
 	protected List<String> labels;
-	@XmlAttribute(name = ShortName.RESOURCE_NAME, required = true)
+	@XmlAttribute(name = ShortName.RESOURCE_NAME, required = true, namespace="")
 	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
 	@XmlSchemaType(name = "token")
 	protected String name;
diff --git a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java
index 7aa6d8c4..2a76ec31 100644
--- a/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java
+++ b/org.eclipse.om2m.commons/src/main/java/org/eclipse/om2m/commons/resource/SetOfAcrs.java
@@ -62,7 +62,7 @@ import org.eclipse.om2m.commons.constants.ShortName;
 @XmlType(name = "setOfAcrs")
 public class SetOfAcrs {
 
-	@XmlElement(name = ShortName.ACR)
+	@XmlElement(name = ShortName.ACR, namespace="")
 	protected List<AccessControlRule> accessControlRule;
 
 	/**
diff --git a/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding-flexcontainer.json b/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding-flexcontainer.json
index 83c8d40d..61cc521e 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding-flexcontainer.json
+++ b/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding-flexcontainer.json
@@ -5,6 +5,8 @@
     "namespace": "http:\/\/www.onem2m.org\/xml\/protocols\/homedomain"
   },
   "java-types": {
+  	"java-type": [
+      ]
   }
 }
 
diff --git a/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding.json b/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding.json
index 269802bb..b1355709 100644
--- a/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding.json
+++ b/org.eclipse.om2m.datamapping.jaxb/src/main/resources/json-binding.json
@@ -12,7 +12,8 @@
           "xml-element": [
             {
               "java-attribute": "labels",
-              "name": "lbl"
+              "name": "lbl",
+              "namespace": ""
             }
           ]
         }
@@ -23,11 +24,13 @@
           "xml-element": [
             {
               "java-attribute": "accessControlPolicyIDs",
-              "name": "acpi"
+              "name": "acpi",
+              "namespace": ""
             },
             {
               "java-attribute": "dynamicAuthorizationConsultationIDs",
-              "name": "daci"
+              "name": "daci",
+              "namespace": ""
             }
           ]
         }
@@ -38,11 +41,13 @@
           "xml-element": [
             {
               "java-attribute": "announceTo",
-              "name": "at"
+              "name": "at",
+              "namespace": ""
             },
             {
               "java-attribute": "announcedAttribute",
-              "name": "aa"
+              "name": "aa",
+              "namespace": ""
             }
           ]
         }
@@ -53,11 +58,13 @@
           "xml-element": [
             {
               "java-attribute": "announceTo",
-              "name": "at"
+              "name": "at",
+              "namespace": ""
             },
             {
               "java-attribute": "announcedAttribute",
-              "name": "aa"
+              "name": "aa",
+              "namespace": ""
             }
           ]
         }
@@ -68,7 +75,8 @@
           "xml-element": [
             {
               "java-attribute": "accessControlPolicyIDs",
-              "name": "acpi"
+              "name": "acpi",
+              "namespace": ""
             }
           ]
         }
@@ -79,19 +87,23 @@
           "xml-element": [
             {
               "java-attribute": "accessControlPolicyIDs",
-              "name": "acpi"
+              "name": "acpi",
+              "namespace": ""
             },
             {
               "java-attribute": "dynamicAuthorizationConsultationIDs",
-              "name": "daci"
+              "name": "daci",
+              "namespace": ""
             },
             {
               "java-attribute": "supportedResourceType",
-              "name": "srt"
+              "name": "srt",
+              "namespace": ""
             },
             {
               "java-attribute": "pointOfAccess",
-              "name": "poa"
+              "name": "poa",
+              "namespace": ""
             }
           ]
         }
@@ -102,7 +114,8 @@
           "xml-element": [
             {
               "java-attribute": "pointOfAccess",
-              "name": "poa"
+              "name": "poa",
+              "namespace": ""
             }
           ]
         }
@@ -113,7 +126,8 @@
           "xml-element": [
             {
               "java-attribute": "accessControlOriginators",
-              "name": "acor"
+              "name": "acor",
+              "namespace": ""
             }
           ]
         }
@@ -124,7 +138,8 @@
           "xml-element": [
             {
               "java-attribute": "pointOfAccess",
-              "name": "poa"
+              "name": "poa",
+              "namespace": ""
             }
           ]
         }
@@ -135,7 +150,8 @@
           "xml-element": [
             {
               "java-attribute": "pointOfAccess",
-              "name": "poa"
+              "name": "poa",
+              "namespace": ""
             }
           ]
         }
@@ -146,11 +162,13 @@
           "xml-element": [
             {
               "java-attribute": "memberIDs",
-              "name": "mid"
+              "name": "mid",
+              "namespace": ""
             },
             {
               "java-attribute": "membersAccessControlPolicyIDs",
-              "name": "macp"
+              "name": "macp",
+              "namespace": ""
             }
           ]
         }
@@ -161,7 +179,8 @@
           "xml-element": [
             {
               "java-attribute": "notificationURI",
-              "name": "nu"
+              "name": "nu",
+              "namespace": ""
             }
           ]
         }
@@ -172,20 +191,8 @@
           "xml-element": [
             {
               "java-attribute": "listOfUri",
-              "name":"uril"
-            }
-          ]
-        }
-      },
-      {
-        "name": "Group",
-        "java-attributes": {
-          "xml-element": [
-            {
-              "java-attribute": "countryCode"
-            },
-            {
-              "java-attribute": "circRegion"
+              "name":"uril",
+              "namespace": ""
             }
           ]
         }