You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by jb...@apache.org on 2010/11/20 19:34:07 UTC
svn commit: r1037291 [1/5] - in /tomcat/taglibs/standard/trunk/examples:
src/org/apache/taglibs/standard/examples/beans/
src/org/apache/taglibs/standard/examples/i18n/
src/org/apache/taglibs/standard/examples/startup/
src/org/apache/taglibs/standard/ex...
Author: jboynes
Date: Sat Nov 20 18:34:03 2010
New Revision: 1037291
URL: http://svn.apache.org/viewvc?rev=1037291&view=rev
Log:
reformat examples to clean up tabs
Modified:
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Address.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_de.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_fr.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_it.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/Util.java
tomcat/taglibs/standard/trunk/examples/web/ShowSource.jsp
tomcat/taglibs/standard/trunk/examples/web/WEB-INF/tlds/jstl-examples.tld
tomcat/taglibs/standard/trunk/examples/web/WEB-INF/web.xml
tomcat/taglibs/standard/trunk/examples/web/conditionals/Choose.jsp
tomcat/taglibs/standard/trunk/examples/web/conditionals/CustomLogicTag.jsp
tomcat/taglibs/standard/trunk/examples/web/conditionals/FailureLocal.jsp
tomcat/taglibs/standard/trunk/examples/web/conditionals/If.jsp
tomcat/taglibs/standard/trunk/examples/web/conditionals/index.html
tomcat/taglibs/standard/trunk/examples/web/elsupport/Out.jsp
tomcat/taglibs/standard/trunk/examples/web/elsupport/Set.jsp
tomcat/taglibs/standard/trunk/examples/web/elsupport/Set2.jsp
tomcat/taglibs/standard/trunk/examples/web/elsupport/index.html
tomcat/taglibs/standard/trunk/examples/web/format/Demo.jsp
tomcat/taglibs/standard/trunk/examples/web/format/FormatDateTime.jsp
tomcat/taglibs/standard/trunk/examples/web/format/FormatDateTimeBrowserLocale.jsp
tomcat/taglibs/standard/trunk/examples/web/format/FormatNumber.jsp
tomcat/taglibs/standard/trunk/examples/web/format/FormatNumberBrowserLocale.jsp
tomcat/taglibs/standard/trunk/examples/web/format/GermanLocale.jsp
tomcat/taglibs/standard/trunk/examples/web/format/GermanUmlautCorrect.jsp
tomcat/taglibs/standard/trunk/examples/web/format/GermanUmlautIncorrect.jsp
tomcat/taglibs/standard/trunk/examples/web/format/ItalianLocale.jsp
tomcat/taglibs/standard/trunk/examples/web/format/MissingResourceBundle.jsp
tomcat/taglibs/standard/trunk/examples/web/format/ParametricReplacement.jsp
tomcat/taglibs/standard/trunk/examples/web/format/PrefixAttribute.jsp
tomcat/taglibs/standard/trunk/examples/web/format/RequestEncoding.jsp
tomcat/taglibs/standard/trunk/examples/web/format/UndefinedKey.jsp
tomcat/taglibs/standard/trunk/examples/web/format/index.html
tomcat/taglibs/standard/trunk/examples/web/functions/EscapeXml.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/Length.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/Replace.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/SplitJoin.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/StringCapitalization.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/StringSubset.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/SubstringContained.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/Trim.jsp
tomcat/taglibs/standard/trunk/examples/web/functions/index.html
tomcat/taglibs/standard/trunk/examples/web/global.css
tomcat/taglibs/standard/trunk/examples/web/import/Absolute.jsp
tomcat/taglibs/standard/trunk/examples/web/import/AbsoluteFtp.jsp
tomcat/taglibs/standard/trunk/examples/web/import/ContextRelative.jsp
tomcat/taglibs/standard/trunk/examples/web/import/Encode.jsp
tomcat/taglibs/standard/trunk/examples/web/import/EncodeContextRelative.jsp
tomcat/taglibs/standard/trunk/examples/web/import/ExposeString.jsp
tomcat/taglibs/standard/trunk/examples/web/import/ExposeStringRelative.jsp
tomcat/taglibs/standard/trunk/examples/web/import/LocalSample.jsp
tomcat/taglibs/standard/trunk/examples/web/import/Param.jsp
tomcat/taglibs/standard/trunk/examples/web/import/Relative.jsp
tomcat/taglibs/standard/trunk/examples/web/import/StartSlash.jsp
tomcat/taglibs/standard/trunk/examples/web/import/index.html
tomcat/taglibs/standard/trunk/examples/web/import/index.jsp
tomcat/taglibs/standard/trunk/examples/web/import/links.html
tomcat/taglibs/standard/trunk/examples/web/import/relativeLinks.html
tomcat/taglibs/standard/trunk/examples/web/import/session.jsp
tomcat/taglibs/standard/trunk/examples/web/index.html
tomcat/taglibs/standard/trunk/examples/web/iterators/Collaboration.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/DataTypes.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/Extensability.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/ForTokens.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/Simple.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/SimpleRange.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/Status.jsp
tomcat/taglibs/standard/trunk/examples/web/iterators/index.html
tomcat/taglibs/standard/trunk/examples/web/misc/IteratorTest.jsp
tomcat/taglibs/standard/trunk/examples/web/misc/index.html
tomcat/taglibs/standard/trunk/examples/web/sql/DriverSetup.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/QueryDirect.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/QueryIterate.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/QueryParam.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/Transaction.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/Update.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/index.jsp
tomcat/taglibs/standard/trunk/examples/web/sql/links.html
tomcat/taglibs/standard/trunk/examples/web/sql/session.jsp
tomcat/taglibs/standard/trunk/examples/web/tlv/PermittedTaglibsError.jsp
tomcat/taglibs/standard/trunk/examples/web/tlv/PermittedTaglibsOk.jsp
tomcat/taglibs/standard/trunk/examples/web/tlv/ScriptFreeError.jsp
tomcat/taglibs/standard/trunk/examples/web/tlv/ScriptFreeOk.jsp
tomcat/taglibs/standard/trunk/examples/web/tlv/index.html
tomcat/taglibs/standard/trunk/examples/web/xml/Filter.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/ForEach.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/ForEachDoc.xml
tomcat/taglibs/standard/trunk/examples/web/xml/If.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/Out.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/Parse.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/ParseWithEntities.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/Set.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/Transform.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/TransformWithInclusion.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/When.jsp
tomcat/taglibs/standard/trunk/examples/web/xml/games.xml
tomcat/taglibs/standard/trunk/examples/web/xml/included.xml
tomcat/taglibs/standard/trunk/examples/web/xml/includedStylesheet.xsl
tomcat/taglibs/standard/trunk/examples/web/xml/index.html
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Address.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Address.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Address.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Address.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.beans;
@@ -25,33 +25,45 @@ package org.apache.taglibs.standard.exam
*/
public class Address {
-
+
//*********************************************************************
// Instance variables
-
- /** Holds value of property line1. */
+
+ /**
+ * Holds value of property line1.
+ */
private String line1;
-
- /** Holds value of property line2. */
+
+ /**
+ * Holds value of property line2.
+ */
private String line2;
-
- /** Holds value of property city. */
+
+ /**
+ * Holds value of property city.
+ */
private String city;
-
- /** Holds value of property zip. */
+
+ /**
+ * Holds value of property zip.
+ */
private String zip;
- /** Holds value of property state. */
+ /**
+ * Holds value of property state.
+ */
private String state;
-
- /** Holds value of property country. */
+
+ /**
+ * Holds value of property country.
+ */
private String country;
-
+
//*********************************************************************
// Constructor
-
+
public Address(String line1, String line2, String city,
- String state, String zip, String country) {
+ String state, String zip, String country) {
setLine1(line1);
setLine2(line2);
setCity(city);
@@ -59,97 +71,121 @@ public class Address {
setZip(zip);
setCountry(country);
}
-
+
//*********************************************************************
// Accessors
-
- /** Getter for property line1.
+
+ /**
+ * Getter for property line1.
+ *
* @return Value of property line1.
*/
public String getLine1() {
return line1;
}
-
- /** Setter for property line1.
+
+ /**
+ * Setter for property line1.
+ *
* @param line1 New value of property line1.
*/
public void setLine1(String line1) {
this.line1 = line1;
}
-
- /** Getter for property line2.
+
+ /**
+ * Getter for property line2.
+ *
* @return Value of property line2.
*/
public String getLine2() {
return line2;
}
-
- /** Setter for property line2.
+
+ /**
+ * Setter for property line2.
+ *
* @param line2 New value of property line2.
*/
public void setLine2(String line2) {
this.line2 = line2;
}
-
- /** Getter for property city.
+
+ /**
+ * Getter for property city.
+ *
* @return Value of property city.
*/
public String getCity() {
return city;
}
-
- /** Setter for property city.
+
+ /**
+ * Setter for property city.
+ *
* @param city New value of property city.
*/
public void setCity(String city) {
this.city = city;
}
-
- /** Getter for property zip.
+
+ /**
+ * Getter for property zip.
+ *
* @return Value of property zip.
*/
public String getZip() {
return zip;
}
-
- /** Setter for property zip.
+
+ /**
+ * Setter for property zip.
+ *
* @param zip New value of property zip.
*/
public void setZip(String zip) {
this.zip = zip;
}
-
- /** Getter for property country.
+
+ /**
+ * Getter for property country.
+ *
* @return Value of property country.
*/
public String getCountry() {
return country;
}
-
- /** Setter for property country.
+
+ /**
+ * Setter for property country.
+ *
* @param country New value of property country.
*/
public void setCountry(String country) {
this.country = country;
}
-
- /** Getter for property state.
+
+ /**
+ * Getter for property state.
+ *
* @return Value of property state.
*/
public String getState() {
return state;
}
-
- /** Setter for property state.
+
+ /**
+ * Setter for property state.
+ *
* @param state New value of property state.
*/
public void setState(String state) {
this.state = state;
}
-
+
//*********************************************************************
// Utility Methods
-
+
/**
* Return a String representation of this object.
*/
@@ -159,5 +195,5 @@ public class Address {
sb.append(city).append(" ");
sb.append(country);
return (sb.toString());
- }
+ }
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customer.java Sat Nov 20 18:34:03 2010
@@ -13,12 +13,13 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.beans;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.Date;
-import java.text.*;
/**
* Object that represents a Customer.
@@ -28,55 +29,70 @@ import java.text.*;
*/
public class Customer {
-
+
//*********************************************************************
// Instance variables
-
- /** Holds value of property key. */
+
+ /**
+ * Holds value of property key.
+ */
int key;
-
- /** Holds value of property lastName. */
+
+ /**
+ * Holds value of property lastName.
+ */
private String lastName;
-
- /** Holds value of property firstName. */
+
+ /**
+ * Holds value of property firstName.
+ */
private String firstName;
-
- /** Holds value of property birthDate. */
+
+ /**
+ * Holds value of property birthDate.
+ */
private Date birthDate;
-
- /** Holds value of property address. */
+
+ /**
+ * Holds value of property address.
+ */
private Address address;
-
- /** Holds value of property phoneHome. */
+
+ /**
+ * Holds value of property phoneHome.
+ */
private String phoneHome;
-
- /** Holds value of property phoneCell. */
+
+ /**
+ * Holds value of property phoneCell.
+ */
private String phoneCell;
-
+
static DateFormat df = new SimpleDateFormat("MM/dd/yyyy");
-
+
//*********************************************************************
// Constructors
-
- public Customer() {}
-
+
+ public Customer() {
+ }
+
public Customer(int key,
- String lastName,
- String firstName,
- Date birthDate,
- Address address,
- String phoneHome,
- String phoneCell) {
+ String lastName,
+ String firstName,
+ Date birthDate,
+ Address address,
+ String phoneHome,
+ String phoneCell) {
init(key, lastName, firstName, birthDate, address, phoneHome, phoneCell);
}
-
+
public void init(int key,
- String lastName,
- String firstName,
- Date birthDate,
- Address address,
- String phoneHome,
- String phoneCell) {
+ String lastName,
+ String firstName,
+ Date birthDate,
+ Address address,
+ String phoneHome,
+ String phoneCell) {
setKey(key);
setLastName(lastName);
setFirstName(firstName);
@@ -85,125 +101,139 @@ public class Customer {
setPhoneHome(phoneHome);
setPhoneCell(phoneCell);
}
-
+
//*********************************************************************
// Properties
-
+
/**
* Getter for property key.
+ *
* @return Value of property key.
*/
public int getKey() {
return key;
}
-
+
/**
* Setter for property key.
+ *
* @param key New value of property key.
*/
public void setKey(int key) {
this.key = key;
}
-
+
/**
* Getter for property lastName.
+ *
* @return Value of property lastName.
*/
public String getLastName() {
return lastName;
}
-
+
/**
* Setter for property lastName.
+ *
* @param lastName New value of property lastName.
*/
public void setLastName(String lastName) {
this.lastName = lastName;
}
-
+
/**
* Getter for property firstName.
+ *
* @return Value of property firstName.
*/
public String getFirstName() {
return firstName;
}
-
+
/**
* Setter for property firstName.
+ *
* @param firstName New value of property firstName.
*/
public void setFirstName(String firstName) {
this.firstName = firstName;
}
-
+
/**
* Getter for property birthDate.
+ *
* @return Value of property birthDate.
*/
public Date getBirthDate() {
return birthDate;
}
-
+
/**
* Setter for property birthDate.
+ *
* @param birthDate New value of property birthDate.
*/
public void setBirthDate(Date birthDate) {
this.birthDate = birthDate;
}
-
+
/**
* Getter for property address.
+ *
* @return Value of property address.
*/
public Address getAddress() {
return address;
}
-
+
/**
* Setter for property address.
+ *
* @param address New value of property address.
*/
public void setAddress(Address address) {
this.address = address;
}
-
+
/**
* Getter for property phoneHome.
+ *
* @return Value of property phoneHome.
*/
public String getPhoneHome() {
return phoneHome;
}
-
+
/**
* Setter for property phoneHome.
+ *
* @param phoneHome New value of property phoneHome.
*/
public void setPhoneHome(String phoneHome) {
this.phoneHome = phoneHome;
}
-
+
/**
* Getter for property phoneCell.
+ *
* @return Value of property phoneCell.
*/
public String getPhoneCell() {
return phoneCell;
}
-
+
/**
* Setter for property phoneCell.
+ *
* @param phoneCell New value of property phoneCell.
*/
public void setPhoneCell(String phoneCell) {
this.phoneCell = phoneCell;
}
-
+
//*********************************************************************
// Utility Methods
-
+
/**
* Return a String representation of this object.
*/
@@ -214,8 +244,12 @@ public class Customer {
sb.append(getFirstName()).append(" ");
sb.append(df.format(getBirthDate())).append(" ");
sb.append(getAddress()).append(" ");
- if(getPhoneHome() != null) sb.append(getPhoneHome()).append(" ");
- if(getPhoneCell() != null) sb.append(getPhoneCell());
+ if (getPhoneHome() != null) {
+ sb.append(getPhoneHome()).append(" ");
+ }
+ if (getPhoneCell() != null) {
+ sb.append(getPhoneCell());
+ }
return (sb.toString());
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/beans/Customers.java Sat Nov 20 18:34:03 2010
@@ -13,12 +13,15 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.beans;
-import java.util.*;
-import java.text.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Vector;
/**
* Customers Datastore.
@@ -28,62 +31,62 @@ import java.text.*;
*/
public class Customers {
-
+
//*********************************************************************
// Instance variables
-
+
private static Vector customers = new Vector();
private static int nextSeqNo = 0;
-
+
//*********************************************************************
// Datastore operations
-
+
public static void create(
- String lastName,
- String firstName,
- String birthDate,
- String line1,
- String line2,
- String city,
- String state,
- String zip,
- String country) {
+ String lastName,
+ String firstName,
+ String birthDate,
+ String line1,
+ String line2,
+ String city,
+ String state,
+ String zip,
+ String country) {
create(lastName, firstName, birthDate, line1, line2, city, state, zip,
- country, null, null);
+ country, null, null);
}
-
+
/**
- * Create new customer
+ * Create new customer
*/
public static void create(
- String lastName,
- String firstName,
- String birthDate,
- String line1,
- String line2,
- String city,
- String state,
- String zip,
- String country,
- String phoneHome,
- String phoneCell) {
+ String lastName,
+ String firstName,
+ String birthDate,
+ String line1,
+ String line2,
+ String city,
+ String state,
+ String zip,
+ String country,
+ String phoneHome,
+ String phoneCell) {
Customer customer =
- new Customer(++nextSeqNo, lastName, firstName,
- genDate(birthDate), genAddress(line1, line2, city, state, zip, country),
- phoneHome, phoneCell);
+ new Customer(++nextSeqNo, lastName, firstName,
+ genDate(birthDate), genAddress(line1, line2, city, state, zip, country),
+ phoneHome, phoneCell);
customers.add(customer);
}
-
+
/**
* Find all customers
*/
public static Collection findAll() {
return customers;
}
-
+
//*********************************************************************
// Utility methods
-
+
private static Date genDate(String dateString) {
DateFormat df = new SimpleDateFormat("M/d/y");
Date date;
@@ -94,9 +97,9 @@ public class Customers {
}
return date;
}
-
+
private static Address genAddress(String line1, String line2, String city,
- String state, String zip, String country) {
+ String state, String zip, String country) {
return new Address(line1, line2, city, state, zip, country);
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.i18n;
@@ -23,18 +23,18 @@ public class Resources extends ListResou
private static Object[][] contents;
static {
- contents = new Object[][] {
- { "greetingMorning", "Good Morning!" },
- { "greetingEvening", "Good Evening!" },
- { "serverInfo", "Name/Version of Servlet Container: {0}, "
- + "Java Version: {1}" },
- { "currentTime", "Current time: {0}" },
- { "com.acme.labels.cancel", "Cancel" },
- { "java.lang.ArithmeticException", "division by 0" }
- };
+ contents = new Object[][]{
+ {"greetingMorning", "Good Morning!"},
+ {"greetingEvening", "Good Evening!"},
+ {"serverInfo", "Name/Version of Servlet Container: {0}, "
+ + "Java Version: {1}"},
+ {"currentTime", "Current time: {0}"},
+ {"com.acme.labels.cancel", "Cancel"},
+ {"java.lang.ArithmeticException", "division by 0"}
+ };
}
public Object[][] getContents() {
- return contents;
+ return contents;
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_de.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_de.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_de.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_de.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.i18n;
@@ -23,18 +23,18 @@ public class Resources_de extends ListRe
private static Object[][] contents;
static {
- contents = new Object[][] {
- { "greetingMorning", "Guten Morgen!" },
- { "greetingEvening", "Guten Abend!" },
- { "serverInfo", "Name/Version des Servlet Containers: {0}, "
- + "Java Version: {1}" },
- { "currentTime", "Heutiges Datum und Uhrzeit: {0}" },
- { "com.acme.labels.cancel", "Abbrechen" },
- { "java.lang.ArithmeticException", "/ durch 0" }
- };
+ contents = new Object[][]{
+ {"greetingMorning", "Guten Morgen!"},
+ {"greetingEvening", "Guten Abend!"},
+ {"serverInfo", "Name/Version des Servlet Containers: {0}, "
+ + "Java Version: {1}"},
+ {"currentTime", "Heutiges Datum und Uhrzeit: {0}"},
+ {"com.acme.labels.cancel", "Abbrechen"},
+ {"java.lang.ArithmeticException", "/ durch 0"}
+ };
}
public Object[][] getContents() {
- return contents;
+ return contents;
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_fr.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_fr.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_fr.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_fr.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.i18n;
@@ -23,18 +23,18 @@ public class Resources_fr extends ListRe
private static Object[][] contents;
static {
- contents = new Object[][] {
- { "greetingMorning", "Bonjour!!" },
- { "greetingEvening", "Bonsoir!" },
- { "serverInfo", "Nom/Version du Servlet Container: {0}, "
- + "Version Java: {1}" },
- { "currentTime", "Nous sommes le: {0}" },
- { "com.acme.labels.cancel", "Annuler" },
- { "java.lang.ArithmeticException", "division par 0" }
- };
+ contents = new Object[][]{
+ {"greetingMorning", "Bonjour!!"},
+ {"greetingEvening", "Bonsoir!"},
+ {"serverInfo", "Nom/Version du Servlet Container: {0}, "
+ + "Version Java: {1}"},
+ {"currentTime", "Nous sommes le: {0}"},
+ {"com.acme.labels.cancel", "Annuler"},
+ {"java.lang.ArithmeticException", "division par 0"}
+ };
}
public Object[][] getContents() {
- return contents;
+ return contents;
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_it.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_it.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_it.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/i18n/Resources_it.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.i18n;
@@ -23,12 +23,12 @@ public class Resources_it extends ListRe
private static Object[][] contents;
static {
- contents = new Object[][] {
- { "greetingMorning", "Buon giorno!" }
- };
+ contents = new Object[][]{
+ {"greetingMorning", "Buon giorno!"}
+ };
}
public Object[][] getContents() {
- return contents;
+ return contents;
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/startup/Init.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/startup/Init.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/startup/Init.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/startup/Init.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.startup;
@@ -33,63 +33,64 @@ import org.apache.taglibs.standard.examp
* @version $Revision$ $Date$
*/
public class Init implements ServletContextListener {
-
+
//*********************************************************************
// ServletContextListener methods
-
+
// recovers the one context parameter we need
+
public void contextInitialized(ServletContextEvent sce) {
//p("contextInitialized");
init(sce);
}
-
+
public void contextDestroyed(ServletContextEvent sce) {
//p("contextInitialized");
}
-
+
//*********************************************************************
// Initializations
-
+
private void init(ServletContextEvent sce) {
/*
* Customers
*/
Customers.create("Richard", "Maurice", "5/15/35",
- "123 Chemin Royal", "Appt. #301",
- "Montreal", "QC", "H3J 9R9", "Canada");
+ "123 Chemin Royal", "Appt. #301",
+ "Montreal", "QC", "H3J 9R9", "Canada");
Customers.create("Mikita", "Stan", "12/25/47",
- "45 Fisher Blvd", "Suite 203",
- "Chicago", "IL", "65982", "USA", "(320)876-9784", null);
+ "45 Fisher Blvd", "Suite 203",
+ "Chicago", "IL", "65982", "USA", "(320)876-9784", null);
Customers.create("Gilbert", "Rod", "3/11/51",
- "123 Main Street", "",
- "New-York City", "NY", "19432", "USA");
+ "123 Main Street", "",
+ "New-York City", "NY", "19432", "USA");
Customers.create("Howe", "Gordie", "7/25/46",
- "7654 Wings Street", "",
- "Detroit", "MG", "07685", "USA", "(465)675-0761", "(465)879-9802");
+ "7654 Wings Street", "",
+ "Detroit", "MG", "07685", "USA", "(465)675-0761", "(465)879-9802");
Customers.create("Sawchuk", "Terrie", "11/05/46",
- "12 Maple Leafs Avenue", "",
- "Toronto", "ON", "M5C 1Z1", "Canada");
+ "12 Maple Leafs Avenue", "",
+ "Toronto", "ON", "M5C 1Z1", "Canada");
sce.getServletContext().setAttribute("customers", Customers.findAll());
- /**
- * Array of primitives (int)
- */
- int[] intArray = new int[] {10, 20, 30, 40, 50};
+ /**
+ * Array of primitives (int)
+ */
+ int[] intArray = new int[]{10, 20, 30, 40, 50};
sce.getServletContext().setAttribute("intArray", intArray);
- /**
- * Array of Objects (String)
- */
- String[] stringArray = new String[] {
- "A first string",
- "La deuxieme string",
- "Ella troisiemo stringo",
- };
+ /**
+ * Array of Objects (String)
+ */
+ String[] stringArray = new String[]{
+ "A first string",
+ "La deuxieme string",
+ "Ella troisiemo stringo",
+ };
sce.getServletContext().setAttribute("stringArray", stringArray);
- /**
- * String-keyed Map
- */
+ /**
+ * String-keyed Map
+ */
Hashtable stringMap = new Hashtable();
sce.getServletContext().setAttribute("stringMap", stringMap);
stringMap.put("one", "uno");
@@ -105,43 +106,43 @@ public class Init implements ServletCont
/**
* Integer-keyed Map
- */
- // we use a Hashtable so we can get an Enumeration easily, below
+ */
+ // we use a Hashtable so we can get an Enumeration easily, below
Hashtable numberMap = new Hashtable();
- sce.getServletContext().setAttribute("numberMap", numberMap);
- numberMap.put(new Integer(1), "uno");
- numberMap.put(new Integer(2), "dos");
- numberMap.put(new Integer(3), "tres");
- numberMap.put(new Integer(4), "cuatro");
- numberMap.put(new Integer(5), "cinco");
- numberMap.put(new Integer(6), "seis");
- numberMap.put(new Integer(7), "siete");
- numberMap.put(new Integer(8), "ocho");
- numberMap.put(new Integer(9), "nueve");
- numberMap.put(new Integer(10), "diez");
-
- /**
- * Enumeration
- */
- Enumeration enum_ = numberMap.keys();
- // don't use 'enum' for attribute name because it is a
- // reserved word in EcmaScript.
+ sce.getServletContext().setAttribute("numberMap", numberMap);
+ numberMap.put(new Integer(1), "uno");
+ numberMap.put(new Integer(2), "dos");
+ numberMap.put(new Integer(3), "tres");
+ numberMap.put(new Integer(4), "cuatro");
+ numberMap.put(new Integer(5), "cinco");
+ numberMap.put(new Integer(6), "seis");
+ numberMap.put(new Integer(7), "siete");
+ numberMap.put(new Integer(8), "ocho");
+ numberMap.put(new Integer(9), "nueve");
+ numberMap.put(new Integer(10), "diez");
+
+ /**
+ * Enumeration
+ */
+ Enumeration enum_ = numberMap.keys();
+ // don't use 'enum' for attribute name because it is a
+ // reserved word in EcmaScript.
sce.getServletContext().setAttribute("enumeration", enum_);
- /**
- * Message arguments for parametric replacement
- */
- Object[] serverInfoArgs =
- new Object[] {
- sce.getServletContext().getServerInfo(),
- System.getProperty("java.version")
- };
- sce.getServletContext().setAttribute("serverInfoArgs", serverInfoArgs);
+ /**
+ * Message arguments for parametric replacement
+ */
+ Object[] serverInfoArgs =
+ new Object[]{
+ sce.getServletContext().getServerInfo(),
+ System.getProperty("java.version")
+ };
+ sce.getServletContext().setAttribute("serverInfoArgs", serverInfoArgs);
}
-
+
//*********************************************************************
// Initializations
-
+
private void p(String s) {
System.out.println("[Init] " + s);
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/CustomerFmtTag.java Sat Nov 20 18:34:03 2010
@@ -13,16 +13,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
import java.io.IOException;
-import javax.servlet.jsp.*;
-import javax.servlet.jsp.tagext.*;
-import javax.servlet.jsp.jstl.core.*;
-
import org.apache.taglibs.standard.examples.beans.Customer;
/**
@@ -32,87 +28,97 @@ import org.apache.taglibs.standard.examp
* @version $Revision$ $Date$
*/
public class CustomerFmtTag extends TagSupport {
-
+
//*********************************************************************
// Instance variables
-
- /** Holds value of property customer. */
+
+ /**
+ * Holds value of property customer.
+ */
private Customer customer;
-
- /** Holds value of property fmt. */
+
+ /**
+ * Holds value of property fmt.
+ */
private String fmt;
-
+
//*********************************************************************
// Constructors
-
+
public CustomerFmtTag() {
super();
init();
}
-
+
private void init() {
customer = null;
fmt = null;
- }
-
+ }
+
//*********************************************************************
// TagSupport methods
-
+
public int doStartTag() throws JspException {
JspWriter out = pageContext.getOut();
try {
if (fmt.equalsIgnoreCase("short")) {
out.println(customer.getFirstName() + " " +
- customer.getLastName());
+ customer.getLastName());
} else if (fmt.equalsIgnoreCase("long")) {
out.println(customer.getFirstName() + " " +
- customer.getLastName() + " " + customer.getAddress());
+ customer.getLastName() + " " + customer.getAddress());
} else {
out.println("invalid format");
}
- } catch (IOException ex) {}
-
+ } catch (IOException ex) {
+ }
+
return SKIP_BODY;
}
-
+
// Releases any resources we may have (or inherit)
+
public void release() {
super.release();
init();
}
-
+
//*********************************************************************
// Accessors
-
+
/**
* Getter for property customer.
+ *
* @return Value of property customer.
*/
public Customer getCustomer() {
return customer;
}
-
+
/**
* Setter for property customer.
+ *
* @param customer New value of property customer.
*/
public void setCustomer(Customer customer) {
this.customer = customer;
}
-
+
/**
* Getter for property fmt.
+ *
* @return Value of property fmt.
*/
public String getFmt() {
return fmt;
}
-
+
/**
* Setter for property fmt.
+ *
* @param fmt New value of property fmt.
*/
public void setFmt(String fmt) {
this.fmt = fmt;
- }
+ }
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/DefaultLocaleTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -31,13 +31,13 @@ import javax.servlet.jsp.jstl.core.Condi
public class DefaultLocaleTag extends ConditionalTagSupport {
- private static final Locale defaultLocale = Locale.getDefault();
+ private static final Locale defaultLocale = Locale.getDefault();
- public boolean condition() throws JspTagException {
- LocalesTag localesTag = (LocalesTag) findAncestorWithClass( this, LocalesTag.class );
- if ( localesTag == null ) {
- throw new JspTagException( "defaultLocale bust be inside locales");
+ public boolean condition() throws JspTagException {
+ LocalesTag localesTag = (LocalesTag) findAncestorWithClass(this, LocalesTag.class);
+ if (localesTag == null) {
+ throw new JspTagException("defaultLocale bust be inside locales");
+ }
+ return localesTag.getCurrent().equals(defaultLocale);
}
- return localesTag.getCurrent().equals( defaultLocale );
- }
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EscapeHtmlTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -34,72 +34,72 @@ import org.apache.taglibs.standard.examp
* @version $Revision$ $Date$
*/
public class EscapeHtmlTag extends BodyTagSupport {
-
+
//*********************************************************************
// Instance variables
-
+
private Object reader;
private Object writer;
-
+
//*********************************************************************
// Constructors
-
+
public EscapeHtmlTag() {
super();
init();
}
-
+
private void init() {
reader = null;
writer = null;
}
-
-
+
+
//*********************************************************************
// Tag's properties
-
+
/**
* Tag's 'reader' attribute
*/
public void setReader(Object reader) {
this.reader = reader;
}
-
+
/**
* Tag's 'writer' attribute
*/
public void setWriter(Object writer) {
this.writer = writer;
}
-
+
//*********************************************************************
// TagSupport methods
-
+
public int doEndTag() throws JspException {
Reader in;
Writer out;
-
+
if (reader == null) {
String bcs = getBodyContent().getString().trim();
if (bcs == null || bcs.equals("")) {
throw new JspTagException("In <escapeHtml>, 'reader' " +
- "not specified and no non-whitespace content inside the tag.");
+ "not specified and no non-whitespace content inside the tag.");
}
in = Util.castToReader(bcs);
} else {
in = Util.castToReader(reader);
}
-
+
if (writer == null) {
out = pageContext.getOut();
} else {
out = Util.castToWriter(writer);
}
-
+
transform(in, out);
return EVAL_PAGE;
}
-
+
/**
* Releases any resources we may have (or inherit)
*/
@@ -107,15 +107,15 @@ public class EscapeHtmlTag extends BodyT
super.release();
init();
}
-
+
//*********************************************************************
// Tag's scific behavior methods
-
+
/**
* Transform
*/
public void transform(Reader reader, Writer writer)
- throws JspException {
+ throws JspException {
int c;
try {
writer.write("<pre>");
@@ -131,7 +131,7 @@ public class EscapeHtmlTag extends BodyT
writer.write("</pre>");
} catch (IOException ex) {
throw new JspException("EscapeHtml: " +
- "error copying chars", ex);
+ "error copying chars", ex);
}
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/EvenTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -29,17 +29,17 @@ import javax.servlet.jsp.tagext.TagSuppo
* @version $Revision$ $Date$
*/
public class EvenTag extends TagSupport {
-
+
//*********************************************************************
// TagSupport methods
-
+
public int doStartTag() throws JspException {
- LoopTag iteratorTag = (LoopTag)findAncestorWithClass(
- this, LoopTag.class);
+ LoopTag iteratorTag = (LoopTag) findAncestorWithClass(
+ this, LoopTag.class);
if (iteratorTag == null) {
throw new JspTagException("<even> must be nested within a LoopTag");
}
-
+
int count = iteratorTag.getLoopStatus().getCount();
return (count % 2 == 0) ? EVAL_BODY_INCLUDE : SKIP_BODY;
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/FileTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -32,62 +32,63 @@ import javax.servlet.jsp.tagext.TagSuppo
* @version $Revision$ $Date$
*/
public class FileTag extends TagSupport {
-
+
//*********************************************************************
// Instance variables
-
+
private String id;
private String file;
-
+
private Reader reader;
-
+
//*********************************************************************
// Constructors
-
+
public FileTag() {
super();
init();
}
-
+
private void init() {
id = null;
file = null;
}
-
+
//*********************************************************************
// Tag's properties
-
+
/**
* Tag's 'id' attribute
*/
public void setId(String id) {
this.id = id;
}
-
+
/**
* Tag's 'file' attribute
*/
public void setfile(String file) {
this.file = file;
}
-
+
//*********************************************************************
// TagSupport methods
-
+
public int doStartTag() throws JspException {
reader = getReaderFromFile(file);
exposeVariable(reader);
return EVAL_BODY_INCLUDE;
}
-
+
public int doEndTag() throws JspException {
try {
reader.close();
- } catch (IOException ex) {}
+ } catch (IOException ex) {
+ }
reader = null;
return EVAL_PAGE;
}
-
+
/**
* Releases any files we may have (or inherit)
*/
@@ -95,13 +96,13 @@ public class FileTag extends TagSupport
super.release();
init();
}
-
+
//*********************************************************************
// Tag's specific behavior methods
-
+
public Reader getReaderFromFile(String name) throws JspException {
InputStream in = pageContext.getServletContext().
- getResourceAsStream(name);
+ getResourceAsStream(name);
if (in == null) {
throw new JspException("Could not access " + name);
}
@@ -109,10 +110,10 @@ public class FileTag extends TagSupport
return new InputStreamReader(in);
}
-
+
//*********************************************************************
// Utility methods
-
+
private void exposeVariable(Reader reader) {
if (id != null) {
pageContext.setAttribute(id, reader);
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/Functions.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -23,7 +23,7 @@ import javax.servlet.jsp.JspTagException
/**
* <p>Exmaples taglib Functions</p>
- *
+ *
* @author Pierre Delisle
*/
@@ -33,8 +33,12 @@ public class Functions {
* Display the collection types supported by c:forEach.
*/
public static String display(Object obj) throws JspTagException {
- if (obj == null) return "";
- if (obj instanceof String) return obj.toString();
+ if (obj == null) {
+ return "";
+ }
+ if (obj instanceof String) {
+ return obj.toString();
+ }
/*
if (obj instanceof Collection) {
return "FIXME";
@@ -60,12 +64,15 @@ public class Functions {
try {
StringBuffer buf = new StringBuffer();
int count = Array.getLength(obj);
- for (int i=0; i<count; i++) {
+ for (int i = 0; i < count; i++) {
buf.append(Array.get(obj, i).toString());
- if (i<count-1) buf.append("<font color='red'> • </font>");
+ if (i < count - 1) {
+ buf.append("<font color='red'> • </font>");
+ }
}
return buf.toString();
- } catch (IllegalArgumentException ex) {}
- throw new JspTagException("Bad Item");
- }
+ } catch (IllegalArgumentException ex) {
+ }
+ throw new JspTagException("Bad Item");
+ }
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/LocalesTag.java Sat Nov 20 18:34:03 2010
@@ -13,11 +13,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
import java.util.Locale;
+
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.jstl.core.LoopTagSupport;
@@ -30,34 +31,34 @@ import javax.servlet.jsp.jstl.core.LoopT
public class LocalesTag extends LoopTagSupport {
private static final Locale[] locales = Locale.getAvailableLocales();
- private int pointer;
+ private int pointer;
private String varTotal;
- public void setVarTotal( String value ) {
- varTotal = value;
+ public void setVarTotal(String value) {
+ varTotal = value;
}
public void prepare() {
- pointer = 0;
- if ( varTotal!=null && varTotal.length()>0 ) {
- pageContext.setAttribute( varTotal, new Integer(locales.length) );
- }
-
- }
+ pointer = 0;
+ if (varTotal != null && varTotal.length() > 0) {
+ pageContext.setAttribute(varTotal, new Integer(locales.length));
+ }
+
+ }
public boolean hasNext() {
- return pointer < locales.length;
- }
+ return pointer < locales.length;
+ }
public Object next() {
- return locales[ pointer++ ];
+ return locales[pointer++];
+ }
+
+ public void setBegin(int value) {
+ super.begin = value;
+ }
+
+ public void setEnd(int value) {
+ super.end = value;
}
-
- public void setBegin( int value ) {
- super.begin = value;
- }
-
- public void setEnd( int value ) {
- super.end = value;
- }
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/NullAttributeException.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -36,8 +36,8 @@ public class NullAttributeException exte
* @param att The attribute value for which the error occurred.
*/
public NullAttributeException(String tag, String att) {
- super("The '" + att + "' attribute illegally evaluated to 'null' "
- + "in <" + tag + ">.");
+ super("The '" + att + "' attribute illegally evaluated to 'null' "
+ + "in <" + tag + ">.");
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/OddTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -29,20 +29,20 @@ import javax.servlet.jsp.tagext.TagSuppo
* @version $Revision$ $Date$
*/
public class OddTag extends TagSupport {
-
+
//*********************************************************************
// TagSupport methods
-
+
public int doStartTag() throws JspException {
- LoopTag iteratorTag = (LoopTag)findAncestorWithClass(
+ LoopTag iteratorTag = (LoopTag) findAncestorWithClass(
this, LoopTag.class);
if (iteratorTag == null) {
throw new JspTagException("<odd> must be nested within a LoopTag");
}
-
+
int count = iteratorTag.getLoopStatus().getCount();
System.out.println("count: " + count);
- System.out.println("count odd/even: " + (count % 2));
+ System.out.println("count odd/even: " + (count % 2));
return (count % 2 == 1) ? EVAL_BODY_INCLUDE : SKIP_BODY;
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/ResourceTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -39,62 +39,63 @@ import org.apache.taglibs.standard.examp
* @version $Revision$ $Date$
*/
public class ResourceTag extends TagSupport {
-
+
//*********************************************************************
// Instance variables
-
+
private String id;
private String resource;
-
+
private Reader reader;
-
+
//*********************************************************************
// Constructors
-
+
public ResourceTag() {
super();
init();
}
-
+
private void init() {
id = null;
resource = null;
}
-
+
//*********************************************************************
// Tag's properties
-
+
/**
* Tag's 'id' attribute
*/
public void setId(String id) {
this.id = id;
}
-
+
/**
* Tag's 'resource' attribute
*/
public void setResource(String resource) {
this.resource = resource;
}
-
+
//*********************************************************************
// TagSupport methods
-
+
public int doStartTag() throws JspException {
reader = getReaderFromResource(resource);
exposeVariable(reader);
return EVAL_BODY_INCLUDE;
}
-
+
public int doEndTag() throws JspException {
try {
reader.close();
- } catch (IOException ex) {}
+ } catch (IOException ex) {
+ }
reader = null;
return EVAL_PAGE;
}
-
+
/**
* Releases any resources we may have (or inherit)
*/
@@ -102,24 +103,24 @@ public class ResourceTag extends TagSupp
super.release();
init();
}
-
+
//*********************************************************************
// Tag's scific behavior methods
-
+
private Reader getReaderFromResource(String name) throws JspException {
HttpServletRequest request =
- (HttpServletRequest)pageContext.getRequest();
+ (HttpServletRequest) pageContext.getRequest();
HttpServletResponse response =
- (HttpServletResponse)pageContext.getResponse();
+ (HttpServletResponse) pageContext.getResponse();
RequestDispatcher rd = null;
-
+
// The response of the local URL becomes the reader that
// we export. Need temporary storage.
IOBean ioBean = new IOBean();
Writer writer = ioBean.getWriter();
ServletResponseWrapper responseWrapper =
- new ServletResponseWrapperForWriter(
- response, new PrintWriter(writer));
+ new ServletResponseWrapperForWriter(
+ response, new PrintWriter(writer));
rd = pageContext.getServletContext().getRequestDispatcher(name);
try {
rd.include(request, responseWrapper);
@@ -128,10 +129,10 @@ public class ResourceTag extends TagSupp
throw new JspException(ex);
}
}
-
+
//*********************************************************************
// Utility methods
-
+
private void exposeVariable(Reader reader) {
if (id != null) {
pageContext.setAttribute(id, reader);
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/taglib/UsCustomerTag.java Sat Nov 20 18:34:03 2010
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.taglib;
@@ -30,36 +30,38 @@ import org.apache.taglibs.standard.examp
* @version $Revision$ $Date$
*/
public class UsCustomerTag extends ConditionalTagSupport {
-
+
//*********************************************************************
// Instance Variables
-
- /** Holds value of property customer. */
+
+ /**
+ * Holds value of property customer.
+ */
private Customer customer;
-
+
//*********************************************************************
// Constructor and lusCustomerecycle management
-
+
public UsCustomerTag() {
super();
init();
}
-
+
private void init() {
customer = null;
}
-
+
//*********************************************************************
// TagSupport methods
-
+
public void release() {
super.release();
init();
}
-
+
//*********************************************************************
// ConditionalTagSupport methods
-
+
protected boolean condition() throws JspTagException {
try {
if (customer == null) {
@@ -72,20 +74,22 @@ public class UsCustomerTag extends Condi
throw new JspTagException(ex.toString());
}
}
-
+
//*********************************************************************
// Accessors
-
+
/**
* Getter for property customer.
+ *
* @return Value of property customer.
*/
public Customer getCustomer() {
return customer;
}
-
+
/**
* Setter for property customer.
+ *
* @param customer New value of property customer.
*/
public void setCustomer(Customer customer) {
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/IOBean.java Sat Nov 20 18:34:03 2010
@@ -13,11 +13,15 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.util;
-import java.io.*;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.Writer;
+
import javax.servlet.jsp.JspException;
/**
@@ -31,30 +35,30 @@ public class IOBean {
String content = null;
public Reader getReader() throws JspException {
- //p("getReader()");
- if (content == null) {
- if (stringWriter == null) {
- throw new JspException(
- "content must first be added to the bean via the writer");
- }
- content = stringWriter.toString();
- }
- return new StringReader(content);
+ //p("getReader()");
+ if (content == null) {
+ if (stringWriter == null) {
+ throw new JspException(
+ "content must first be added to the bean via the writer");
+ }
+ content = stringWriter.toString();
+ }
+ return new StringReader(content);
}
public Writer getWriter() {
- //p("getWriter()");
- content = null;
- stringWriter = new StringWriter();
- return stringWriter;
+ //p("getWriter()");
+ content = null;
+ stringWriter = new StringWriter();
+ return stringWriter;
}
public void release() {
- stringWriter = null;
- content = null;
+ stringWriter = null;
+ content = null;
}
private void p(String s) {
- System.out.println("[IOBean] " + s);
+ System.out.println("[IOBean] " + s);
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/ServletResponseWrapperForWriter.java Sat Nov 20 18:34:03 2010
@@ -13,21 +13,17 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.util;
import java.io.PrintWriter;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import javax.servlet.jsp.*;
-
/**
- * ServletResponseWrapper used for the the generation of
+ * ServletResponseWrapper used for the the generation of
* semi-dynamic pages.
- * <p>
- * This 'wrapped' response object is passed as the second argument
+ * <p/>
+ * This 'wrapped' response object is passed as the second argument
* to the internal RequestDispatcher.include(). It channels
* all output text into the PrintWriter specified in the
* constructor (which is associated with the file where the
@@ -37,27 +33,24 @@ import javax.servlet.jsp.*;
* @version $Revision$ $Date$
*/
public class ServletResponseWrapperForWriter
- extends HttpServletResponseWrapper
-{
+ extends HttpServletResponseWrapper {
/**
* The writer that will get all the output of the response.
*/
PrintWriter writer;
- public ServletResponseWrapperForWriter(ServletResponse response,
- PrintWriter writer)
- {
- super((HttpServletResponse)response);
- this.writer = writer;
+ public ServletResponseWrapperForWriter(ServletResponse response,
+ PrintWriter writer) {
+ super((HttpServletResponse) response);
+ this.writer = writer;
}
/**
* Returns the Writer associated with the response.
*/
public java.io.PrintWriter getWriter()
- throws java.io.IOException
- {
- return writer;
+ throws java.io.IOException {
+ return writer;
}
}
Modified: tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/Util.java
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/Util.java?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/Util.java (original)
+++ tomcat/taglibs/standard/trunk/examples/src/org/apache/taglibs/standard/examples/util/Util.java Sat Nov 20 18:34:03 2010
@@ -13,12 +13,17 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- */
+ */
package org.apache.taglibs.standard.examples.util;
-import java.io.*;
-import javax.servlet.jsp.*;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.Writer;
/**
* <p>Utility class for examples webapp.
@@ -30,28 +35,28 @@ public class Util {
public static Writer castToWriter(Object obj) throws JspException {
if (obj instanceof OutputStream) {
- return new OutputStreamWriter((OutputStream)obj);
+ return new OutputStreamWriter((OutputStream) obj);
} else if (obj instanceof Writer) {
- return (Writer)obj;
+ return (Writer) obj;
/*@@@
} else if (obj instanceof String) {
return new StringWriter();
*/
}
throw new JspException("Invalid type '" + obj.getClass().getName() +
- "' for castToWriter()");
+ "' for castToWriter()");
}
-
+
public static Reader castToReader(Object obj) throws JspException {
if (obj instanceof InputStream) {
- return new InputStreamReader((InputStream)obj);
+ return new InputStreamReader((InputStream) obj);
} else if (obj instanceof Reader) {
- return (Reader)obj;
+ return (Reader) obj;
} else if (obj instanceof String) {
- return new StringReader((String)obj);
+ return new StringReader((String) obj);
}
throw new JspException("Invalid type '" + obj.getClass().getName() +
- "' for castToReader()");
+ "' for castToReader()");
}
}
Modified: tomcat/taglibs/standard/trunk/examples/web/ShowSource.jsp
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/ShowSource.jsp?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/web/ShowSource.jsp (original)
+++ tomcat/taglibs/standard/trunk/examples/web/ShowSource.jsp Sat Nov 20 18:34:03 2010
@@ -1,10 +1,10 @@
<!--
- Displays the content of the file specified in request
- parameter "filename".
- <%-- Warning! Can be used to retrieve the source code for
- any file in the 'standard-examples' application.
- It is not advisable to insert any sensitive code
- (even as an experiment) into this application --%>
+Displays the content of the file specified in request
+parameter "filename".
+<%-- Warning! Can be used to retrieve the source code for
+any file in the 'standard-examples' application.
+It is not advisable to insert any sensitive code
+(even as an experiment) into this application --%>
-->
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
@@ -15,13 +15,13 @@
demonstrate "c:import"
--%>
<% pageContext.setAttribute("filepath",
- application.
- getResource(request.getParameter("filename")).toExternalForm()); %>
+ application.
+ getResource(request.getParameter("filename")).toExternalForm()); %>
<% pageContext.setAttribute("filename", request.getParameter("filename")); %>
<html>
<head>
- <title>JSTL: Source code for <c:out value="${filename}"/></title>
+ <title>JSTL: Source code for <c:out value="${filename}"/></title>
</head>
<body bgcolor="#FFFFFF">
<h3>Source code for: ${filename}</h3>
@@ -29,7 +29,7 @@
<hr>
<c:import varReader="reader" url="${filepath}">
- <ex:escapeHtml reader="${reader}"/>
+ <ex:escapeHtml reader="${reader}"/>
</c:import>
<hr>
</body>
Modified: tomcat/taglibs/standard/trunk/examples/web/WEB-INF/tlds/jstl-examples.tld
URL: http://svn.apache.org/viewvc/tomcat/taglibs/standard/trunk/examples/web/WEB-INF/tlds/jstl-examples.tld?rev=1037291&r1=1037290&r2=1037291&view=diff
==============================================================================
--- tomcat/taglibs/standard/trunk/examples/web/WEB-INF/tlds/jstl-examples.tld (original)
+++ tomcat/taglibs/standard/trunk/examples/web/WEB-INF/tlds/jstl-examples.tld Sat Nov 20 18:34:03 2010
@@ -1,165 +1,165 @@
<?xml version="1.0" encoding="UTF-8" ?>
<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
- version="2.0">
- <description>
- Tag Library to support examples webapp
- </description>
- <tlib-version>1.1</tlib-version>
- <short-name>ex</short-name>
- <uri>/jstl-examples-taglib</uri>
-
- <tag>
- <name>defaultLocale</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.DefaultLocaleTag</tag-class>
- <body-content>JSP</body-content>
- </tag>
-
- <tag>
- <name>locales</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.LocalesTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>var</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>varStatus</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>varTotal</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>begin</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>end</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>escapeHtml</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.EscapeHtmlTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>reader</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>writer</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>resource</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.ResourceTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
+ version="2.0">
+ <description>
+ Tag Library to support examples webapp
+ </description>
+ <tlib-version>1.1</tlib-version>
+ <short-name>ex</short-name>
+ <uri>/jstl-examples-taglib</uri>
+
+ <tag>
+ <name>defaultLocale</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.DefaultLocaleTag</tag-class>
+ <body-content>JSP</body-content>
+ </tag>
+
+ <tag>
+ <name>locales</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.LocalesTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>var</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>varStatus</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>varTotal</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>begin</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>end</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>escapeHtml</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.EscapeHtmlTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>reader</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>writer</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>resource</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>file</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.FileTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>id</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.ResourceTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>resource</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
<name>file</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>odd</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.OddTag</tag-class>
- <body-content>JSP</body-content>
- </tag>
-
- <tag>
- <name>even</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.EvenTag</tag-class>
- <body-content>JSP</body-content>
- </tag>
-
- <tag>
- <name>usCustomer</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.UsCustomerTag</tag-class>
- <body-content>JSP</body-content>
- <attribute>
- <name>customer</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>var</name>
- <required>false</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>customerFmt</name>
- <tag-class>org.apache.taglibs.standard.examples.taglib.CustomerFmtTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <name>customer</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>fmt</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
- <name>SPath</name>
- <tag-class>org.apache.taglibs.standard.extra.spath.SPathTag</tag-class>
- <body-content>empty</body-content>
- <attribute>
- <name>var</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- <attribute>
- <name>select</name>
- <required>true</required>
- <rtexprvalue>false</rtexprvalue>
- </attribute>
- </tag>
-
- <function>
- <name>display</name>
- <function-class>org.apache.taglibs.standard.examples.taglib.Functions</function-class>
- <function-signature>java.lang.String display(java.lang.Object)</function-signature>
- </function>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.FileTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>id</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>file</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>odd</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.OddTag</tag-class>
+ <body-content>JSP</body-content>
+ </tag>
+
+ <tag>
+ <name>even</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.EvenTag</tag-class>
+ <body-content>JSP</body-content>
+ </tag>
+
+ <tag>
+ <name>usCustomer</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.UsCustomerTag</tag-class>
+ <body-content>JSP</body-content>
+ <attribute>
+ <name>customer</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>var</name>
+ <required>false</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>customerFmt</name>
+ <tag-class>org.apache.taglibs.standard.examples.taglib.CustomerFmtTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>customer</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>fmt</name>
+ <required>true</required>
+ <rtexprvalue>true</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <tag>
+ <name>SPath</name>
+ <tag-class>org.apache.taglibs.standard.extra.spath.SPathTag</tag-class>
+ <body-content>empty</body-content>
+ <attribute>
+ <name>var</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ <attribute>
+ <name>select</name>
+ <required>true</required>
+ <rtexprvalue>false</rtexprvalue>
+ </attribute>
+ </tag>
+
+ <function>
+ <name>display</name>
+ <function-class>org.apache.taglibs.standard.examples.taglib.Functions</function-class>
+ <function-signature>java.lang.String display(java.lang.Object)</function-signature>
+ </function>
</taglib>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org