Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated README and add endpoint for HiPS layer requests. #234

Merged
merged 1 commit into from
Jan 17, 2024
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
1 change: 0 additions & 1 deletion caom2-search-server/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
.gradle
docker
build
README.md
4 changes: 4 additions & 0 deletions caom2-search-server/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## January 16, 2024
### 2.15.3
* Add LOTSS HiPS image survey to AladinLite Sky Viewer.

## February 23, 2022
### 2.13.8
* Add JWST in the Data Train order
Expand Down
56 changes: 56 additions & 0 deletions caom2-search-server/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# CAOM-2 Search interface Library v2.15.3


This is the User Interface to perform complicated searches to a running
[TAP](http://www.ivoa.net/documents/TAP/) web service.

## Building

Simply run `gradle clean build`

To have a constructed JAR file in the `build/libs` directory that can
be used to create a WAR to then be run in a Java Servlet Container.

See the Properties File section below for properties to set, although it
is very recommended to leave them as their defaults.

## Deployment options

### Properties File

Location: `config/org.opencadc.search.properties`

Example content:
```
# The TAP Service ID to resolve.
org.opencadc.search.tap-service-id = ivo://cadc.nrc.ca/argus

# The endpoint for this application.
# org.opencadc.search.app-service-endpoint = /search

# Whether to show the ObsCore tab
# org.opencadc.search.obs-core = true

# Max row count for results
# org.opencadc.search.max-row-count = 10000
```

## Running

### In a Servlet Container


Simply drop the WAR into a Java Servlet Container, then point a browser
to: http://localhost:8080/search/

To bring up the form. By default, this will connect to the [CADC TAP
service](http://www.cadc-ccda.hia-iha.nrc-cnrc.gc.ca/tap), but can be
configured with the `org.opencadc.search.tap-service-id` system
property like so:

```
-Dca.nrc.cadc.reg.client.RegistryClient.host=%YOUR HOST% -Dorg.opencadc.search.tap-service-id=ivo://%YOUR DOMAIN%/tap-service
```

Where `%YOUR HOST%` is the location of a running TAP web service, and
the service id is made up of your Organization's service URI policy.
69 changes: 0 additions & 69 deletions caom2-search-server/README.rst

This file was deleted.

6 changes: 3 additions & 3 deletions caom2-search-server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ repositories {
dependencies {
implementation 'com.opencsv:opencsv:[5.1,6.0)'
implementation 'org.jdom:jdom2:2.0.6'
implementation 'org.json:json:20211205'
implementation 'org.json:json:20231013'
implementation 'org.opencadc:cadc-registry:[1.5.6,2.0)'
implementation 'org.opencadc:cadc-rest:[1.2.13,1.3)'
implementation 'org.opencadc:caom2-search-lib:[2.5.1,2.6.0)'
Expand Down Expand Up @@ -41,7 +41,7 @@ dependencies {

apply from: '../opencadc.gradle'

def git_url = 'https://github.com/opencadc/caom2ui'
def git_url = 'https://github.com/opencadc/caom2ui.git'

version = '2.15.1'
version = '2.15.3'
description = 'OpenCADC CAOM-2 search server library'
19 changes: 0 additions & 19 deletions caom2-search-server/examples/default/Dockerfile

This file was deleted.

49 changes: 0 additions & 49 deletions caom2-search-server/examples/default/build.gradle

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading