Changed namespace to http://www.onem2m.org/xml/sdt/4.0

SDT/schema4.0/build.xml

@@ -92,7 +92,7 @@
     <schemavalidate warn="true">
       <fileset dir="${basedir}/test" includes="*.xml"/>
       <attribute name="http://apache.org/xml/features/xinclude" value="true"/>
-      <schema namespace="http://homegatewayinitiative.org/xml/dal/4.0"
+      <schema namespace="http://www.onem2m.org/xml/sdt/4.0"
 	      file="${path.src}/domain.xsd" />
       <schema namespace="http://www.w3.org/2001/XInclude"
 	      file="${basedir}/etc/XInclude.xsd" />

SDT/schema4.0/etc/dal.rnc

 
 namespace local = ""
-default namespace xsl = "http://homegatewayinitiative.org/xml/dal/4.0"
+default namespace xsl = "http://www.onem2m.org/xml/sdt/4.0"
 namespace xi = "http://www.w3.org/2001/XInclude"
 
 version = "1.0"

SDT/schema4.0/etc/schema.xmlns

-targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0" 
-	   xmlns="http://homegatewayinitiative.org/xml/dal/4.0" 
+targetNamespace="http://www.onem2m.org/xml/sdt/4.0" 
+	   xmlns="http://www.onem2m.org/xml/sdt/4.0" 
 	   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 	  

SDT/schema4.0/etc/schemas.xml

 <locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
   
-  <namespace ns="http://homegatewayinitiative.org/xml/dal/4.0" typeId="DAL"/>
+  <namespace ns="http://www.onem2m.org/xml/sdt/4.0" typeId="DAL"/>
   <namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/>
 
   <typeId id="DAL" uri="dal.rnc"/>

SDT/schema4.0/gen/html/EchonetLiteExamples.html

@@ -112,18 +112,21 @@
 							This property indicates whether the door/cover is open or closed.
 							
 								
+								
 							
 						
 						
 							Washing machine setting
 							
 								
+								
 							
 						
 						
 							This property indicates the current stage of the washing cycle.
 							
 								
+								
 							
 						
 						
@@ -139,6 +142,7 @@
 							Reservation ON/OFF
 							
 								
+								
 							
 						
 						

SDT/schema4.0/gen/html/dal-core.html

 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-  
-    
-      
-	BooleanState is the preferred module for modelling a
-	functionality corresponding to an underlying binary state. This
-	module should be used to abstract away from the actual datatype
-	and values in question. Note that the module does not define whether
-	the execution mode is blocking or non-blocking.
-      
-      
 	
-	  
-	    Obtain the current associated state.
-	  
+		
+			
+				BooleanState is the preferred module for modelling a
+				functionality corresponding to an underlying binary state. This
+				module should be used to abstract away from the actual datatype
+				and values in question. Note that the module does not define whether
+				the execution mode is blocking or non-blocking.
+				
+			
+				
+					Obtain the current associated state.
+					
+						
+					
+				
+				
+					Set the associated state to the specified value.
+					
+						
+							The desired value of the associated state.
+							
+								
+							
+						
+					
+				
+			
+		
 	
-	
-	  
-	    Set the associated state to the specified value.
-	  
-	  
-	    
-	      The desired value of the associated state.
-	    
-	  
-	
-      
-    
-  
 

SDT/schema4.0/gen/html/dal-eg.html

 <?xml version="1.0" encoding="ISO-8859-1"?>
-
-  
-    
-  
-
-  
-  
-
-  
-
-    
-      
-	PowerSwitch
 	
-	Telekom Innovation Laboratories
-      
-      
-      
-	This device is intended as a demonstration of how to use the
-	abstract modules defined in the HGI Core domain. The
-	vendor has provided a proprietry module with two operations
-	on and off. This is clearly a candidate for the 
-	module class BooleanState.
-      
-
-      
+		
 	
