diff --git a/Dockerfile b/Dockerfile index 4465c72b..88340a20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN mvn -Pstandalone clean install ### Deploy Web-Client webapp on Tomcat -FROM tomcat:9.0.59-jdk17-openjdk +FROM tomcat:10.1.4-jdk17 WORKDIR $CATALINA_HOME/webapps diff --git a/README.md b/README.md index d8c0ad5d..738670fc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ AtomGraph Web-Client is a Linked Data web client. If you have a triplestore with and/or build an end-user application on it, or would like to explore Linked Open Data, Web-Client provides the components you need. Web-Client renders (X)HTML user interface by transforming ["plain" RDF/XML](https://jena.apache.org/documentation/io/rdf-output.html#rdfxml) (without nested resource descriptions) -using [XSLT 2.0](https://www.w3.org/TR/xslt20/) stylesheets. +using [XSLT 3.0](https://www.w3.org/TR/xslt30/) stylesheets. ![AtomGraph Web-Client screenshot](https://raw.github.com/AtomGraph/Web-Client/master/screenshot.png) @@ -13,7 +13,7 @@ What AWC provides for users as out-of-the-box generic features: * loading RDF data from remote Linked Data sources * multilingual, responsive user interface built with Twitter Bootstrap (currently [2.3.2](https://getbootstrap.com/2.3.2/)) * multiple RDF rendering modes (currently item/list/table/map) -* RDF editing mode based on [RDF/POST](http://www.lsrn.org/semweb/rdfpost.html) encoding +* RDF editing mode based on [RDF/POST](https://atomgraph.github.io/RDF-POST/) encoding * SPARQL endpoint with interactive results Getting started diff --git a/pom.xml b/pom.xml index 866aa0b9..b3a0ddef 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.atomgraph client - 3.1.49-SNAPSHOT + 4.2.8-SNAPSHOT ${packaging.type} AtomGraph Web-Client @@ -46,8 +46,14 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + central-portal-snapshots + https://central.sonatype.com/repository/maven-snapshots/ + + false + + + true + apache-repo-releases @@ -79,13 +85,13 @@ junit junit - 4.13.1 + 4.13.2 test net.sf.saxon Saxon-HE - 11.1.1 + 11.4 @@ -106,32 +112,13 @@ jakarta.servlet jakarta.servlet-api - 4.0.3 + 5.0.0 provided - - ${project.groupId} - twirl - 1.0.30 - - - - org.glassfish - jakarta.json - - - ${project.groupId} core - 3.1.14 - - - - org.glassfish - jakarta.json - - + 4.0.10 - - - Title - A name given to the resource. - - Typically, a Title will be a name by which the resource is - formally known. - - - - - - - - Creator - An entity primarily responsible for making the content - of the resource. - Examples of a Creator include a person, an organisation, - or a service. Typically, the name of a Creator should - be used to indicate the entity. - - - - - - - Subject and Keywords - The topic of the content of the resource. - Typically, a Subject will be expressed as keywords, - key phrases or classification codes that describe a topic - of the resource. Recommended best practice is to select - a value from a controlled vocabulary or formal - classification scheme. - - - - - - - Description - An account of the content of the resource. - Description may include but is not limited to: an abstract, - table of contents, reference to a graphical representation - of content or a free-text account of the content. - - - - - - - Publisher - An entity responsible for making the resource available - Examples of a Publisher include a person, an organisation, - or a service. - Typically, the name of a Publisher should be used to - indicate the entity. - - - - - - - Contributor - An entity responsible for making contributions to the - content of the resource. - Examples of a Contributor include a person, an - organisation, or a service. Typically, the name of a - Contributor should be used to indicate the entity. - - - - - - - Date - A date associated with an event in the life cycle of the - resource. - Typically, Date will be associated with the creation or - availability of the resource. Recommended best practice - for encoding the date value is defined in a profile of - ISO 8601 [W3CDTF] and follows the YYYY-MM-DD format. - - - - - - - Resource Type - The nature or genre of the content of the resource. - Type includes terms describing general categories, functions, - genres, or aggregation levels for content. Recommended best - practice is to select a value from a controlled vocabulary - (for example, the DCMI Type Vocabulary [DCMITYPE]). To - describe the physical or digital manifestation of the - resource, use the Format element. - - - - - - - Format - The physical or digital manifestation of the resource. - Typically, Format may include the media-type or dimensions of - the resource. Format may be used to determine the software, - hardware or other equipment needed to display or operate the - resource. Examples of dimensions include size and duration. - Recommended best practice is to select a value from a - controlled vocabulary (for example, the list of Internet Media - Types [MIME] defining computer media formats). - - - - - - - Resource Identifier - An unambiguous reference to the resource within a given context. - Recommended best practice is to identify the resource by means - of a string or number conforming to a formal identification - system. - Example formal identification systems include the Uniform - Resource Identifier (URI) (including the Uniform Resource - Locator (URL)), the Digital Object Identifier (DOI) and the - International Standard Book Number (ISBN). - - - - - - - Source - A reference to a resource from which the present resource - is derived. - The present resource may be derived from the Source resource - in whole or in part. Recommended best practice is to reference - the resource by means of a string or number conforming to a - formal identification system. - - - - - - - Language - A language of the intellectual content of the resource. - Recommended best practice is to use RFC 3066 [RFC3066], - which, in conjunction with ISO 639 [ISO639], defines two- - and three-letter primary language tags with optional - subtags. Examples include "en" or "eng" for English, - "akk" for Akkadian, and "en-GB" for English used in the - United Kingdom. - - - - - - - Relation - A reference to a related resource. - - Recommended best practice is to reference the resource by means - of a string or number conforming to a formal identification - system. - - - - - - - - Coverage - The extent or scope of the content of the resource. - Coverage will typically include spatial location (a place name - or geographic coordinates), temporal period (a period label, - date, or date range) or jurisdiction (such as a named - administrative entity). - Recommended best practice is to select a value from a - controlled vocabulary (for example, the Thesaurus of Geographic - Names [TGN]) and that, where appropriate, named places or time - periods be used in preference to numeric identifiers such as - sets of coordinates or date ranges. - - - - - - - Rights Management - Information about rights held in and over the resource. - - Typically, a Rights element will contain a rights - management statement for the resource, or reference - a service providing such information. Rights information - often encompasses Intellectual Property Rights (IPR), - Copyright, and various Property Rights. - If the Rights element is absent, no assumptions can be made - about the status of these and other rights with respect to - the resource. - - - - \ No newline at end of file diff --git a/src/main/resources/prefix-mapping.n3 b/src/main/resources/prefix-mapping.n3 index 8b2f23a5..7da27a8a 100644 --- a/src/main/resources/prefix-mapping.n3 +++ b/src/main/resources/prefix-mapping.n3 @@ -16,13 +16,11 @@ [ lm:name "http://www.w3.org/2011/http-statusCodes#" ; lm:altName "com/atomgraph/client/http-statusCodes.rdf" ] , [ lm:name "https://www.w3.org/ns/ldt#" ; lm:altName "com/atomgraph/client/ldt.ttl" ] , [ lm:name "https://www.w3.org/ns/ldt/core#" ; lm:altName "com/atomgraph/client/c.ttl" ] , - [ lm:name "https://www.w3.org/ns/ldt/document-hierarchy#" ; lm:altName "com/atomgraph/client/dh.ttl" ] , [ lm:name "http://www.w3.org/ns/sparql-service-description#" ; lm:altName "com/atomgraph/client/sparql-service.owl" ] , [ lm:name "http://purl.org/dc/elements/1.1/" ; lm:altName "com/atomgraph/client/dcelements.rdf" ] , [ lm:name "http://purl.org/dc/terms/" ; lm:altName "com/atomgraph/client/dcterms.rdf" ] , [ lm:name "http://purl.org/goodrelations/v1#" ; lm:altName "com/atomgraph/client/goodrelations.owl" ] , [ lm:name "http://xmlns.com/foaf/0.1/" ; lm:altName "com/atomgraph/client/foaf.owl" ] , - [ lm:name "http://dbpedia.org/ontology/" ; lm:altName "com/atomgraph/client/dbpedia-owl.owl" ] , [ lm:name "http://graph.facebook.com/schema/user#" ; lm:altName "com/atomgraph/client/gfb-user.owl" ] , [ lm:name "http://usefulinc.com/ns/doap#" ; lm:altName "com/atomgraph/client/doap.owl" ] , @@ -40,13 +38,11 @@ [ lm:prefix "http://www.w3.org/2011/http-statusCodes" ; lm:altName "com/atomgraph/client/http-statusCodes.rdf" ] , [ lm:prefix "https://www.w3.org/ns/ldt" ; lm:altName "com/atomgraph/client/ldt.ttl" ] , [ lm:prefix "https://www.w3.org/ns/ldt/core" ; lm:altName "com/atomgraph/client/c.ttl" ] , - [ lm:prefix "https://www.w3.org/ns/ldt/document-hierarchy" ; lm:altName "com/atomgraph/client/dh.ttl" ] , [ lm:prefix "http://www.w3.org/ns/sparql-service-description" ; lm:altName "com/atomgraph/client/sparql-service.owl" ] , [ lm:prefix "http://purl.org/dc/elements/1.1/" ; lm:altName "com/atomgraph/client/dcelements.rdf" ] , [ lm:prefix "http://purl.org/dc/terms/" ; lm:altName "com/atomgraph/client/dcterms.rdf" ] , [ lm:prefix "http://purl.org/goodrelations/v1" ; lm:altName "com/atomgraph/client/goodrelations.owl" ] , [ lm:prefix "http://xmlns.com/foaf/0.1/" ; lm:altName "com/atomgraph/client/foaf.owl" ] , - [ lm:prefix "http://dbpedia.org/ontology/" ; lm:altName "com/atomgraph/client/dbpedia-owl.owl" ] , [ lm:prefix "http://graph.facebook.com/schema/user" ; lm:altName "com/atomgraph/client/gfb-user.owl" ] , [ lm:prefix "http://usefulinc.com/ns/doap" ; lm:altName "com/atomgraph/client/doap.owl" ] . \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 8c5f0d6b..2c41f952 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,9 @@ - + AtomGraph Client Generic Linked Data client diff --git a/src/main/webapp/static/com/atomgraph/client/xsl/bootstrap/2.3.2/container.xsl b/src/main/webapp/static/com/atomgraph/client/xsl/bootstrap/2.3.2/container.xsl index 64ffee76..f89940a4 100644 --- a/src/main/webapp/static/com/atomgraph/client/xsl/bootstrap/2.3.2/container.xsl +++ b/src/main/webapp/static/com/atomgraph/client/xsl/bootstrap/2.3.2/container.xsl @@ -21,7 +21,8 @@ limitations under the License. ]> - - + - + @@ -206,15 +207,15 @@ exclude-result-prefixes="#all"> - - + + -
+
@@ -321,11 +333,11 @@ exclude-result-prefixes="#all"> - +
- + @@ -353,16 +365,20 @@ exclude-result-prefixes="#all"> - + + + + + - +
-
+