Various tidy ups, and AG-update changes (#127)

inrupt · Sep 28, 2021 · d60f943 · d60f943
1 parent 4a33c61
commit d60f943
Show file tree

Hide file tree

Showing 13 changed files with 208 additions and 85 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,12 @@ configuration files contained in this repository.
   fail to describe themselves).
 - Moved the basic test code into a JavaScript-specific sub-directory.
 - Added Schema.org term ('accountId'), and authn token as a JWT term for Inrupt.
+- Fixed 3 occurrences of `vann:preferredNamespaceURI` with `vann:preferredNamespaceUri`!
+- Updated configuration field names from `artifactPrefix` and `artifactSuffix`
+  to `artifactNamePrefix` and `artifactNameSuffix` respectively, to better
+  convey their intent, and to align them better with the `artifactName` field
+  that they both apply to.
+
 
 ## v1.0.1 2021-08-20
 

diff --git a/common-rdf/vocab-common-rdf.yml b/common-rdf/vocab-common-rdf.yml
@@ -18,7 +18,7 @@
 #
 
 artifactName: vocab-common-rdf
-artifactGeneratorVersion: 1.0.1
+artifactGeneratorVersion: 1.0.3
 
 versioning:
   type: git
@@ -40,6 +40,8 @@ artifactToGenerate:
   # it depends on RDF4J or Jena or RDF Commons, etc.).
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: ""
 
     artifactDirectoryName: Java
     sourceFileExtension: java
@@ -84,6 +86,8 @@ artifactToGenerate:
 
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab-rdf4j
 
     artifactDirectoryName: Java
     sourceFileExtension: java
@@ -129,11 +133,12 @@ artifactToGenerate:
 
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: -stringliteral
 
     artifactDirectoryName: Java-StringLiteral
     sourceFileExtension: java
     javaPackageName: com.inrupt.vocab.common.rdf.stringliteral
-    artifactSuffix: -stringliteral
 
     templateInternal: stringLiteral/java/vocab.hbs
 
@@ -174,11 +179,12 @@ artifactToGenerate:
 
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab-rdf4j
 
     artifactDirectoryName: Java-SolidCommonVocab-RDF4J
     sourceFileExtension: java
     javaPackageName: com.inrupt.vocab.common.rdf.rdf4j
-    artifactSuffix: -solidcommonvocab-rdf4j
 
     solidCommonVocabVersion: 0.0.3
     rdf4jVersion: 3.4.2
@@ -211,11 +217,12 @@ artifactToGenerate:
 
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: -commonsrdf-serviceloader
 
     artifactDirectoryName: Java-CommonsRdf-ServiceLoader
     sourceFileExtension: java
     javaPackageName: com.inrupt.vocab.common.rdf.commonsrdf.serviceloader
-    artifactSuffix: -commonsrdf-serviceloader
 
     # This config doesn't use our own vocab library - it uses a specific
     # underlying RDF library instead.
@@ -251,7 +258,9 @@ artifactToGenerate:
   # dependencies (e.g., whether it provides SolidCommonVocab constants or just string
   # literals, or whether it depends on RDF/JS or Jena or RDF Commons, etc.).
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: ""
 
     artifactDirectoryName: TypeScript
     sourceFileExtension: ts
@@ -291,11 +300,12 @@ artifactToGenerate:
   # contain details of the underlying RDF library dependencies (e.g.,
   # whether it depends on RDF/JS or a specific implementation, etc.).
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab
 
     artifactDirectoryName: TypeScript-SolidCommonVocab
     sourceFileExtension: ts
-    artifactSuffix: -solidcommonvocab
 
     solidCommonVocabVersion: "^1.0.0"
     rdfjsTypesVersion: "^1.0.1"
@@ -331,11 +341,12 @@ artifactToGenerate:
 
 
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab-rdfdatafactory
 
     artifactDirectoryName: TypeScript-SolidCommonVocab-RdfDataFactory
     sourceFileExtension: ts
-    artifactSuffix: -solidcommonvocab-rdfdatafactory
 
     solidCommonVocabVersion: "^1.0.0"
     rdfjsTypesVersion: "^1.0.1"
@@ -377,11 +388,13 @@ artifactToGenerate:
 # RDF/JS interface DataFactory type).
 #
 #  - programmingLanguage: TypeScript
