Sergio's patch, new version of RDFa ontologies
authorDominik Tomaszuk <ddooss@wp.pl>
Mon, 10 Oct 2011 16:21:00 +0200
changeset 167 97176f5a05ac
parent 166 0d032e74bdc9
child 168 e4c329ba40b4
Sergio's patch, new version of RDFa ontologies
ontologies/rdfa/cert.html
ontologies/rdfa/rsa.html
ontologies/rdfa/template_cert.html
ontologies/rdfa/template_rsa.html
ontologies/specgen/libvocab.py
--- a/ontologies/rdfa/cert.html	Wed Oct 05 10:31:21 2011 +0200
+++ b/ontologies/rdfa/cert.html	Mon Oct 10 16:21:00 2011 +0200
@@ -26,17 +26,19 @@
 
 <dl>
 <dt>This version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>, <a href="http://www.w3.org/ns/auth/cert.rdf">RDF/XML</a>)</dd>
 
 <dt>Latest version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>, <a href="http://www.w3.org/ns/auth/cert.rdf">RDF/XML</a>)</dd>
 
 <dt>Authors:</dt>
+<dd><a href="http://bblfish.net/">Henry Story</a> </dd>
+
+<dt>Contributors:</dt>
 <dd><a href="http://ii.uwb.edu.pl/~dtomaszuk/">Dominik Tomaszuk</a> (<a href="http://ii.uwb.edu.pl/">University of Bialystok</a>)</dd>
-<dd><a href="http://bblfish.net/">Henry Story</a> </dd>
 </dl>
 
-<p class="copyright"><span>Copyright © 2010-2011 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C liability, trademark and document use rules apply.</span></p>
+<p class="copyright"><a rel="license" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2010-2011 <span rel="dcterms:publisher"><span typeof="foaf:Organization"><a rel="foaf:homepage" property="foaf:name" content="World Wide Web Consotrium" href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup></span></span> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
 
 <hr />
 
@@ -76,9 +78,9 @@
  
  
 <div class="azlist">
-<p>Classes: | <a href="#Certificate">Certificate</a> |  <a href="#Key">Key</a> |  <a href="#PGPCertificate">PGPCertificate</a> |  <a href="#PrivateKey">PrivateKey</a> |  <a href="#PublicKey">PublicKey</a> |  <a href="#Signature">Signature</a> |  <a href="#X509Certificate">X509Certificate</a> | 
+<p>Classes: | <a href="#Certificate">Certificate</a> |  <a href="#PGPCertificate">PGPCertificate</a> |  <a href="#PrivateKey">PrivateKey</a> |  <a href="#PublicKey">PublicKey</a> |  <a href="#Signature">Signature</a> |  <a href="#X509Certificate">X509Certificate</a> | 
 </p>
-<p>Properties: | <a href="#decimal">decimal</a> |  <a href="#hex">hex</a> |  <a href="#identity">identity</a> |  <a href="#int">int</a> |  <a href="#public_key">public_key</a> | 
+<p>Properties: | <a href="#decimal">decimal</a> |  <a href="#hex">hex</a> |  <a href="#identity">identity</a> |  <a href="#public_key">public_key</a> | 
 </p>
 </div>
 
@@ -145,9 +147,9 @@
 
 <!-- this is the a-z listing -->
 <div class="azlist">
-<p>Classes: | <a href="#Certificate">Certificate</a> |  <a href="#Key">Key</a> |  <a href="#PGPCertificate">PGPCertificate</a> |  <a href="#PrivateKey">PrivateKey</a> |  <a href="#PublicKey">PublicKey</a> |  <a href="#Signature">Signature</a> |  <a href="#X509Certificate">X509Certificate</a> | 
+<p>Classes: | <a href="#Certificate">Certificate</a> |  <a href="#PGPCertificate">PGPCertificate</a> |  <a href="#PrivateKey">PrivateKey</a> |  <a href="#PublicKey">PublicKey</a> |  <a href="#Signature">Signature</a> |  <a href="#X509Certificate">X509Certificate</a> | 
 </p>
-<p>Properties: | <a href="#decimal">decimal</a> |  <a href="#hex">hex</a> |  <a href="#identity">identity</a> |  <a href="#int">int</a> |  <a href="#public_key">public_key</a> | 
+<p>Properties: | <a href="#decimal">decimal</a> |  <a href="#hex">hex</a> |  <a href="#identity">identity</a> |  <a href="#public_key">public_key</a> | 
 </p>
 </div>
 
@@ -159,45 +161,37 @@
  
 
 <div class="specterm" id="Certificate" about="http://www.w3.org/ns/auth/cert#Certificate" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:Certificate</h4> 
-  			<em property="rdfs:label" >Certificate</em> - <span property="rdfs:comment" >A certificate is a Document that is signed. As explained here http://www.pgpi.org/doc/pgpintro/#p16 'A digital certificate consists of three things: (1) A public key. (2) Certificate information. 'Identity' information about the user, such as name, user ID, and so on. (3) One or more digital signatures.'</span> <br /><table style="float: top;">
+  			<h4>Class: cert:Certificate</h4> 
+  			<em property="rdfs:label" >Certificate</em> - <span property="rdfs:comment" >A certificate is a Document that is signed.
+    As explained here http://www.pgpi.org/doc/pgpintro/#p16
+    'A digital certificate consists of three things:
+        * A public key.
+        * Certificate information. ('Identity' information about the  
+          user, such as name, user ID, and so on.)
+        * One or more digital signatures.'
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			
   			<tr><th>Sub class of</th>
  <td>  <span rel="rdfs:subClassOf" href="http://xmlns.com/foaf/0.1/Document"><a href="http://xmlns.com/foaf/0.1/Document">foaf:Document</a></span>
  </td></tr><tr><th>Has sub class</th>
