You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by lu...@apache.org on 2002/04/29 18:35:04 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql DataSourceUtil.java QueryTagSupport.java SetDataSourceTagSupport.java
luehe 02/04/29 09:35:04
Modified: standard/src/javax/servlet/jsp/jstl/core Config.java
standard/src/org/apache/taglibs/standard/tag/common/fmt
BundleSupport.java SetBundleSupport.java
SetLocaleSupport.java SetTimeZoneSupport.java
TimeZoneSupport.java
standard/src/org/apache/taglibs/standard/tag/common/sql
DataSourceUtil.java QueryTagSupport.java
SetDataSourceTagSupport.java
Log:
Changed config constants as follows:
FMT_FALLBACKLOCALE -> FMT_FALLBACK_LOCALE
FMT_LOCALIZATIONCONTEXT -> FMT_LOCALIZATION_CONTEXT
FMT_TIMEZONE -> FMT_TIME_ZONE
SQL_DATASOURCE -> SQL_DATA_SOURCE
SQL_MAXROWS -> SQL_MAX_ROWS
Revision Changes Path
1.7 +5 -5 jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/core/Config.java
Index: Config.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/javax/servlet/jsp/jstl/core/Config.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Config.java 24 Apr 2002 21:26:03 -0000 1.6
+++ Config.java 29 Apr 2002 16:35:03 -0000 1.7
@@ -70,19 +70,19 @@
*/
public static final String FMT_LOCALE
= "javax.servlet.jsp.jstl.fmt.locale";
- public static final String FMT_FALLBACKLOCALE
+ public static final String FMT_FALLBACK_LOCALE
= "javax.servlet.jsp.jstl.fmt.fallbackLocale";
- public static final String FMT_LOCALIZATIONCONTEXT
+ public static final String FMT_LOCALIZATION_CONTEXT
= "javax.servlet.jsp.jstl.fmt.localizationContext";
- public static final String FMT_TIMEZONE
+ public static final String FMT_TIME_ZONE
= "javax.servlet.jsp.jstl.fmt.timeZone";
/**
* SQL actions related configuration data
*/
- public static final String SQL_DATASOURCE
+ public static final String SQL_DATA_SOURCE
= "javax.servlet.jsp.jstl.sql.dataSource";
- public static final String SQL_MAXROWS
+ public static final String SQL_MAX_ROWS
= "javax.servlet.jsp.jstl.sql.maxRows";
/*
1.26 +2 -2 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java
Index: BundleSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/BundleSupport.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- BundleSupport.java 26 Apr 2002 19:59:21 -0000 1.25
+++ BundleSupport.java 29 Apr 2002 16:35:03 -0000 1.26
@@ -158,7 +158,7 @@
public static LocalizationContext getLocalizationContext(PageContext pc) {
LocalizationContext locCtxt = null;
- Object obj = Config.find(pc, Config.FMT_LOCALIZATIONCONTEXT);
+ Object obj = Config.find(pc, Config.FMT_LOCALIZATION_CONTEXT);
if (obj == null) {
return null;
}
@@ -221,7 +221,7 @@
if (locCtxt == null) {
// No match found with preferred locales, try using fallback locale
- pref = SetLocaleSupport.getLocale(pc, Config.FMT_FALLBACKLOCALE);
+ pref = SetLocaleSupport.getLocale(pc, Config.FMT_FALLBACK_LOCALE);
if (pref != null) {
bundle = findMatch(basename, pref);
if (bundle != null) {
1.8 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java
Index: SetBundleSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetBundleSupport.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SetBundleSupport.java 26 Apr 2002 19:59:21 -0000 1.7
+++ SetBundleSupport.java 29 Apr 2002 16:35:03 -0000 1.8
@@ -123,7 +123,7 @@
if (var != null) {
pageContext.setAttribute(var, locCtxt, scope);
} else {
- Config.set(pageContext, Config.FMT_LOCALIZATIONCONTEXT, locCtxt,
+ Config.set(pageContext, Config.FMT_LOCALIZATION_CONTEXT, locCtxt,
scope);
}
1.10 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java
Index: SetLocaleSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetLocaleSupport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SetLocaleSupport.java 26 Apr 2002 20:55:59 -0000 1.9
+++ SetLocaleSupport.java 29 Apr 2002 16:35:03 -0000 1.10
@@ -305,7 +305,7 @@
}
if (match == null) {
//Use fallback locale.
- pref = getLocale(pc, Config.FMT_FALLBACKLOCALE);
+ pref = getLocale(pc, Config.FMT_FALLBACK_LOCALE);
if (pref != null) {
match = findFormattingMatch(pref, avail);
}
1.5 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java
Index: SetTimeZoneSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/SetTimeZoneSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetTimeZoneSupport.java 18 Apr 2002 22:53:51 -0000 1.4
+++ SetTimeZoneSupport.java 29 Apr 2002 16:35:04 -0000 1.5
@@ -134,7 +134,7 @@
if (var != null) {
pageContext.setAttribute(var, timeZone, scope);
} else {
- Config.set(pageContext, Config.FMT_TIMEZONE, timeZone, scope);
+ Config.set(pageContext, Config.FMT_TIME_ZONE, timeZone, scope);
}
return EVAL_PAGE;
1.13 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java
Index: TimeZoneSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/fmt/TimeZoneSupport.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TimeZoneSupport.java 14 Apr 2002 04:48:46 -0000 1.12
+++ TimeZoneSupport.java 29 Apr 2002 16:35:04 -0000 1.13
@@ -174,7 +174,7 @@
tz = parent.getTimeZone();
} else {
// get time zone from config variable or context init param
- Object obj = Config.find(pc, Config.FMT_TIMEZONE);
+ Object obj = Config.find(pc, Config.FMT_TIME_ZONE);
if (obj != null) {
if (obj instanceof TimeZone) {
tz = (TimeZone) obj;
1.10 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java
Index: DataSourceUtil.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DataSourceUtil.java 24 Apr 2002 22:14:24 -0000 1.9
+++ DataSourceUtil.java 29 Apr 2002 16:35:04 -0000 1.10
@@ -89,7 +89,7 @@
DataSource dataSource = null;
if (rawDataSource == null) {
- rawDataSource = Config.find(pc, Config.SQL_DATASOURCE);
+ rawDataSource = Config.find(pc, Config.SQL_DATA_SOURCE);
}
if (rawDataSource == null) {
1.30 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java
Index: QueryTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/QueryTagSupport.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- QueryTagSupport.java 25 Apr 2002 00:25:16 -0000 1.29
+++ QueryTagSupport.java 29 Apr 2002 16:35:04 -0000 1.30
@@ -168,7 +168,7 @@
public int doStartTag() throws JspException {
if (!maxRowsSpecified) {
- Object obj = Config.find(pageContext, Config.SQL_MAXROWS);
+ Object obj = Config.find(pageContext, Config.SQL_MAX_ROWS);
if (obj != null) {
if (obj instanceof Integer) {
maxRows = ((Integer) obj).intValue();
1.10 +1 -1 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java
Index: SetDataSourceTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/SetDataSourceTagSupport.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SetDataSourceTagSupport.java 24 Apr 2002 22:14:24 -0000 1.9
+++ SetDataSourceTagSupport.java 29 Apr 2002 16:35:04 -0000 1.10
@@ -155,7 +155,7 @@
if (var != null) {
pageContext.setAttribute(var, ds, scope);
} else {
- Config.set(pageContext, Config.SQL_DATASOURCE, ds, scope);
+ Config.set(pageContext, Config.SQL_DATA_SOURCE, ds, scope);
}
return SKIP_BODY;
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>