-	  
-	    The proprietry interface for turning the switch on and off. 
-	    Actions for setting the state to on or off 
-	    and for querying the state.
-	  
-
-	  
-	    
-	      
-		Turn the switch on.
-	      
-	    
-	    
-	      
-		Turn the switch off.
-	      
-	    
-	    
-	      
-		Query the state of the switch. Returns the string "on"
-		or "off".
-	      
-	    
-	  
-
-	  
-	  	
-		  
-		    
-	 		
-		  
-		  An event that indicates the new state of the switch.
-		  
-	  	
-	  
 	
-
+		
+			This device is intended as a demonstration of how to use the abstract modules defined in the HGI Core	domain. The vendor has provided a proprietry module with two operations	on	and off. This is clearly a candidate for the module class BooleanState.
+			
+				
+					Original value: PowerSwitch
+					
+				
+				
+				
+					Original value: Telekom Innovation Laboratories
+					
+				
+			
+			
+				
+					The proprietry interface for turning the switch on and off.  Actions for setting the state to on or offand for querying the state.
+					
+						
+							Turn the switch on.
+						
+						
+							Turn the switch off.
+						
+						
+							Query the state of the switch. Returns the string "on" or "off".
+							
+								
+							
+						
+					
+					
+						
+							An event that indicates the new state of the switch.
+							
+								
+									
+										
+									
+								
+							
+						
+					
+				
+				
+					
+				
+			
+		
 	
-	  
-	
-      
-    
-  

SDT/schema4.0/gen/html/mseeb.html

@@ -16,6 +16,9 @@
                     
                         Obtain the current associated state.
                     
+                    
+                        
+                    
                 
                 
                     
@@ -23,7 +26,12 @@
                     
                     
                         
-                        The desired value of the associated state.
+                            
+                            The desired value of the associated state.
+                            
+                            
+                                
+                            
                         
                     
                 
@@ -32,6 +40,9 @@
                 
                     
                         
+                            
+                        		
+                            
                         
                     
                       
@@ -47,14 +58,29 @@
 
         
             
-                Multi Socket Electrical-Extension-Block
-                HGI
-                1.0
-                http://www.homegatewayinitative.org
-                1234.5
+                This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
             
             
-                This device is intended as a demonstration of how to define a Root Device with multiple sub-devices.
+                
+                    Original value: Multi Socket Electrical-Extension-Block
+                    
+                
+                
+                    Original value: HGI
+                    
+                
+                
+                  Original value: 1.0
+                  
+                
+                
+                  Original value: http://www.homegatewayinitative.org
+                  
+                
+                
+                  Original value: 1234.5
+                  
+                
             
 
 
@@ -62,23 +88,84 @@
             
                 
                     
-                    
                         The proprietry interface for turning all switches of the extension block on and off. 
                         The action "BooleanState:get" returns "true" when any of the sub-devices is in the state "on", otherwise it returns "false".
                     
+                    
+                    
+                        
+                            Version for this ModuleClass
+                            
+                        
+                    
+                
+                
+                    
+                    	
+                            Get the power consumption.
+                            
+                    			
+                                    
+                        				
+                                           
+                                                This is an example simple data type with a minimum-value constraint.
+                            					
+                                                
+                                                    
+                                                        The value must be equal or greater 0.0
+                                                    
+                                                      
+                                                        Steps are 0.1
+                                                    
+                                                
+                                            
+                				        
+                                    
+                                    
+                        				
+                                            
+                            					
+                                            
+                				        
+                                    
+                                
+                            
+                    	
+                    
                 
 
                 
+                    
+                        
+                            
+                                
+                                    
+                                        
+                                    
+                                
+                            
+                        
+                    
                     
                         
                             
                                 This datapoint represents the firmware version of the extension block.
                             
+                            
+                                
+                            
                         
                         
                         
                             
                                 This datapoint is an array of strings with the names of the contained devices.
+                            
+                            
+                                
+                                    
+                                        
+                                    
+                                
                             
                         
                     
@@ -93,11 +180,15 @@
 
                 
                     
