Alexander Wels has posted comments on this change.
Change subject: core: rearrange product uris
......................................................................
Patch Set 13:
(13 comments)
....................................................
File backend/manager/modules/docs/pom.xml
Line 65:
Line 66: <dependency>
Line 67: <groupId>${engine.groupId}</groupId>
Line 68: <artifactId>branding</artifactId>
Line 69: <version>${engine.version}</version>
Yes, we tried that, but for some reason jboss doesn't like the tags in the jar
which caused us not to be able to make this a module.
Line 70: </dependency>
Line 71: </dependencies>
Line 72:
Line 73: <build>
....................................................
File backend/manager/modules/services/pom.xml
Line 53: <plugins>
Line 54:
Line 55: <plugin>
Line 56: <groupId>org.apache.maven.plugins</groupId>
Line 57: <artifactId>maven-war-plugin</artifactId>
Didn't know that, will see what happens when I take it out.
Line 58: </plugin>
Line 59: </plugins>
Line 60: </build>
Line 61:
....................................................
File
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/ForwardServlet.java
Line 32: * The key to use in web.xml to specify the target context.
Line 33: */
Line 34: public static final String CONTEXT_PARAM = "targetContext";
//$NON-NLS-1$
Line 35: /**
Line 36: * The key to use in web.xml to specify the page not found forward
URI.
Done
Line 37: */
Line 38: public static final String URI_PARAM = "uri"; //$NON-NLS-1$
Line 39: /**
Line 40: * The URI parameter that will simply try to forward the request
path to the new context.
Line 36: * The key to use in web.xml to specify the page not found forward
URI.
Line 37: */
Line 38: public static final String URI_PARAM = "uri"; //$NON-NLS-1$
Line 39: /**
Line 40: * The URI parameter that will simply try to forward the request
path to the new context.
Done
Line 41: */
Line 42: public static final String ALL = "*"; //$NON-NLS-1$
Line 43: /**
Line 44: * Init param prefix for adding attributes.
Line 46: public static final String ATTR_PREF = "attr-";
Line 47: /**
Line 48: * Init param prefix for adding request parameters.
Line 49: */
Line 50: public static final String REQUEST_PREF = "req-";
Removed
Line 51:
Line 52: /**
Line 53: * The target context to use when forwarding.
Line 54: */
Line 53: * The target context to use when forwarding.
Line 54: */
Line 55: private String targetContext = null;
Line 56: /**
Line 57: * The page not found URI to use when forwarding.
Fixed
Line 58: */
Line 59: private String uri = null;
Line 60:
Line 61: @Override
Line 70: }
Line 71: if (targetContext == null) {
Line 72: throw new ServletException("Target context not defined in
web.xml"); //$NON-NLS-1$
Line 73: }
Line 74: if (uri == null) {
I didn't have 'all' when I wrote the init, so not having it would blow up the
servlet, but you make a good point, I will change it.
Line 75: throw new ServletException("Target uri not defined in
web.xml"); //$NON-NLS-1$
Line 76: }
Line 77: }
Line 78:
Line 120:
Line 121: /**
Line 122: * Forward the request to the appropriate servlet in the context
specified in the init method. This works
Line 123: * for all verbs due to the fact that forward calls service in
the target servlet, which determines which
Line 124: * verb was used based on the request object.
The target servlet uses the 'service' method to determine which doXXX method to
call, this doForward method doesn't care what the VERB is, neither does the
target servlet.
Line 125: *
Line 126: * If the initialization of the {@code ForwardServlet} includes
special parameters with a key starts with
Line 127: * 'attr-' those keys and values will be added to the request
attributes for use in the target servlet. The
Line 128: * 'attr-' prefix will be stripped from attribute key.
....................................................
File
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/servlet/RedirectServlet.java
Line 8: import javax.servlet.http.HttpServletResponse;
Line 9:
Line 10: import org.ovirt.engine.core.utils.EngineLocalConfig;
Line 11:
Line 12: public class RedirectServlet extends HttpServlet {
Done
Line 13: private static final long serialVersionUID = -1794616863361241804L;
Line 14:
Line 15: private static final String URL = "url";
Line 16:
Line 19: @Override
Line 20: public void init(ServletConfig config) throws ServletException {
Line 21: super.init(config);
Line 22:
Line 23: // we use %{x} convention to avoid conflict with jboss
properties
Done
Line 24: url =
EngineLocalConfig.getInstance().expandString(config.getInitParameter(URL).replaceAll("%\\{",
"\\${"));
Line 25: }
Line 26:
Line 27: @Override
....................................................
File backend/manager/modules/welcome/pom.xml
Line 54:
Line 55: <dependency>
Line 56: <groupId>${engine.groupId}</groupId>
Line 57: <artifactId>branding</artifactId>
Line 58: <version>${engine.version}</version>
See response on same question in other pom.
Line 59: </dependency>
Line 60:
Line 61: </dependencies>
Line 62:
....................................................
File
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/server/gwt/GwtDynamicHostPageServlet.java
Line 43: ATTR_SELECTOR_SCRIPT("selectorScript"), //$NON-NLS-1$
Line 44: ATTR_USER_INFO("userInfo"), //$NON-NLS-1$
Line 45: ATTR_STYLES("brandingStyle"), //$NON-NLS-1$
Line 46: ATTR_MESSAGES("messages"), //$NON-NLS-1$
Line 47: ATTR_CONF("conf"), //$NON-NLS-1$
Done
Line 48: ATTR_LOCALE(LocaleFilter.LOCALE),
Line 49: ATTR_APPLICATION_TYPE(BrandingFilter.APPLICATION_NAME);
Line 50:
Line 51: private final String attributeKey;
....................................................
File
frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/utils/HostPageConfiguration.java
Line 1: package org.ovirt.engine.ui.frontend.utils;
Line 2:
Line 3: import com.google.gwt.i18n.client.Dictionary;
Line 4:
Line 5: public class HostPageConfiguration {
Done
Line 6: /**
Line 7: * The name under which the dictionary will appear in the host page.
Line 8: */
Line 9: private static final String CONF_DICTIONARY_NAME = "conf";
//$NON-NLS-1$
--
To view, visit http://gerrit.ovirt.org/20473
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I9cb4822f6bf4d372715e12858635db5ed3edd115
Gerrit-PatchSet: 13
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alexander Wels <aw...@redhat.com>
Gerrit-Reviewer: Alexander Wels <aw...@redhat.com>
Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alo...@redhat.com>
Gerrit-Reviewer: Daniel Erez <de...@redhat.com>
Gerrit-Reviewer: Einav Cohen <eco...@redhat.com>
Gerrit-Reviewer: Frank Kobzik <fkob...@redhat.com>
Gerrit-Reviewer: Greg Sheremeta <gsher...@redhat.com>
Gerrit-Reviewer: Itamar Heim <ih...@redhat.com>
Gerrit-Reviewer: Michael Pasternak <mpast...@redhat.com>
Gerrit-Reviewer: Michal Skrivanek <michal.skriva...@redhat.com>
Gerrit-Reviewer: Roy Golan <rgo...@redhat.com>
Gerrit-Reviewer: Sandro Bonazzola <sbona...@redhat.com>
Gerrit-Reviewer: Vojtech Szocs <vsz...@redhat.com>
Gerrit-Reviewer: Yaniv Dary <yd...@redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
