Change in ovirt-engine[master]: userportal, webadmin: use json for documentation mapping files
Alexander Wels 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).
Change-Id: I4d6e8be143583d253943445842c2851fb52274e6
Bug-Url: https://bugzilla.redhat.com/1014859
Signed-off-by: Greg Sheremeta <gshereme(a)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/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
10 files changed, 245 insertions(+), 14 deletions(-)
Approvals:
Alexander Wels: Verified; Looks good to me, approved
Greg Sheremeta: Verified
--
To view, visit http://gerrit.ovirt.org/21392
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d6e8be143583d253943445842c2851fb52274e6
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Alexander Wels <awels(a)redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl(a)redhat.com>
Gerrit-Reviewer: Einav Cohen <ecohen(a)redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gshereme(a)redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vszocs(a)redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server