From e5f7898d8776d7af23eb1a7b6a22eb191b7daee1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6rdes?= Date: Thu, 9 Jan 2025 15:57:48 +0100 Subject: [PATCH] restructured (ExampleTests not adjusted) --- distribution/examples/README.md | 38 +++++++++--------- .../custom-interceptor/README.md | 0 .../{ => internal}/custom-interceptor/pom.xml | 0 .../custom-interceptor/proxies.xml | 0 .../custom-interceptor}/service-proxy.bat | 0 .../custom-interceptor}/service-proxy.sh | 0 .../main/java/com/predic8/MyInterceptor.java | 0 .../{ => operation}/opentelemetry/README.md | 2 +- .../{ => operation}/opentelemetry/proxies.xml | 0 .../opentelemetry/resources/otel_example.png | Bin .../opentelemetry/resources/otel_sample.png | Bin .../opentelemetry/service-proxy.bat | 0 .../opentelemetry}/service-proxy.sh | 0 .../{ => operation}/prometheus/Dockerfile | 0 .../{ => operation}/prometheus/README.md | 0 .../prometheus/docker-compose.yml | 0 .../provisioning/datasources/datasource.yml | 0 .../prometheus/prometheus-grafana-example.png | Bin .../prometheus/prometheus/prometheus.yml | 0 .../{ => operation}/prometheus/proxies.xml | 0 .../examples/{ => routing}/cbr/README.md | 0 .../examples/{ => routing}/cbr/express.xml | 0 .../examples/{ => routing}/cbr/import.xml | 0 .../examples/{ => routing}/cbr/order.xml | 0 .../examples/{ => routing}/cbr/proxies.xml | 0 .../cbr}/service-proxy.bat | 0 .../{ => routing}/cbr/service-proxy.sh | 0 .../{ => routing}/shadowing/README.md | 0 .../{ => routing}/shadowing/proxies.xml | 0 .../shadowing}/service-proxy.bat | 0 .../shadowing}/service-proxy.sh | 0 .../examples/{ => scripting}/groovy/README.md | 0 .../{ => scripting}/groovy/order.json | 0 .../{ => scripting}/groovy/proxies.xml | 0 .../groovy}/service-proxy.bat | 0 .../{ => scripting}/groovy/service-proxy.sh | 0 .../{ => scripting}/javascript/README.md | 0 .../{ => scripting}/javascript/order.json | 0 .../{ => scripting}/javascript/proxies.xml | 0 .../{ => scripting}/javascript/requests.http | 0 .../javascript}/service-proxy.bat | 0 .../javascript/service-proxy.sh | 0 .../examples/{ => scripting}/spel/README.md | 0 .../examples/{ => scripting}/spel/proxies.xml | 0 .../spel}/service-proxy.bat | 0 .../spel}/service-proxy.sh | 0 distribution/examples/security/README.md | 0 .../examples/{ => security}/acl/README.md | 0 .../examples/{ => security}/acl/acl.xml | 0 .../examples/{ => security}/acl/proxies.xml | 0 .../{login => security/acl}/service-proxy.bat | 0 .../acl}/service-proxy.sh | 0 .../examples/{ => security}/login/README.md | 0 .../{ => security}/login/dialog/index.html | 0 .../{ => security}/login/dialog/main.css | 0 .../examples/{ => security}/login/proxies.xml | 0 .../login}/service-proxy.bat | 0 .../login}/service-proxy.sh | 0 .../examples/{ => security}/ntlm/README.md | 0 .../examples/{ => security}/ntlm/proxies.xml | 0 .../ntlm}/service-proxy.bat | 0 .../{ => security}/ntlm/service-proxy.sh | 0 .../examples/{ => security}/oauth2/README.md | 0 .../oauth2/api/OAuth2TrustedClient.java | 0 .../{ => security}/oauth2/api/README.md | 0 .../api/authorization_server/proxies.xml | 0 .../authorization_server/service-proxy.bat | 0 .../api/authorization_server/service-proxy.sh | 0 .../{ => security}/oauth2/api/client.bat | 0 .../{ => security}/oauth2/api/client.ps1 | 0 .../{ => security}/oauth2/api/client.sh | 0 .../api/oauth2-password-flow-for-apis.png | Bin .../{ => security}/oauth2/api/rest.http | 0 .../oauth2/api/token_validator/proxies.xml | 0 .../api/token_validator/service-proxy.bat | 0 .../api/token_validator/service-proxy.sh | 0 .../oauth2/azure-ad-with-jwts/README.md | 12 +++--- .../azure-ad-with-jwts/images/00-overview.png | Bin .../images/01-backend-registration.png | Bin .../images/03-client-registration.png | Bin .../images/04-client-secret-creation.png | Bin .../images/05-client-permission-granting.png | Bin .../images/06-client-permission-granting2.png | Bin .../images/07-client-permission-granting3.png | Bin .../oauth2/azure-ad-with-jwts/proxies.xml | 0 .../azure-ad-with-jwts}/service-proxy.bat | 0 .../azure-ad-with-jwts}/service-proxy.sh | 0 .../credentials/OAuth2TrustedClient.java | 0 .../oauth2/credentials/README.md | 0 .../authorization_server/proxies.xml | 0 .../authorization_server/service-proxy.bat | 0 .../authorization_server/service-proxy.sh | 0 .../oauth2/credentials/client.ps1 | 0 .../oauth2/credentials/client.sh | 0 .../credentials/token_validator/proxies.xml | 0 .../token_validator/service-proxy.bat | 0 .../token_validator/service-proxy.sh | 0 .../{ => security}/oauth2/github/README.md | 0 .../oauth2/github/dialog/index.html | 0 .../oauth2/github/dialog/main.css | 0 .../{ => security}/oauth2/github/proxies.xml | 0 .../oauth2/github/proxiesSSL.xml | 0 .../oauth2/github}/service-proxy.bat | 0 .../oauth2/github}/service-proxy.sh | 0 .../oauth2/github/service-proxySSL.bat | 0 .../oauth2/github/service-proxySSL.sh | 0 .../{ => security}/oauth2/google/README.md | 0 .../oauth2/google/dialog/index.html | 0 .../oauth2/google/dialog/main.css | 0 .../{ => security}/oauth2/google/proxies.xml | 0 .../oauth2/google/proxiesSSL.xml | 0 .../oauth2/google}/service-proxy.bat | 0 .../oauth2/google}/service-proxy.sh | 0 .../oauth2/google/service-proxySSL.bat | 0 .../oauth2/google/service-proxySSL.sh | 0 .../oauth2/implicit/JavaScriptClient.html | 0 .../{ => security}/oauth2/implicit/README.md | 0 .../authorization_server/consentFile.json | 0 .../logindialog/index.html | 0 .../authorization_server/logindialog/main.css | 0 .../implicit/authorization_server/proxies.xml | 0 .../authorization_server/service-proxy.bat | 0 .../authorization_server/service-proxy.sh | 0 .../oauth2/implicit/webserver/proxies.xml | 0 .../implicit/webserver/service-proxy.bat | 0 .../implicit/webserver/service-proxy.sh | 0 .../{ => security}/oauth2/membrane/README.md | 0 .../authorization_server/consentFile.json | 0 .../logindialog/index.html | 0 .../authorization_server/logindialog/main.css | 0 .../membrane/authorization_server/proxies.xml | 0 .../authorization_server/service-proxy.bat | 0 .../authorization_server/service-proxy.sh | 0 .../oauth2/membrane/client/proxies.xml | 0 .../oauth2/membrane/client/service-proxy.bat | 0 .../oauth2/membrane/client/service-proxy.sh | 0 .../{ => security}/oauth2/openid/README.md | 0 .../{ => security}/oauth2/openid/proxies.xml | 0 .../oauth2/openid}/service-proxy.bat | 0 .../oauth2/openid}/service-proxy.sh | 0 .../{ => security}/rateLimiter/README.md | 0 .../{ => security}/rateLimiter/proxies.xml | 32 +++++++-------- .../rateLimiter}/service-proxy.bat | 0 .../rateLimiter/service-proxy.sh | 0 .../examples/{ => security}/ssl/README.md | 0 .../ssl/api-with-tls-pem/README.md | 0 .../ssl/api-with-tls-pem/membrane-key.pem | 0 .../ssl/api-with-tls-pem/membrane.pem | 0 .../ssl/api-with-tls-pem/proxies.xml | 0 .../ssl/api-with-tls-pem}/service-proxy.bat | 0 .../ssl/api-with-tls-pem}/service-proxy.sh | 0 .../ssl/api-with-tls-pkcs12/README.md | 0 .../ssl/api-with-tls-pkcs12/proxies.xml | 0 .../api-with-tls-pkcs12}/service-proxy.bat | 0 .../ssl/api-with-tls-pkcs12}/service-proxy.sh | 0 .../{ => security}/ssl/to-backend/README.md | 0 .../{ => security}/ssl/to-backend/proxies.xml | 0 .../ssl/to-backend}/service-proxy.bat | 0 .../ssl/to-backend}/service-proxy.sh | 0 .../soap/add-soap-header/README.md | 0 .../soap/add-soap-header/pom.xml | 0 .../soap/add-soap-header/proxies.xml | 0 .../soap/add-soap-header}/service-proxy.bat | 0 .../soap/add-soap-header}/service-proxy.sh | 0 .../soap-message-without-header.xml | 0 .../com/predic8/AddSoapHeaderInterceptor.java | 0 .../soap/sample-soap-service/README.md | 0 .../soap/sample-soap-service/proxies.xml | 0 .../soap/sample-soap-service/request.xml | 0 .../soap/sample-soap-service/requests.http | 0 .../sample-soap-service}/service-proxy.bat | 0 .../sample-soap-service}/service-proxy.sh | 0 .../soap/secured-wsdl/proxies.xml | 0 .../custom-websocket-interceptor/README.md | 0 .../embedded/README.md | 0 .../embedded/pom.xml | 0 .../predic8/application/MyApplication.java | 0 .../custom/MyWebSocketLogInterceptor.java | 0 .../embedded/src/main/resources/log4j2.xml | 0 .../embedded/start.bat | 0 .../embedded/start.sh | 0 .../standalone/README.md | 0 .../standalone/compile-and-copy.bat | 0 .../standalone/compile-and-copy.sh | 0 .../standalone/pom.xml | 0 .../standalone/proxies.xml | 0 .../standalone}/service-proxy.bat | 0 .../standalone}/service-proxy.sh | 0 .../custom/MyWebSocketLogInterceptor.java | 0 .../README.md | 0 .../index.html | 0 .../jquery.min.js | 0 .../proxies.xml | 0 .../service-proxy.bat | 0 .../service-proxy.sh | 0 .../stomp.js | 0 .../websocket-intercepting/README.md | 0 .../websocket-intercepting/index.js | 0 .../websocket-intercepting/package.json | 0 .../websocket-intercepting/proxies.xml | 0 .../websocket-intercepting}/service-proxy.bat | 0 .../websocket-intercepting/service-proxy.sh | 0 .../websocket-intercepting/startWebsocket.bat | 0 .../websocket-intercepting/startWebsocket.sh | 0 .../websocket-stomp/README.md | 0 .../websocket-stomp/index.html | 0 .../websocket-stomp/jquery.min.js | 0 .../websocket-stomp/proxies.xml | 0 .../websocket-stomp}/service-proxy.bat | 0 .../websocket-stomp/service-proxy.sh | 0 .../websocket-stomp/stomp.js | 0 .../{ => xml}/basic-xml-interceptor/README.md | 0 .../basic-xml-interceptor/example.xml | 0 .../{ => xml}/basic-xml-interceptor/pom.xml | 0 .../basic-xml-interceptor/proxies.xml | 0 .../basic-xml-interceptor}/service-proxy.bat | 0 .../basic-xml-interceptor}/service-proxy.sh | 0 .../java/com/predic8/BasicXmlInterceptor.java | 0 .../{ => xml}/stax-interceptor/README.md | 0 .../{ => xml}/stax-interceptor/pom.xml | 0 .../{ => xml}/stax-interceptor/proxies.xml | 0 .../{ => xml}/stax-interceptor/request.xml | 0 .../stax-interceptor}/service-proxy.bat | 0 .../stax-interceptor/service-proxy.sh | 0 .../com/predic8/StaxConverterInterceptor.java | 0 .../examples/{ => xml}/xslt/README.md | 0 .../examples/{ => xml}/xslt/proxies.xml | 0 .../examples/{ => xml}/xslt/reformat.xsl | 0 .../xslt}/service-proxy.bat | 34 ++++++++-------- .../examples/{ => xml}/xslt/service-proxy.sh | 0 230 files changed, 59 insertions(+), 59 deletions(-) rename distribution/examples/{ => internal}/custom-interceptor/README.md (100%) rename distribution/examples/{ => internal}/custom-interceptor/pom.xml (100%) rename distribution/examples/{ => internal}/custom-interceptor/proxies.xml (100%) rename distribution/examples/{acl => internal/custom-interceptor}/service-proxy.bat (100%) rename distribution/examples/{acl => internal/custom-interceptor}/service-proxy.sh (100%) mode change 100644 => 100755 rename distribution/examples/{ => internal}/custom-interceptor/src/main/java/com/predic8/MyInterceptor.java (100%) rename distribution/examples/{ => operation}/opentelemetry/README.md (98%) rename distribution/examples/{ => operation}/opentelemetry/proxies.xml (100%) rename distribution/examples/{ => operation}/opentelemetry/resources/otel_example.png (100%) rename distribution/examples/{ => operation}/opentelemetry/resources/otel_sample.png (100%) rename distribution/examples/{ => operation}/opentelemetry/service-proxy.bat (100%) rename distribution/examples/{basic-xml-interceptor => operation/opentelemetry}/service-proxy.sh (100%) rename distribution/examples/{ => operation}/prometheus/Dockerfile (100%) rename distribution/examples/{ => operation}/prometheus/README.md (100%) rename distribution/examples/{ => operation}/prometheus/docker-compose.yml (100%) rename distribution/examples/{ => operation}/prometheus/grafana/provisioning/datasources/datasource.yml (100%) rename distribution/examples/{ => operation}/prometheus/prometheus-grafana-example.png (100%) rename distribution/examples/{ => operation}/prometheus/prometheus/prometheus.yml (100%) rename distribution/examples/{ => operation}/prometheus/proxies.xml (100%) rename distribution/examples/{ => routing}/cbr/README.md (100%) rename distribution/examples/{ => routing}/cbr/express.xml (100%) rename distribution/examples/{ => routing}/cbr/import.xml (100%) rename distribution/examples/{ => routing}/cbr/order.xml (100%) rename distribution/examples/{ => routing}/cbr/proxies.xml (100%) rename distribution/examples/{basic-xml-interceptor => routing/cbr}/service-proxy.bat (100%) rename distribution/examples/{ => routing}/cbr/service-proxy.sh (100%) rename distribution/examples/{ => routing}/shadowing/README.md (100%) rename distribution/examples/{ => routing}/shadowing/proxies.xml (100%) rename distribution/examples/{cbr => routing/shadowing}/service-proxy.bat (100%) rename distribution/examples/{custom-interceptor => routing/shadowing}/service-proxy.sh (100%) mode change 100755 => 100644 rename distribution/examples/{ => scripting}/groovy/README.md (100%) rename distribution/examples/{ => scripting}/groovy/order.json (100%) rename distribution/examples/{ => scripting}/groovy/proxies.xml (100%) rename distribution/examples/{custom-interceptor => scripting/groovy}/service-proxy.bat (100%) rename distribution/examples/{ => scripting}/groovy/service-proxy.sh (100%) rename distribution/examples/{ => scripting}/javascript/README.md (100%) rename distribution/examples/{ => scripting}/javascript/order.json (100%) rename distribution/examples/{ => scripting}/javascript/proxies.xml (100%) rename distribution/examples/{ => scripting}/javascript/requests.http (100%) rename distribution/examples/{groovy => scripting/javascript}/service-proxy.bat (100%) rename distribution/examples/{ => scripting}/javascript/service-proxy.sh (100%) rename distribution/examples/{ => scripting}/spel/README.md (100%) rename distribution/examples/{ => scripting}/spel/proxies.xml (100%) rename distribution/examples/{javascript => scripting/spel}/service-proxy.bat (100%) rename distribution/examples/{login => scripting/spel}/service-proxy.sh (100%) delete mode 100644 distribution/examples/security/README.md rename distribution/examples/{ => security}/acl/README.md (100%) rename distribution/examples/{ => security}/acl/acl.xml (100%) rename distribution/examples/{ => security}/acl/proxies.xml (100%) rename distribution/examples/{login => security/acl}/service-proxy.bat (100%) rename distribution/examples/{opentelemetry => security/acl}/service-proxy.sh (100%) mode change 100755 => 100644 rename distribution/examples/{ => security}/login/README.md (100%) rename distribution/examples/{ => security}/login/dialog/index.html (100%) rename distribution/examples/{ => security}/login/dialog/main.css (100%) rename distribution/examples/{ => security}/login/proxies.xml (100%) rename distribution/examples/{ntlm => security/login}/service-proxy.bat (100%) rename distribution/examples/{shadowing => security/login}/service-proxy.sh (100%) rename distribution/examples/{ => security}/ntlm/README.md (100%) rename distribution/examples/{ => security}/ntlm/proxies.xml (100%) rename distribution/examples/{shadowing => security/ntlm}/service-proxy.bat (100%) rename distribution/examples/{ => security}/ntlm/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/README.md (100%) rename distribution/examples/{ => security}/oauth2/api/OAuth2TrustedClient.java (100%) rename distribution/examples/{ => security}/oauth2/api/README.md (100%) rename distribution/examples/{ => security}/oauth2/api/authorization_server/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/api/authorization_server/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/api/authorization_server/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/api/client.bat (100%) rename distribution/examples/{ => security}/oauth2/api/client.ps1 (100%) rename distribution/examples/{ => security}/oauth2/api/client.sh (100%) rename distribution/examples/{ => security}/oauth2/api/oauth2-password-flow-for-apis.png (100%) rename distribution/examples/{ => security}/oauth2/api/rest.http (100%) rename distribution/examples/{ => security}/oauth2/api/token_validator/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/api/token_validator/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/api/token_validator/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/README.md (93%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/00-overview.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/01-backend-registration.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/03-client-registration.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png (100%) rename distribution/examples/{ => security}/oauth2/azure-ad-with-jwts/proxies.xml (100%) rename distribution/examples/{custom-websocket-interceptor/standalone => security/oauth2/azure-ad-with-jwts}/service-proxy.bat (100%) rename distribution/examples/{custom-websocket-interceptor/standalone => security/oauth2/azure-ad-with-jwts}/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/credentials/OAuth2TrustedClient.java (100%) rename distribution/examples/{ => security}/oauth2/credentials/README.md (100%) rename distribution/examples/{ => security}/oauth2/credentials/authorization_server/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/credentials/authorization_server/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/credentials/authorization_server/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/credentials/client.ps1 (100%) rename distribution/examples/{ => security}/oauth2/credentials/client.sh (100%) rename distribution/examples/{ => security}/oauth2/credentials/token_validator/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/credentials/token_validator/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/credentials/token_validator/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/github/README.md (100%) rename distribution/examples/{ => security}/oauth2/github/dialog/index.html (100%) rename distribution/examples/{ => security}/oauth2/github/dialog/main.css (100%) rename distribution/examples/{ => security}/oauth2/github/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/github/proxiesSSL.xml (100%) rename distribution/examples/{oauth2/azure-ad-with-jwts => security/oauth2/github}/service-proxy.bat (100%) rename distribution/examples/{oauth2/azure-ad-with-jwts => security/oauth2/github}/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/github/service-proxySSL.bat (100%) rename distribution/examples/{ => security}/oauth2/github/service-proxySSL.sh (100%) rename distribution/examples/{ => security}/oauth2/google/README.md (100%) rename distribution/examples/{ => security}/oauth2/google/dialog/index.html (100%) rename distribution/examples/{ => security}/oauth2/google/dialog/main.css (100%) rename distribution/examples/{ => security}/oauth2/google/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/google/proxiesSSL.xml (100%) rename distribution/examples/{oauth2/github => security/oauth2/google}/service-proxy.bat (100%) rename distribution/examples/{oauth2/github => security/oauth2/google}/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/google/service-proxySSL.bat (100%) rename distribution/examples/{ => security}/oauth2/google/service-proxySSL.sh (100%) rename distribution/examples/{ => security}/oauth2/implicit/JavaScriptClient.html (100%) rename distribution/examples/{ => security}/oauth2/implicit/README.md (100%) rename distribution/examples/{ => security}/oauth2/implicit/authorization_server/consentFile.json (100%) rename distribution/examples/{ => security}/oauth2/implicit/authorization_server/logindialog/index.html (100%) rename distribution/examples/{ => security}/oauth2/implicit/authorization_server/logindialog/main.css (100%) rename distribution/examples/{ => security}/oauth2/implicit/authorization_server/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/implicit/authorization_server/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/implicit/authorization_server/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/implicit/webserver/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/implicit/webserver/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/implicit/webserver/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/membrane/README.md (100%) rename distribution/examples/{ => security}/oauth2/membrane/authorization_server/consentFile.json (100%) rename distribution/examples/{ => security}/oauth2/membrane/authorization_server/logindialog/index.html (100%) rename distribution/examples/{ => security}/oauth2/membrane/authorization_server/logindialog/main.css (100%) rename distribution/examples/{ => security}/oauth2/membrane/authorization_server/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/membrane/authorization_server/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/membrane/authorization_server/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/membrane/client/proxies.xml (100%) rename distribution/examples/{ => security}/oauth2/membrane/client/service-proxy.bat (100%) rename distribution/examples/{ => security}/oauth2/membrane/client/service-proxy.sh (100%) rename distribution/examples/{ => security}/oauth2/openid/README.md (100%) rename distribution/examples/{ => security}/oauth2/openid/proxies.xml (100%) rename distribution/examples/{oauth2/google => security/oauth2/openid}/service-proxy.bat (100%) rename distribution/examples/{oauth2/google => security/oauth2/openid}/service-proxy.sh (100%) rename distribution/examples/{ => security}/rateLimiter/README.md (100%) rename distribution/examples/{ => security}/rateLimiter/proxies.xml (97%) rename distribution/examples/{spel => security/rateLimiter}/service-proxy.bat (100%) rename distribution/examples/{ => security}/rateLimiter/service-proxy.sh (100%) rename distribution/examples/{ => security}/ssl/README.md (100%) rename distribution/examples/{ => security}/ssl/api-with-tls-pem/README.md (100%) rename distribution/examples/{ => security}/ssl/api-with-tls-pem/membrane-key.pem (100%) rename distribution/examples/{ => security}/ssl/api-with-tls-pem/membrane.pem (100%) rename distribution/examples/{ => security}/ssl/api-with-tls-pem/proxies.xml (100%) rename distribution/examples/{oauth2/openid => security/ssl/api-with-tls-pem}/service-proxy.bat (100%) rename distribution/examples/{oauth2/openid => security/ssl/api-with-tls-pem}/service-proxy.sh (100%) rename distribution/examples/{ => security}/ssl/api-with-tls-pkcs12/README.md (100%) rename distribution/examples/{ => security}/ssl/api-with-tls-pkcs12/proxies.xml (100%) rename distribution/examples/{soap/add-soap-header => security/ssl/api-with-tls-pkcs12}/service-proxy.bat (100%) rename distribution/examples/{soap/add-soap-header => security/ssl/api-with-tls-pkcs12}/service-proxy.sh (100%) mode change 100755 => 100644 rename distribution/examples/{ => security}/ssl/to-backend/README.md (100%) rename distribution/examples/{ => security}/ssl/to-backend/proxies.xml (100%) rename distribution/examples/{soap/sample-soap-service => security/ssl/to-backend}/service-proxy.bat (100%) rename distribution/examples/{soap/sample-soap-service => security/ssl/to-backend}/service-proxy.sh (100%) mode change 100755 => 100644 rename distribution/examples/{ => web-services}/soap/add-soap-header/README.md (100%) rename distribution/examples/{ => web-services}/soap/add-soap-header/pom.xml (100%) rename distribution/examples/{ => web-services}/soap/add-soap-header/proxies.xml (100%) rename distribution/examples/{ssl/api-with-tls-pem => web-services/soap/add-soap-header}/service-proxy.bat (100%) rename distribution/examples/{ssl/api-with-tls-pem => web-services/soap/add-soap-header}/service-proxy.sh (100%) mode change 100644 => 100755 rename distribution/examples/{ => web-services}/soap/add-soap-header/soap-message-without-header.xml (100%) rename distribution/examples/{ => web-services}/soap/add-soap-header/src/main/java/com/predic8/AddSoapHeaderInterceptor.java (100%) rename distribution/examples/{ => web-services}/soap/sample-soap-service/README.md (100%) rename distribution/examples/{ => web-services}/soap/sample-soap-service/proxies.xml (100%) rename distribution/examples/{ => web-services}/soap/sample-soap-service/request.xml (100%) rename distribution/examples/{ => web-services}/soap/sample-soap-service/requests.http (100%) rename distribution/examples/{ssl/api-with-tls-pkcs12 => web-services/soap/sample-soap-service}/service-proxy.bat (100%) rename distribution/examples/{ssl/api-with-tls-pkcs12 => web-services/soap/sample-soap-service}/service-proxy.sh (100%) mode change 100644 => 100755 rename distribution/examples/{ => web-services}/soap/secured-wsdl/proxies.xml (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/README.md (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/README.md (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/pom.xml (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/src/main/java/com/predic8/application/MyApplication.java (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/src/main/resources/log4j2.xml (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/start.bat (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/embedded/start.sh (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/standalone/README.md (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/standalone/compile-and-copy.bat (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/standalone/compile-and-copy.sh (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/standalone/pom.xml (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/standalone/proxies.xml (100%) rename distribution/examples/{ssl/to-backend => web-sockets/custom-websocket-interceptor/standalone}/service-proxy.bat (100%) rename distribution/examples/{ssl/to-backend => web-sockets/custom-websocket-interceptor/standalone}/service-proxy.sh (100%) rename distribution/examples/{ => web-sockets}/custom-websocket-interceptor/standalone/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java (100%) rename distribution/examples/{ => web-sockets}/stomp-over-websocket-intercepting/README.md (100%) rename distribution/examples/{ => web-sockets}/stomp-over-websocket-intercepting/index.html (100%) rename distribution/examples/{ => web-sockets}/stomp-over-websocket-intercepting/jquery.min.js (100%) rename distribution/examples/{ => web-sockets}/stomp-over-websocket-intercepting/proxies.xml (100%) rename distribution/examples/{stax-interceptor => web-sockets/stomp-over-websocket-intercepting}/service-proxy.bat (100%) rename distribution/examples/{ => web-sockets}/stomp-over-websocket-intercepting/service-proxy.sh (100%) rename distribution/examples/{ => web-sockets}/stomp-over-websocket-intercepting/stomp.js (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/README.md (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/index.js (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/package.json (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/proxies.xml (100%) rename distribution/examples/{stomp-over-websocket-intercepting => web-sockets/websocket-intercepting}/service-proxy.bat (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/service-proxy.sh (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/startWebsocket.bat (100%) rename distribution/examples/{ => web-sockets}/websocket-intercepting/startWebsocket.sh (100%) rename distribution/examples/{ => web-sockets}/websocket-stomp/README.md (100%) rename distribution/examples/{ => web-sockets}/websocket-stomp/index.html (100%) rename distribution/examples/{ => web-sockets}/websocket-stomp/jquery.min.js (100%) rename distribution/examples/{ => web-sockets}/websocket-stomp/proxies.xml (100%) rename distribution/examples/{websocket-intercepting => web-sockets/websocket-stomp}/service-proxy.bat (100%) rename distribution/examples/{ => web-sockets}/websocket-stomp/service-proxy.sh (100%) rename distribution/examples/{ => web-sockets}/websocket-stomp/stomp.js (100%) rename distribution/examples/{ => xml}/basic-xml-interceptor/README.md (100%) rename distribution/examples/{ => xml}/basic-xml-interceptor/example.xml (100%) rename distribution/examples/{ => xml}/basic-xml-interceptor/pom.xml (100%) rename distribution/examples/{ => xml}/basic-xml-interceptor/proxies.xml (100%) rename distribution/examples/{websocket-stomp => xml/basic-xml-interceptor}/service-proxy.bat (100%) rename distribution/examples/{spel => xml/basic-xml-interceptor}/service-proxy.sh (100%) mode change 100644 => 100755 rename distribution/examples/{ => xml}/basic-xml-interceptor/src/main/java/com/predic8/BasicXmlInterceptor.java (100%) rename distribution/examples/{ => xml}/stax-interceptor/README.md (100%) rename distribution/examples/{ => xml}/stax-interceptor/pom.xml (100%) rename distribution/examples/{ => xml}/stax-interceptor/proxies.xml (100%) rename distribution/examples/{ => xml}/stax-interceptor/request.xml (100%) rename distribution/examples/{xslt => xml/stax-interceptor}/service-proxy.bat (100%) rename distribution/examples/{ => xml}/stax-interceptor/service-proxy.sh (100%) rename distribution/examples/{ => xml}/stax-interceptor/src/main/java/com/predic8/StaxConverterInterceptor.java (100%) rename distribution/examples/{ => xml}/xslt/README.md (100%) rename distribution/examples/{ => xml}/xslt/proxies.xml (100%) rename distribution/examples/{ => xml}/xslt/reformat.xsl (100%) rename distribution/examples/{rateLimiter => xml/xslt}/service-proxy.bat (97%) rename distribution/examples/{ => xml}/xslt/service-proxy.sh (100%) diff --git a/distribution/examples/README.md b/distribution/examples/README.md index 901875c1a7..bbde3c4377 100644 --- a/distribution/examples/README.md +++ b/distribution/examples/README.md @@ -13,9 +13,9 @@ |------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | [logging](logging) | How to log requests and responses into a file and database in text, CSV and JSON format. | | [template](template) | With the Template Plugin you can intercept request and responses and change them using templates. | -| [groovy](groovy) | Run groovy scripts to manipulate or monitor messages. | +| [groovy](scripting/groovy) | Run groovy scripts to manipulate or monitor messages. | | [internalproxy](internalproxy) | Internally handled endpoint / chainable proxy service. | -| [javascript](javascript) | Manipulate and monitor messages with Javascript. | +| [javascript](scripting/javascript) | Manipulate and monitor messages with Javascript. | | [message-transformation](message-transformation) | Transformation of messages between JSON, XML and other formats | | [rewriter](rewriter) | With the `RewriteInterceptor` you can rewrite URLs using regular expressions. | @@ -23,15 +23,15 @@ | Example | Description | |------------------------------------------------------------------------|-----------------------------------------------------| -| [acl](acl) | Restrict access to APIs by ip address or hostnames. | | +| [acl](security/acl) | Restrict access to APIs by ip address or hostnames. | | | [basic-auth](security/basic-auth) | _HTTP Basic Authentication_ to secure APIs or Web pages with username and password. | | [json-protection](security/json-protection) | Validate JSON documents and limit document attributes. | -| [login page](login) | Protect Web pages using a login page and passwords. | -| [ntlm](ntlm) | Authentication against NTLM protected backends e.g. running on Microsoft IIS | -| [oauth2](oauth2) | Please follow https://www.membrane-soa.org/service-proxy-doc/current/oauth2-password-flow-sample.htm | +| [login page](security/login) | Protect Web pages using a login page and passwords. | +| [ntlm](security/ntlm) | Authentication against NTLM protected backends e.g. running on Microsoft IIS | +| [oauth2](security/oauth2) | Please follow https://www.membrane-soa.org/service-proxy-doc/current/oauth2-password-flow-sample.htm | | [openapi](openapi) | Load APIs from OpenAPI documents and validate requests and responses against OpenAPI. | | -| [rateLimiter](rateLimiter) | The `RateLimiter` limits the number of requests in a given interval. | -| [SSL/TLS](ssl) | SSL for APIs and for the communication to backends | +| [rateLimiter](security/rateLimiter) | The `RateLimiter` limits the number of requests in a given interval. | +| [SSL/TLS](security/ssl) | SSL for APIs and for the communication to backends | | [throttle](throttle) | With the `ThrottleInterceptor` you can delay and limit parallel requests. | | [validation](validation) | Contains examples about form, xml schema, schematron, json-schema and soap proxy validation | @@ -40,10 +40,10 @@ | Example | Description | |------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [xslt](xslt) | XSLTInterceptor applying XSLT stylesheets to request and response. | -| [cbr](cbr) | Content based routing using XPath. | -| [basic-xml-interceptor](basic-xml-interceptor) | BasicXmlInterceptor adds date element with current time information inside bar element. | -| [stax-interceptor](stax-interceptor) | In this example we will install an interceptor called StaxConverterInterceptor that changes tag name from `` to `` using Java STAX API. | +| [xslt](xml/xslt) | XSLTInterceptor applying XSLT stylesheets to request and response. | +| [cbr](routing/cbr) | Content based routing using XPath. | +| [basic-xml-interceptor](xml/basic-xml-interceptor) | BasicXmlInterceptor adds date element with current time information inside bar element. | +| [stax-interceptor](xml/stax-interceptor) | In this example we will install an interceptor called StaxConverterInterceptor that changes tag name from `` to `` using Java STAX API. | | [versioning](versioning) | Examples showcasing routing and xslt versioning | @@ -51,9 +51,9 @@ | Example | Description | |------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [stomp-over-websocket-intercepting](stomp-over-websocket-intercepting) | In this example we are going to see how STOMP-over-WebSocket messages are routed through Membrane Service Proxy. | -| [websocket-intercepting](websocket-intercepting) | This example demonstrates how Websocket frames are routed through Membrane Service Proxy. | -| [websocket-stomp](websocket-stomp) | STOMP over WebSocket, all handled by Membrane Service Proxy. | +| [stomp-over-websocket-intercepting](web-sockets/stomp-over-websocket-intercepting) | In this example we are going to see how STOMP-over-WebSocket messages are routed through Membrane Service Proxy. | +| [websocket-intercepting](web-sockets/websocket-intercepting) | This example demonstrates how Websocket frames are routed through Membrane Service Proxy. | +| [websocket-stomp](web-sockets/websocket-stomp) | STOMP over WebSocket, all handled by Membrane Service Proxy. | @@ -61,7 +61,7 @@ | Example | Description | |------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [add-soap-header](soap/add-soap-header) | This interceptor adds a SOAP header to the incoming request using the Java DOM API. | +| [add-soap-header](web-services/soap/add-soap-header) | This interceptor adds a SOAP header to the incoming request using the Java DOM API. | | [rest2soap](rest2soap) | With the REST2SOAP Converter you can make a SOAP Web Service as a REST resource accessible. | | [rest2soap-json](rest2soap-json) | `REST2SOAP` converter exposes a SOAP Web Service as a REST resource. In contrast to the rest2soap example the response will be a JSON object. | @@ -70,8 +70,8 @@ | Example | Description | |------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| [custom-interceptor](custom-interceptor) | How to write custom interceptors in Java. | -| [custom-websocket-interceptor](custom-websocket-interceptor) | Please visit https://www.membrane-soa.org/service-proxy-doc/current/websockets/create-websocket-interceptor.htm to learn how to create custom WebSocket interceptors. | +| [custom-interceptor](internal/custom-interceptor) | How to write custom interceptors in Java. | +| [custom-websocket-interceptor](web-sockets/custom-websocket-interceptor) | Please visit https://www.membrane-soa.org/service-proxy-doc/current/websockets/create-websocket-interceptor.htm to learn how to create custom WebSocket interceptors. | | [file-exchangestore](file-exchangestore) | Membrane uses exchange stores to save requests and responses on disc or memory. | @@ -83,5 +83,5 @@ | [api-management](api-management) | A simple file based api management approach. | | [loadbalancing](loadbalancing) | From simple static laodbalancers to dynamic node management | | [service-discovery-with-etcd](service-discovery-with-etcd) | The publisher publishes endpoint details for services to "the cloud". The configurator reads those details from "the cloud" and dynamically forwards to those services | -| [spel](spel) | Using the Spring Expression language as part of router configuration. | +| [spel](scripting/spel) | Using the Spring Expression language as part of router configuration. | diff --git a/distribution/examples/custom-interceptor/README.md b/distribution/examples/internal/custom-interceptor/README.md similarity index 100% rename from distribution/examples/custom-interceptor/README.md rename to distribution/examples/internal/custom-interceptor/README.md diff --git a/distribution/examples/custom-interceptor/pom.xml b/distribution/examples/internal/custom-interceptor/pom.xml similarity index 100% rename from distribution/examples/custom-interceptor/pom.xml rename to distribution/examples/internal/custom-interceptor/pom.xml diff --git a/distribution/examples/custom-interceptor/proxies.xml b/distribution/examples/internal/custom-interceptor/proxies.xml similarity index 100% rename from distribution/examples/custom-interceptor/proxies.xml rename to distribution/examples/internal/custom-interceptor/proxies.xml diff --git a/distribution/examples/acl/service-proxy.bat b/distribution/examples/internal/custom-interceptor/service-proxy.bat similarity index 100% rename from distribution/examples/acl/service-proxy.bat rename to distribution/examples/internal/custom-interceptor/service-proxy.bat diff --git a/distribution/examples/acl/service-proxy.sh b/distribution/examples/internal/custom-interceptor/service-proxy.sh old mode 100644 new mode 100755 similarity index 100% rename from distribution/examples/acl/service-proxy.sh rename to distribution/examples/internal/custom-interceptor/service-proxy.sh diff --git a/distribution/examples/custom-interceptor/src/main/java/com/predic8/MyInterceptor.java b/distribution/examples/internal/custom-interceptor/src/main/java/com/predic8/MyInterceptor.java similarity index 100% rename from distribution/examples/custom-interceptor/src/main/java/com/predic8/MyInterceptor.java rename to distribution/examples/internal/custom-interceptor/src/main/java/com/predic8/MyInterceptor.java diff --git a/distribution/examples/opentelemetry/README.md b/distribution/examples/operation/opentelemetry/README.md similarity index 98% rename from distribution/examples/opentelemetry/README.md rename to distribution/examples/operation/opentelemetry/README.md index 93ec52758a..90793226a9 100644 --- a/distribution/examples/opentelemetry/README.md +++ b/distribution/examples/operation/opentelemetry/README.md @@ -24,7 +24,7 @@ docker run -d --name jaeger -e COLLECTOR_OTLP_ENABLED=true -p 16686:16686 -p 431 5. Open `localhost:16686` in the browser to access the Jaeger UI. 6. Select Membrane as the service and click on `Find Traces`. A span created by Membrane should be visible in [Jaeger UI](http://localhost:16686). -![sample](./resources/otel_sample.png) +![sample](resources/otel_sample.png) 7. Examine the printed header fields on the console. You will see headers called `traceparent`, these denote which spans were involved in the request. **HOW IT IS DONE** diff --git a/distribution/examples/opentelemetry/proxies.xml b/distribution/examples/operation/opentelemetry/proxies.xml similarity index 100% rename from distribution/examples/opentelemetry/proxies.xml rename to distribution/examples/operation/opentelemetry/proxies.xml diff --git a/distribution/examples/opentelemetry/resources/otel_example.png b/distribution/examples/operation/opentelemetry/resources/otel_example.png similarity index 100% rename from distribution/examples/opentelemetry/resources/otel_example.png rename to distribution/examples/operation/opentelemetry/resources/otel_example.png diff --git a/distribution/examples/opentelemetry/resources/otel_sample.png b/distribution/examples/operation/opentelemetry/resources/otel_sample.png similarity index 100% rename from distribution/examples/opentelemetry/resources/otel_sample.png rename to distribution/examples/operation/opentelemetry/resources/otel_sample.png diff --git a/distribution/examples/opentelemetry/service-proxy.bat b/distribution/examples/operation/opentelemetry/service-proxy.bat similarity index 100% rename from distribution/examples/opentelemetry/service-proxy.bat rename to distribution/examples/operation/opentelemetry/service-proxy.bat diff --git a/distribution/examples/basic-xml-interceptor/service-proxy.sh b/distribution/examples/operation/opentelemetry/service-proxy.sh similarity index 100% rename from distribution/examples/basic-xml-interceptor/service-proxy.sh rename to distribution/examples/operation/opentelemetry/service-proxy.sh diff --git a/distribution/examples/prometheus/Dockerfile b/distribution/examples/operation/prometheus/Dockerfile similarity index 100% rename from distribution/examples/prometheus/Dockerfile rename to distribution/examples/operation/prometheus/Dockerfile diff --git a/distribution/examples/prometheus/README.md b/distribution/examples/operation/prometheus/README.md similarity index 100% rename from distribution/examples/prometheus/README.md rename to distribution/examples/operation/prometheus/README.md diff --git a/distribution/examples/prometheus/docker-compose.yml b/distribution/examples/operation/prometheus/docker-compose.yml similarity index 100% rename from distribution/examples/prometheus/docker-compose.yml rename to distribution/examples/operation/prometheus/docker-compose.yml diff --git a/distribution/examples/prometheus/grafana/provisioning/datasources/datasource.yml b/distribution/examples/operation/prometheus/grafana/provisioning/datasources/datasource.yml similarity index 100% rename from distribution/examples/prometheus/grafana/provisioning/datasources/datasource.yml rename to distribution/examples/operation/prometheus/grafana/provisioning/datasources/datasource.yml diff --git a/distribution/examples/prometheus/prometheus-grafana-example.png b/distribution/examples/operation/prometheus/prometheus-grafana-example.png similarity index 100% rename from distribution/examples/prometheus/prometheus-grafana-example.png rename to distribution/examples/operation/prometheus/prometheus-grafana-example.png diff --git a/distribution/examples/prometheus/prometheus/prometheus.yml b/distribution/examples/operation/prometheus/prometheus/prometheus.yml similarity index 100% rename from distribution/examples/prometheus/prometheus/prometheus.yml rename to distribution/examples/operation/prometheus/prometheus/prometheus.yml diff --git a/distribution/examples/prometheus/proxies.xml b/distribution/examples/operation/prometheus/proxies.xml similarity index 100% rename from distribution/examples/prometheus/proxies.xml rename to distribution/examples/operation/prometheus/proxies.xml diff --git a/distribution/examples/cbr/README.md b/distribution/examples/routing/cbr/README.md similarity index 100% rename from distribution/examples/cbr/README.md rename to distribution/examples/routing/cbr/README.md diff --git a/distribution/examples/cbr/express.xml b/distribution/examples/routing/cbr/express.xml similarity index 100% rename from distribution/examples/cbr/express.xml rename to distribution/examples/routing/cbr/express.xml diff --git a/distribution/examples/cbr/import.xml b/distribution/examples/routing/cbr/import.xml similarity index 100% rename from distribution/examples/cbr/import.xml rename to distribution/examples/routing/cbr/import.xml diff --git a/distribution/examples/cbr/order.xml b/distribution/examples/routing/cbr/order.xml similarity index 100% rename from distribution/examples/cbr/order.xml rename to distribution/examples/routing/cbr/order.xml diff --git a/distribution/examples/cbr/proxies.xml b/distribution/examples/routing/cbr/proxies.xml similarity index 100% rename from distribution/examples/cbr/proxies.xml rename to distribution/examples/routing/cbr/proxies.xml diff --git a/distribution/examples/basic-xml-interceptor/service-proxy.bat b/distribution/examples/routing/cbr/service-proxy.bat similarity index 100% rename from distribution/examples/basic-xml-interceptor/service-proxy.bat rename to distribution/examples/routing/cbr/service-proxy.bat diff --git a/distribution/examples/cbr/service-proxy.sh b/distribution/examples/routing/cbr/service-proxy.sh similarity index 100% rename from distribution/examples/cbr/service-proxy.sh rename to distribution/examples/routing/cbr/service-proxy.sh diff --git a/distribution/examples/shadowing/README.md b/distribution/examples/routing/shadowing/README.md similarity index 100% rename from distribution/examples/shadowing/README.md rename to distribution/examples/routing/shadowing/README.md diff --git a/distribution/examples/shadowing/proxies.xml b/distribution/examples/routing/shadowing/proxies.xml similarity index 100% rename from distribution/examples/shadowing/proxies.xml rename to distribution/examples/routing/shadowing/proxies.xml diff --git a/distribution/examples/cbr/service-proxy.bat b/distribution/examples/routing/shadowing/service-proxy.bat similarity index 100% rename from distribution/examples/cbr/service-proxy.bat rename to distribution/examples/routing/shadowing/service-proxy.bat diff --git a/distribution/examples/custom-interceptor/service-proxy.sh b/distribution/examples/routing/shadowing/service-proxy.sh old mode 100755 new mode 100644 similarity index 100% rename from distribution/examples/custom-interceptor/service-proxy.sh rename to distribution/examples/routing/shadowing/service-proxy.sh diff --git a/distribution/examples/groovy/README.md b/distribution/examples/scripting/groovy/README.md similarity index 100% rename from distribution/examples/groovy/README.md rename to distribution/examples/scripting/groovy/README.md diff --git a/distribution/examples/groovy/order.json b/distribution/examples/scripting/groovy/order.json similarity index 100% rename from distribution/examples/groovy/order.json rename to distribution/examples/scripting/groovy/order.json diff --git a/distribution/examples/groovy/proxies.xml b/distribution/examples/scripting/groovy/proxies.xml similarity index 100% rename from distribution/examples/groovy/proxies.xml rename to distribution/examples/scripting/groovy/proxies.xml diff --git a/distribution/examples/custom-interceptor/service-proxy.bat b/distribution/examples/scripting/groovy/service-proxy.bat similarity index 100% rename from distribution/examples/custom-interceptor/service-proxy.bat rename to distribution/examples/scripting/groovy/service-proxy.bat diff --git a/distribution/examples/groovy/service-proxy.sh b/distribution/examples/scripting/groovy/service-proxy.sh similarity index 100% rename from distribution/examples/groovy/service-proxy.sh rename to distribution/examples/scripting/groovy/service-proxy.sh diff --git a/distribution/examples/javascript/README.md b/distribution/examples/scripting/javascript/README.md similarity index 100% rename from distribution/examples/javascript/README.md rename to distribution/examples/scripting/javascript/README.md diff --git a/distribution/examples/javascript/order.json b/distribution/examples/scripting/javascript/order.json similarity index 100% rename from distribution/examples/javascript/order.json rename to distribution/examples/scripting/javascript/order.json diff --git a/distribution/examples/javascript/proxies.xml b/distribution/examples/scripting/javascript/proxies.xml similarity index 100% rename from distribution/examples/javascript/proxies.xml rename to distribution/examples/scripting/javascript/proxies.xml diff --git a/distribution/examples/javascript/requests.http b/distribution/examples/scripting/javascript/requests.http similarity index 100% rename from distribution/examples/javascript/requests.http rename to distribution/examples/scripting/javascript/requests.http diff --git a/distribution/examples/groovy/service-proxy.bat b/distribution/examples/scripting/javascript/service-proxy.bat similarity index 100% rename from distribution/examples/groovy/service-proxy.bat rename to distribution/examples/scripting/javascript/service-proxy.bat diff --git a/distribution/examples/javascript/service-proxy.sh b/distribution/examples/scripting/javascript/service-proxy.sh similarity index 100% rename from distribution/examples/javascript/service-proxy.sh rename to distribution/examples/scripting/javascript/service-proxy.sh diff --git a/distribution/examples/spel/README.md b/distribution/examples/scripting/spel/README.md similarity index 100% rename from distribution/examples/spel/README.md rename to distribution/examples/scripting/spel/README.md diff --git a/distribution/examples/spel/proxies.xml b/distribution/examples/scripting/spel/proxies.xml similarity index 100% rename from distribution/examples/spel/proxies.xml rename to distribution/examples/scripting/spel/proxies.xml diff --git a/distribution/examples/javascript/service-proxy.bat b/distribution/examples/scripting/spel/service-proxy.bat similarity index 100% rename from distribution/examples/javascript/service-proxy.bat rename to distribution/examples/scripting/spel/service-proxy.bat diff --git a/distribution/examples/login/service-proxy.sh b/distribution/examples/scripting/spel/service-proxy.sh similarity index 100% rename from distribution/examples/login/service-proxy.sh rename to distribution/examples/scripting/spel/service-proxy.sh diff --git a/distribution/examples/security/README.md b/distribution/examples/security/README.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/distribution/examples/acl/README.md b/distribution/examples/security/acl/README.md similarity index 100% rename from distribution/examples/acl/README.md rename to distribution/examples/security/acl/README.md diff --git a/distribution/examples/acl/acl.xml b/distribution/examples/security/acl/acl.xml similarity index 100% rename from distribution/examples/acl/acl.xml rename to distribution/examples/security/acl/acl.xml diff --git a/distribution/examples/acl/proxies.xml b/distribution/examples/security/acl/proxies.xml similarity index 100% rename from distribution/examples/acl/proxies.xml rename to distribution/examples/security/acl/proxies.xml diff --git a/distribution/examples/login/service-proxy.bat b/distribution/examples/security/acl/service-proxy.bat similarity index 100% rename from distribution/examples/login/service-proxy.bat rename to distribution/examples/security/acl/service-proxy.bat diff --git a/distribution/examples/opentelemetry/service-proxy.sh b/distribution/examples/security/acl/service-proxy.sh old mode 100755 new mode 100644 similarity index 100% rename from distribution/examples/opentelemetry/service-proxy.sh rename to distribution/examples/security/acl/service-proxy.sh diff --git a/distribution/examples/login/README.md b/distribution/examples/security/login/README.md similarity index 100% rename from distribution/examples/login/README.md rename to distribution/examples/security/login/README.md diff --git a/distribution/examples/login/dialog/index.html b/distribution/examples/security/login/dialog/index.html similarity index 100% rename from distribution/examples/login/dialog/index.html rename to distribution/examples/security/login/dialog/index.html diff --git a/distribution/examples/login/dialog/main.css b/distribution/examples/security/login/dialog/main.css similarity index 100% rename from distribution/examples/login/dialog/main.css rename to distribution/examples/security/login/dialog/main.css diff --git a/distribution/examples/login/proxies.xml b/distribution/examples/security/login/proxies.xml similarity index 100% rename from distribution/examples/login/proxies.xml rename to distribution/examples/security/login/proxies.xml diff --git a/distribution/examples/ntlm/service-proxy.bat b/distribution/examples/security/login/service-proxy.bat similarity index 100% rename from distribution/examples/ntlm/service-proxy.bat rename to distribution/examples/security/login/service-proxy.bat diff --git a/distribution/examples/shadowing/service-proxy.sh b/distribution/examples/security/login/service-proxy.sh similarity index 100% rename from distribution/examples/shadowing/service-proxy.sh rename to distribution/examples/security/login/service-proxy.sh diff --git a/distribution/examples/ntlm/README.md b/distribution/examples/security/ntlm/README.md similarity index 100% rename from distribution/examples/ntlm/README.md rename to distribution/examples/security/ntlm/README.md diff --git a/distribution/examples/ntlm/proxies.xml b/distribution/examples/security/ntlm/proxies.xml similarity index 100% rename from distribution/examples/ntlm/proxies.xml rename to distribution/examples/security/ntlm/proxies.xml diff --git a/distribution/examples/shadowing/service-proxy.bat b/distribution/examples/security/ntlm/service-proxy.bat similarity index 100% rename from distribution/examples/shadowing/service-proxy.bat rename to distribution/examples/security/ntlm/service-proxy.bat diff --git a/distribution/examples/ntlm/service-proxy.sh b/distribution/examples/security/ntlm/service-proxy.sh similarity index 100% rename from distribution/examples/ntlm/service-proxy.sh rename to distribution/examples/security/ntlm/service-proxy.sh diff --git a/distribution/examples/oauth2/README.md b/distribution/examples/security/oauth2/README.md similarity index 100% rename from distribution/examples/oauth2/README.md rename to distribution/examples/security/oauth2/README.md diff --git a/distribution/examples/oauth2/api/OAuth2TrustedClient.java b/distribution/examples/security/oauth2/api/OAuth2TrustedClient.java similarity index 100% rename from distribution/examples/oauth2/api/OAuth2TrustedClient.java rename to distribution/examples/security/oauth2/api/OAuth2TrustedClient.java diff --git a/distribution/examples/oauth2/api/README.md b/distribution/examples/security/oauth2/api/README.md similarity index 100% rename from distribution/examples/oauth2/api/README.md rename to distribution/examples/security/oauth2/api/README.md diff --git a/distribution/examples/oauth2/api/authorization_server/proxies.xml b/distribution/examples/security/oauth2/api/authorization_server/proxies.xml similarity index 100% rename from distribution/examples/oauth2/api/authorization_server/proxies.xml rename to distribution/examples/security/oauth2/api/authorization_server/proxies.xml diff --git a/distribution/examples/oauth2/api/authorization_server/service-proxy.bat b/distribution/examples/security/oauth2/api/authorization_server/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/api/authorization_server/service-proxy.bat rename to distribution/examples/security/oauth2/api/authorization_server/service-proxy.bat diff --git a/distribution/examples/oauth2/api/authorization_server/service-proxy.sh b/distribution/examples/security/oauth2/api/authorization_server/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/api/authorization_server/service-proxy.sh rename to distribution/examples/security/oauth2/api/authorization_server/service-proxy.sh diff --git a/distribution/examples/oauth2/api/client.bat b/distribution/examples/security/oauth2/api/client.bat similarity index 100% rename from distribution/examples/oauth2/api/client.bat rename to distribution/examples/security/oauth2/api/client.bat diff --git a/distribution/examples/oauth2/api/client.ps1 b/distribution/examples/security/oauth2/api/client.ps1 similarity index 100% rename from distribution/examples/oauth2/api/client.ps1 rename to distribution/examples/security/oauth2/api/client.ps1 diff --git a/distribution/examples/oauth2/api/client.sh b/distribution/examples/security/oauth2/api/client.sh similarity index 100% rename from distribution/examples/oauth2/api/client.sh rename to distribution/examples/security/oauth2/api/client.sh diff --git a/distribution/examples/oauth2/api/oauth2-password-flow-for-apis.png b/distribution/examples/security/oauth2/api/oauth2-password-flow-for-apis.png similarity index 100% rename from distribution/examples/oauth2/api/oauth2-password-flow-for-apis.png rename to distribution/examples/security/oauth2/api/oauth2-password-flow-for-apis.png diff --git a/distribution/examples/oauth2/api/rest.http b/distribution/examples/security/oauth2/api/rest.http similarity index 100% rename from distribution/examples/oauth2/api/rest.http rename to distribution/examples/security/oauth2/api/rest.http diff --git a/distribution/examples/oauth2/api/token_validator/proxies.xml b/distribution/examples/security/oauth2/api/token_validator/proxies.xml similarity index 100% rename from distribution/examples/oauth2/api/token_validator/proxies.xml rename to distribution/examples/security/oauth2/api/token_validator/proxies.xml diff --git a/distribution/examples/oauth2/api/token_validator/service-proxy.bat b/distribution/examples/security/oauth2/api/token_validator/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/api/token_validator/service-proxy.bat rename to distribution/examples/security/oauth2/api/token_validator/service-proxy.bat diff --git a/distribution/examples/oauth2/api/token_validator/service-proxy.sh b/distribution/examples/security/oauth2/api/token_validator/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/api/token_validator/service-proxy.sh rename to distribution/examples/security/oauth2/api/token_validator/service-proxy.sh diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/README.md b/distribution/examples/security/oauth2/azure-ad-with-jwts/README.md similarity index 93% rename from distribution/examples/oauth2/azure-ad-with-jwts/README.md rename to distribution/examples/security/oauth2/azure-ad-with-jwts/README.md index b135a39d15..6234487b2b 100644 --- a/distribution/examples/oauth2/azure-ad-with-jwts/README.md +++ b/distribution/examples/security/oauth2/azure-ad-with-jwts/README.md @@ -4,7 +4,7 @@ This tutorial shows how to use Membrane API Gateway to validate Json Web Tokens Membrane API Gateway protects the Backend API. -![Overview](./images/00-overview.png) +![Overview](images/00-overview.png) 1. The client retrieves the token from Azure AD. 2. The JWT is issued by Azure AD and returned to the client @@ -26,7 +26,7 @@ Both the Client and the Backend are registered in Azure AD with an "App registra 5. Choose ``New registration``. 6. Enter a name (e.g. ``Demo Backend``) and click ``Register``. - ![Backend Registration](./images/01-backend-registration.png) + ![Backend Registration](images/01-backend-registration.png) 7. Next to *Application ID URI*, click on ``Add an Application ID URI``. 8. Next to *Application ID URI*, click on ``Set``. @@ -47,7 +47,7 @@ There are several possibilities of getting a valid token. For this demo, we use 1. Open https://aad.portal.azure.com/#view/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/~/RegisteredApps . 2. Choose ``New registration``. 3. Enter a name (e.g. ``Demo Client``) and click ``Register``. - ![Client Registration](./images/03-client-registration.png) + ![Client Registration](images/03-client-registration.png) 4. Take note of your ``Application (client) ID``. 5. Next to *Client credentials*, click on ``Add a certificate or secret``. @@ -58,11 +58,11 @@ There are several possibilities of getting a valid token. For this demo, we use 9. Take note of the ``Value``, also known as the ``client secret``. 10. Click on ``API permissions``. 11. Click on ``Add a permission``. - ![Adding a permission](./images/05-client-permission-granting.png) + ![Adding a permission](images/05-client-permission-granting.png) 13. Below ``My APIs``, choose ``Demo Backend``. - ![Adding a permission](./images/06-client-permission-granting2.png) + ![Adding a permission](images/06-client-permission-granting2.png) 14. Select the ``ReadWrite`` permission. - ![Adding a permission](./images/07-client-permission-granting3.png) + ![Adding a permission](images/07-client-permission-granting3.png) 15. Click on ``Add permission``. ### 2.b. Get a token diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/00-overview.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/00-overview.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/00-overview.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/00-overview.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/01-backend-registration.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/01-backend-registration.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/01-backend-registration.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/01-backend-registration.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/03-client-registration.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/03-client-registration.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/03-client-registration.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/03-client-registration.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/04-client-secret-creation.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/05-client-permission-granting.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/06-client-permission-granting2.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png b/distribution/examples/security/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png rename to distribution/examples/security/oauth2/azure-ad-with-jwts/images/07-client-permission-granting3.png diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/proxies.xml b/distribution/examples/security/oauth2/azure-ad-with-jwts/proxies.xml similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/proxies.xml rename to distribution/examples/security/oauth2/azure-ad-with-jwts/proxies.xml diff --git a/distribution/examples/custom-websocket-interceptor/standalone/service-proxy.bat b/distribution/examples/security/oauth2/azure-ad-with-jwts/service-proxy.bat similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/service-proxy.bat rename to distribution/examples/security/oauth2/azure-ad-with-jwts/service-proxy.bat diff --git a/distribution/examples/custom-websocket-interceptor/standalone/service-proxy.sh b/distribution/examples/security/oauth2/azure-ad-with-jwts/service-proxy.sh similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/service-proxy.sh rename to distribution/examples/security/oauth2/azure-ad-with-jwts/service-proxy.sh diff --git a/distribution/examples/oauth2/credentials/OAuth2TrustedClient.java b/distribution/examples/security/oauth2/credentials/OAuth2TrustedClient.java similarity index 100% rename from distribution/examples/oauth2/credentials/OAuth2TrustedClient.java rename to distribution/examples/security/oauth2/credentials/OAuth2TrustedClient.java diff --git a/distribution/examples/oauth2/credentials/README.md b/distribution/examples/security/oauth2/credentials/README.md similarity index 100% rename from distribution/examples/oauth2/credentials/README.md rename to distribution/examples/security/oauth2/credentials/README.md diff --git a/distribution/examples/oauth2/credentials/authorization_server/proxies.xml b/distribution/examples/security/oauth2/credentials/authorization_server/proxies.xml similarity index 100% rename from distribution/examples/oauth2/credentials/authorization_server/proxies.xml rename to distribution/examples/security/oauth2/credentials/authorization_server/proxies.xml diff --git a/distribution/examples/oauth2/credentials/authorization_server/service-proxy.bat b/distribution/examples/security/oauth2/credentials/authorization_server/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/credentials/authorization_server/service-proxy.bat rename to distribution/examples/security/oauth2/credentials/authorization_server/service-proxy.bat diff --git a/distribution/examples/oauth2/credentials/authorization_server/service-proxy.sh b/distribution/examples/security/oauth2/credentials/authorization_server/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/credentials/authorization_server/service-proxy.sh rename to distribution/examples/security/oauth2/credentials/authorization_server/service-proxy.sh diff --git a/distribution/examples/oauth2/credentials/client.ps1 b/distribution/examples/security/oauth2/credentials/client.ps1 similarity index 100% rename from distribution/examples/oauth2/credentials/client.ps1 rename to distribution/examples/security/oauth2/credentials/client.ps1 diff --git a/distribution/examples/oauth2/credentials/client.sh b/distribution/examples/security/oauth2/credentials/client.sh similarity index 100% rename from distribution/examples/oauth2/credentials/client.sh rename to distribution/examples/security/oauth2/credentials/client.sh diff --git a/distribution/examples/oauth2/credentials/token_validator/proxies.xml b/distribution/examples/security/oauth2/credentials/token_validator/proxies.xml similarity index 100% rename from distribution/examples/oauth2/credentials/token_validator/proxies.xml rename to distribution/examples/security/oauth2/credentials/token_validator/proxies.xml diff --git a/distribution/examples/oauth2/credentials/token_validator/service-proxy.bat b/distribution/examples/security/oauth2/credentials/token_validator/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/credentials/token_validator/service-proxy.bat rename to distribution/examples/security/oauth2/credentials/token_validator/service-proxy.bat diff --git a/distribution/examples/oauth2/credentials/token_validator/service-proxy.sh b/distribution/examples/security/oauth2/credentials/token_validator/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/credentials/token_validator/service-proxy.sh rename to distribution/examples/security/oauth2/credentials/token_validator/service-proxy.sh diff --git a/distribution/examples/oauth2/github/README.md b/distribution/examples/security/oauth2/github/README.md similarity index 100% rename from distribution/examples/oauth2/github/README.md rename to distribution/examples/security/oauth2/github/README.md diff --git a/distribution/examples/oauth2/github/dialog/index.html b/distribution/examples/security/oauth2/github/dialog/index.html similarity index 100% rename from distribution/examples/oauth2/github/dialog/index.html rename to distribution/examples/security/oauth2/github/dialog/index.html diff --git a/distribution/examples/oauth2/github/dialog/main.css b/distribution/examples/security/oauth2/github/dialog/main.css similarity index 100% rename from distribution/examples/oauth2/github/dialog/main.css rename to distribution/examples/security/oauth2/github/dialog/main.css diff --git a/distribution/examples/oauth2/github/proxies.xml b/distribution/examples/security/oauth2/github/proxies.xml similarity index 100% rename from distribution/examples/oauth2/github/proxies.xml rename to distribution/examples/security/oauth2/github/proxies.xml diff --git a/distribution/examples/oauth2/github/proxiesSSL.xml b/distribution/examples/security/oauth2/github/proxiesSSL.xml similarity index 100% rename from distribution/examples/oauth2/github/proxiesSSL.xml rename to distribution/examples/security/oauth2/github/proxiesSSL.xml diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/service-proxy.bat b/distribution/examples/security/oauth2/github/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/service-proxy.bat rename to distribution/examples/security/oauth2/github/service-proxy.bat diff --git a/distribution/examples/oauth2/azure-ad-with-jwts/service-proxy.sh b/distribution/examples/security/oauth2/github/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/azure-ad-with-jwts/service-proxy.sh rename to distribution/examples/security/oauth2/github/service-proxy.sh diff --git a/distribution/examples/oauth2/github/service-proxySSL.bat b/distribution/examples/security/oauth2/github/service-proxySSL.bat similarity index 100% rename from distribution/examples/oauth2/github/service-proxySSL.bat rename to distribution/examples/security/oauth2/github/service-proxySSL.bat diff --git a/distribution/examples/oauth2/github/service-proxySSL.sh b/distribution/examples/security/oauth2/github/service-proxySSL.sh similarity index 100% rename from distribution/examples/oauth2/github/service-proxySSL.sh rename to distribution/examples/security/oauth2/github/service-proxySSL.sh diff --git a/distribution/examples/oauth2/google/README.md b/distribution/examples/security/oauth2/google/README.md similarity index 100% rename from distribution/examples/oauth2/google/README.md rename to distribution/examples/security/oauth2/google/README.md diff --git a/distribution/examples/oauth2/google/dialog/index.html b/distribution/examples/security/oauth2/google/dialog/index.html similarity index 100% rename from distribution/examples/oauth2/google/dialog/index.html rename to distribution/examples/security/oauth2/google/dialog/index.html diff --git a/distribution/examples/oauth2/google/dialog/main.css b/distribution/examples/security/oauth2/google/dialog/main.css similarity index 100% rename from distribution/examples/oauth2/google/dialog/main.css rename to distribution/examples/security/oauth2/google/dialog/main.css diff --git a/distribution/examples/oauth2/google/proxies.xml b/distribution/examples/security/oauth2/google/proxies.xml similarity index 100% rename from distribution/examples/oauth2/google/proxies.xml rename to distribution/examples/security/oauth2/google/proxies.xml diff --git a/distribution/examples/oauth2/google/proxiesSSL.xml b/distribution/examples/security/oauth2/google/proxiesSSL.xml similarity index 100% rename from distribution/examples/oauth2/google/proxiesSSL.xml rename to distribution/examples/security/oauth2/google/proxiesSSL.xml diff --git a/distribution/examples/oauth2/github/service-proxy.bat b/distribution/examples/security/oauth2/google/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/github/service-proxy.bat rename to distribution/examples/security/oauth2/google/service-proxy.bat diff --git a/distribution/examples/oauth2/github/service-proxy.sh b/distribution/examples/security/oauth2/google/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/github/service-proxy.sh rename to distribution/examples/security/oauth2/google/service-proxy.sh diff --git a/distribution/examples/oauth2/google/service-proxySSL.bat b/distribution/examples/security/oauth2/google/service-proxySSL.bat similarity index 100% rename from distribution/examples/oauth2/google/service-proxySSL.bat rename to distribution/examples/security/oauth2/google/service-proxySSL.bat diff --git a/distribution/examples/oauth2/google/service-proxySSL.sh b/distribution/examples/security/oauth2/google/service-proxySSL.sh similarity index 100% rename from distribution/examples/oauth2/google/service-proxySSL.sh rename to distribution/examples/security/oauth2/google/service-proxySSL.sh diff --git a/distribution/examples/oauth2/implicit/JavaScriptClient.html b/distribution/examples/security/oauth2/implicit/JavaScriptClient.html similarity index 100% rename from distribution/examples/oauth2/implicit/JavaScriptClient.html rename to distribution/examples/security/oauth2/implicit/JavaScriptClient.html diff --git a/distribution/examples/oauth2/implicit/README.md b/distribution/examples/security/oauth2/implicit/README.md similarity index 100% rename from distribution/examples/oauth2/implicit/README.md rename to distribution/examples/security/oauth2/implicit/README.md diff --git a/distribution/examples/oauth2/implicit/authorization_server/consentFile.json b/distribution/examples/security/oauth2/implicit/authorization_server/consentFile.json similarity index 100% rename from distribution/examples/oauth2/implicit/authorization_server/consentFile.json rename to distribution/examples/security/oauth2/implicit/authorization_server/consentFile.json diff --git a/distribution/examples/oauth2/implicit/authorization_server/logindialog/index.html b/distribution/examples/security/oauth2/implicit/authorization_server/logindialog/index.html similarity index 100% rename from distribution/examples/oauth2/implicit/authorization_server/logindialog/index.html rename to distribution/examples/security/oauth2/implicit/authorization_server/logindialog/index.html diff --git a/distribution/examples/oauth2/implicit/authorization_server/logindialog/main.css b/distribution/examples/security/oauth2/implicit/authorization_server/logindialog/main.css similarity index 100% rename from distribution/examples/oauth2/implicit/authorization_server/logindialog/main.css rename to distribution/examples/security/oauth2/implicit/authorization_server/logindialog/main.css diff --git a/distribution/examples/oauth2/implicit/authorization_server/proxies.xml b/distribution/examples/security/oauth2/implicit/authorization_server/proxies.xml similarity index 100% rename from distribution/examples/oauth2/implicit/authorization_server/proxies.xml rename to distribution/examples/security/oauth2/implicit/authorization_server/proxies.xml diff --git a/distribution/examples/oauth2/implicit/authorization_server/service-proxy.bat b/distribution/examples/security/oauth2/implicit/authorization_server/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/implicit/authorization_server/service-proxy.bat rename to distribution/examples/security/oauth2/implicit/authorization_server/service-proxy.bat diff --git a/distribution/examples/oauth2/implicit/authorization_server/service-proxy.sh b/distribution/examples/security/oauth2/implicit/authorization_server/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/implicit/authorization_server/service-proxy.sh rename to distribution/examples/security/oauth2/implicit/authorization_server/service-proxy.sh diff --git a/distribution/examples/oauth2/implicit/webserver/proxies.xml b/distribution/examples/security/oauth2/implicit/webserver/proxies.xml similarity index 100% rename from distribution/examples/oauth2/implicit/webserver/proxies.xml rename to distribution/examples/security/oauth2/implicit/webserver/proxies.xml diff --git a/distribution/examples/oauth2/implicit/webserver/service-proxy.bat b/distribution/examples/security/oauth2/implicit/webserver/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/implicit/webserver/service-proxy.bat rename to distribution/examples/security/oauth2/implicit/webserver/service-proxy.bat diff --git a/distribution/examples/oauth2/implicit/webserver/service-proxy.sh b/distribution/examples/security/oauth2/implicit/webserver/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/implicit/webserver/service-proxy.sh rename to distribution/examples/security/oauth2/implicit/webserver/service-proxy.sh diff --git a/distribution/examples/oauth2/membrane/README.md b/distribution/examples/security/oauth2/membrane/README.md similarity index 100% rename from distribution/examples/oauth2/membrane/README.md rename to distribution/examples/security/oauth2/membrane/README.md diff --git a/distribution/examples/oauth2/membrane/authorization_server/consentFile.json b/distribution/examples/security/oauth2/membrane/authorization_server/consentFile.json similarity index 100% rename from distribution/examples/oauth2/membrane/authorization_server/consentFile.json rename to distribution/examples/security/oauth2/membrane/authorization_server/consentFile.json diff --git a/distribution/examples/oauth2/membrane/authorization_server/logindialog/index.html b/distribution/examples/security/oauth2/membrane/authorization_server/logindialog/index.html similarity index 100% rename from distribution/examples/oauth2/membrane/authorization_server/logindialog/index.html rename to distribution/examples/security/oauth2/membrane/authorization_server/logindialog/index.html diff --git a/distribution/examples/oauth2/membrane/authorization_server/logindialog/main.css b/distribution/examples/security/oauth2/membrane/authorization_server/logindialog/main.css similarity index 100% rename from distribution/examples/oauth2/membrane/authorization_server/logindialog/main.css rename to distribution/examples/security/oauth2/membrane/authorization_server/logindialog/main.css diff --git a/distribution/examples/oauth2/membrane/authorization_server/proxies.xml b/distribution/examples/security/oauth2/membrane/authorization_server/proxies.xml similarity index 100% rename from distribution/examples/oauth2/membrane/authorization_server/proxies.xml rename to distribution/examples/security/oauth2/membrane/authorization_server/proxies.xml diff --git a/distribution/examples/oauth2/membrane/authorization_server/service-proxy.bat b/distribution/examples/security/oauth2/membrane/authorization_server/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/membrane/authorization_server/service-proxy.bat rename to distribution/examples/security/oauth2/membrane/authorization_server/service-proxy.bat diff --git a/distribution/examples/oauth2/membrane/authorization_server/service-proxy.sh b/distribution/examples/security/oauth2/membrane/authorization_server/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/membrane/authorization_server/service-proxy.sh rename to distribution/examples/security/oauth2/membrane/authorization_server/service-proxy.sh diff --git a/distribution/examples/oauth2/membrane/client/proxies.xml b/distribution/examples/security/oauth2/membrane/client/proxies.xml similarity index 100% rename from distribution/examples/oauth2/membrane/client/proxies.xml rename to distribution/examples/security/oauth2/membrane/client/proxies.xml diff --git a/distribution/examples/oauth2/membrane/client/service-proxy.bat b/distribution/examples/security/oauth2/membrane/client/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/membrane/client/service-proxy.bat rename to distribution/examples/security/oauth2/membrane/client/service-proxy.bat diff --git a/distribution/examples/oauth2/membrane/client/service-proxy.sh b/distribution/examples/security/oauth2/membrane/client/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/membrane/client/service-proxy.sh rename to distribution/examples/security/oauth2/membrane/client/service-proxy.sh diff --git a/distribution/examples/oauth2/openid/README.md b/distribution/examples/security/oauth2/openid/README.md similarity index 100% rename from distribution/examples/oauth2/openid/README.md rename to distribution/examples/security/oauth2/openid/README.md diff --git a/distribution/examples/oauth2/openid/proxies.xml b/distribution/examples/security/oauth2/openid/proxies.xml similarity index 100% rename from distribution/examples/oauth2/openid/proxies.xml rename to distribution/examples/security/oauth2/openid/proxies.xml diff --git a/distribution/examples/oauth2/google/service-proxy.bat b/distribution/examples/security/oauth2/openid/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/google/service-proxy.bat rename to distribution/examples/security/oauth2/openid/service-proxy.bat diff --git a/distribution/examples/oauth2/google/service-proxy.sh b/distribution/examples/security/oauth2/openid/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/google/service-proxy.sh rename to distribution/examples/security/oauth2/openid/service-proxy.sh diff --git a/distribution/examples/rateLimiter/README.md b/distribution/examples/security/rateLimiter/README.md similarity index 100% rename from distribution/examples/rateLimiter/README.md rename to distribution/examples/security/rateLimiter/README.md diff --git a/distribution/examples/rateLimiter/proxies.xml b/distribution/examples/security/rateLimiter/proxies.xml similarity index 97% rename from distribution/examples/rateLimiter/proxies.xml rename to distribution/examples/security/rateLimiter/proxies.xml index 31d9d220cf..ccace92527 100644 --- a/distribution/examples/rateLimiter/proxies.xml +++ b/distribution/examples/security/rateLimiter/proxies.xml @@ -1,16 +1,16 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/distribution/examples/spel/service-proxy.bat b/distribution/examples/security/rateLimiter/service-proxy.bat similarity index 100% rename from distribution/examples/spel/service-proxy.bat rename to distribution/examples/security/rateLimiter/service-proxy.bat diff --git a/distribution/examples/rateLimiter/service-proxy.sh b/distribution/examples/security/rateLimiter/service-proxy.sh similarity index 100% rename from distribution/examples/rateLimiter/service-proxy.sh rename to distribution/examples/security/rateLimiter/service-proxy.sh diff --git a/distribution/examples/ssl/README.md b/distribution/examples/security/ssl/README.md similarity index 100% rename from distribution/examples/ssl/README.md rename to distribution/examples/security/ssl/README.md diff --git a/distribution/examples/ssl/api-with-tls-pem/README.md b/distribution/examples/security/ssl/api-with-tls-pem/README.md similarity index 100% rename from distribution/examples/ssl/api-with-tls-pem/README.md rename to distribution/examples/security/ssl/api-with-tls-pem/README.md diff --git a/distribution/examples/ssl/api-with-tls-pem/membrane-key.pem b/distribution/examples/security/ssl/api-with-tls-pem/membrane-key.pem similarity index 100% rename from distribution/examples/ssl/api-with-tls-pem/membrane-key.pem rename to distribution/examples/security/ssl/api-with-tls-pem/membrane-key.pem diff --git a/distribution/examples/ssl/api-with-tls-pem/membrane.pem b/distribution/examples/security/ssl/api-with-tls-pem/membrane.pem similarity index 100% rename from distribution/examples/ssl/api-with-tls-pem/membrane.pem rename to distribution/examples/security/ssl/api-with-tls-pem/membrane.pem diff --git a/distribution/examples/ssl/api-with-tls-pem/proxies.xml b/distribution/examples/security/ssl/api-with-tls-pem/proxies.xml similarity index 100% rename from distribution/examples/ssl/api-with-tls-pem/proxies.xml rename to distribution/examples/security/ssl/api-with-tls-pem/proxies.xml diff --git a/distribution/examples/oauth2/openid/service-proxy.bat b/distribution/examples/security/ssl/api-with-tls-pem/service-proxy.bat similarity index 100% rename from distribution/examples/oauth2/openid/service-proxy.bat rename to distribution/examples/security/ssl/api-with-tls-pem/service-proxy.bat diff --git a/distribution/examples/oauth2/openid/service-proxy.sh b/distribution/examples/security/ssl/api-with-tls-pem/service-proxy.sh similarity index 100% rename from distribution/examples/oauth2/openid/service-proxy.sh rename to distribution/examples/security/ssl/api-with-tls-pem/service-proxy.sh diff --git a/distribution/examples/ssl/api-with-tls-pkcs12/README.md b/distribution/examples/security/ssl/api-with-tls-pkcs12/README.md similarity index 100% rename from distribution/examples/ssl/api-with-tls-pkcs12/README.md rename to distribution/examples/security/ssl/api-with-tls-pkcs12/README.md diff --git a/distribution/examples/ssl/api-with-tls-pkcs12/proxies.xml b/distribution/examples/security/ssl/api-with-tls-pkcs12/proxies.xml similarity index 100% rename from distribution/examples/ssl/api-with-tls-pkcs12/proxies.xml rename to distribution/examples/security/ssl/api-with-tls-pkcs12/proxies.xml diff --git a/distribution/examples/soap/add-soap-header/service-proxy.bat b/distribution/examples/security/ssl/api-with-tls-pkcs12/service-proxy.bat similarity index 100% rename from distribution/examples/soap/add-soap-header/service-proxy.bat rename to distribution/examples/security/ssl/api-with-tls-pkcs12/service-proxy.bat diff --git a/distribution/examples/soap/add-soap-header/service-proxy.sh b/distribution/examples/security/ssl/api-with-tls-pkcs12/service-proxy.sh old mode 100755 new mode 100644 similarity index 100% rename from distribution/examples/soap/add-soap-header/service-proxy.sh rename to distribution/examples/security/ssl/api-with-tls-pkcs12/service-proxy.sh diff --git a/distribution/examples/ssl/to-backend/README.md b/distribution/examples/security/ssl/to-backend/README.md similarity index 100% rename from distribution/examples/ssl/to-backend/README.md rename to distribution/examples/security/ssl/to-backend/README.md diff --git a/distribution/examples/ssl/to-backend/proxies.xml b/distribution/examples/security/ssl/to-backend/proxies.xml similarity index 100% rename from distribution/examples/ssl/to-backend/proxies.xml rename to distribution/examples/security/ssl/to-backend/proxies.xml diff --git a/distribution/examples/soap/sample-soap-service/service-proxy.bat b/distribution/examples/security/ssl/to-backend/service-proxy.bat similarity index 100% rename from distribution/examples/soap/sample-soap-service/service-proxy.bat rename to distribution/examples/security/ssl/to-backend/service-proxy.bat diff --git a/distribution/examples/soap/sample-soap-service/service-proxy.sh b/distribution/examples/security/ssl/to-backend/service-proxy.sh old mode 100755 new mode 100644 similarity index 100% rename from distribution/examples/soap/sample-soap-service/service-proxy.sh rename to distribution/examples/security/ssl/to-backend/service-proxy.sh diff --git a/distribution/examples/soap/add-soap-header/README.md b/distribution/examples/web-services/soap/add-soap-header/README.md similarity index 100% rename from distribution/examples/soap/add-soap-header/README.md rename to distribution/examples/web-services/soap/add-soap-header/README.md diff --git a/distribution/examples/soap/add-soap-header/pom.xml b/distribution/examples/web-services/soap/add-soap-header/pom.xml similarity index 100% rename from distribution/examples/soap/add-soap-header/pom.xml rename to distribution/examples/web-services/soap/add-soap-header/pom.xml diff --git a/distribution/examples/soap/add-soap-header/proxies.xml b/distribution/examples/web-services/soap/add-soap-header/proxies.xml similarity index 100% rename from distribution/examples/soap/add-soap-header/proxies.xml rename to distribution/examples/web-services/soap/add-soap-header/proxies.xml diff --git a/distribution/examples/ssl/api-with-tls-pem/service-proxy.bat b/distribution/examples/web-services/soap/add-soap-header/service-proxy.bat similarity index 100% rename from distribution/examples/ssl/api-with-tls-pem/service-proxy.bat rename to distribution/examples/web-services/soap/add-soap-header/service-proxy.bat diff --git a/distribution/examples/ssl/api-with-tls-pem/service-proxy.sh b/distribution/examples/web-services/soap/add-soap-header/service-proxy.sh old mode 100644 new mode 100755 similarity index 100% rename from distribution/examples/ssl/api-with-tls-pem/service-proxy.sh rename to distribution/examples/web-services/soap/add-soap-header/service-proxy.sh diff --git a/distribution/examples/soap/add-soap-header/soap-message-without-header.xml b/distribution/examples/web-services/soap/add-soap-header/soap-message-without-header.xml similarity index 100% rename from distribution/examples/soap/add-soap-header/soap-message-without-header.xml rename to distribution/examples/web-services/soap/add-soap-header/soap-message-without-header.xml diff --git a/distribution/examples/soap/add-soap-header/src/main/java/com/predic8/AddSoapHeaderInterceptor.java b/distribution/examples/web-services/soap/add-soap-header/src/main/java/com/predic8/AddSoapHeaderInterceptor.java similarity index 100% rename from distribution/examples/soap/add-soap-header/src/main/java/com/predic8/AddSoapHeaderInterceptor.java rename to distribution/examples/web-services/soap/add-soap-header/src/main/java/com/predic8/AddSoapHeaderInterceptor.java diff --git a/distribution/examples/soap/sample-soap-service/README.md b/distribution/examples/web-services/soap/sample-soap-service/README.md similarity index 100% rename from distribution/examples/soap/sample-soap-service/README.md rename to distribution/examples/web-services/soap/sample-soap-service/README.md diff --git a/distribution/examples/soap/sample-soap-service/proxies.xml b/distribution/examples/web-services/soap/sample-soap-service/proxies.xml similarity index 100% rename from distribution/examples/soap/sample-soap-service/proxies.xml rename to distribution/examples/web-services/soap/sample-soap-service/proxies.xml diff --git a/distribution/examples/soap/sample-soap-service/request.xml b/distribution/examples/web-services/soap/sample-soap-service/request.xml similarity index 100% rename from distribution/examples/soap/sample-soap-service/request.xml rename to distribution/examples/web-services/soap/sample-soap-service/request.xml diff --git a/distribution/examples/soap/sample-soap-service/requests.http b/distribution/examples/web-services/soap/sample-soap-service/requests.http similarity index 100% rename from distribution/examples/soap/sample-soap-service/requests.http rename to distribution/examples/web-services/soap/sample-soap-service/requests.http diff --git a/distribution/examples/ssl/api-with-tls-pkcs12/service-proxy.bat b/distribution/examples/web-services/soap/sample-soap-service/service-proxy.bat similarity index 100% rename from distribution/examples/ssl/api-with-tls-pkcs12/service-proxy.bat rename to distribution/examples/web-services/soap/sample-soap-service/service-proxy.bat diff --git a/distribution/examples/ssl/api-with-tls-pkcs12/service-proxy.sh b/distribution/examples/web-services/soap/sample-soap-service/service-proxy.sh old mode 100644 new mode 100755 similarity index 100% rename from distribution/examples/ssl/api-with-tls-pkcs12/service-proxy.sh rename to distribution/examples/web-services/soap/sample-soap-service/service-proxy.sh diff --git a/distribution/examples/soap/secured-wsdl/proxies.xml b/distribution/examples/web-services/soap/secured-wsdl/proxies.xml similarity index 100% rename from distribution/examples/soap/secured-wsdl/proxies.xml rename to distribution/examples/web-services/soap/secured-wsdl/proxies.xml diff --git a/distribution/examples/custom-websocket-interceptor/README.md b/distribution/examples/web-sockets/custom-websocket-interceptor/README.md similarity index 100% rename from distribution/examples/custom-websocket-interceptor/README.md rename to distribution/examples/web-sockets/custom-websocket-interceptor/README.md diff --git a/distribution/examples/custom-websocket-interceptor/embedded/README.md b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/README.md similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/README.md rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/README.md diff --git a/distribution/examples/custom-websocket-interceptor/embedded/pom.xml b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/pom.xml similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/pom.xml rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/pom.xml diff --git a/distribution/examples/custom-websocket-interceptor/embedded/src/main/java/com/predic8/application/MyApplication.java b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/src/main/java/com/predic8/application/MyApplication.java similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/src/main/java/com/predic8/application/MyApplication.java rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/src/main/java/com/predic8/application/MyApplication.java diff --git a/distribution/examples/custom-websocket-interceptor/embedded/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java diff --git a/distribution/examples/custom-websocket-interceptor/embedded/src/main/resources/log4j2.xml b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/src/main/resources/log4j2.xml similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/src/main/resources/log4j2.xml rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/src/main/resources/log4j2.xml diff --git a/distribution/examples/custom-websocket-interceptor/embedded/start.bat b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/start.bat similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/start.bat rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/start.bat diff --git a/distribution/examples/custom-websocket-interceptor/embedded/start.sh b/distribution/examples/web-sockets/custom-websocket-interceptor/embedded/start.sh similarity index 100% rename from distribution/examples/custom-websocket-interceptor/embedded/start.sh rename to distribution/examples/web-sockets/custom-websocket-interceptor/embedded/start.sh diff --git a/distribution/examples/custom-websocket-interceptor/standalone/README.md b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/README.md similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/README.md rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/README.md diff --git a/distribution/examples/custom-websocket-interceptor/standalone/compile-and-copy.bat b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/compile-and-copy.bat similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/compile-and-copy.bat rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/compile-and-copy.bat diff --git a/distribution/examples/custom-websocket-interceptor/standalone/compile-and-copy.sh b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/compile-and-copy.sh similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/compile-and-copy.sh rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/compile-and-copy.sh diff --git a/distribution/examples/custom-websocket-interceptor/standalone/pom.xml b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/pom.xml similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/pom.xml rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/pom.xml diff --git a/distribution/examples/custom-websocket-interceptor/standalone/proxies.xml b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/proxies.xml similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/proxies.xml rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/proxies.xml diff --git a/distribution/examples/ssl/to-backend/service-proxy.bat b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/service-proxy.bat similarity index 100% rename from distribution/examples/ssl/to-backend/service-proxy.bat rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/service-proxy.bat diff --git a/distribution/examples/ssl/to-backend/service-proxy.sh b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/service-proxy.sh similarity index 100% rename from distribution/examples/ssl/to-backend/service-proxy.sh rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/service-proxy.sh diff --git a/distribution/examples/custom-websocket-interceptor/standalone/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java b/distribution/examples/web-sockets/custom-websocket-interceptor/standalone/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java similarity index 100% rename from distribution/examples/custom-websocket-interceptor/standalone/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java rename to distribution/examples/web-sockets/custom-websocket-interceptor/standalone/src/main/java/com/predic8/membrane/core/interceptor/websocket/custom/MyWebSocketLogInterceptor.java diff --git a/distribution/examples/stomp-over-websocket-intercepting/README.md b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/README.md similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/README.md rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/README.md diff --git a/distribution/examples/stomp-over-websocket-intercepting/index.html b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/index.html similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/index.html rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/index.html diff --git a/distribution/examples/stomp-over-websocket-intercepting/jquery.min.js b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/jquery.min.js similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/jquery.min.js rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/jquery.min.js diff --git a/distribution/examples/stomp-over-websocket-intercepting/proxies.xml b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/proxies.xml similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/proxies.xml rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/proxies.xml diff --git a/distribution/examples/stax-interceptor/service-proxy.bat b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/service-proxy.bat similarity index 100% rename from distribution/examples/stax-interceptor/service-proxy.bat rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/service-proxy.bat diff --git a/distribution/examples/stomp-over-websocket-intercepting/service-proxy.sh b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/service-proxy.sh similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/service-proxy.sh rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/service-proxy.sh diff --git a/distribution/examples/stomp-over-websocket-intercepting/stomp.js b/distribution/examples/web-sockets/stomp-over-websocket-intercepting/stomp.js similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/stomp.js rename to distribution/examples/web-sockets/stomp-over-websocket-intercepting/stomp.js diff --git a/distribution/examples/websocket-intercepting/README.md b/distribution/examples/web-sockets/websocket-intercepting/README.md similarity index 100% rename from distribution/examples/websocket-intercepting/README.md rename to distribution/examples/web-sockets/websocket-intercepting/README.md diff --git a/distribution/examples/websocket-intercepting/index.js b/distribution/examples/web-sockets/websocket-intercepting/index.js similarity index 100% rename from distribution/examples/websocket-intercepting/index.js rename to distribution/examples/web-sockets/websocket-intercepting/index.js diff --git a/distribution/examples/websocket-intercepting/package.json b/distribution/examples/web-sockets/websocket-intercepting/package.json similarity index 100% rename from distribution/examples/websocket-intercepting/package.json rename to distribution/examples/web-sockets/websocket-intercepting/package.json diff --git a/distribution/examples/websocket-intercepting/proxies.xml b/distribution/examples/web-sockets/websocket-intercepting/proxies.xml similarity index 100% rename from distribution/examples/websocket-intercepting/proxies.xml rename to distribution/examples/web-sockets/websocket-intercepting/proxies.xml diff --git a/distribution/examples/stomp-over-websocket-intercepting/service-proxy.bat b/distribution/examples/web-sockets/websocket-intercepting/service-proxy.bat similarity index 100% rename from distribution/examples/stomp-over-websocket-intercepting/service-proxy.bat rename to distribution/examples/web-sockets/websocket-intercepting/service-proxy.bat diff --git a/distribution/examples/websocket-intercepting/service-proxy.sh b/distribution/examples/web-sockets/websocket-intercepting/service-proxy.sh similarity index 100% rename from distribution/examples/websocket-intercepting/service-proxy.sh rename to distribution/examples/web-sockets/websocket-intercepting/service-proxy.sh diff --git a/distribution/examples/websocket-intercepting/startWebsocket.bat b/distribution/examples/web-sockets/websocket-intercepting/startWebsocket.bat similarity index 100% rename from distribution/examples/websocket-intercepting/startWebsocket.bat rename to distribution/examples/web-sockets/websocket-intercepting/startWebsocket.bat diff --git a/distribution/examples/websocket-intercepting/startWebsocket.sh b/distribution/examples/web-sockets/websocket-intercepting/startWebsocket.sh similarity index 100% rename from distribution/examples/websocket-intercepting/startWebsocket.sh rename to distribution/examples/web-sockets/websocket-intercepting/startWebsocket.sh diff --git a/distribution/examples/websocket-stomp/README.md b/distribution/examples/web-sockets/websocket-stomp/README.md similarity index 100% rename from distribution/examples/websocket-stomp/README.md rename to distribution/examples/web-sockets/websocket-stomp/README.md diff --git a/distribution/examples/websocket-stomp/index.html b/distribution/examples/web-sockets/websocket-stomp/index.html similarity index 100% rename from distribution/examples/websocket-stomp/index.html rename to distribution/examples/web-sockets/websocket-stomp/index.html diff --git a/distribution/examples/websocket-stomp/jquery.min.js b/distribution/examples/web-sockets/websocket-stomp/jquery.min.js similarity index 100% rename from distribution/examples/websocket-stomp/jquery.min.js rename to distribution/examples/web-sockets/websocket-stomp/jquery.min.js diff --git a/distribution/examples/websocket-stomp/proxies.xml b/distribution/examples/web-sockets/websocket-stomp/proxies.xml similarity index 100% rename from distribution/examples/websocket-stomp/proxies.xml rename to distribution/examples/web-sockets/websocket-stomp/proxies.xml diff --git a/distribution/examples/websocket-intercepting/service-proxy.bat b/distribution/examples/web-sockets/websocket-stomp/service-proxy.bat similarity index 100% rename from distribution/examples/websocket-intercepting/service-proxy.bat rename to distribution/examples/web-sockets/websocket-stomp/service-proxy.bat diff --git a/distribution/examples/websocket-stomp/service-proxy.sh b/distribution/examples/web-sockets/websocket-stomp/service-proxy.sh similarity index 100% rename from distribution/examples/websocket-stomp/service-proxy.sh rename to distribution/examples/web-sockets/websocket-stomp/service-proxy.sh diff --git a/distribution/examples/websocket-stomp/stomp.js b/distribution/examples/web-sockets/websocket-stomp/stomp.js similarity index 100% rename from distribution/examples/websocket-stomp/stomp.js rename to distribution/examples/web-sockets/websocket-stomp/stomp.js diff --git a/distribution/examples/basic-xml-interceptor/README.md b/distribution/examples/xml/basic-xml-interceptor/README.md similarity index 100% rename from distribution/examples/basic-xml-interceptor/README.md rename to distribution/examples/xml/basic-xml-interceptor/README.md diff --git a/distribution/examples/basic-xml-interceptor/example.xml b/distribution/examples/xml/basic-xml-interceptor/example.xml similarity index 100% rename from distribution/examples/basic-xml-interceptor/example.xml rename to distribution/examples/xml/basic-xml-interceptor/example.xml diff --git a/distribution/examples/basic-xml-interceptor/pom.xml b/distribution/examples/xml/basic-xml-interceptor/pom.xml similarity index 100% rename from distribution/examples/basic-xml-interceptor/pom.xml rename to distribution/examples/xml/basic-xml-interceptor/pom.xml diff --git a/distribution/examples/basic-xml-interceptor/proxies.xml b/distribution/examples/xml/basic-xml-interceptor/proxies.xml similarity index 100% rename from distribution/examples/basic-xml-interceptor/proxies.xml rename to distribution/examples/xml/basic-xml-interceptor/proxies.xml diff --git a/distribution/examples/websocket-stomp/service-proxy.bat b/distribution/examples/xml/basic-xml-interceptor/service-proxy.bat similarity index 100% rename from distribution/examples/websocket-stomp/service-proxy.bat rename to distribution/examples/xml/basic-xml-interceptor/service-proxy.bat diff --git a/distribution/examples/spel/service-proxy.sh b/distribution/examples/xml/basic-xml-interceptor/service-proxy.sh old mode 100644 new mode 100755 similarity index 100% rename from distribution/examples/spel/service-proxy.sh rename to distribution/examples/xml/basic-xml-interceptor/service-proxy.sh diff --git a/distribution/examples/basic-xml-interceptor/src/main/java/com/predic8/BasicXmlInterceptor.java b/distribution/examples/xml/basic-xml-interceptor/src/main/java/com/predic8/BasicXmlInterceptor.java similarity index 100% rename from distribution/examples/basic-xml-interceptor/src/main/java/com/predic8/BasicXmlInterceptor.java rename to distribution/examples/xml/basic-xml-interceptor/src/main/java/com/predic8/BasicXmlInterceptor.java diff --git a/distribution/examples/stax-interceptor/README.md b/distribution/examples/xml/stax-interceptor/README.md similarity index 100% rename from distribution/examples/stax-interceptor/README.md rename to distribution/examples/xml/stax-interceptor/README.md diff --git a/distribution/examples/stax-interceptor/pom.xml b/distribution/examples/xml/stax-interceptor/pom.xml similarity index 100% rename from distribution/examples/stax-interceptor/pom.xml rename to distribution/examples/xml/stax-interceptor/pom.xml diff --git a/distribution/examples/stax-interceptor/proxies.xml b/distribution/examples/xml/stax-interceptor/proxies.xml similarity index 100% rename from distribution/examples/stax-interceptor/proxies.xml rename to distribution/examples/xml/stax-interceptor/proxies.xml diff --git a/distribution/examples/stax-interceptor/request.xml b/distribution/examples/xml/stax-interceptor/request.xml similarity index 100% rename from distribution/examples/stax-interceptor/request.xml rename to distribution/examples/xml/stax-interceptor/request.xml diff --git a/distribution/examples/xslt/service-proxy.bat b/distribution/examples/xml/stax-interceptor/service-proxy.bat similarity index 100% rename from distribution/examples/xslt/service-proxy.bat rename to distribution/examples/xml/stax-interceptor/service-proxy.bat diff --git a/distribution/examples/stax-interceptor/service-proxy.sh b/distribution/examples/xml/stax-interceptor/service-proxy.sh similarity index 100% rename from distribution/examples/stax-interceptor/service-proxy.sh rename to distribution/examples/xml/stax-interceptor/service-proxy.sh diff --git a/distribution/examples/stax-interceptor/src/main/java/com/predic8/StaxConverterInterceptor.java b/distribution/examples/xml/stax-interceptor/src/main/java/com/predic8/StaxConverterInterceptor.java similarity index 100% rename from distribution/examples/stax-interceptor/src/main/java/com/predic8/StaxConverterInterceptor.java rename to distribution/examples/xml/stax-interceptor/src/main/java/com/predic8/StaxConverterInterceptor.java diff --git a/distribution/examples/xslt/README.md b/distribution/examples/xml/xslt/README.md similarity index 100% rename from distribution/examples/xslt/README.md rename to distribution/examples/xml/xslt/README.md diff --git a/distribution/examples/xslt/proxies.xml b/distribution/examples/xml/xslt/proxies.xml similarity index 100% rename from distribution/examples/xslt/proxies.xml rename to distribution/examples/xml/xslt/proxies.xml diff --git a/distribution/examples/xslt/reformat.xsl b/distribution/examples/xml/xslt/reformat.xsl similarity index 100% rename from distribution/examples/xslt/reformat.xsl rename to distribution/examples/xml/xslt/reformat.xsl diff --git a/distribution/examples/rateLimiter/service-proxy.bat b/distribution/examples/xml/xslt/service-proxy.bat similarity index 97% rename from distribution/examples/rateLimiter/service-proxy.bat rename to distribution/examples/xml/xslt/service-proxy.bat index 57a0fde463..d2dec51288 100644 --- a/distribution/examples/rateLimiter/service-proxy.bat +++ b/distribution/examples/xml/xslt/service-proxy.bat @@ -1,18 +1,18 @@ -@echo off -if not "%MEMBRANE_HOME%" == "" goto homeSet -set "MEMBRANE_HOME=%cd%\..\.." -echo "%MEMBRANE_HOME%" -if exist "%MEMBRANE_HOME%\service-proxy.bat" goto homeOk - -:homeSet -if exist "%MEMBRANE_HOME%\service-proxy.bat" goto homeOk -echo Please set the MEMBRANE_HOME environment variable to point to -echo the directory where you have extracted the Membrane software. -exit - -:homeOk -set "CLASSPATH=%MEMBRANE_HOME%" -set "CLASSPATH=%MEMBRANE_HOME%/conf" -set "CLASSPATH=%CLASSPATH%;%MEMBRANE_HOME%/starter.jar" -echo Membrane Router running... +@echo off +if not "%MEMBRANE_HOME%" == "" goto homeSet +set "MEMBRANE_HOME=%cd%\..\.." +echo "%MEMBRANE_HOME%" +if exist "%MEMBRANE_HOME%\service-proxy.bat" goto homeOk + +:homeSet +if exist "%MEMBRANE_HOME%\service-proxy.bat" goto homeOk +echo Please set the MEMBRANE_HOME environment variable to point to +echo the directory where you have extracted the Membrane software. +exit + +:homeOk +set "CLASSPATH=%MEMBRANE_HOME%" +set "CLASSPATH=%MEMBRANE_HOME%/conf" +set "CLASSPATH=%CLASSPATH%;%MEMBRANE_HOME%/starter.jar" +echo Membrane Router running... java -classpath "%CLASSPATH%" com.predic8.membrane.core.Starter -c proxies.xml \ No newline at end of file diff --git a/distribution/examples/xslt/service-proxy.sh b/distribution/examples/xml/xslt/service-proxy.sh similarity index 100% rename from distribution/examples/xslt/service-proxy.sh rename to distribution/examples/xml/xslt/service-proxy.sh