Skip to content

Commit

Permalink
Updates for passing etsp10 tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Koushikey4596 committed Jul 23, 2023
1 parent 7ea0953 commit 0807dea
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 11 deletions.
12 changes: 10 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ services:
- ./docker/oas.cfg:/usr/lib/cgi-bin/oas.cfg
- ./docker/default.conf:/etc/apache2/sites-available/000-default.conf
# Uncomment below to expose a process named org.n52.javaps.test.EchoProcess
#- ./zoo-project/zoo-services/echo-py/cgi-env:/usr/lib/cgi-bin/org/n52/javaps/test
- ./zoo-project/zoo-services/echo-py/cgi-env:/usr/lib/cgi-bin/org/n52/javaps/test
- ./zoo-project/zoo-services/echo-py/cgi-env/echo_service.py:/usr/lib/cgi-bin/echo_service.py
- ./zoo-project/zoo-services/echo-py/cgi-env/echo.zcfg:/usr/lib/cgi-bin/echo.zcfg
- ./zoo-project/zoo-services/utils/open-api/server/publish.py:/usr/lib/cgi-bin/publish.py
Expand All @@ -38,7 +38,7 @@ services:
- ./docker/mapserver.conf:/mapserver/etc/mapserver.conf
- ./docker/com:/usr/com/zoo-project
# Uncomment below to expose a process named org.n52.javaps.test.EchoProcess
#- ./zoo-project/zoo-services/echo-py/cgi-env:/usr/lib/cgi-bin/org/n52/javaps/test
- ./zoo-project/zoo-services/echo-py/cgi-env:/usr/lib/cgi-bin/org/n52/javaps/test
- ./zoo-project/zoo-services/echo-py/cgi-env/echo_service.py:/usr/lib/cgi-bin/echo_service.py
- ./zoo-project/zoo-services/echo-py/cgi-env/echo.zcfg:/usr/lib/cgi-bin/echo.zcfg
depends_on:
Expand Down Expand Up @@ -91,3 +91,11 @@ services:
image: rabbitmq:3.8.9-management-alpine
volumes:
- ./docker/definitions.json:/etc/rabbitmq/definitions.json
teamengine:
image: zooproject/ets-ogcapi-processes10:latest
volumes:
- ./docker/ets-ogcapi-processes/test-run-props.xml:/root/test-run-props.xml
- ./docker/ets-ogcapi-processes/src1/ets-ogcapi-processes10/src/main/config/teamengine/config.xml:/root/teamengine/config.xml
- ./docker/ets-ogcapi-processes/test.sh:/root/test.sh
ports:
- "8080:8080"
8 changes: 4 additions & 4 deletions docker/main.cfg
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[main]
encoding = utf-8
version = 1.0.0
serverAddress = http://localhost/cgi-bin/zoo_loader.cgi
serverAddress = http://zookernel/cgi-bin/zoo_loader.cgi
language = en-US
lang = fr-FR,en-CA,en-US
tmpPath=/tmp/zTmp/
tmpUrl = http://localhost/temp/
tmpUrl = http://zookernel/temp/
dataPath = /usr/com/zoo-project
cacheDir = /tmp/zTmp/
templatesPath = /var/www/
mapserverAddress = http://localhost/cgi-bin/mapserv
mapserverAddress = http://zookernel/cgi-bin/mapserv
msOgcVersion=1.0.0
cors=true
memory=protect
Expand Down Expand Up @@ -47,7 +47,7 @@ type=PG
schema=public

[security]
hosts=http://localhost
hosts=http://zookernel
attributes=Accept-Language

[env]
Expand Down
10 changes: 5 additions & 5 deletions docker/oas.cfg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[openapi]
use_content=false
rootUrl=http://localhost/ogc-api
rootHost=http://localhost
rootUrl=http://zookernel/ogc-api
rootHost=http://zookernel
rootPath=ogc-api
links=/,/api,/conformance,/processes,/jobs
paths=/root,/api,/conformance,/processes,/processes/{processID},/processes/SAGA.shapes_points.12/execution,/processes/OTB.BandMath/execution,/processes/{processID}/execution,/jobs,/jobs/{jobID},/jobs/{jobID}/results
Expand All @@ -12,12 +12,12 @@ license_name=OGC license
license_url=https://raw.githubusercontent.com/opengeospatial/ogcapi-processes/master/LICENSE
full_html_support=false
partial_html_support=true
wsUrl=ws://localhost:8888/
wsUrl=ws://zookernel:8888/
publisherUrl=http://zookernel/cgi-bin/publish.py?jobid=
link_href=http://zoo-project.org/dl/link.json
tags=Home,API,Conformance,GetCapabilities,ProcessDescription,ExecuteEndpoint,JobList,GetStatus,GetResult,Dismiss
examplesPath=/var/www/html/examples/
examplesUrl=http://localhost/examples/
examplesUrl=http://zookernel/examples/
exceptionsUrl=http://www.opengis.net/def/exceptions/ogcapi-processes-1/1.0
sensure_type_validation=true
sensure_type_validation_but_ets=true
Expand Down Expand Up @@ -85,7 +85,7 @@ rel=service-doc
type=text/html

[api.html]
href=http://localhost/swagger-ui/oapip/
href=http://zookernel/swagger-ui/oapip/

[api]
method=get
Expand Down

0 comments on commit 0807dea

Please sign in to comment.