You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hr...@apache.org on 2005/08/21 20:54:28 UTC
svn commit: r234316 - in /struts/el/trunk: doc/userGuide/
src/share/org/apache/strutsel/taglib/bean/
src/share/org/apache/strutsel/taglib/html/ web/exercise-taglib/
Author: hrabago
Date: Sun Aug 21 11:54:18 2005
New Revision: 234316
URL: http://svn.apache.org/viewcvs?rev=234316&view=rev
Log:
Remove deprecated attributes and references to them:
bean:include's name
html:html's locale
html:img's contextRelative
Modified:
struts/el/trunk/doc/userGuide/struts-bean-el.xml
struts/el/trunk/doc/userGuide/struts-html-el.xml
struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java
struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTagBeanInfo.java
struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java
struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTagBeanInfo.java
struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java
struts/el/trunk/web/exercise-taglib/html-link.jsp
Modified: struts/el/trunk/doc/userGuide/struts-bean-el.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/doc/userGuide/struts-bean-el.xml?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/doc/userGuide/struts-bean-el.xml (original)
+++ struts/el/trunk/doc/userGuide/struts-bean-el.xml Sun Aug 21 11:54:18 2005
@@ -128,20 +128,6 @@
</attribute>
<attribute>
- <name>name</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <info>
- <p>Module-relative name (starting with a '/') of the web application
- resource to be dispatched, and whose response data is to be made
- available as a bean.</p>
- </info>
- <deprecated>
- Use the "page" attribute instead.
- </deprecated>
- </attribute>
-
- <attribute>
<name>page</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
Modified: struts/el/trunk/doc/userGuide/struts-html-el.xml
URL: http://svn.apache.org/viewcvs/struts/el/trunk/doc/userGuide/struts-html-el.xml?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/doc/userGuide/struts-html-el.xml (original)
+++ struts/el/trunk/doc/userGuide/struts-html-el.xml Sun Aug 21 11:54:18 2005
@@ -2552,23 +2552,6 @@
</attribute>
<attribute>
- <name>locale</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <info>
- <p>Set to <code>true</code> in order to store a Locale in the session based on
- the current request's <code>Accept-Language</code> header (if
- any) if none has currently been set. This attribute will create a session
- if one does not already exist. The lang attribute is rendered with the
- appropriate language code.</p>
- </info>
- <deprecated>
- Creating a session is undesirable for apps that don't support them. Use the lang
- attribute to achieve the same functionality without creating a session.
- </deprecated>
- </attribute>
-
- <attribute>
<name>xhtml</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -3113,18 +3096,6 @@
instance to use. If not specified, defaults to the
application resources configured for our action servlet.</p>
</info>
- </attribute>
-
- <attribute>
- <name>contextRelative</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- <deprecated>Use module attribute instead; will be removed in a release afer 1.2.0.</deprecated>
- <info>
- <p>If set to "true", this "anchors" the image src at the
- application context rather than the module context when the
- 'page' attribute is used to specify an image path.</p>
- </info>
</attribute>
<attribute>
Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTag.java Sun Aug 21 11:54:18 2005
@@ -56,11 +56,6 @@
*/
private String idExpr;
/**
- * Instance variable mapped to "name" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- private String nameExpr;
- /**
* Instance variable mapped to "page" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -92,11 +87,6 @@
*/
public String getIdExpr() { return (idExpr); }
/**
- * Getter method for "name" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- public String getNameExpr() { return (nameExpr); }
- /**
* Getter method for "page" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -128,11 +118,6 @@
*/
public void setIdExpr(String idExpr) { this.idExpr = idExpr; }
/**
- * Setter method for "name" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- public void setNameExpr(String nameExpr) { this.nameExpr = nameExpr; }
- /**
* Setter method for "page" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -153,7 +138,6 @@
setForwardExpr(null);
setHrefExpr(null);
setIdExpr(null);
- setNameExpr(null);
setPageExpr(null);
setTransactionExpr(null);
}
@@ -193,10 +177,6 @@
if ((string = EvalHelper.evalString("id", getIdExpr(),
this, pageContext)) != null)
setId(string);
-
- if ((string = EvalHelper.evalString("name", getNameExpr(),
- this, pageContext)) != null)
- setName(string);
if ((string = EvalHelper.evalString("page", getPageExpr(),
this, pageContext)) != null)
Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTagBeanInfo.java?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTagBeanInfo.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/bean/ELIncludeTagBeanInfo.java Sun Aug 21 11:54:18 2005
@@ -59,10 +59,6 @@
null, "setIdExpr"));
} catch (IntrospectionException ex) {}
try {
- proplist.add(new PropertyDescriptor("name", ELIncludeTag.class,
- null, "setNameExpr"));
- } catch (IntrospectionException ex) {}
- try {
proplist.add(new PropertyDescriptor("page", ELIncludeTag.class,
null, "setPageExpr"));
} catch (IntrospectionException ex) {}
Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java Sun Aug 21 11:54:18 2005
@@ -42,11 +42,6 @@
*/
private String langExpr;
/**
- * Instance variable mapped to "locale" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- private String localeExpr;
- /**
* Instance variable mapped to "xhtml" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -58,11 +53,6 @@
*/
public String getLangExpr() { return (langExpr); }
/**
- * Getter method for "locale" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- public String getLocaleExpr() { return (localeExpr); }
- /**
* Getter method for "xhtml" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -74,11 +64,6 @@
*/
public void setLangExpr(String langExpr) { this.langExpr = langExpr; }
/**
- * Setter method for "locale" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- public void setLocaleExpr(String localeExpr) { this.localeExpr = localeExpr; }
- /**
* Setter method for "xhtml" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -91,7 +76,6 @@
{
super.release();
setLangExpr(null);
- setLocaleExpr(null);
setXhtmlExpr(null);
}
@@ -118,10 +102,6 @@
if ((bool = EvalHelper.evalBoolean("lang", getLangExpr(),
this, pageContext)) != null)
setLang(bool.booleanValue());
-
- if ((bool = EvalHelper.evalBoolean("locale", getLocaleExpr(),
- this, pageContext)) != null)
- setLocale(bool.booleanValue());
if ((bool = EvalHelper.evalBoolean("xhtml", getXhtmlExpr(),
this, pageContext)) != null)
Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTagBeanInfo.java?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTagBeanInfo.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELHtmlTagBeanInfo.java Sun Aug 21 11:54:18 2005
@@ -50,10 +50,6 @@
proplist.add(new PropertyDescriptor("lang", ELHtmlTag.class,
null, "setLangExpr"));
} catch (IntrospectionException ex) {}
- try {
- proplist.add(new PropertyDescriptor("locale", ELHtmlTag.class,
- null, "setLocaleExpr"));
- } catch (IntrospectionException ex) {}
PropertyDescriptor[] result =
new PropertyDescriptor[proplist.size()];
Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTag.java Sun Aug 21 11:54:18 2005
@@ -81,11 +81,6 @@
*/
private String bundleExpr;
/**
- * Instance variable mapped to "contextRelative" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- private String contextRelativeExpr;
- /**
* Instance variable mapped to "height" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -302,11 +297,6 @@
*/
public String getBundleExpr() { return (bundleExpr); }
/**
- * Getter method for "contextRelative" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- public String getContextRelativeExpr() { return (contextRelativeExpr); }
- /**
* Getter method for "height" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -523,11 +513,6 @@
*/
public void setBundleExpr(String bundleExpr) { this.bundleExpr = bundleExpr; }
/**
- * Setter method for "contextRelative" tag attribute.
- * (Mapping set in associated BeanInfo class.)
- */
- public void setContextRelativeExpr(String contextRelativeExpr) { this.contextRelativeExpr = contextRelativeExpr; }
- /**
* Setter method for "height" tag attribute.
* (Mapping set in associated BeanInfo class.)
*/
@@ -721,7 +706,6 @@
setAltKeyExpr(null);
setBorderExpr(null);
setBundleExpr(null);
- setContextRelativeExpr(null);
setHeightExpr(null);
setHspaceExpr(null);
setImageNameExpr(null);
@@ -807,10 +791,6 @@
if ((string = EvalHelper.evalString("bundle", getBundleExpr(),
this, pageContext)) != null)
setBundle(string);
-
- if ((string = EvalHelper.evalString("contextRelative", getContextRelativeExpr(),
- this, pageContext)) != null)
- setContextRelative(string);
if ((string = EvalHelper.evalString("height", getHeightExpr(),
this, pageContext)) != null)
Modified: struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java
URL: http://svn.apache.org/viewcvs/struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java (original)
+++ struts/el/trunk/src/share/org/apache/strutsel/taglib/html/ELImgTagBeanInfo.java Sun Aug 21 11:54:18 2005
@@ -64,10 +64,6 @@
null, "setBundleExpr"));
} catch (IntrospectionException ex) {}
try {
- proplist.add(new PropertyDescriptor("contextRelative", ELImgTag.class,
- null, "setContextRelativeExpr"));
- } catch (IntrospectionException ex) {}
- try {
proplist.add(new PropertyDescriptor("height", ELImgTag.class,
null, "setHeightExpr"));
} catch (IntrospectionException ex) {}
Modified: struts/el/trunk/web/exercise-taglib/html-link.jsp
URL: http://svn.apache.org/viewcvs/struts/el/trunk/web/exercise-taglib/html-link.jsp?rev=234316&r1=234315&r2=234316&view=diff
==============================================================================
--- struts/el/trunk/web/exercise-taglib/html-link.jsp (original)
+++ struts/el/trunk/web/exercise-taglib/html-link.jsp Sun Aug 21 11:54:18 2005
@@ -4,7 +4,7 @@
<%@ taglib uri="http://struts.apache.org/tags-html-el" prefix="html-el" %>
<%@ taglib uri="http://struts.apache.org/tags-logic-el" prefix="logic-el" %>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<html-el:html locale="${!empty pageScope}" xhtml="${!empty pageScope}">
+<html-el:html xhtml="${!empty pageScope}">
<head>
<title>Test html-el:link Tag</title>
<%
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org