Change in ovirt-engine[ovirt-engine-3.4]: userportal, webadmin: use json for documentation mapping files

[iheim at redhat.com]

Itamar Heim has submitted this change and it was merged.

Change subject: userportal, webadmin: use json for documentation mapping files
......................................................................


userportal, webadmin: use json for documentation mapping files

Convert from using csv to json for documentation mapping files.

Create new HelpTagJsonServlet to serve the json files to web apps. The servlet is
configurable to allow multiple json files (so there can be a common file shared
between webadmin and userportal). All configured files are merged into one json
String at init time, and cached (to limit server calls).

This backport also includes fix found in http://gerrit.ovirt.org/#/c/24212/
and http://gerrit.ovirt.org/#/c/24207/

Change-Id: I4d6e8be143583d253943445842c2851fb52274e6
Bug-Url: https://bugzilla.redhat.com/1014859
Signed-off-by: Greg Sheremeta <gshereme at redhat.com>
---
M Makefile
A README.manual
A backend/manager/modules/docs/src/main/java/org/ovirt/engine/docs/utils/servlet/HelpTagJsonServlet.java
M backend/manager/modules/docs/src/main/webapp/WEB-INF/web.xml
M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/uicommon/DocumentationPathTranslator.java
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java
M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java
M ovirt-engine.spec.in
D packaging/manual/DocumentationPath.csv
D packaging/manual/UserPortalDocumentationPath.csv
11 files changed, 254 insertions(+), 14 deletions(-)

Approvals:
  Greg Sheremeta: Verified
  Vojtech Szocs: Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/24280
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4d6e8be143583d253943445842c2851fb52274e6
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: ovirt-engine-3.4
Gerrit-Owner: Greg Sheremeta <gshereme at redhat.com>
Gerrit-Reviewer: Alexander Wels <awels at redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen at redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme at redhat.com>
Gerrit-Reviewer: Itamar Heim <iheim at redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server