-                        PowerSwitch 1
-                        HGI
+                        This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
                     
                     
-                        This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
+                        
+                            
+                        
+                        
+                            
+                        
                     
                     
                         
@@ -110,11 +201,21 @@
 
                 
                     
-                        PowerSwitch 2
-                        HGI
+                        This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
                     
                     
-                        This sub device is intended as a demonstration of how to use the abstract modules defined in the HGI Core domain.
+                        
+                            
+                        
+                        
+                            
+                        
+                        
+                            
+                        
+                        
+                            
+                        
                     
                     
                         

SDT/schema4.0/src/domain.xsd

@@ -9,8 +9,8 @@
   - See the license text at [https://opensource.org/licenses/BSD-3-Clause for
   - full details.
 -->
-<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/4.0" 
-	   xmlns="http://homegatewayinitiative.org/xml/dal/4.0" 
+<xs:schema targetNamespace="http://www.onem2m.org/xml/sdt/4.0" 
+	   xmlns="http://www.onem2m.org/xml/sdt/4.0" 
 	   xmlns:xs="http://www.w3.org/2001/XMLSchema" 
 	  
  elementFormDefault="qualified">

SDT/schema4.0/style/html.xsl

@@ -8,7 +8,7 @@
        document ... -->
 
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-		xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0"
+		xmlns:dal="http://www.onem2m.org/xml/sdt/4.0"
 		xmlns="http://www.w3.org/1999/xhtml"
 		
 		xmlns:redirect="http://xml.apache.org/xalan/redirect" 

SDT/schema4.0/test/EchonetLiteExamples.xml

@@ -3,7 +3,7 @@
 <!-- Example SDT definition taken from EchonetLite https://github.com/ECHONET-Consortium -->
 
 
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	id="example.based.on.echonetLite">
 

SDT/schema4.0/test/action-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Test the data types references -->
 
-<Domain id="action-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="action-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<ModuleClasses>
 		<ModuleClass name="TestActions">

SDT/schema4.0/test/arg-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Test the data types references -->
 
-<Domain id="arg-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="arg-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 
 	<ModuleClasses>
 		<ModuleClass name="TestArg">

SDT/schema4.0/test/dal-core.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" 
-	id="hgi.dal.core">
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" 
+	id="dal.core">
 
 	<ModuleClasses>
 		<ModuleClass name="BooleanState">

SDT/schema4.0/test/dal-eg.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
-<Domain id="com.telekom" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="com.telekom" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<Imports>
 		<xi:include href="./dal-core.xml" parse="xml"/>
 	</Imports>

SDT/schema4.0/test/datapoint-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Test the EnumType -->
 
-<Domain id="datapoint-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="datapoint-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<ModuleClasses>
 		<ModuleClass name="TestDataPoint">
 			<Data>

SDT/schema4.0/test/datatypes-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Test the data types references -->
 
-<Domain id="datatypes-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="datatypes-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<DataTypes>
 		<DataType name="temperatureType" unitOfMeasure="C">
 			<SimpleType type="float"/>

SDT/schema4.0/test/deviceClass-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass.test" >
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude" id="deviceClass.test" >
 	<Imports>
 		<xi:include href="./dal-core.xml" parse="xml"/>
 	</Imports>

SDT/schema4.0/test/enumtype-test.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Test the EnumType -->
 
-<Domain id="enumtype-test" xmlns="http://homegatewayinitiative.org/xml/dal/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="enumtype-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
 	<ModuleClasses>
 		<ModuleClass name="TestEnumType">
 			<Data>

SDT/schema4.0/test/example1.SDT.xml

 <?xml version="1.0" encoding="iso-8859-1"?>
 <!-- Example1 SDT inspired by some Echonet Lite examples -->
-<Domain xmlns="http://homegatewayinitiative.org/xml/dal/4.0"
+<Domain xmlns="http://www.onem2m.org/xml/sdt/4.0"
 	xmlns:xi="http://www.w3.org/2001/XInclude"
 	id="example1.SDT">