-#    artifactVersion: "1.0.1"
+#    artifactVersion: "1.0.2"
+#    artifactNamePrefix: ""
+#    artifactNameSuffix: -base
+#
 #    artifactDirectoryName: TypeScript-Base
 #    templateInternal: rdfLibraryDependent/typescript/rdfjsBase-DataModel/vocab.hbs
 #    sourceFileExtension: ts
-#    artifactSuffix: -base
 #    packaging:
 #      - packagingTool: npm
 #        npmModuleScope: "@inrupt/"
@@ -412,11 +425,12 @@ artifactToGenerate:
 #
 #
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -rdfdatafactory
 
     artifactDirectoryName: TypeScript-RdfDataFactory
     sourceFileExtension: ts
-    artifactSuffix: -rdfdatafactory
 
     rdfjsTypesVersion: "^1.0.1"
     rdfjsImplVersion: "^1.1.0"
@@ -451,11 +465,12 @@ artifactToGenerate:
 
 
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -stringliteral
 
     artifactDirectoryName: TypeScript-StringLiteral
     sourceFileExtension: ts
-    artifactSuffix: -stringliteral
 
     templateInternal: stringLiteral/typescript/vocab.hbs
 

diff --git a/inrupt-rdf/ClientApplication/vocab-inrupt-client-application.yml b/inrupt-rdf/ClientApplication/vocab-inrupt-client-application.yml
@@ -11,7 +11,7 @@
 # list file.
 #
 artifactName: vocab-inrupt-client-application
-artifactGeneratorVersion: 1.0.1
+artifactGeneratorVersion: 1.0.3
 
 versioning:
   type: git
@@ -29,6 +29,8 @@ license:
 artifactToGenerate:
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: ""
 
     artifactDirectoryName: Java
     sourceFileExtension: java
@@ -69,11 +71,12 @@ artifactToGenerate:
   # contain details of the underlying RDF library dependencies (e.g.,
   # whether it depends on RDF/JS or a specific implementation, etc.).
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab
 
     artifactDirectoryName: TypeScript-SolidCommonVocab
     sourceFileExtension: ts
-    artifactSuffix: -solidcommonvocab
 
     solidCommonVocabVersion: "^1.0.0"
     rdfjsTypesVersion: "^1.0.1"
@@ -109,11 +112,12 @@ artifactToGenerate:
 
 
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab-rdfdatafactory
 
     artifactDirectoryName: TypeScript-SolidCommonVocab-RdfDataFactory
     sourceFileExtension: ts
-    artifactSuffix: -solidcommonvocab-rdfdatafactory
 
     solidCommonVocabVersion: "^1.0.0"
     rdfjsTypesVersion: "^1.0.1"

diff --git a/inrupt-rdf/Core/vocab-inrupt-core.yml b/inrupt-rdf/Core/vocab-inrupt-core.yml
@@ -17,7 +17,7 @@
 # list file.
 #
 artifactName: vocab-inrupt-core
-artifactGeneratorVersion: 1.0.1
+artifactGeneratorVersion: 1.0.3
 
 versioning:
   type: git
@@ -39,6 +39,8 @@ artifactToGenerate:
   # it depends on RDF4J or Jena or RDF Commons, etc.).
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: ""
 
     artifactDirectoryName: Java
     sourceFileExtension: java
@@ -83,6 +85,8 @@ artifactToGenerate:
 
   - programmingLanguage: Java
     artifactVersion: 0.8.2-SNAPSHOT
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab-rdf4j
 
     artifactDirectoryName: Java
     sourceFileExtension: java
@@ -123,7 +127,9 @@ artifactToGenerate:
   # dependencies (e.g., whether it provides SolidCommonVocab constants or just string
   # literals, or whether it depends on RDF/JS or Jena or RDF Commons, etc.).
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: ""
 
     artifactDirectoryName: TypeScript
     sourceFileExtension: ts
@@ -163,11 +169,12 @@ artifactToGenerate:
   # contain details of the underlying RDF library dependencies (e.g.,
   # whether it depends on RDF/JS or a specific implementation, etc.).
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab
 
     artifactDirectoryName: TypeScript-SolidCommonVocab
     sourceFileExtension: ts
