From 39ecbc47ab073f0e236fda3c5407fa90727ebc2a Mon Sep 17 00:00:00 2001 From: sbader Date: Sat, 4 Apr 2020 18:12:39 +0200 Subject: [PATCH 1/4] IDSA home repository has moved from https://github.com/IndustrialDataSpace/InformationModel/ to https://github.com/International-Data-Spaces-Association/InformationModel/ Update of JSON-LD context URL to 3.0.0 (3.1.0 respectively for dev-context) --- idsa/.htaccess | 32 ++++++++++++++++---------------- idsa/README.md | 20 ++++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/idsa/.htaccess b/idsa/.htaccess index 9d30bb3dd..dfcdac705 100644 --- a/idsa/.htaccess +++ b/idsa/.htaccess @@ -18,40 +18,40 @@ RewriteCond %{HTTP_ACCEPT} text/html [OR] RewriteCond %{HTTP_ACCEPT} application/xhtml\+xml [OR] RewriteCond %{HTTP_ACCEPT} text/\* [OR] RewriteCond %{HTTP_ACCEPT} \*/\* -RewriteRule ^(core|code)/?$ https://industrialdataspace.github.io/InformationModel/ [R=303] +RewriteRule ^(core|code)/?$ https://international-data-spaces-association.github.io/InformationModel/ [R=303] # TURTLE RewriteCond %{HTTP_ACCEPT} ^.*text/turtle.* -RewriteRule ^(core|code)(/|#)* https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.ttl [R=303] -RewriteRule ^(core|code).ttl https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.ttl [R=303] +RewriteRule ^(core|code)(/|#)* https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.ttl [R=303] +RewriteRule ^(core|code).ttl https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.ttl [R=303] # RDF/XML RewriteCond %{HTTP_ACCEPT} ^.*application/rdf\+xml.* [OR] RewriteCond %{HTTP_ACCEPT} ^.*application/xml.* [OR] RewriteCond %{HTTP_ACCEPT} ^.*text/xml.* -RewriteRule ^(core|code)(/|#)*(.*) https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.xml [R=303] -RewriteRule ^(core|code).rdf https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.xml [R=303] -RewriteRule ^(core|code).xml https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.xml [R=303] +RewriteRule ^(core|code)(/|#)*(.*) https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.xml [R=303] +RewriteRule ^(core|code).rdf https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.xml [R=303] +RewriteRule ^(core|code).xml https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.xml [R=303] # JSON-LD RewriteCond %{HTTP_ACCEPT} ^.*application/ld\+json.* [OR] RewriteCond %{HTTP_ACCEPT} ^.*application/json.* -RewriteRule ^(core|code)(/|#)*(.*) https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.json [R=303] -RewriteRule ^(core|code).json https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.json [R=303] -RewriteRule ^(core|code).jsonld https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.json [R=303] +RewriteRule ^(core|code)(/|#)*(.*) https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.json [R=303] +RewriteRule ^(core|code).json https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.json [R=303] +RewriteRule ^(core|code).jsonld https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.json [R=303] # N-TRIPLES RewriteCond %{HTTP_ACCEPT} ^.*application/n-triples.* -RewriteRule ^(core|code)(/|#)* https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.nt [R=303] -RewriteRule ^(core|code).nt https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.nt [R=303] +RewriteRule ^(core|code)(/|#)* https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.nt [R=303] +RewriteRule ^(core|code).nt https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.nt [R=303] # context.json(ld) -RewriteRule ^contexts/context.json$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/2.0.1/context.jsonld [R=303] -RewriteRule ^contexts/context.jsonld$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/2.0.1/context.jsonld [R=303] -RewriteRule ^contexts/context-dev.json$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/2.0.1/context.jsonld [R=303] -RewriteRule ^contexts/context-dev.jsonld$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/2.0.1/context.jsonld [R=303] +RewriteRule ^contexts/context.json$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.0.0/context.jsonld [R=303] +RewriteRule ^contexts/context.jsonld$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.0.0/context.jsonld [R=303] +RewriteRule ^contexts/context-dev.json$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.1.0/context.jsonld [R=303] +RewriteRule ^contexts/context-dev.jsonld$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.1.0/context.jsonld [R=303] RewriteRule ^contexts/([0-9][.][0-9][.][0-9])/context.json$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/$1/context.jsonld [R=303] RewriteRule ^contexts/([0-9][.][0-9][.][0-9])/context.jsonld$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/$1/context.jsonld [R=303] # -RewriteRule ^(core|code)/(.+) https://industrialdataspace.github.io/InformationModel/docs/index.html#/$2 [R=303,NE] \ No newline at end of file +RewriteRule ^(core|code)/(.+) https://international-data-spaces-association.github.io/InformationModel/docs/index.html#/$2 [R=303,NE] \ No newline at end of file diff --git a/idsa/README.md b/idsa/README.md index 8fa1a18bb..119cb6af9 100644 --- a/idsa/README.md +++ b/idsa/README.md @@ -6,18 +6,18 @@ Homepage: Redirections: * https://w3id.org/idsa --> https://www.internationaldataspaces.org/ -* https://w3id.org/idsa/core, https://w3id.org/idsa/code --> https://industrialdataspace.github.io/InformationModel/ -* https://w3id.org/idsa/core, https://w3id.org/idsa/code with "Accept: text/turtle" --> https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.ttl -* https://w3id.org/idsa/core.ttl, https://w3id.org/idsa/code.ttl --> https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology.ttl -* https://w3id.org/idsa/core[.rdf|.xml|.json|.nt], https://w3id.org/idsa/code[.rdf|.xml|.json|.nt] --> https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology[.rdf|.xml|.json|.nt] -* https://w3id.org/idsa/core, https://w3id.org/idsa/code with "Accept: application/[rdf+xml|xml|json|ld+json|n-triples]" or "Accept: text/xml" --> https://industrialdataspace.github.io/InformationModel/docs/serializations/ontology[.rdf|.xml|.json|.nt] -* https://w3id.org/idsa/contexts/context.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/2.0.1/context.jsonld +* https://w3id.org/idsa/core, https://w3id.org/idsa/code --> https://International-Data-Spaces-Association.github.io/InformationModel/ +* https://w3id.org/idsa/core, https://w3id.org/idsa/code with "Accept: text/turtle" --> https://International-Data-Spaces-Association.github.io/InformationModel/docs/serializations/ontology.ttl +* https://w3id.org/idsa/core.ttl, https://w3id.org/idsa/code.ttl --> https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology.ttl +* https://w3id.org/idsa/core[.rdf|.xml|.json|.nt], https://w3id.org/idsa/code[.rdf|.xml|.json|.nt] --> https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology[.rdf|.xml|.json|.nt] +* https://w3id.org/idsa/core, https://w3id.org/idsa/code with "Accept: application/[rdf+xml|xml|json|ld+json|n-triples]" or "Accept: text/xml" --> https://international-data-spaces-association.github.io/InformationModel/docs/serializations/ontology[.rdf|.xml|.json|.nt] +* https://w3id.org/idsa/contexts/context.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.0.0/context.jsonld * https://w3id.org/idsa/contexts/[a.b.c]/context.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/[a.b.c]/context.jsonld -* https://w3id.org/idsa/contexts/context-dev.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/2.1.0/context.jsonld +* https://w3id.org/idsa/contexts/context-dev.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.1.0/context.jsonld Support: -* [Information Model GitHub Repository](https://github.com/IndustrialDataSpace/InformationModel) +* [Information Model GitHub Repository](https://github.com/International-Data-Spaces-Association/InformationModel) Contacts: -* Christoph LANGE -* Sebastian Bader +* [Christoph Lange](https://github.com/clange/) +* [Sebastian Bader](https://github.com/sebbader) From e93a8b5c47d7dc48c5d293edce9c09e748d43df4 Mon Sep 17 00:00:00 2001 From: sbader Date: Mon, 6 Apr 2020 16:14:59 +0200 Subject: [PATCH 2/4] adding redirect to Message Docu --- idsa/.htaccess | 5 ++++- idsa/README.md | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/idsa/.htaccess b/idsa/.htaccess index dfcdac705..a12fc12af 100644 --- a/idsa/.htaccess +++ b/idsa/.htaccess @@ -54,4 +54,7 @@ RewriteRule ^contexts/([0-9][.][0-9][.][0-9])/context.json$ https://jira.iais.fr RewriteRule ^contexts/([0-9][.][0-9][.][0-9])/context.jsonld$ https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/$1/context.jsonld [R=303] # -RewriteRule ^(core|code)/(.+) https://international-data-spaces-association.github.io/InformationModel/docs/index.html#/$2 [R=303,NE] \ No newline at end of file +RewriteRule ^(core|code)/(.+) https://international-data-spaces-association.github.io/InformationModel/docs/index.html#/$2 [R=303,NE] + +# IDS Messages Table +RewriteRule ^(ids-messages)?$ http://htmlpreview.github.io/?https://github.com/International-Data-Spaces-Association/InformationModel/blob/feature/message_taxonomy_description/model/communication/Message_Description.htm [R=303] \ No newline at end of file diff --git a/idsa/README.md b/idsa/README.md index 119cb6af9..f42ffc27d 100644 --- a/idsa/README.md +++ b/idsa/README.md @@ -14,6 +14,7 @@ Redirections: * https://w3id.org/idsa/contexts/context.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.0.0/context.jsonld * https://w3id.org/idsa/contexts/[a.b.c]/context.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/[a.b.c]/context.jsonld * https://w3id.org/idsa/contexts/context-dev.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.1.0/context.jsonld +* https://w3id.org/idsa/ids-messages --> http://htmlpreview.github.io/?https://github.com/International-Data-Spaces-Association/InformationModel/blob/feature/message_taxonomy_description/model/communication/Message_Description.htm Support: * [Information Model GitHub Repository](https://github.com/International-Data-Spaces-Association/InformationModel) From 7ab2c35cbddc6ce6a225690cc9fdc65cc6dab0e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20B=C3=B6ckmann?= Date: Wed, 8 Apr 2020 14:00:08 +0200 Subject: [PATCH 3/4] Add "shacl" redirect Add a stable link to shacl shapes. Note that these refer to the develop branch. Should we change that to master? Would be more stable, but harder to update. --- idsa/.htaccess | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/idsa/.htaccess b/idsa/.htaccess index a12fc12af..60ff4a47e 100644 --- a/idsa/.htaccess +++ b/idsa/.htaccess @@ -55,6 +55,7 @@ RewriteRule ^contexts/([0-9][.][0-9][.][0-9])/context.jsonld$ https://jira.iais. # RewriteRule ^(core|code)/(.+) https://international-data-spaces-association.github.io/InformationModel/docs/index.html#/$2 [R=303,NE] +RewriteRule ^shacl/(.+) https://raw.githubusercontent.com/International-Data-Spaces-Association/InformationModel/develop/testing/$2 [R=303,NE] # IDS Messages Table -RewriteRule ^(ids-messages)?$ http://htmlpreview.github.io/?https://github.com/International-Data-Spaces-Association/InformationModel/blob/feature/message_taxonomy_description/model/communication/Message_Description.htm [R=303] \ No newline at end of file +RewriteRule ^(ids-messages)?$ http://htmlpreview.github.io/?https://github.com/International-Data-Spaces-Association/InformationModel/blob/feature/message_taxonomy_description/model/communication/Message_Description.htm [R=303] From 09ee8d2361148f4459446efdb721d43c378afdf0 Mon Sep 17 00:00:00 2001 From: sbader Date: Thu, 9 Apr 2020 14:49:16 +0200 Subject: [PATCH 4/4] adding redirects for SHACL Shapes at /idsa/shacl/* --- idsa/.htaccess | 2 +- idsa/README.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/idsa/.htaccess b/idsa/.htaccess index 60ff4a47e..c37127d2a 100644 --- a/idsa/.htaccess +++ b/idsa/.htaccess @@ -55,7 +55,7 @@ RewriteRule ^contexts/([0-9][.][0-9][.][0-9])/context.jsonld$ https://jira.iais. # RewriteRule ^(core|code)/(.+) https://international-data-spaces-association.github.io/InformationModel/docs/index.html#/$2 [R=303,NE] -RewriteRule ^shacl/(.+) https://raw.githubusercontent.com/International-Data-Spaces-Association/InformationModel/develop/testing/$2 [R=303,NE] +RewriteRule ^shacl/(.+) https://raw.githubusercontent.com/International-Data-Spaces-Association/InformationModel/develop/testing/$1 [R=303,NE] # IDS Messages Table RewriteRule ^(ids-messages)?$ http://htmlpreview.github.io/?https://github.com/International-Data-Spaces-Association/InformationModel/blob/feature/message_taxonomy_description/model/communication/Message_Description.htm [R=303] diff --git a/idsa/README.md b/idsa/README.md index f42ffc27d..60218a3e5 100644 --- a/idsa/README.md +++ b/idsa/README.md @@ -15,6 +15,7 @@ Redirections: * https://w3id.org/idsa/contexts/[a.b.c]/context.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/[a.b.c]/context.jsonld * https://w3id.org/idsa/contexts/context-dev.[jsonld|json] --> https://jira.iais.fraunhofer.de/stash/projects/ICTSL/repos/ids-infomodel-commons/raw/jsonld-context/3.1.0/context.jsonld * https://w3id.org/idsa/ids-messages --> http://htmlpreview.github.io/?https://github.com/International-Data-Spaces-Association/InformationModel/blob/feature/message_taxonomy_description/model/communication/Message_Description.htm +* https://w3id.org/idsa/shacl/* --> https://raw.githubusercontent.com/International-Data-Spaces-Association/InformationModel/develop/testing/* Support: * [Information Model GitHub Repository](https://github.com/International-Data-Spaces-Association/InformationModel)