cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[mrdon]

mrdon   2003/09/20 00:31:18

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Allow Struts to be compiled with JDK 1.4 and work on 1.3 or earlier
  
  PR: 23230
  Submitted by: [EMAIL PROTECTED] (Leonardo Quijano)
  
  Revision  ChangesPath
  1.19  +5 -5  
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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BaseTag.java  28 Aug 2003 05:50:32 -  1.18
  +++ BaseTag.java  20 Sep 2003 07:31:18 -  1.19
  @@ -157,7 +157,7 @@
   String uri) {
   
   StringBuffer tag = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

dgraham 2003/07/26 11:51:56

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Moved isXhtml to TagUtils.
  
  Revision  ChangesPath
  1.17  +6 -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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- BaseTag.java  17 May 2003 01:56:51 -  1.16
  +++ BaseTag.java  26 Jul 2003 18:51:56 -  1.17
  @@ -70,8 +70,8 @@
   import javax.servlet.jsp.tagext.TagSupport;
   
   import org.apache.struts.Globals;
  +import org.apache.struts.taglib.TagUtils;
   import org.apache.struts.util.MessageResources;
  -import org.apache.struts.util.RequestUtils;
   
   /**
* Renders an HTML  element with an href 
  @@ -178,7 +178,7 @@
   tag.append("\"");
   }
   
  -if (RequestUtils.isXhtml(this.pageContext)) {
  +if (TagUtils.getInstance().isXhtml(this.pageContext)) {
   tag.append(" />");
   } else {
   tag.append(">");
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

dgraham 2003/01/29 21:38:41

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Missed one of the duplicated method calls...
  
  Revision  ChangesPath
  1.13  +5 -5  
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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- BaseTag.java  30 Jan 2003 05:37:15 -  1.12
  +++ BaseTag.java  30 Jan 2003 05:38:41 -  1.13
  @@ -123,7 +123,7 @@
   int port = request.getServerPort();
   
   StringBuffer buf = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

dgraham 2003/01/29 21:37:16

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Cleaned up duplicated method calls.
  
  Revision  ChangesPath
  1.12  +12 -8 
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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- BaseTag.java  17 Nov 2002 01:48:33 -  1.11
  +++ BaseTag.java  30 Jan 2003 05:37:15 -  1.12
  @@ -7,7 +7,7 @@
*
* The Apache Software License, Version 1.1
*
  - * Copyright (c) 1999-2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
  @@ -81,6 +81,7 @@
* used to call the ActionServlet.
*
* @author Luis Arias <[EMAIL PROTECTED]>
  + * @author David Graham
* @version $Revision$ $Date$
*/
   
  @@ -118,6 +119,9 @@
   public int doStartTag() throws JspException {
   HttpServletRequest request = (HttpServletRequest) pageContext.getRequest();
   String serverName = request.getServerName();
  +String scheme = request.getScheme();
  +int port = request.getServerPort();
  +
   StringBuffer buf = new StringBuffer("

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dgraham]

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  ChangesPath
  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 -  1.36
  +++ struts-html.xml   17 Nov 2002 01:48:32 -  1.37
  @@ -61,6 +61,14 @@
 The window target for this base reference.
   
 
  +  
  +server
  +false
  +true
  +
  +  The server name to use instead of request.getServerName().
  +
  +  
   
   
   
  
  
  
  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 -  1.10
  +++ BaseTag.java  17 Nov 2002 01:48:33 -  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("");
   } 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:   
For additional commands, e-mail: 

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[dmkarr]

dmkarr  2002/10/05 15:56:21

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  PR: 13124
  Removed statement from javadoc comment that said "there are no attributes for
  this tag." (because it does have attributes).
  
  Revision  ChangesPath
  1.6   +5 -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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BaseTag.java  23 Sep 2002 05:13:43 -  1.5
  +++ BaseTag.java  5 Oct 2002 22:56:21 -   1.6
  @@ -77,8 +77,7 @@
* tag is only valid when nested inside a head tag body. The presence 
* of this tag allows the browser to resolve relative URL's to images,
* CSS stylesheets  and other resources in a manner independent of the URL
  - * used to call the ActionServlet.  There are no attributes associated with
  - * this tag.
  + * used to call the ActionServlet.
*
* @author Luis Arias <[EMAIL PROTECTED]>
* @version $Revision$ $Date$
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail: 

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[craigmcc]

craigmcc01/03/06 14:06:09

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Add an optional "target" attribute to the  tag.
  
  PR: Bugzilla #763
  
  Revision  ChangesPath
  1.3   +25 -5 
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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseTag.java  2001/02/02 20:14:18 1.2
  +++ BaseTag.java  2001/03/06 22:06:05 1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v 1.2 
2001/02/02 20:14:18 craigmcc Exp $
  - * $Revision: 1.2 $
  - * $Date: 2001/02/02 20:14:18 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v 1.3 
2001/03/06 22:06:05 craigmcc Exp $
  + * $Revision: 1.3 $
  + * $Date: 2001/03/06 22:06:05 $
*
* 
*
  @@ -80,7 +80,7 @@
* this tag.
*
* @author Luis Arias <[EMAIL PROTECTED]>
  - * @version $Revision: 1.2 $ $Date: 2001/02/02 20:14:18 $
  + * @version $Revision: 1.3 $ $Date: 2001/03/06 22:06:05 $
*/
   
   public class BaseTag extends TagSupport {
  @@ -91,6 +91,20 @@
 protected static MessageResources messages =
MessageResources.getMessageResources(Constants.Package + ".LocalStrings");
   
  +/**
  + * The target window for this base reference.
  + */
  +protected String target = null;
  +
  +public String getTarget() {
  +return (this.target);
  +}
  +
  +public void setTarget(String target) {
  +this.target = target;
  +}
  +
  +
 /**
  * Process the start of this tag.
  *
  @@ -113,7 +127,13 @@
   buf.append(request.getServerPort());
   }
   buf.append(request.getRequestURI());
  -buf.append("\">");
  +buf.append("\"");
  +if (target != null) {
  +buf.append(" target=\"");
  +buf.append(target);
  +buf.append("\"");
  +}
  +buf.append(">");
   JspWriter out = pageContext.getOut();
   try {
   out.write(buf.toString());
  
  
  

cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html BaseTag.java

[craigmcc]

craigmcc01/02/02 12:14:20

  Modified:src/share/org/apache/struts/taglib/html BaseTag.java
  Log:
  Do not include the port number in the rendered base URL if the port is
  the default for the specified scheme (80 for "http", 443 for "https").
  
  Revision  ChangesPath
  1.2   +13 -5 
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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BaseTag.java  2001/01/06 21:50:39 1.1
  +++ BaseTag.java  2001/02/02 20:14:18 1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v 1.1 
2001/01/06 21:50:39 mschachter Exp $
  - * $Revision: 1.1 $
  - * $Date: 2001/01/06 21:50:39 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/BaseTag.java,v 1.2 
2001/02/02 20:14:18 craigmcc Exp $
  + * $Revision: 1.2 $
  + * $Date: 2001/02/02 20:14:18 $
*
* 
*
  @@ -80,7 +80,7 @@
* this tag.
*
* @author Luis Arias <[EMAIL PROTECTED]>
  - * @version $Revision: 1.1 $ $Date: 2001/01/06 21:50:39 $
  + * @version $Revision: 1.2 $ $Date: 2001/02/02 20:14:18 $
*/
   
   public class BaseTag extends TagSupport {
  @@ -102,8 +102,16 @@
   buf.append(request.getScheme());
   buf.append("://");
   buf.append(request.getServerName());
  -buf.append(":");
  -buf.append(request.getServerPort());
  +if ("http".equals(request.getScheme()) &&
  +(80 == request.getServerPort())) {
  +;
  +} else if ("https".equals(request.getScheme()) &&
  +   (443 == request.getServerPort())) {
  +;
  +} else {
  +buf.append(":");
  +buf.append(request.getServerPort());
  +}
   buf.append(request.getRequestURI());
   buf.append("\">");
   JspWriter out = pageContext.getOut();