- <td>  <a href="#X509Certificate">Certificate</a>
- <a href="#PGPCertificate">PGP Certificate</a>
+ <td>  <a href="#PGPCertificate">cert:PGPCertificate</a>
+ <a href="#X509Certificate">cert:X509Certificate</a>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
   			
   			<p style="float: right; font-size: small;">[<a href="#Certificate">#</a>] <!-- Certificate --> [<a href="#glance">back to top</a>]</p>
   			<br/>
-  			</div><div class="specterm" id="Key" about="http://www.w3.org/ns/auth/cert#Key" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:Key</h4> 
-  			<em property="rdfs:label" >Key</em> - <span property="rdfs:comment" >the class of keys</span> <br /><table style="float: top;">
-  			<tr><th>Status:</th>
-  			<td><span property="vs:term_status" >unstable</span></td></tr>
-  			
-  			<tr><th>Has sub class</th>
- <td>  <a href="#PrivateKey">Private Key</a>
- <a href="#PublicKey">Public Key</a>
- </td></tr><tr><th colspan="2">OWL Class</th>
- <td>  </td></tr>
-  			</table>
-  			
-  			<p style="float: right; font-size: small;">[<a href="#Key">#</a>] <!-- Key --> [<a href="#glance">back to top</a>]</p>
-  			<br/>
   			</div><div class="specterm" id="PGPCertificate" about="http://www.w3.org/ns/auth/cert#PGPCertificate" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:PGPCertificate</h4> 
-  			<em property="rdfs:label" >PGP Certificate</em> - <span property="rdfs:comment" >the class of PGP Certificates</span> <br /><table style="float: top;">
+  			<h4>Class: cert:PGPCertificate</h4> 
+  			<em property="rdfs:label" >PGPCertificate</em> - <span property="rdfs:comment" >the class of PGP Certificates</span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			
   			<tr><th>Sub class of</th>
- <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Certificate"><a href="#Certificate">Certificate</a></span>
+ <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Certificate"><a href="#Certificate">cert:Certificate</a></span>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -205,15 +199,13 @@
   			<p style="float: right; font-size: small;">[<a href="#PGPCertificate">#</a>] <!-- PGPCertificate --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div><div class="specterm" id="PrivateKey" about="http://www.w3.org/ns/auth/cert#PrivateKey" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:PrivateKey</h4> 
-  			<em property="rdfs:label" >Private Key</em> - <span property="rdfs:comment" >Private Key</span> <br /><table style="float: top;">
+  			<h4>Class: cert:PrivateKey</h4> 
+  			<em property="rdfs:label" >PrivateKey</em> - <span property="rdfs:comment" >Private Key</span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
-  			<tr><th>Properties include:</th>
- <td>  <a href="#public_key">public_key</a>
- </td></tr>
+  			
   			<tr><th>Sub class of</th>
- <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Key"><a href="#Key">Key</a></span>
+ <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Key"><a href="http://www.w3.org/ns/auth/cert#Key">cert:Key</a></span>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -221,17 +213,17 @@
   			<p style="float: right; font-size: small;">[<a href="#PrivateKey">#</a>] <!-- PrivateKey --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div><div class="specterm" id="PublicKey" about="http://www.w3.org/ns/auth/cert#PublicKey" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:PublicKey</h4> 
-  			<em property="rdfs:label" >Public Key</em> - <span property="rdfs:comment" >Public Key</span> <br /><table style="float: top;">
+  			<h4>Class: cert:PublicKey</h4> 
+  			<em property="rdfs:label" >PublicKey</em> - <span property="rdfs:comment" >Public Key</span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Properties include:</th>
- <td>  <a href="#identity">identity</a>
+ <td>  <a href="#identity">cert:identity</a>
  </td></tr>
   			<tr><th>Used with:</th>
- <td>  <a href="#public_key">public_key</a>
+ <td>  <a href="#public_key">cert:public_key</a>
 </td></tr> <tr><th>Sub class of</th>
- <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Key"><a href="#Key">Key</a></span>
+ <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Key"><a href="http://www.w3.org/ns/auth/cert#Key">cert:Key</a></span>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -239,7 +231,7 @@
   			<p style="float: right; font-size: small;">[<a href="#PublicKey">#</a>] <!-- PublicKey --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div><div class="specterm" id="Signature" about="http://www.w3.org/ns/auth/cert#Signature" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:Signature</h4> 
+  			<h4>Class: cert:Signature</h4> 
   			<em property="rdfs:label" >Signature</em> - <span property="rdfs:comment" >the class of signtatures</span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
@@ -251,13 +243,13 @@
   			<p style="float: right; font-size: small;">[<a href="#Signature">#</a>] <!-- Signature --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div><div class="specterm" id="X509Certificate" about="http://www.w3.org/ns/auth/cert#X509Certificate" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/cert#:X509Certificate</h4> 
-  			<em property="rdfs:label" >Certificate</em> - <span property="rdfs:comment" >the class of X509 Certificates</span> <br /><table style="float: top;">
+  			<h4>Class: cert:X509Certificate</h4> 
+  			<em property="rdfs:label" >X509Certificate</em> - <span property="rdfs:comment" >the class of X509 Certificates</span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			
   			<tr><th>Sub class of</th>
- <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Certificate"><a href="#Certificate">Certificate</a></span>
+ <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Certificate"><a href="#Certificate">cert:Certificate</a></span>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -268,69 +260,83 @@
 <h3>Properties</h3>
  
 
-<div class="specterm" id="hex" about="http://www.w3.org/ns/auth/cert#hex" typeof="owl:DatatypeProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/cert#:hex</h4> 
-  			<em property="rdfs:label" >hex</em> - <span property="rdfs:comment" >An encoding of a positive integer (from 0 to infinity) as a hexadecimal string that makes it easy to read and/or fun to present on the web. 
-The purpose of this way of representing hexadecimals is to enable users to copy and paste hexadecimal notations as shown by most browsers, keychains or tools such as opensso, into their rdf representation of choice.There are a wide variety of ways in which such strings can be presented. One finds the following e1 dc d5 e1 00 8f 21 5e d5 cc 7c 7e c4 9c ad 86 64 aa dc 29 f2 8d d9 56 7f 31 b6 bd 1b fd b8 ee 51 0d 3c 84 59 a2 45 d2 13 59 2a 14 82 1a 0f 6e d3 d1 4a 2d a9 4c 7e db 90 07 fc f1 8d a3 8e 38 25 21 0a 32 c1 95 31 3c ba 56 cc 17 45 87 e1 eb fd 9f 0f 82 16 67 9f 67 fa 91 e4 0d 55 4e 52 c0 66 64 2f fe 98 8f ae f8 96 21 5e ea 38 9e 5c 4f 27 e2 48 ca ca f2 90 23 ad 99 4b cc 38 32 6d bf Or the same as the above, with ':' instead of spaces. We can't guarantee that these are the only ways such tools will present hexadecimals, so we are very lax. The letters can be uppercase or lowercase, or mixed.
- Some strings may start with initial 00's, and can be stripped in this notation as they often are. Doing this could, in complement of 2 notation turn a positive number into a negative one, if the first hexadecimal character happens to be one ofthe set {'8', '9', 'a', 'A', 'b', 'B', 'c', 'C', 'd', 'D', 'e', 'E', 'f', 'F'} .As we interpret this string as a hexadecimal number leading 00s are not important(Complement of 2 notation and hexadecimal overlap for positive numbers) In order to make this fun, we allow any unicode characters in the string. A parser should 1. remove all non hexadecimal characters
-2. treat the resulting as a hexadecimal representation of a number This will allow people to make an ascii - better yet a UTF-8 - picture of their public key when publishing it on the web.</span> <br /><table style="float: top;">
+<div class="specterm" id="hex" about="http://www.w3.org/ns/auth/cert#hex" typeof="owl:InverseFunctionalProperty">
+  			<h4>Property: cert:hex</h4> 
+  			<em property="rdfs:label" >hexadecimal</em> - <span property="rdfs:comment" >
+   An encoding of a positive integer (from 0 to infinity) as a hexadecimal string that makes it easy to read and/or fun to present on the web. 
+   The purpose of this way of representing hexadecimals is to enable users to copy and paste hexadecimal notations as shown by most browsers, keychains or tools such as opensso, into their rdf representation of choice.  There are a wide variety of ways in which such strings can be presented. One finds the following 
+
+  e1 dc d5 e1 00 8f 21 5e d5 cc 7c 7e c4 9c ad 86 
+  64 aa dc 29 f2 8d d9 56 7f 31 b6 bd 1b fd b8 ee 
+  51 0d 3c 84 59 a2 45 d2 13 59 2a 14 82 1a 0f 6e 
+  d3 d1 4a 2d a9 4c 7e db 90 07 fc f1 8d a3 8e 38 
+  25 21 0a 32 c1 95 31 3c ba 56 cc 17 45 87 e1 eb 
+  fd 9f 0f 82 16 67 9f 67 fa 91 e4 0d 55 4e 52 c0 
+  66 64 2f fe 98 8f ae f8 96 21 5e ea 38 9e 5c 4f 
+  27 e2 48 ca ca f2 90 23 ad 99 4b cc 38 32 6d bf  
+
+ Or the same as the above, with ':' instead of spaces. We can't guarantee that these are the only ways such tools will present hexadecimals, so we are very lax.
+ The letters can be uppercase or lowercase, or mixed.  
+ Some strings may start with initial 00's, and can be stripped in this notation as they often are. Doing this could, in complement of 2 notation turn a positive number into a negative one, if the first hexadecimal character happens to be one of  the set {'8', '9', 'a', 'A', 'b', 'B', 'c', 'C', 'd', 'D', 'e', 'E', 'f', 'F'} .  As we interpret this string as a hexadecimal number leading 00s are not important  (Complement of 2 notation and hexadecimal overlap for positive numbers)
+ In order to make this fun, we allow any unicode characters in the string. A parser should 
+  1. remove all non hexadecimal characters
+  2. treat the resulting as a hexadecimal representation of a number
+ This will allow people to make an ascii - better yet a UTF-8 - picture of their public key when publishing it on the web.
+
+  Cert hex is also a datatype property because we used to write it out like this
+ <pre>
+   [] a rsa:RSAPublicKey;
+     rsa:public_exponent [ cert:hex "e1 dc d5 ..."] 
+ </pre> 
+  The above notation is now deprecated. Now we prefer the literal format below
+ <pre>
+   [] a rsa:RSAPublicKey;
+     rsa:public_exponent "e1 dc d5 ..."^^cert:hex .
+ </pre> 
+ 
+   </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
-  			
-  			<tr><th colspan="2">Datatype Property</th>
- <td>  </td></tr><tr><th colspan="2">Inverse Functional Property</th>
- <td> <span rel="rdf:type" href="http://www.w3.org/2002/07/owl#InverseFunctionalProperty"></span> </td></tr>
+  			<tr><th>Domain:</th>
+ <td>  <span rel="rdfs:domain" href="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"><a href="http://www.w3.org/2001/XMLSchema#nonNegativeInteger">xsd:nonNegativeInteger</a></span>
+ </td></tr>
+  			<tr><th>Range:</th>
+ <td>  <span rel="rdfs:range" href="http://www.w3.org/2001/XMLSchema#string"><a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a></span>
+ </td></tr><tr><th colspan="2">Datatype Property</th>
+ <td> <span rel="rdf:type" href="http://www.w3.org/2002/07/owl#DatatypeProperty"></span> </td></tr><tr><th colspan="2">Inverse Functional Property</th>
+ <td>  </td></tr>
   			</table>
   			
   			<p style="float: right; font-size: small;">[<a href="#hex">#</a>] <!-- hex --> [<a href="#glance">back to top</a>]</p>
   			<br/>
-  			</div><div class="specterm" id="identity" about="http://www.w3.org/ns/auth/cert#identity" typeof="owl:ObjectProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/cert#:identity</h4> 
-  			<em property="rdfs:label" >identity</em> - <span property="rdfs:comment" >the identity of the public key. This is the entity that knows the private key and so can decrypt messages encrypted with the public key, or encrypt messages that can be decrypted with the public key. It can be an Agent, or an idirect identifier of an agent such as a foaf:OnlineAccount .
-Should one specify the range as being the union of those two classes, or should one leave this open?</span> <br /><table style="float: top;">
+  			</div><div class="specterm" id="public_key" about="http://www.w3.org/ns/auth/cert#public_key" typeof="owl:ObjectProperty">
+  			<h4>Property: cert:public_key</h4> 
+  			<em property="rdfs:label" >public_key</em> - <span property="rdfs:comment" >
+      a relation from an agent to a public key for which he alone has 
+      the private key. This public key identifies that agent, allows him
+      to decrypt messages sent to him with that key, and is able to sign
+      messages with it too.
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Domain:</th>
- <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/cert#PublicKey"><a href="#PublicKey">Public Key</a></span>
-</td></tr>
-  			<tr><th colspan="2">Object Property</th>
- <td>  </td></tr>
-  			</table>
-  			
-  			<p style="float: right; font-size: small;">[<a href="#identity">#</a>] <!-- identity --> [<a href="#glance">back to top</a>]</p>
-  			<br/>
-  			</div><div class="specterm" id="int" about="http://www.w3.org/ns/auth/cert#int" typeof="owl:DatatypeProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/cert#:int</h4> 
-  			<em property="rdfs:label" >int</em> - <span property="rdfs:comment" >A positive integer in base 10 notation. xsd:nonNegativeInteger could be used, but is a bit long to write, and may be too strictly defined. 
-This is here to provice a pair with cert:hex, to avoid needing to import a new namespace, and to give a bit more flexibility in the future.</span> <br /><table style="float: top;">
-  			<tr><th>Status:</th>
-  			<td><span property="vs:term_status" >unstable</span></td></tr>
-  			
-  			<tr><th colspan="2">Datatype Property</th>
- <td>  </td></tr>
-  			</table>
-  			
-  			<p style="float: right; font-size: small;">[<a href="#int">#</a>] <!-- int --> [<a href="#glance">back to top</a>]</p>
-  			<br/>
-  			</div><div class="specterm" id="public_key" about="http://www.w3.org/ns/auth/cert#public_key" typeof="owl:ObjectProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/cert#:public_key</h4> 
-  			<em property="rdfs:label" >public key</em> - <span property="rdfs:comment" >relates the private key to the public key component, in a public/private key pair.</span> <br /><table style="float: top;">
-  			<tr><th>Status:</th>
-  			<td><span property="vs:term_status" >unstable</span></td></tr>
-  			<tr><th>Domain:</th>
- <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/cert#PrivateKey"><a href="#PrivateKey">Private Key</a></span>
-</td></tr>
+ <td>  <span rel="rdfs:domain" href="http://xmlns.com/foaf/0.1/Agent"><a href="http://xmlns.com/foaf/0.1/Agent">foaf:Agent</a></span>
+ </td></tr>
   			<tr><th>Range:</th>
- <td> <span rel="rdfs:range" href="http://www.w3.org/ns/auth/cert#PublicKey"><a href="#PublicKey">Public Key</a></span>
-</td>	</tr><tr><th colspan="2">Object Property</th>
+ <td> <span rel="rdfs:range" href="http://www.w3.org/ns/auth/cert#PublicKey"><a href="#PublicKey">cert:PublicKey</a></span>
+</td>	</tr><tr><th>Inverse property of</th>
+ <td>  <span rel="owl:inverseOf" href="http://www.w3.org/ns/auth/cert#identity"><a href="#identity">cert:identity</a></span>
+ </td></tr><tr><th>Has inverse property</th>
+ <td>  <a href="#identity">cert:identity</a>
+ </td></tr><tr><th colspan="2">Object Property</th>
  <td>  </td></tr>
   			</table>
   			
   			<p style="float: right; font-size: small;">[<a href="#public_key">#</a>] <!-- public_key --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div>
-<div class="specterm" id="decimal" about="http://www.w3.org/ns/auth/cert#decimal" typeof="owl:DatatypeProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/cert#:decimal</h4> 
+<div class="specterm" id="decimal" about="http://www.w3.org/ns/auth/cert#decimal" typeof="owl:InverseFunctionalProperty">
+  			<h4>Property: cert:decimal</h4> 
   			<em property="rdfs:label" >decimal</em> - <span property="rdfs:comment" >An encoding of an integer in base 10 notation. Use cert:int instead.</span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >archaic</span></td></tr>
@@ -340,12 +346,34 @@
   			<tr><th>Range:</th>
  <td>  <span rel="rdfs:range" href="http://www.w3.org/2001/XMLSchema#string"><a href="http://www.w3.org/2001/XMLSchema#string">xsd:string</a></span>
  </td></tr><tr><th colspan="2">Datatype Property</th>
- <td>  </td></tr><tr><th colspan="2">Inverse Functional Property</th>
- <td> <span rel="rdf:type" href="http://www.w3.org/2002/07/owl#InverseFunctionalProperty"></span> </td></tr>
+ <td> <span rel="rdf:type" href="http://www.w3.org/2002/07/owl#DatatypeProperty"></span> </td></tr><tr><th colspan="2">Inverse Functional Property</th>
+ <td>  </td></tr>
   			</table>
   			
   			<p style="float: right; font-size: small;">[<a href="#decimal">#</a>] <!-- decimal --> [<a href="#glance">back to top</a>]</p>
   			<br/>
+  			</div><div class="specterm" id="identity" about="http://www.w3.org/ns/auth/cert#identity" typeof="owl:ObjectProperty">
+  			<h4>Property: cert:identity</h4> 
+  			<em property="rdfs:label" >identity</em> - <span property="rdfs:comment" >
+    the identity of the public key. This is the entity that knows the private key and 
+    so can decrypt messages encrypted with the public key, or encrypt messages that can 
+    be decrypted with the public key. 
+    </span> <br /><table style="float: top;">
+  			<tr><th>Status:</th>
+  			<td><span property="vs:term_status" >archaic</span></td></tr>
+  			<tr><th>Domain:</th>
+ <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/cert#PublicKey"><a href="#PublicKey">cert:PublicKey</a></span>
+</td></tr>
+  			<tr><th>Inverse property of</th>
+ <td>  <span rel="owl:inverseOf" href="http://www.w3.org/ns/auth/cert#public_key"><a href="#public_key">cert:public_key</a></span>
+ </td></tr><tr><th>Has inverse property</th>
+ <td>  <a href="#public_key">cert:public_key</a>
+ </td></tr><tr><th colspan="2">Object Property</th>
+ <td>  </td></tr>
+  			</table>
+  			
+  			<p style="float: right; font-size: small;">[<a href="#identity">#</a>] <!-- identity --> [<a href="#glance">back to top</a>]</p>
+  			<br/>
   			</div>
 
 
@@ -353,7 +381,6 @@
 
 
 
-
 </div>
 </div>
 
--- a/ontologies/rdfa/rsa.html	Wed Oct 05 10:31:21 2011 +0200
+++ b/ontologies/rdfa/rsa.html	Mon Oct 10 16:21:00 2011 +0200
@@ -26,17 +26,18 @@
 
 <dl>
 <dt>This version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>, <a href="http://www.w3.org/ns/auth/rsa.rdf">RDF/XML</a>)</dd>
 
 <dt>Latest version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>, <a href="http://www.w3.org/ns/auth/rsa.rdf">RDF/XML</a>)</dd>
 
 <dt>Authors:</dt>
-<dd><a href="http://ii.uwb.edu.pl/~dtomaszuk/">Dominik Tomaszuk</a> (<a href="http://ii.uwb.edu.pl/">University of Bialystok</a>)</dd>
 <dd><a href="http://bblfish.net/">Henry Story</a> </dd>
+
+<dt>Contributors:</dt>
+<dd><a href="http://ii.uwb.edu.pl/~dtomaszuk/">Dominik Tomaszuk</a> (<a href="http://ii.uwb.edu.pl/">University of Bialystok</a>)</dd>
 </dl>
-
-<p class="copyright"><span>Copyright © 2010-2011 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C liability, trademark and document use rules apply.</span></p>
+<p class="copyright"><a rel="license" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2010-2011 <span rel="dcterms:publisher"><span typeof="foaf:Organization"><a rel="foaf:homepage" property="foaf:name" content="World Wide Web Consotrium" href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup></span></span> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
 
 <hr />
 
@@ -159,18 +160,21 @@
  
 
 <div class="specterm" id="RSAKey" about="http://www.w3.org/ns/auth/rsa#RSAKey" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/rsa#:RSAKey</h4> 
-  			<em property="rdfs:label" >RSA Key</em> - <span property="rdfs:comment" >The union of the public and private components of an RSAKey. Usually those pieces are not kept together.</span> <br /><table style="float: top;">
+  			<h4>Class: rsa:RSAKey</h4> 
+  			<em property="rdfs:label" >RSA Key</em> - <span property="rdfs:comment" >
+    The union of the public and private components of an RSAKey.
+    Usually those pieces are not kept together
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Properties include:</th>
- <td>  <a href="#modulus">modulus</a>
+ <td>  <a href="#modulus">rsa:modulus</a>
  </td></tr>
   			<tr><th>Sub class of</th>
  <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#Key"><a href="http://www.w3.org/ns/auth/cert#Key">http://www.w3.org/ns/auth/cert#:Key</a></span>
  </td></tr><tr><th>Has sub class</th>
- <td>  <a href="#RSAPrivateKey">RSA Private Key</a>
- <a href="#RSAPublicKey">RSA Public Key</a>
+ <td>  <a href="#RSAPrivateKey">rsa:RSAPrivateKey</a>
+ <a href="#RSAPublicKey">rsa:RSAPublicKey</a>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -178,16 +182,17 @@
   			<p style="float: right; font-size: small;">[<a href="#RSAKey">#</a>] <!-- RSAKey --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div><div class="specterm" id="RSAPrivateKey" about="http://www.w3.org/ns/auth/rsa#RSAPrivateKey" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/rsa#:RSAPrivateKey</h4> 
-  			<em property="rdfs:label" >RSA Private Key</em> - <span property="rdfs:comment" >A Private Key in the RSA framework</span> <br /><table style="float: top;">
+  			<h4>Class: rsa:RSAPrivateKey</h4> 
+  			<em property="rdfs:label" >RSA Private Key</em> - <span property="rdfs:comment" >
+    A Private Key in the RSA framework 
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Properties include:</th>
- <td>  <a href="#private_exponent">private_exponent</a>
+ <td>  <a href="#private_exponent">rsa:private_exponent</a>
  </td></tr>
   			<tr><th>Sub class of</th>
- <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#PrivateKey"><a href="#PrivateKey">Private Key</a></span>
- <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/rsa#RSAKey"><a href="#RSAKey">RSA Key</a></span>
+ <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/rsa#RSAKey"><a href="#RSAKey">rsa:RSAKey</a></span>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -195,16 +200,18 @@
   			<p style="float: right; font-size: small;">[<a href="#RSAPrivateKey">#</a>] <!-- RSAPrivateKey --> [<a href="#glance">back to top</a>]</p>
   			<br/>
   			</div><div class="specterm" id="RSAPublicKey" about="http://www.w3.org/ns/auth/rsa#RSAPublicKey" typeof="owl:Class">
-  			<h4>Class: http://www.w3.org/ns/auth/rsa#:RSAPublicKey</h4> 
-  			<em property="rdfs:label" >RSA Public Key</em> - <span property="rdfs:comment" >The RSA public key. Padded message m are encrypted by applying the function modulus(power(m,exponent),modulus).</span> <br /><table style="float: top;">
+  			<h4>Class: rsa:RSAPublicKey</h4> 
+  			<em property="rdfs:label" >RSA Public Key</em> - <span property="rdfs:comment" >
+    The RSA public key.  Padded message m are encrypted by applying the function
+      modulus(power(m,exponent),modulus)
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Properties include:</th>
- <td>  <a href="#public_exponent">public_exponent</a>
+ <td>  <a href="#public_exponent">rsa:public_exponent</a>
  </td></tr>
   			<tr><th>Sub class of</th>
- <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/cert#PublicKey"><a href="#PublicKey">Public Key</a></span>
- <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/rsa#RSAKey"><a href="#RSAKey">RSA Key</a></span>
+ <td>  <span rel="rdfs:subClassOf" href="http://www.w3.org/ns/auth/rsa#RSAKey"><a href="#RSAKey">rsa:RSAKey</a></span>
  </td></tr><tr><th colspan="2">OWL Class</th>
  <td>  </td></tr>
   			</table>
@@ -215,49 +222,60 @@
 <h3>Properties</h3>
  
 
-<div class="specterm" id="modulus" about="http://www.w3.org/ns/auth/rsa#modulus" typeof="owl:ObjectProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/rsa#:modulus</h4> 
-  			<em property="rdfs:label" >modulus</em> - <span property="rdfs:comment" >The modulus of an RSA public and private key. This is defined as n = p*q.</span> <br /><table style="float: top;">
+<div class="specterm" id="modulus" about="http://www.w3.org/ns/auth/rsa#modulus" typeof="owl:DatatypeProperty">
+  			<h4>Property: rsa:modulus</h4> 
+  			<em property="rdfs:label" >modulus</em> - <span property="rdfs:comment" >    
+   The modulus of an RSA public and private key. 
+   This is defined as n = p*q
+   </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Domain:</th>
- <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/rsa#RSAKey"><a href="#RSAKey">RSA Key</a></span>
+ <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/rsa#RSAKey"><a href="#RSAKey">rsa:RSAKey</a></span>
 </td></tr>
   			<tr><th>Range:</th>
  <td>  <span rel="rdfs:range" href="http://www.w3.org/ns/auth/cert#int"><a href="http://www.w3.org/ns/auth/cert#int">http://www.w3.org/ns/auth/cert#:int</a></span>
- </td></tr><tr><th colspan="2">Object Property</th>
+ </td></tr><tr><th colspan="2">Datatype Property</th>
  <td>  </td></tr>
   			</table>
   			
   			<p style="float: right; font-size: small;">[<a href="#modulus">#</a>] <!-- modulus --> [<a href="#glance">back to top</a>]</p>
   			<br/>
-  			</div><div class="specterm" id="private_exponent" about="http://www.w3.org/ns/auth/rsa#private_exponent" typeof="owl:ObjectProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/rsa#:private_exponent</h4> 
-  			<em property="rdfs:label" >private exponent</em> - <span property="rdfs:comment" > The exponent used to decrypt the message calculated as public_exponent*private_exponent = 1 modulo totient(p*q). The private exponent is often named 'd'</span> <br /><table style="float: top;">
+  			</div><div class="specterm" id="private_exponent" about="http://www.w3.org/ns/auth/rsa#private_exponent" typeof="owl:DatatypeProperty">
+  			<h4>Property: rsa:private_exponent</h4> 
+  			<em property="rdfs:label" >private</em> - <span property="rdfs:comment" >
+       The exponent used to decrypt the message
+       calculated as 
+          public_exponent*private_exponent = 1 modulo totient(p*q)
+       The private exponent is often named 'd'
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Domain:</th>
- <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/rsa#RSAPrivateKey"><a href="#RSAPrivateKey">RSA Private Key</a></span>
+ <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/rsa#RSAPrivateKey"><a href="#RSAPrivateKey">rsa:RSAPrivateKey</a></span>
 </td></tr>
   			<tr><th>Range:</th>
  <td>  <span rel="rdfs:range" href="http://www.w3.org/ns/auth/cert#int"><a href="http://www.w3.org/ns/auth/cert#int">http://www.w3.org/ns/auth/cert#:int</a></span>
- </td></tr><tr><th colspan="2">Object Property</th>
+ </td></tr><tr><th colspan="2">Datatype Property</th>
  <td>  </td></tr>
   			</table>
   			
   			<p style="float: right; font-size: small;">[<a href="#private_exponent">#</a>] <!-- private_exponent --> [<a href="#glance">back to top</a>]</p>
   			<br/>
-  			</div><div class="specterm" id="public_exponent" about="http://www.w3.org/ns/auth/rsa#public_exponent" typeof="owl:ObjectProperty">
-  			<h4>Property: http://www.w3.org/ns/auth/rsa#:public_exponent</h4> 
-  			<em property="rdfs:label" >public exponent</em> - <span property="rdfs:comment" >The exponent used to encrypt the message. Number chosen between 1 and the totient(p*q). Often named 'e'.</span> <br /><table style="float: top;">
+  			</div><div class="specterm" id="public_exponent" about="http://www.w3.org/ns/auth/rsa#public_exponent" typeof="owl:DatatypeProperty">
+  			<h4>Property: rsa:public_exponent</h4> 
+  			<em property="rdfs:label" >public_exponent</em> - <span property="rdfs:comment" >
+       The exponent used to encrypt the message. Number chosen between
+       1 and the totient(p*q). Often named 'e' .
+    </span> <br /><table style="float: top;">
   			<tr><th>Status:</th>
   			<td><span property="vs:term_status" >unstable</span></td></tr>
   			<tr><th>Domain:</th>
- <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/rsa#RSAPublicKey"><a href="#RSAPublicKey">RSA Public Key</a></span>
+ <td> <span rel="rdfs:domain" href="http://www.w3.org/ns/auth/rsa#RSAPublicKey"><a href="#RSAPublicKey">rsa:RSAPublicKey</a></span>
 </td></tr>
   			<tr><th>Range:</th>
  <td>  <span rel="rdfs:range" href="http://www.w3.org/ns/auth/cert#int"><a href="http://www.w3.org/ns/auth/cert#int">http://www.w3.org/ns/auth/cert#:int</a></span>
- </td></tr><tr><th colspan="2">Object Property</th>
+ </td></tr><tr><th colspan="2">Datatype Property</th>
  <td>  </td></tr>
   			</table>
   			
--- a/ontologies/rdfa/template_cert.html	Wed Oct 05 10:31:21 2011 +0200
+++ b/ontologies/rdfa/template_cert.html	Mon Oct 10 16:21:00 2011 +0200
@@ -26,10 +26,10 @@
 
 <dl>
 <dt>This version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>, <a href="http://www.w3.org/ns/auth/cert.rdf">RDF/XML</a>)</dd>
 
 <dt>Latest version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/cert#">http://www.w3.org/ns/auth/cert#</a> (<a href="http://www.w3.org/ns/auth/cert.n3">N3</a>, <a href="http://www.w3.org/ns/auth/cert.rdf">RDF/XML</a>)</dd>
 
 <dt>Authors:</dt>
 <dd><a href="http://bblfish.net/">Henry Story</a> </dd>
@@ -38,7 +38,7 @@
 <dd><a href="http://ii.uwb.edu.pl/~dtomaszuk/">Dominik Tomaszuk</a> (<a href="http://ii.uwb.edu.pl/">University of Bialystok</a>)</dd>
 </dl>
 
-<p class="copyright"><span>Copyright © 2010-2011 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C liability, trademark and document use rules apply.</span></p>
+<p class="copyright"><a rel="license" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2010-2011 <span rel="dcterms:publisher"><span typeof="foaf:Organization"><a rel="foaf:homepage" property="foaf:name" content="World Wide Web Consotrium" href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup></span></span> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
 
 <hr />
 
@@ -148,6 +148,8 @@
 
 <!-- dirty hack for specgen -->
 <div style="display: none"><span about="http://www.w3.org/ns/auth/cert#PGPCertificate" rel="owl:equivalentClass" href="http://xmlns.com/wot/0.1/PubKey"></span></div>
+<div style="display: none"><span about="http://www.w3.org/ns/auth/cert#hex" rel="owl:equivalentClass" href="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"></span></div>
+<div style="display: none"><span about="http://www.w3.org/ns/auth/cert#int" rel="owl:equivalentClass" href="http://www.w3.org/2001/XMLSchema#nonNegativeInteger"></span></div>
 
 
 <h2 id="sec-ack">Acknowledgments</h2>
--- a/ontologies/rdfa/template_rsa.html	Wed Oct 05 10:31:21 2011 +0200
+++ b/ontologies/rdfa/template_rsa.html	Mon Oct 10 16:21:00 2011 +0200
@@ -26,10 +26,10 @@
 
 <dl>
 <dt>This version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>, <a href="http://www.w3.org/ns/auth/rsa.rdf">RDF/XML</a>)</dd>
 
 <dt>Latest version:</dt>
-<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>)</dd>
+<dd><a href="http://www.w3.org/ns/auth/rsa#">http://www.w3.org/ns/auth/rsa#</a> (<a href="http://www.w3.org/ns/auth/rsa.n3">N3</a>, <a href="http://www.w3.org/ns/auth/rsa.rdf">RDF/XML</a>)</dd>
 
 <dt>Authors:</dt>
 <dd><a href="http://bblfish.net/">Henry Story</a> </dd>
@@ -37,7 +37,7 @@
 <dt>Contributors:</dt>
 <dd><a href="http://ii.uwb.edu.pl/~dtomaszuk/">Dominik Tomaszuk</a> (<a href="http://ii.uwb.edu.pl/">University of Bialystok</a>)</dd>
 </dl>
-<p class="copyright"><span>Copyright © 2010-2011 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C liability, trademark and document use rules apply.</span></p>
+<p class="copyright"><a rel="license" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © 2010-2011 <span rel="dcterms:publisher"><span typeof="foaf:Organization"><a rel="foaf:homepage" property="foaf:name" content="World Wide Web Consotrium" href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a><sup>®</sup></span></span> (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>, <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
 
 <hr />
 
--- a/ontologies/specgen/libvocab.py	Wed Oct 05 10:31:21 2011 +0200
+++ b/ontologies/specgen/libvocab.py	Mon Oct 10 16:21:00 2011 +0200
@@ -265,7 +265,7 @@
 
 
   	def addShortName(self, sn):
-  		self.ns_list[self._uri] = sn
+  		self.ns_list[self.uri] = sn
   		self.shortName = sn
   		#print self.ns_list
 
@@ -551,7 +551,8 @@
   				dom = Term(domain)
   				# danbri hack 20100101
   				#          termStr = """<a href="#term_%s">%s</a>\n""" % (dom.id, label)
-  				termStr = """<a href="#%s">%s</a>\n""" % (dom.id, dom.id)
+  				curie = "%s:%s" % (self.vocab.ns_list[dom.ns], dom.id)
+  				termStr = """<a href="#%s">%s</a>\n""" % (dom.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":
@@ -568,7 +569,8 @@
   				ran = Term(range)
   				#          termStr = """<a href="#term_%s">%s</a>\n""" % (ran.id, label)
   				# danbri hack 20100101 better to use exact IDs here
-  				termStr = """<a href="#%s">%s</a>\n""" % (ran.id, ran.id)
+  				curie = "%s:%s" % (self.vocab.ns_list[ran.ns], ran.id)
+  				termStr = """<a href="#%s">%s</a>\n""" % (ran.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":
@@ -587,7 +589,8 @@
   			contentStr2 = ''
   			for (subclass, label) in relations:
   				sub = Term(subclass)
-  				termStr = """<span rel="rdfs:subClassOf" href="%s"><a href="#%s">%s</a></span>\n""" % (subclass, sub.id, label)
+  				curie = "%s:%s" % (self.vocab.ns_list[sub.ns], sub.id)
+  				termStr = """<span rel="rdfs:subClassOf" href="%s"><a href="#%s">%s</a></span>\n""" % (subclass, sub.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":
@@ -720,7 +723,8 @@
   			contentStr = ''
   			for (subclass, label) in relations:
   				sub = Term(subclass)
-  				termStr = """<a href="#%s">%s</a>\n""" % (sub.id, label)
+  				curie = "%s:%s" % (self.vocab.ns_list[sub.ns], sub.id)
+  				termStr = """<a href="#%s">%s</a>\n""" % (sub.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":
@@ -867,7 +871,8 @@
   			contentStr = ''
   			for (domain, label) in relations:
   				dom = Term(domain)
-  				termStr = """<span rel="rdfs:domain" href="%s"><a href="#%s">%s</a></span>\n""" % (domain, dom.id, label)
+  				curie = "%s:%s" % (self.vocab.ns_list[dom.ns], dom.id)
+  				termStr = """<span rel="rdfs:domain" href="%s"><a href="#%s">%s</a></span>\n""" % (domain, dom.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":
@@ -877,15 +882,10 @@
 
   				relations = g.query(q)
   				for (domain) in relations:
-  					domainnice = self.vocab.niceName(domain)
-  					# print "domain ",domain
-  					# print "domainnice ",domainnice
-  					# check niceName result
-  					# TODO: handle other domain types (owl:Union, ...)
-  					colon = domainnice.find(':')
-  					if colon > 0:
-  						termStr = """<span rel="rdfs:domain" href="%s"><a href="%s">%s</a></span>\n""" % (domain, domain, domainnice)
-  						contentStr = "%s %s" % (contentStr, termStr)
+  					dom = Term(domain)
+  					curie = "%s:%s" % (self.vocab.ns_list[dom.ns], dom.id)
+  					termStr = """<span rel="rdfs:domain" href="%s"><a href="%s">%s</a></span>\n""" % (domain, domain, curie)
+  					contentStr = "%s %s" % (contentStr, termStr)
 
   				if contentStr != "":
   					domainsOfProperty = "%s <td> %s </td></tr>" % (startStr, contentStr)
@@ -898,7 +898,8 @@
   			contentStr = ''
   			for (range, label) in relations2:
   				ran = Term(range)
-  				termStr = """<span rel="rdfs:range" href="%s"><a href="#%s">%s</a></span>\n""" % (range, ran.id, label)
+  				curie = "%s:%s" % (self.vocab.ns_list[ran.ns], ran.id)
+  				termStr = """<span rel="rdfs:range" href="%s"><a href="#%s">%s</a></span>\n""" % (range, ran.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":
@@ -985,7 +986,8 @@
   				# check wether explicite defined inverse property or anonymous defined inverse property
   				if colon > 0:
   					inverse = Term(inverseproperty)
-  					termStr = """<span rel="owl:inverseOf" href="%s"><a href="#%s">%s</a></span>\n""" % (inverseproperty, inverse.id, label)
+  					curie = "%s:%s" % (self.vocab.ns_list[inverse.ns], inverse.id)
+  					termStr = """<span rel="owl:inverseOf" href="%s"><a href="#%s">%s</a></span>\n""" % (inverseproperty, inverse.id, curie)
   					print "inverse property must be explicitly defined"
   				else:
   					q2 = 'SELECT ?ipt WHERE {<%s> <http://www.w3.org/2002/07/owl#inverseOf> ?ip . ?ip rdfs:label ?l . ?ip rdf:type ?ipt } ' % (term.uri)
@@ -1038,7 +1040,8 @@
   			contentStr = ''
   			for (inverseproperty, label) in relations:
   				inverse = Term(inverseproperty)
-  				termStr = """<a href="#%s">%s</a>\n""" % (inverse.id, label)
+  				curie = "%s:%s" % (self.vocab.ns_list[inverse.ns], inverse.id)
+  				termStr = """<a href="#%s">%s</a>\n""" % (inverse.id, curie)
   				contentStr = "%s %s" % (contentStr, termStr)
 
   			if contentStr != "":