Change in ovirt-engine[master]: core: rearrange product uris

Vojtech Szocs has submitted this change and it was merged. Change subject: core: rearrange product uris ...................................................................... core: rearrange product uris MISSION Advanced farther into well behaved web application, install as much as we can into /ovirt-engine URI name space, removing / abuse. Synchronize between jboss and apache URI layouts so that development setup will be as similar as possible to production. NEW LAYOUT -+- / (root.war) Redirect: ovirt-engine | +--- api/ (api.war) | +-+- ovirt-engine/ (welcome.war) [NEW] | | | +--- docs/ (docs.war) [NEW] | | | +-+- services(services.war) [NEW] | | | | | +-+- attachment/ | | | | | +-+- files/ | | | | | +--- get-session-user | | | | | +--- health | | | | | +--- host-register | | | | | +--- pki-resource | | | | | +--- reports-redirect | | | +--- userportal/ (userportal.war) | | | +--- webadmin/ (webadmin.war) | +-+- OvirtEngineWeb/ | | | +--- HealthStatus.aspx Forward: ovirt-engine/services/health | | | +--- HealthStatus/* Forward: ovirt-engine/services/health | | | +--- VdsAutoRegistration.aspx Forward: ovirt-engine/services/host-register | | | +--- register Forward: ovirt-engine/services/host-register | +-+- RHEVManagerWeb/ | | | +--- VdsAutoRegistration.aspx Forward: ovirt-engine/services/host-register | +--- ca.crt Forward: ovirt-engine/serivces/pki-resource | +--- engine.ssh.key.txt Forward: ovirt-engine/serivces/pki-resource | +--- rhevm.ssh.key.txt Forward: ovirt-engine/serivces/pki-resource LAYOUT NOTES HealthStatus servlet is used by python using urllib2 which supports redirect, it does not accept extra path, so it is redirected into servlet at services. Registration uses python httplib which does not support redirect, so these uris are forwarded into servlets at services. /ValidateSession is gone as reports can be modified to support the new servlet name at /services/get-session-user. GWT NOTES - Generate GWT files in-place so that application name is user friendly and there is no extra nesting, so we end up with: /ovirt-engine/webadmin /ovirt-engine/userportal - Added client side BaseContextPathData class to read base context path from host page. CONFIGURATION ENGINE_URI was added to be able to configure URI at runtime, jboss upstream has some bugs regarding variable substitution within resources, once this is resolved we can have fully configured URI. Change-Id: I9cb4822f6bf4d372715e12858635db5ed3edd115 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=961677 Signed-off-by: Alexander Wels <awels(a)redhat.com&gt; Signed-off-by: Alon Bar-Lev <alonbl(a)redhat.com&gt; --- A backend/manager/modules/docs/exclude-filters.xml A backend/manager/modules/docs/pom.xml A backend/manager/modules/docs/src/main/resources/META-INF/MANIFEST.MF R backend/manager/modules/docs/src/main/resources/messages.properties R backend/manager/modules/docs/src/main/webapp/WEB-INF/no_lang.jsp A backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml M backend/manager/modules/pom.xml D backend/manager/modules/root/exclude-filters.xml M backend/manager/modules/root/pom.xml D backend/manager/modules/root/src/main/java/org/ovirt/engine/core/pki/PKIResourceServlet.java M backend/manager/modules/root/src/main/resources/META-INF/MANIFEST.MF M backend/manager/modules/root/src/main/webapp/WEB-INF/web.xml A backend/manager/modules/services/exclude-filters.xml A backend/manager/modules/services/pom.xml R backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetAttachmentServlet.java R backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/GetSessionUser.java R backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/HealthStatus.java A backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/PKIResourceServlet.java R backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/RegisterServlet.java R backend/manager/modules/services/src/main/java/org/ovirt/engine/core/services/ReportsRedirectServlet.java A backend/manager/modules/services/src/main/resources/META-INF/MANIFEST.MF A backend/manager/modules/services/src/main/webapp/WEB-INF/web.xml R backend/manager/modules/services/src/main/webapp/novnc-main.html R backend/manager/modules/services/src/main/webapp/spicehtml5-main.html M backend/manager/modules/utils/exclude-filters.xml R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/DocsServlet.java R backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/FileServlet.java A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java D backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/PageNotFoundForwardServlet.java A backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/RedirectServlet.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ServletUtils.java R backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/DocsServletTest.java R backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/FileServletTest.java M backend/manager/modules/utils/src/test/java/org/ovirt/engine/core/utils/servlet/ServletUtilsTest.java R backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/servlet/filetest/en-US/index.html R backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/servlet/filetest/fr/index.html R backend/manager/modules/utils/src/test/resources/org/ovirt/engine/core/utils/servlet/filetest/index.html A backend/manager/modules/welcome/pom.xml R backend/manager/modules/welcome/src/main/java/org/ovirt/engine/core/WelcomeServlet.java A backend/manager/modules/welcome/src/main/resources/META-INF/MANIFEST.MF A backend/manager/modules/welcome/src/main/resources/messages.properties R backend/manager/modules/welcome/src/main/webapp/WEB-INF/404.jsp R backend/manager/modules/welcome/src/main/webapp/WEB-INF/ovirt-engine.jsp A backend/manager/modules/welcome/src/main/webapp/WEB-INF/web.xml R backend/manager/modules/welcome/src/main/webapp/splash.js R backend/manager/modules/welcome/src/test/java/org/ovirt/engine/core/WelcomeServletTest.java M ear/pom.xml M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServlet.java A frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/BaseContextPathData.java M frontend/webadmin/modules/frontend/src/main/resources/META-INF/resources/GwtHostPage.jsp M frontend/webadmin/modules/frontend/src/main/resources/META-INF/web-fragment.xml M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/AbstractGwtDynamicHostPageServletTest.java M frontend/webadmin/modules/frontend/src/test/java/org/ovirt/engine/ui/frontend/server/gwt/UserPortalHostPageServletTest.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/NoVncImpl.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/SpiceHtml5Impl.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ConsoleModel.java M frontend/webadmin/modules/userportal-gwtp/pom.xml M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/UserPortal.gwt.xml M frontend/webadmin/modules/userportal-gwtp/src/main/webapp/WEB-INF/web.xml D frontend/webadmin/modules/userportal-gwtp/src/main/webapp/index.html M frontend/webadmin/modules/webadmin/pom.xml M frontend/webadmin/modules/webadmin/src/main/webapp/WEB-INF/web.xml D frontend/webadmin/modules/webadmin/src/main/webapp/index.html M ovirt-engine.spec.in M packaging/branding/ovirt.brand/welcome_page.template M packaging/conf/ovirt-engine-proxy.conf.v2.in M packaging/services/ovirt-engine/ovirt-engine.conf.in 70 files changed, 1,283 insertions(+), 629 deletions(-) Approvals: Alexander Wels: Verified Vojtech Szocs: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/20473 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9cb4822f6bf4d372715e12858635db5ed3edd115 Gerrit-PatchSet: 15 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alexander Wels <awels(a)redhat.com&gt; Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com&gt; Gerrit-Reviewer: Daniel Erez <derez(a)redhat.com&gt; Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com&gt; Gerrit-Reviewer: Frank Kobzik <fkobzik(a)redhat.com&gt; Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com&gt; Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com&gt; Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com&gt; Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Sandro Bonazzola <sbonazzo(a)redhat.com&gt; Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com&gt; Gerrit-Reviewer: Yaniv Dary <ydary(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server