dgraham 2002/11/16 17:48:33 Modified: doc/userGuide struts-html.xml src/share/org/apache/struts/taglib/html BaseTag.java Log: Added server attribute for BaseTag. PR: #5303 Revision Changes Path 1.37 +8 -0 jakarta-struts/doc/userGuide/struts-html.xml Index: struts-html.xml =================================================================== RCS file: /home/cvs/jakarta-struts/doc/userGuide/struts-html.xml,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- struts-html.xml 16 Nov 2002 07:28:01 -0000 1.36 +++ struts-html.xml 17 Nov 2002 01:48:32 -0000 1.37 @@ -61,6 +61,14 @@ <p>The window target for this base reference.</p> </info> </attribute> + <attribute> + <name>server</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + <info> + <p>The server name to use instead of request.getServerName().</p> + </info> + </attribute> </tag> 1.11 +34 -6 jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java Index: BaseTag.java =================================================================== RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- BaseTag.java 16 Nov 2002 06:05:22 -0000 1.10 +++ BaseTag.java 17 Nov 2002 01:48:33 -0000 1.11 @@ -93,6 +93,11 @@ MessageResources.getMessageResources(Constants.Package + ".LocalStrings"); /** + * The server name to use instead of request.getServerName(). + */ + protected String server = null; + + /** * The target window for this base reference. */ protected String target = null; @@ -112,10 +117,16 @@ */ public int doStartTag() throws JspException { HttpServletRequest request = (HttpServletRequest) pageContext.getRequest(); + String serverName = request.getServerName(); StringBuffer buf = new StringBuffer("<base href=\""); buf.append(request.getScheme()); buf.append("://"); - buf.append(request.getServerName()); + + if (this.server != null) { + serverName = this.server; + } + + buf.append(serverName); if ("http".equals(request.getScheme()) && (80 == request.getServerPort())) { ; } else if ("https".equals(request.getScheme()) && (443 == request.getServerPort())) { @@ -134,7 +145,7 @@ String xhtml = (String) this.pageContext.getAttribute(Globals.XHTML_KEY, this.pageContext.PAGE_SCOPE); - + if ("true".equalsIgnoreCase(xhtml)) { buf.append(" />"); } else { @@ -150,4 +161,21 @@ } return EVAL_BODY_INCLUDE; } + + /** + * Returns the server. + * @return String + */ + public String getServer() { + return server; + } + + /** + * Sets the server. + * @param server The server to set + */ + public void setServer(String server) { + this.server = server; + } + }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>