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 ho...@apache.org on 2002/01/04 22:59:01 UTC
cvs commit: jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql UpdateTagSupport.java TransactionTagSupport.java QueryTagSupport.java ParamTagSupport.java DriverTagSupport.java DataSourceWrapper.java
horwat 02/01/04 13:59:01
Modified: standard/src/org/apache/taglibs/standard/resources
Resources.properties
standard/src/org/apache/taglibs/standard/tag/common/sql
UpdateTagSupport.java TransactionTagSupport.java
QueryTagSupport.java ParamTagSupport.java
DriverTagSupport.java DataSourceWrapper.java
Log:
SQL tag error message resource properties.
Revision Changes Path
1.6 +29 -0 jakarta-taglibs/standard/src/org/apache/taglibs/standard/resources/Resources.properties
Index: Resources.properties
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/resources/Resources.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Resources.properties 4 Jan 2002 01:39:24 -0000 1.5
+++ Resources.properties 4 Jan 2002 21:59:01 -0000 1.6
@@ -122,6 +122,35 @@
EXCEPTION_NOT_IN_ERROR_PAGE=\
<exception> not in error page
+# SQL
+
+DRIVER_INVALID_CLASS=\
+ In <driver>, invalid driver class name: "{0}"
+
+PARAM_SQLVALUE_CONTEXT=\
+ In <param>, "sqlValue" used in wrong context
+
+TRANSACTION_NO_SUPPORT=\
+ In <transaction>, datasource does not support transactions
+
+TRANSACTION_COMMIT_ERROR=\
+ In <transaction>, error committing transaction: "{0}"
+
+TRANSACTION_INVALID_ISOLATION=\
+ In <transaction>, invalid transaction isolation
+
+NOT_SUPPORTED=\
+ Not supported
+
+ERROR_GET_CONNECTION=\
+ Error getting connection: "{0}"
+
+SQL_NO_STATEMENT=\
+ No SQL statement specified
+
+SQL_PROCESS_ERROR=\
+ Error processing SQL: "{0}"
+
# XML
PARAM_NO_VALUE=\
1.5 +7 -5 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java
Index: UpdateTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/UpdateTagSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UpdateTagSupport.java 4 Jan 2002 05:21:53 -0000 1.4
+++ UpdateTagSupport.java 4 Jan 2002 21:59:01 -0000 1.5
@@ -61,6 +61,7 @@
import javax.servlet.jsp.*;
import javax.servlet.jsp.jstl.sql.*;
import javax.servlet.jsp.tagext.*;
+import org.apache.taglibs.standard.resources.Resources;
/**
* <p>Tag handler for <Update> in JSTL.
@@ -147,8 +148,8 @@
conn = getConnection();
}
catch (SQLException e) {
- throw new JspTagException("Error getting connection: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("ERROR_GET_CONNECTION", e.getMessage()));
}
return EVAL_BODY_BUFFERED;
}
@@ -179,7 +180,8 @@
sqlStatement = bodyContent.getString();
}
if (sqlStatement == null || sqlStatement.trim().length() == 0) {
- throw new JspTagException("No SQL statement specified");
+ throw new JspTagException(
+ Resources.getMessage("SQL_NO_STATEMENT"));
}
int result = 0;
@@ -189,8 +191,8 @@
result = ps.executeUpdate();
}
catch (SQLException e) {
- throw new JspTagException("Error processing SQL: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("SQL_PROCESS_ERROR", e.getMessage()));
}
if (var != null)
pageContext.setAttribute(var, new Integer(result), scope);
1.2 +10 -6 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java
Index: TransactionTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/TransactionTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TransactionTagSupport.java 11 Dec 2001 22:13:51 -0000 1.1
+++ TransactionTagSupport.java 4 Jan 2002 21:59:01 -0000 1.2
@@ -61,6 +61,8 @@
import javax.servlet.jsp.*;
import javax.servlet.jsp.jstl.sql.*;
import javax.servlet.jsp.tagext.*;
+import org.apache.taglibs.standard.resources.Resources;
+
/**
* <p>Tag handler for <Transaction> in JSTL.
@@ -110,7 +112,8 @@
this.transactionIsolation = Connection.TRANSACTION_SERIALIZABLE;
}
else {
- throw new JspTagException("Invalid transaction isolation");
+ throw new JspTagException(
+ Resources.getMessage("TRANSACTION_INVALID_ISOLATION"));
}
}
@@ -135,7 +138,8 @@
conn = getConnection();
int origIsolation = conn.getTransactionIsolation();
if (origIsolation == Connection.TRANSACTION_NONE) {
- throw new JspTagException("The DataSource does not support transactions");
+ throw new JspTagException(
+ Resources.getMessage("TRANSACTION_NO_SUPPORT"));
}
if (transactionIsolation != DEFAULT_ISOLATION &&
origIsolation != transactionIsolation) {
@@ -144,8 +148,8 @@
conn.setAutoCommit(false);
}
catch (SQLException e) {
- throw new JspTagException("Error getting connection: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("ERROR_GET_CONNECTION", e.getMessage()));
}
return EVAL_BODY_INCLUDE;
}
@@ -158,8 +162,8 @@
conn.commit();
}
catch (SQLException e) {
- throw new JspTagException("Error committing transaction: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("TRANSACTION_COMMIT_ERROR", e.getMessage()));
}
return EVAL_PAGE;
}
1.4 +8 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- QueryTagSupport.java 12 Dec 2001 22:13:10 -0000 1.3
+++ QueryTagSupport.java 4 Jan 2002 21:59:01 -0000 1.4
@@ -62,6 +62,8 @@
import javax.servlet.jsp.*;
import javax.servlet.jsp.jstl.sql.*;
import javax.servlet.jsp.tagext.*;
+import org.apache.taglibs.standard.resources.Resources;
+
/**
* <p>Tag handler for <Query> in JSTL.
@@ -192,8 +194,8 @@
conn = getConnection();
}
catch (SQLException e) {
- throw new JspTagException("Error getting connection: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("ERROR_GET_CONNECTION", e.getMessage()));
}
return EVAL_BODY_BUFFERED;
}
@@ -224,7 +226,8 @@
sqlStatement = bodyContent.getString();
}
if (sqlStatement == null || sqlStatement.trim().length() == 0) {
- throw new JspTagException("No SQL statement specified");
+ throw new JspTagException(
+ Resources.getMessage("SQL_NO_STATEMENT"));
}
Result result = null;
@@ -238,8 +241,8 @@
result = new ResultImpl(rs, startRow, (maxRows > 0));
}
catch (SQLException e) {
- throw new JspTagException("Error processing SQL: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("SQL_PROCESS_ERROR", e.getMessage()));
}
pageContext.setAttribute(var, result, scope);
return SKIP_BODY;
1.2 +6 -2 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java
Index: ParamTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/ParamTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ParamTagSupport.java 11 Dec 2001 22:13:51 -0000 1.1
+++ ParamTagSupport.java 4 Jan 2002 21:59:01 -0000 1.2
@@ -58,6 +58,8 @@
import javax.servlet.jsp.*;
import javax.servlet.jsp.jstl.sql.*;
import javax.servlet.jsp.tagext.*;
+import org.apache.taglibs.standard.resources.Resources;
+
/**
* <p>Tag handler for <Param> in JSTL, used to set
@@ -76,7 +78,8 @@
SQLExecutionTag parent = (SQLExecutionTag)
findAncestorWithClass(this, SQLExecutionTag.class);
if (parent == null) {
- throw new JspTagException("'sqlValue' used in the wrong context");
+ throw new JspTagException(
+ Resources.getMessage("PARAM_SQLVALUE_CONTEXT"));
}
Object paramValue = null;
@@ -90,7 +93,8 @@
}
}
if (paramValue == null) {
- throw new JspTagException("No value specified");
+ throw new JspTagException(
+ Resources.getMessage("PARAM_NO_VALUE"));
}
parent.addSQLParameter(paramValue);
return EVAL_PAGE;
1.3 +4 -2 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DriverTagSupport.java
Index: DriverTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DriverTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DriverTagSupport.java 17 Dec 2001 22:55:04 -0000 1.2
+++ DriverTagSupport.java 4 Jan 2002 21:59:01 -0000 1.3
@@ -60,6 +60,8 @@
import javax.servlet.jsp.*;
import javax.servlet.jsp.jstl.sql.*;
import javax.servlet.jsp.tagext.*;
+import org.apache.taglibs.standard.resources.Resources;
+
/**
* <p>Tag handler for <Driver> in JSTL, used to create
@@ -120,8 +122,8 @@
ds.setDriverClassName(getDriverClassName());
}
catch (Exception e) {
- throw new JspTagException("Invalid driver class name: " +
- e.getMessage());
+ throw new JspTagException(
+ Resources.getMessage("DRIVER_INVALID_CLASS", e.getMessage()));
}
ds.setJdbcURL(getJdbcURL());
ds.setUserName(getUserName());
1.2 +7 -5 jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java
Index: DataSourceWrapper.java
===================================================================
RCS file: /home/cvs/jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql/DataSourceWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DataSourceWrapper.java 11 Dec 2001 22:13:51 -0000 1.1
+++ DataSourceWrapper.java 4 Jan 2002 21:59:01 -0000 1.2
@@ -59,6 +59,8 @@
import java.sql.*;
import java.util.*;
import javax.sql.*;
+import org.apache.taglibs.standard.resources.Resources;
+
/**
* <p>A simple <code>DataSource</code> wrapper for the standard
@@ -117,35 +119,35 @@
*/
public Connection getConnection(String username, String password)
throws SQLException {
- throw new SQLException("Not supported");
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
/**
* Always throws a SQLException. Not supported.
*/
public int getLoginTimeout() throws SQLException {
- throw new SQLException("Not supported");
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
/**
* Always throws a SQLException. Not supported.
*/
public PrintWriter getLogWriter() throws SQLException {
- throw new SQLException("Not supported");
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
/**
* Always throws a SQLException. Not supported.
*/
public void setLoginTimeout(int seconds) throws SQLException {
- throw new SQLException("Not supported");
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
/**
* Always throws a SQLException. Not supported.
*/
public synchronized void setLogWriter(PrintWriter out) throws SQLException {
- throw new SQLException("Not supported");
+ throw new SQLException(Resources.getMessage("NOT_SUPPORTED"));
}
/**
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>
Re: cvs commit:
jakarta-taglibs/standard/src/org/apache/taglibs/standard/tag/common/sql
UpdateTagSupport.java TransactionTagSupport.java QueryTagSupport.java
ParamTagSupport.java DriverTagSupport.java DataSourceWrapper.java
Posted by Ted Husted <hu...@apache.org>.
Please take this in the spirit it is given.
http://jakarta.apache.org/site/source.html
"All Java Language source code in the repository must be written in
conformance to
the "Code Conventions for the Java Programming Language as published by
Sun."
Accordingly, omitting the braches in an if statement
> if (var != null)
> pageContext.setAttribute(var, new Integer(result), scope);
should be avoided
http://java.sun.com/docs/codeconv/html/CodeConventions.doc6.html#431
in favor of
> if (var != null) {
> pageContext.setAttribute(var, new Integer(result), scope);
}
Just so you know.
-- Ted Husted.
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>