cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties
dgraham 2003/08/02 14:38:16
Modified:src/share/org/apache/struts/taglib TagUtils.java
src/share/org/apache/struts/util LocalStrings.properties
Added: src/share/org/apache/struts/taglib LocalStrings.properties
Log:
Move message resources to taglib package.
Revision ChangesPath
1.21 +13 -6 jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java
Index: TagUtils.java
===
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/TagUtils.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- TagUtils.java 2 Aug 2003 21:07:33 - 1.20
+++ TagUtils.java 2 Aug 2003 21:38:16 - 1.21
@@ -122,7 +122,7 @@
* TODO We need to move the relevant messages out of this properties file.
*/
private static final MessageResources messages =
-MessageResources.getMessageResources(org.apache.struts.util.LocalStrings);
+
MessageResources.getMessageResources(org.apache.struts.taglib.LocalStrings);
/**
* Java 1.4 encode method to use instead of deprecated 1.3 version.
@@ -231,6 +231,7 @@
saveException(pageContext, e);
throw new JspException(
messages.getMessage(parameters.multi, name, property, scope));
+
} catch (JspException e) {
saveException(pageContext, e);
throw e;
@@ -255,6 +256,7 @@
paramName,
paramProperty,
paramScope);
+
} catch (JspException e) {
saveException(pageContext, e);
throw e;
@@ -272,12 +274,14 @@
Object mapValue = results.get(paramId);
if (mapValue == null) {
results.put(paramId, paramString);
+
} else if (mapValue instanceof String) {
String newValues[] = new String[2];
newValues[0] = (String) mapValue;
newValues[1] = paramString;
results.put(paramId, newValues);
-} else /* if (mapValue instanceof String[]) */ {
+
+} else {
String oldValues[] = (String[]) mapValue;
String newValues[] = new String[oldValues.length + 1];
System.arraycopy(oldValues, 0, newValues, 0, oldValues.length);
@@ -296,6 +300,7 @@
if (session != null) {
token = (String)
session.getAttribute(Globals.TRANSACTION_TOKEN_KEY);
}
+
if (token != null) {
results.put(Constants.TOKEN_KEY, token);
}
@@ -660,6 +665,7 @@
} catch (JspException e) {
throw e;
+
} catch (Exception e) {
log.debug(e, e);
}
@@ -790,6 +796,7 @@
} catch (JspException e) {
throw e;
+
} catch (Exception e) {
;
}
1.12 +11 -26
jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings.properties
1.9 +0 -11
jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LocalStrings.properties 15 May 2003 23:28:06 - 1.8
+++ LocalStrings.properties 2 Aug 2003 21:38:16 - 1.9
@@ -1,13 +1,6 @@
-actionErrors.errors=Cannot process ActionErrors instance of class {0}
-
-actionMessages.errors=Cannot process ActionMessages instance of class {0}
-
-computeURL.forward=Cannot retrieve ActionForward named {0}
computeURL.forwards=Cannot retrieve ActionForwards collection
-computeURL.specifier=You must specify exactly one of forward, href, page or
action
-
lookup.access=Invalid access looking up property {0} of bean {1}
lookup.bean.any=Cannot find bean {0} in any scope
@@ -16,13 +9,9 @@
lookup.method=No getter method for property {0} of bean {1}
-lookup.scope=Invalid bean scope {0}
-
lookup.target=Exception thrown by getter for property {0} of bean {1}
message.bundle=Cannot find message resources under key {0}
-
-parameters.multi=Cannot cast to Map for name={0} property={1} scope={2}
parameters.single=Cannot cast to String for name={0} property={1} scope={2}
cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties
dgraham 2003/08/02 14:44:40
Modified:src/share/org/apache/struts/taglib LocalStrings.properties
src/share/org/apache/struts/util LocalStrings.properties
Log:
Complete movement of message resources to taglib package.
Revision ChangesPath
1.13 +15 -1
jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/LocalStrings.properties,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- LocalStrings.properties 2 Aug 2003 21:38:16 - 1.12
+++ LocalStrings.properties 2 Aug 2003 21:44:40 - 1.13
@@ -6,6 +6,20 @@
computeURL.specifier=You must specify exactly one of forward, href, page or
action
+lookup.access=Invalid access looking up property {0} of bean {1}
+
+lookup.bean.any=Cannot find bean {0} in any scope
+
+lookup.bean=Cannot find bean {0} in scope {1}
+
+lookup.method=No getter method for property {0} of bean {1}
+
lookup.scope=Invalid bean scope {0}
-parameters.multi=Cannot cast to Map for name={0} property={1} scope={2}
\ No newline at end of file
+lookup.target=Exception thrown by getter for property {0} of bean {1}
+
+message.bundle=Cannot find message resources under key {0}
+
+parameters.multi=Cannot cast to Map for name={0} property={1} scope={2}
+
+write.io=Input/output error: {0}
\ No newline at end of file
1.10 +0 -14
jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LocalStrings.properties 2 Aug 2003 21:38:16 - 1.9
+++ LocalStrings.properties 2 Aug 2003 21:44:40 - 1.10
@@ -1,19 +1,5 @@
computeURL.forwards=Cannot retrieve ActionForwards collection
-lookup.access=Invalid access looking up property {0} of bean {1}
-
-lookup.bean.any=Cannot find bean {0} in any scope
-
-lookup.bean=Cannot find bean {0} in scope {1}
-
-lookup.method=No getter method for property {0} of bean {1}
-
-lookup.target=Exception thrown by getter for property {0} of bean {1}
-
-message.bundle=Cannot find message resources under key {0}
-
parameters.single=Cannot cast to String for name={0} property={1} scope={2}
-
-write.io=Input/output error: {0}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties
husted 2003/01/20 04:43:44
Modified:src/share/org/apache/struts/util LocalStrings.properties
Log:
Resolve bug 16250 - typing error in exception text - submitted by Leo Mekenkamp
Revision ChangesPath
1.7 +1 -1
jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LocalStrings.properties 8 Aug 2002 23:53:44 - 1.6
+++ LocalStrings.properties 20 Jan 2003 12:43:44 - 1.7
@@ -1,6 +1,6 @@
actionErrors.errors=Cannot process ActionErrors instance of class {0}
actionMessages.errors=Cannot process ActionMessages instance of class {0}
-computeURL.forward=Cannot retrive ActionForward named {0}
+computeURL.forward=Cannot retrieve ActionForward named {0}
computeURL.forwards=Cannot retrieve ActionForwards collection
computeURL.specifier=You must specify exactly one of forward, href, or page
lookup.access=Invalid access looking up property {0} of bean {1}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties
martinc 01/11/19 19:07:30
Modified:src/share/org/apache/struts/util LocalStrings.properties
Log:
Fixed a typo in message resources.
PR: 4836
Submitted by: Daniel Temme
Revision ChangesPath
1.5 +1 -1
jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalStrings.properties 2001/10/16 17:15:25 1.4
+++ LocalStrings.properties 2001/11/20 03:07:29 1.5
@@ -9,6 +9,6 @@
lookup.scope=Invalid bean scope {0}
lookup.target=Exception thrown by getter for property {0} of bean {1}
message.bundle=Cannot find message resources under key {0}
-parameters.multi=Cannot cast to Map for name={0} property={1e} scope={2}
+parameters.multi=Cannot cast to Map for name={0} property={1} scope={2}
parameters.single=Cannot cast to String for name={0} property={1} scope={2}
write.io=Input/output error: {0}
--
To unsubscribe, e-mail: mailto:[EMAIL PROTECTED]
For additional commands, e-mail: mailto:[EMAIL PROTECTED]
cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties
dwinterfeldt01/10/16 10:15:25
Modified:src/share/org/apache/struts/util LocalStrings.properties
Log:
Added error message for the getActionErrors and getActionMessages methods.
Revision ChangesPath
1.4 +2 -0
jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties
Index: LocalStrings.properties
===
RCS file:
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LocalStrings.properties 2001/05/09 19:31:28 1.3
+++ LocalStrings.properties 2001/10/16 17:15:25 1.4
@@ -1,3 +1,5 @@
+actionErrors.errors=Cannot process ActionErrors instance of class {0}
+actionMessages.errors=Cannot process ActionMessages instance of class {0}
computeURL.forward=Cannot retrive ActionForward named {0}
computeURL.forwards=Cannot retrieve ActionForwards collection
computeURL.specifier=You must specify exactly one of forward, href, or page
cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties RequestUtils.java
craigmcc01/05/09 12:31:33 Modified:doc struts-bean.xml struts-html.xml struts-logic.xml src/share/org/apache/struts/taglib/bean IncludeTag.java LocalStrings.properties src/share/org/apache/struts/taglib/html LinkTag.java LocalStrings.properties RewriteTag.java src/share/org/apache/struts/taglib/logic LocalStrings.properties RedirectTag.java src/share/org/apache/struts/util LocalStrings.properties RequestUtils.java Log: Refactor the hyperlink-generation code used in the bean:include, html:link, html:rewrite, and logic:redirect tags to use common utility methods based on URLs rather than Strings. This will ensure consistency in implementation, and make it easy to provide full URL-processing functionality to other tags as necessary. Revision ChangesPath 1.4 +22 -0 jakarta-struts/doc/struts-bean.xml Index: struts-bean.xml === RCS file: /home/cvs/jakarta-struts/doc/struts-bean.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- struts-bean.xml 2001/04/22 00:46:19 1.3 +++ struts-bean.xml 2001/05/09 19:31:00 1.4 @@ -353,6 +353,17 @@ /info attribute + nameanchor/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue + info + pOptional anchor tag (#xxx) to be added to the generated + hyperlink. Specify this value strongwithout/strong any + # character./p + /info +/attribute + +attribute nameforward/name requiredfalse/required rtexprvaluetrue/rtexprvalue @@ -404,6 +415,17 @@ info pContext-relative URI (starting with a '/') of the web application resource to be included./p + /info +/attribute + +attribute + nametransaction/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue + info +pSet to codetrue/code if you want the current +transaction control token included in the generated +URL for this include./p /info /attribute 1.9 +81 -6 jakarta-struts/doc/struts-html.xml Index: struts-html.xml === RCS file: /home/cvs/jakarta-struts/doc/struts-html.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- struts-html.xml 2001/05/05 00:59:50 1.8 +++ struts-html.xml 2001/05/09 19:31:01 1.9 @@ -3704,6 +3704,17 @@ /info attribute + nameanchor/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue + info + pOptional anchor tag (#xxx) to be added to the generated + hyperlink. Specify this value strongwithout/strong any + # character./p + /info +/attribute + +attribute nameforward/name requiredfalse/required rtexprvaluetrue/rtexprvalue @@ -3735,6 +3746,19 @@ /attribute attribute + namename/name + requiredfalse/required + rtexprvaluetrue/rtexprvalue + info + pThe name of a JSP bean that contains a codeMap/code + representing the query parameters (if codeproperty/code + is not specified), or a JSP bean whose property getter is + called to return a codeMap/code (if codeproperty/code + is specified)./p + /info +/attribute + +attribute namepage/name requiredfalse/required rtexprvaluetrue/rtexprvalue @@ -3751,15 +3775,54 @@ /attribute attribute - namename/name + nameparamId/name requiredfalse/required rtexprvaluetrue/rtexprvalue info - pThe name of a JSP bean that contains a codeMap/code - representing the query parameters (if codeproperty/code - is not specified), or a JSP bean whose property getter is - called to return a codeMap/code (if codeproperty/code - is specified)./p + pThe name of the request parameter that will be dynamically + added to the generated hyperlink. The corresponding value is +
cvs commit: jakarta-struts/src/share/org/apache/struts/util LocalStrings.properties
craigmcc01/02/12 16:06:26
Added: src/share/org/apache/struts/util LocalStrings.properties
Log:
Add new messages file.
Revision ChangesPath
1.1
jakarta-struts/src/share/org/apache/struts/util/LocalStrings.properties
Index: LocalStrings.properties
===
lookup.access=Invalid access looking up property {0} of bean {1}
lookup.bean=Cannot find bean {0} in scope {1}
lookup.method=No getter method for property {0} of bean {1}
lookup.scope=Invalid bean scope {0}
lookup.target=Exception thrown by getter for property {0} of bean {1}
write.io=Input/output error: {0}
