Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: api: redirect /api to /ovirt-engine/api using rewrite rules ......................................................................
packaging: api: redirect /api to /ovirt-engine/api using rewrite rules Using forward servlet is not a complete solution as there is some limitation of sharing context. So java based solution is not easily possible. Use jboss rewrite rules in order to achieve similar effect. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1031597 Change-Id: I2ad9bb362719c7805be9f69d7e14bd3ad7b1f5c7 Signed-off-by: Alon Bar-Lev <alo...@redhat.com> --- M backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml M packaging/services/ovirt-engine/ovirt-engine.xml.in 3 files changed, 4 insertions(+), 18 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/66/21566/1 diff --git a/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml index eade16d..76af9ab 100644 --- a/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/restapi/webapp/src/main/webapp/WEB-INF/web.xml @@ -25,5 +25,8 @@ <session-config> <session-timeout>180</session-timeout> + <cookie-config> + <path>/</path> + </cookie-config> </session-config> </web-app> diff --git a/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml b/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml index ea237dc..57bcb96 100644 --- a/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml +++ b/backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml @@ -100,24 +100,6 @@ <url-pattern>/OvirtEngineWeb/HealthStatus.aspx</url-pattern> </servlet-mapping> - <!-- Legacy api URI --> - <servlet> - <servlet-name>API</servlet-name> - <servlet-class>org.ovirt.engine.core.utils.servlet.ForwardServlet</servlet-class> - <init-param> - <param-name>targetContext</param-name> - <param-value>%{ENGINE_URI}/api/</param-value> - </init-param> - <init-param> - <param-name>uri</param-name> - <param-value></param-value> - </init-param> - </servlet> - <servlet-mapping> - <servlet-name>API</servlet-name> - <url-pattern>/api/*</url-pattern> - </servlet-mapping> - <servlet> <servlet-name>index</servlet-name> <servlet-class>org.ovirt.engine.core.utils.servlet.RedirectServlet</servlet-class> diff --git a/packaging/services/ovirt-engine/ovirt-engine.xml.in b/packaging/services/ovirt-engine/ovirt-engine.xml.in index acfa985..7ae04cb 100644 --- a/packaging/services/ovirt-engine/ovirt-engine.xml.in +++ b/packaging/services/ovirt-engine/ovirt-engine.xml.in @@ -309,6 +309,7 @@ <virtual-server name="default-host" enable-welcome-root="false"> <alias name="localhost"/> <rewrite pattern="^/RHEVManager(.*)$" substitution="/OvirtEngine$1" flags="last"/> + <rewrite pattern="^/api(.*)$" substitution="/ovirt-engine/api$1" flags="last"/> </virtual-server> </subsystem> -- To view, visit http://gerrit.ovirt.org/21566 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ad9bb362719c7805be9f69d7e14bd3ad7b1f5c7 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
