Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion youcat/VERSION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## deployable containers have a semantic and build tag
# semantic version tag: major.minor
# build version tag: timestamp
VER=0.9.7
VER=0.10.0
TAGS="${VER} ${VER}-$(date --utc +"%Y%m%dT%H%M%S")"
unset VER
7 changes: 7 additions & 0 deletions youcat/src/main/webapp/WEB-INF/web.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,15 @@
<display-name>youcat</display-name>
<welcome-file-list>
<welcome-file>index.html</welcome-file>
<welcome-file>index.xhtml</welcome-file>
</welcome-file-list>

<!-- for DALI examples -->
<mime-mapping>
<extension>xhtml</extension>
<mime-type>application/xhtml+xml</mime-type>
</mime-mapping>

<servlet>
<servlet-name>logControl</servlet-name>
<servlet-class>ca.nrc.cadc.log.LogControlServlet</servlet-class>
Expand Down
1 change: 0 additions & 1 deletion youcat/src/main/webapp/capabilities.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
<interface xsi:type="vs:ParamHTTP" role="std" version="1.0">
<accessURL use="full">https://example.net/youcat/logControl</accessURL>
<securityMethod standardID="ivo://ivoa.net/sso#tls-with-certificate"/>
<securityMethod standardID="ivo://ivoa.net/sso#token"/>
</interface>
</capability>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://w3.org">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CAOM Query Examples</title>
<title>Query Examples</title>
</head>
<body>
<div vocab="http://www.ivoa.net/rdf/examples#">
Expand Down
4 changes: 3 additions & 1 deletion youcat/src/main/webapp/openapi-base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ servers:

tags:
- name: TAP Query
- name: DALI Examples
- name: VOSI Capabilities
- name: VOSI Table Metadata

Expand All @@ -38,4 +39,5 @@ paths:
/tables/{name}:
$ref: ./openapi/vosi/vosi-table-11.yaml


/examples:
$ref: ./openapi/dali/dali-examples.yaml
3 changes: 3 additions & 0 deletions youcat/src/main/webapp/openapi-youcat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ servers:

tags:
- name: TAP Query
- name: DALI Examples
- name: VOSI Capabilities
- name: VOSI Table Metadata
- name: VOSI Table Operations
Expand Down Expand Up @@ -83,3 +84,5 @@ paths:
/permissions/{name}:
$ref: ./openapi/youcat-permissions.yaml

/examples:
$ref: ./openapi/dali/dali-examples.yaml
73 changes: 73 additions & 0 deletions youcat/src/main/webapp/openapi/dali/dali-examples.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
head:
operationId: probe-examples
tags:
- DALI Examples
summary: DALI Examples
description: |
Get standard headers for the resource.
responses:
'200':
$ref: ../vosi/vosi-std-responses.yaml#/authenticated
'401':
$ref: ../vosi/vosi-std-responses.yaml#/not-authenticated
'403':
$ref: ../vosi/vosi-std-responses.yaml#/permission-denied
'404':
$ref: ../vosi/vosi-std-responses.yaml#/not-found
get:
operationId: read-examples
tags:
- DALI Examples
summary: DALI Examples
description: |
Get a browser- and machine-readable document with examples showing
how to use this service
responses:
'200':
$ref: '#/components/schemas/examples'
'401':
$ref: ../vosi/vosi-std-responses.yaml#/not-authenticated
'403':
$ref: ../vosi/vosi-std-responses.yaml#/permission-denied
'404':
$ref: ../vosi/vosi-std-responses.yaml#/not-found

components:
schemas:
examples:
description: A DALI examples document
content:
application/xhtml+xml:
schema:
type: object
xml:
name: html
namespace: |
http://www.w3.org/1999/xhtml
http://schema.org
example: |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.1//EN" "http://w3.org">
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:schema="http://schema.org"
xml:lang="en" lang="en">
<head>
<title>Examples</title>
</head>
<body>
<div vocab="http://www.ivoa.net/rdf/examples#">
<div id="x" resource="#x" typeof="example">
<h2 property="name">Example X</h2>
<p>
standardID: <span property="capability">ivo://ivoa.net/std/TAP</span>
</p>
<div property="generic-parameter" typeof="keyval">
<span property="key">MAXREC</span>=<span property="value">100</span>
</div>
<div property="generic-parameter" typeof="keyval">
<span property="key">QUERY</span>=<pre property="value">
SELECT * from tap_schema.tables
</pre>
</div>
</div>
</div>
</body>
</html>
Loading