-    artifactSuffix: -solidcommonvocab
 
     solidCommonVocabVersion: "^1.0.0"
     rdfjsTypesVersion: "^1.0.1"
@@ -203,11 +210,12 @@ artifactToGenerate:
 
 
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -solidcommonvocab-rdfdatafactory
 
     artifactDirectoryName: TypeScript-SolidCommonVocab-RdfDataFactory
     sourceFileExtension: ts
-    artifactSuffix: -solidcommonvocab-rdfdatafactory
 
     solidCommonVocabVersion: "^1.0.0"
     rdfjsTypesVersion: "^1.0.1"
@@ -243,11 +251,12 @@ artifactToGenerate:
 
 
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -rdfdatafactory
 
     artifactDirectoryName: TypeScript-RdfDataFactory
     sourceFileExtension: ts
-    artifactSuffix: -rdfdatafactory
 
     rdfjsTypesVersion: "^1.0.1"
     rdfjsImplVersion: "^1.1.0"
@@ -282,11 +291,12 @@ artifactToGenerate:
 
 
   - programmingLanguage: TypeScript
-    artifactVersion: "1.0.1"
+    artifactVersion: "1.0.2"
+    artifactNamePrefix: ""
+    artifactNameSuffix: -stringliteral
 
     artifactDirectoryName: TypeScript-StringLiteral
     sourceFileExtension: ts
-    artifactSuffix: -stringliteral
 
     templateInternal: stringLiteral/typescript/vocab.hbs
 

diff --git a/inrupt-rdf/Glossary/CopyOfVocab/inrupt-glossary-acronym.ttl b/inrupt-rdf/Glossary/CopyOfVocab/inrupt-glossary-acronym.ttl
@@ -26,7 +26,7 @@ inrupt_glossary_acronym: a owl:Ontology, inrupt_gen:Ontology  ;
      dcterms:creator <https://inrupt.com/profile/card/#us> ;
      dcterms:issued "2021-08-23"^^xsd:date ;
      vann:preferredNamespacePrefix "inrupt_glossary_acronym" ;
-     vann:preferredNamespaceURI <https://inrupt.com/inrupt/vocab/glossary/acronym#> ;
+     vann:preferredNamespaceUri <https://inrupt.com/inrupt/vocab/glossary/acronym#> ;
      cc:attributionURL inrupt_glossary_acronym: ;
      cc:license <https://creativecommons.org/publicdomain/zero/1.0/> .
 

diff --git a/inrupt-rdf/Glossary/CopyOfVocab/inrupt-glossary-ess.ttl b/inrupt-rdf/Glossary/CopyOfVocab/inrupt-glossary-ess.ttl
@@ -22,7 +22,7 @@ inrupt_glossary_ess: a owl:Ontology, inrupt_gen:Ontology  ;
     dcterms:creator <https://inrupt.com/profile/card/#us> ;
     dcterms:issued "2021-08-23"^^xsd:date ;
     vann:preferredNamespacePrefix "inrupt_glossary_ess" ;
-    vann:preferredNamespaceURI <https://inrupt.com/inrupt/vocab/glossary/ess#> ;
+    vann:preferredNamespaceUri <https://inrupt.com/inrupt/vocab/glossary/ess#> ;
     cc:attributionURL inrupt_glossary_ess: ;
     cc:license <https://creativecommons.org/publicdomain/zero/1.0/> .
 

diff --git a/inrupt-rdf/Glossary/CopyOfVocab/inrupt-glossary-solid.ttl b/inrupt-rdf/Glossary/CopyOfVocab/inrupt-glossary-solid.ttl
@@ -43,7 +43,7 @@ inrupt_glossary_solid: a owl:Ontology, inrupt_gen:Ontology  ;
      dcterms:creator <https://inrupt.com/profile/card/#us> ;
      dcterms:issued "2021-08-23"^^xsd:date ;
      vann:preferredNamespacePrefix "inrupt_glossary_solid" ;
-     vann:preferredNamespaceURI <https://inrupt.com/inrupt/vocab/glossary/solid#> ;
+     vann:preferredNamespaceUri <https://inrupt.com/inrupt/vocab/glossary/solid#> ;
      cc:attributionURL inrupt_glossary_solid: ;
      cc:license <https://creativecommons.org/publicdomain/zero/1.0/> .