From bfd598b9a845e9948122ff44bfa090bf6cb10201 Mon Sep 17 00:00:00 2001
From: Andreas Kraft <akr@iMac27.fritz.box>
Date: Thu, 7 May 2015 16:57:11 +0200
Subject: [PATCH] Changed the namespace for the XSD from "hgi.org" to
"homegatewayinitiative.org"
---
README.md | 7 ++++++-
SDT/schema2.0/build.xml | 2 +-
SDT/schema2.0/etc/dal.rnc | 2 +-
SDT/schema2.0/etc/schema.xmlns | 4 ++--
SDT/schema2.0/etc/schemas.xml | 2 +-
SDT/schema2.0/gen/html/hgi.dal.core/index.html | 2 +-
SDT/schema2.0/src/domain.xsd | 4 ++--
SDT/schema2.0/style/html.xsl | 2 +-
SDT/schema2.0/test/dal-core.xml | 2 +-
SDT/schema2.0/test/dal-eg.xml | 2 +-
SDT/schema2.0/test/mseeb.xml | 6 +++---
11 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index 55e7434..34a61cd 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,7 @@ You can find further Information here:
- Added optional ``<Doc>`` element to Event
- Changed the optionality of the ``<DataPoint>``'s ``type`` attribute to "required".
- Added [UML diagram](SDT/schema2.0/docs/SDT_Components.md)
+- Changed the namespace for the XSD from "hgi.org" to "homegatewayinitiative.org".
---
@@ -71,7 +72,11 @@ The "numbers" could be just integer number, but may also contain letters, e.g. "
## Domain / namespace
-The SDL now uses the namespace "homegateway.org" as a namespace to identify the schema (also used for includes). The namespace is **not** a URL, but uniquely identifies the namespace and *should* be registered by HGI.
+The SDL now uses the namespace "homegatewayinitiative.org" as a namespace to identify the schema (also used for includes). The namespace is **not** a URL, but uniquely identifies the namespace and *should* be registered by HGI.
+
+That said, most validating parsers expect **that the namesapce IS a valid URL** or that at least there is a server on the other end rejecting the request. A timeout / no connection / no answer / ... leads to an error.
+
+Therefore, we cannot use the namespace "homegateway.org" because parsers don't get an answer from this address.
diff --git a/SDT/schema2.0/build.xml b/SDT/schema2.0/build.xml
index 38d73d7..adbce2f 100644
--- a/SDT/schema2.0/build.xml
+++ b/SDT/schema2.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://hgi.org/xml/dal/2.0"
+ <schema namespace="http://homegatewayinitiative.org/xml/dal/2.0"
file="${path.src}/domain.xsd" />
<schema namespace="http://www.w3.org/2001/XInclude"
file="${basedir}/etc/XInclude.xsd" />
diff --git a/SDT/schema2.0/etc/dal.rnc b/SDT/schema2.0/etc/dal.rnc
index 735196a..d5c572e 100644
--- a/SDT/schema2.0/etc/dal.rnc
+++ b/SDT/schema2.0/etc/dal.rnc
@@ -1,6 +1,6 @@
namespace local = ""
-default namespace xsl = "http://hgi.org/xml/dal/2.0"
+default namespace xsl = "http://homegatewayinitiative.org/xml/dal/2.0"
namespace xi = "http://www.w3.org/2001/XInclude"
version = "1.0"
diff --git a/SDT/schema2.0/etc/schema.xmlns b/SDT/schema2.0/etc/schema.xmlns
index 619292d..e64c329 100644
--- a/SDT/schema2.0/etc/schema.xmlns
+++ b/SDT/schema2.0/etc/schema.xmlns
@@ -1,4 +1,4 @@
-targetNamespace="http://hgi.org/xml/dal/2.0"
- xmlns="http://hgi.org/xml/dal/2.0"
+targetNamespace="http://homegatewayinitiative.org/xml/dal/2.0"
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
diff --git a/SDT/schema2.0/etc/schemas.xml b/SDT/schema2.0/etc/schemas.xml
index a92a4e9..3b0bea6 100644
--- a/SDT/schema2.0/etc/schemas.xml
+++ b/SDT/schema2.0/etc/schemas.xml
@@ -1,6 +1,6 @@
<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
- <namespace ns="http://hgi.org/xml/dal/2.0" typeId="DAL"/>
+ <namespace ns="http://homegatewayinitiative.org/xml/dal/2.0" typeId="DAL"/>
<namespace ns="http://www.w3.org/2001/XInclude" typeId="XINC"/>
<typeId id="DAL" uri="dal.rnc"/>
diff --git a/SDT/schema2.0/gen/html/hgi.dal.core/index.html b/SDT/schema2.0/gen/html/hgi.dal.core/index.html
index 456cbf8..3e17706 100644
--- a/SDT/schema2.0/gen/html/hgi.dal.core/index.html
+++ b/SDT/schema2.0/gen/html/hgi.dal.core/index.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://hgi.org/xml/dal/1.0" xmlns="http://www.w3.org/1999/xhtml">
+<?xml version="1.0" encoding="ISO-8859-1"?><html xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0" xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>Domain hgi.dal.core</title>
</head>
diff --git a/SDT/schema2.0/src/domain.xsd b/SDT/schema2.0/src/domain.xsd
index f929740..f22e199 100644
--- a/SDT/schema2.0/src/domain.xsd
+++ b/SDT/schema2.0/src/domain.xsd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema targetNamespace="http://hgi.org/xml/dal/2.0"
- xmlns="http://hgi.org/xml/dal/2.0"
+<xs:schema targetNamespace="http://homegatewayinitiative.org/xml/dal/2.0"
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified">
diff --git a/SDT/schema2.0/style/html.xsl b/SDT/schema2.0/style/html.xsl
index c7fab6e..8492bed 100644
--- a/SDT/schema2.0/style/html.xsl
+++ b/SDT/schema2.0/style/html.xsl
@@ -8,7 +8,7 @@
document ... -->
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- xmlns:dal="http://hgi.org/xml/dal/1.0"
+ xmlns:dal="http://homegatewayinitiative.org/xml/dal/2.0"
xmlns="http://www.w3.org/1999/xhtml"
xmlns:redirect="http://xml.apache.org/xalan/redirect"
diff --git a/SDT/schema2.0/test/dal-core.xml b/SDT/schema2.0/test/dal-core.xml
index beb3a80..dc61de8 100644
--- a/SDT/schema2.0/test/dal-core.xml
+++ b/SDT/schema2.0/test/dal-core.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<Domain xmlns="http://hgi.org/xml/dal/2.0"
+<Domain xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
id="hgi.dal.core">
<Modules>
diff --git a/SDT/schema2.0/test/dal-eg.xml b/SDT/schema2.0/test/dal-eg.xml
index afe7bb9..10b2a25 100644
--- a/SDT/schema2.0/test/dal-eg.xml
+++ b/SDT/schema2.0/test/dal-eg.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://hgi.org/xml/dal/2.0"
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
id="com.telekom">
<Imports>
diff --git a/SDT/schema2.0/test/mseeb.xml b/SDT/schema2.0/test/mseeb.xml
index e2fc34b..78e0d6a 100644
--- a/SDT/schema2.0/test/mseeb.xml
+++ b/SDT/schema2.0/test/mseeb.xml
@@ -5,7 +5,7 @@
<!--
+................................................+
-:Domain:org.hgi :
+:Domain:org.homegatewayinitiative :
: :
: +..........................................+ :
: :Module:BooleanState : :
@@ -62,8 +62,8 @@
-->
<Domain xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns="http://hgi.org/xml/dal/2.0"
- id="org.hgi">
+ xmlns="http://homegatewayinitiative.org/xml/dal/2.0"
+ id="org.homegatewayinitiative">
<!-- The following import statements include ModuleClasses from HGI -->
--
GitLab