Merge pull request #234 from opencadc/lotss-hips

Updated README and add endpoint for HiPS layer requests.

caom2-search-server/.gitignore

@@ -2,4 +2,3 @@
 .gradle
 docker
 build
-README.md

caom2-search-server/CHANGELOG.md

@@ -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

caom2-search-server/README.md

@@ -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.

caom2-search-server/build.gradle

@@ -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)'
@@ -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'