diff --git a/distribution/examples/message-transformation/transformation-using-javascript/requests.http b/distribution/examples/message-transformation/transformation-using-javascript/requests.http index 796ee72ca..d6333bf9d 100644 --- a/distribution/examples/message-transformation/transformation-using-javascript/requests.http +++ b/distribution/examples/message-transformation/transformation-using-javascript/requests.http @@ -17,7 +17,7 @@ Content-Type: application/json ### -GET localhost:2000/search?limit=10&page=2 +GET http://localhost:2000/search?limit=10&page=2 ### diff --git a/distribution/examples/openapi/validation-simple/requests.http b/distribution/examples/openapi/validation-simple/requests.http index a81e4715d..25128d709 100644 --- a/distribution/examples/openapi/validation-simple/requests.http +++ b/distribution/examples/openapi/validation-simple/requests.http @@ -11,8 +11,7 @@ ### Valid request, should work -POST /persons -Host: localhost:2000 +POST http://localhost:2000/persons Content-Type: application/json { @@ -22,8 +21,7 @@ Content-Type: application/json ### Invalid request, should fail -POST /persons -Host: localhost:2000 +POST http://localhost:2000/persons Content-Type: application/json { diff --git a/distribution/examples/openapi/validation/requests.http b/distribution/examples/openapi/validation/requests.http index d1e546f36..13b5a34fe 100644 --- a/distribution/examples/openapi/validation/requests.http +++ b/distribution/examples/openapi/validation/requests.http @@ -11,20 +11,16 @@ ### Valid request, should work => 200 Ok -GET /demo-api/v2/persons?limit=10 -Host: localhost:2000 +GET http://localhost:2000/demo-api/v2/persons?limit=10 ### Wrong path => 404 Not Found -GET /demo-api/v2/wrong -Host: localhost:2000 +GET http://localhost:2000/demo-api/v2/wrong ### Limit greater than 100 => 400 Bad Request -GET /demo-api/v2/persons?limit=200 -Host: localhost:2000 +GET http://localhost:2000/demo-api/v2/persons?limit=200 ### Valid => 201 Ok -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { @@ -32,8 +28,7 @@ Content-Type: application/json } ### Invalid UUID, email and enum => 400 Bad Request -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2+DDFC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2+DDFC3112CE89D1 Content-Type: application/json { @@ -43,15 +38,13 @@ Content-Type: application/json } ### Wrong Content-Type => 415 Unsupported Mediatype -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/xml Jan ### Required property is missing => 400 Bad Request -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { @@ -59,8 +52,7 @@ Content-Type: application/json } ### Additional property role => 400 Bad Request -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { @@ -69,8 +61,7 @@ Content-Type: application/json } ### Wrong regex pattern => 400 Bad Request -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { @@ -79,8 +70,7 @@ Content-Type: application/json } ### Nested Object => 201 Created -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { @@ -94,8 +84,7 @@ Content-Type: application/json } ### OneOf with wrong string pattern => 400 Bad Request -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { @@ -109,8 +98,7 @@ Content-Type: application/json } ### OneOf with right integer => 201 Created -PUT /demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 -Host: localhost:2000 +PUT http://localhost:2000/demo-api/v2/persons/4077C19D-2C1D-427B-B2DD-FC3112CE89D1 Content-Type: application/json { diff --git a/distribution/examples/security/json-protection/service-proxy.bat b/distribution/examples/security/json-protection/service-proxy.bat index f52742878..1798a43db 100644 --- a/distribution/examples/security/json-protection/service-proxy.bat +++ b/distribution/examples/security/json-protection/service-proxy.bat @@ -1,6 +1,6 @@ @echo off if not "%MEMBRANE_HOME%" == "" goto homeSet -set "MEMBRANE_HOME=%cd%\..\.." +set "MEMBRANE_HOME=%cd%\..\..\.." echo "%MEMBRANE_HOME%" if exist "%MEMBRANE_HOME%\service-proxy.bat" goto homeOk diff --git a/distribution/examples/security/json-protection/service-proxy.sh b/distribution/examples/security/json-protection/service-proxy.sh index 132618c34..2c6c5d0d6 100755 --- a/distribution/examples/security/json-protection/service-proxy.sh +++ b/distribution/examples/security/json-protection/service-proxy.sh @@ -18,9 +18,9 @@ terminate() { homeNotSet() { echo "MEMBRANE_HOME variable is not set" - if [ -f "`pwd`/../../starter.jar" ] + if [ -f "`pwd`/../../../starter.jar" ] then - export MEMBRANE_HOME="`pwd`/../.." + export MEMBRANE_HOME="`pwd`/../../.." homeSet else terminate diff --git a/distribution/router/conf/proxies-full-sample.xml b/distribution/router/conf/proxies-full-sample.xml index 7a2cd3b14..7da16d3da 100644 --- a/distribution/router/conf/proxies-full-sample.xml +++ b/distribution/router/conf/proxies-full-sample.xml @@ -30,16 +30,6 @@ maxDays="30" /> - - - - - - - - - - - + + + + + + + + + + + +