You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2006/03/04 07:32:03 UTC
svn commit: r383055 - in /ibatis/trunk/java/mapper/mapper2: build/
src/com/ibatis/common/beans/ src/com/ibatis/common/exception/
src/com/ibatis/common/jdbc/ src/com/ibatis/common/jdbc/exception/
src/com/ibatis/common/util/ src/com/ibatis/common/xml/ sr...
Author: cbegin
Date: Fri Mar 3 22:32:01 2006
New Revision: 383055
URL: http://svn.apache.org/viewcvs?rev=383055&view=rev
Log:
Removed custom nested exception classes. JDK 1.4 now required.
Removed:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/exception/
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/ProbeException.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/ScriptRunner.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/exception/RuntimeSQLException.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Throttle.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/ThrottledPool.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletException.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/DaoException.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/builder/xml/XmlDaoManagerBuilder.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapException.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/accessplan/PropertyAccessPlan.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/BaseParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/ComplexDataExchange.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/JavaBeanDataExchange.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/MapDataExchange.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/EnhancedLazyResultLoader.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/LazyResultLoader.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/dynamic/elements/ConditionalTagHandler.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/GeneralStatement.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/RowHandlerCallback.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionException.java
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/dao/BaseDaoTest.java
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/CacheStatementTest.java
ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DomStatementTest.java
ibatis/trunk/java/mapper/mapper2/test/xmltester/MiniParser.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Fri Mar 3 22:32:01 2006
@@ -1,5 +1,5 @@
#Build version info
-#Tue Feb 21 21:25:03 MST 2006
+#Fri Mar 03 23:28:40 MST 2006
version=2.1.7
-buildDate=2006/02/21 21\:25
-buildNum=601
+buildDate=2006/03/03 23\:28
+buildNum=602
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/ProbeException.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/ProbeException.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/ProbeException.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/beans/ProbeException.java Fri Mar 3 22:32:01 2006
@@ -15,12 +15,12 @@
*/
package com.ibatis.common.beans;
-import com.ibatis.common.exception.NestedRuntimeException;
+
/**
* BeansException for use for by BeanProbe and StaticBeanProbe.
*/
-public class ProbeException extends NestedRuntimeException {
+public class ProbeException extends RuntimeException {
/**
* Default constructor
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/DbcpConfiguration.java Fri Mar 3 22:32:01 2006
@@ -17,7 +17,7 @@
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import org.apache.commons.dbcp.BasicDataSource;
import javax.sql.DataSource;
@@ -48,7 +48,7 @@
}
} catch (Exception e) {
- throw new NestedRuntimeException("Error initializing DbcpDataSourceFactory. Cause: " + e, e);
+ throw new RuntimeException("Error initializing DbcpDataSourceFactory. Cause: " + e, e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/ScriptRunner.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/ScriptRunner.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/ScriptRunner.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/ScriptRunner.java Fri Mar 3 22:32:01 2006
@@ -16,7 +16,7 @@
package com.ibatis.common.jdbc;
import com.ibatis.common.resources.Resources;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import java.io.IOException;
import java.io.LineNumberReader;
@@ -114,7 +114,7 @@
} catch (SQLException e) {
throw e;
} catch (Exception e) {
- throw new NestedRuntimeException("Error running script. Cause: " + e, e);
+ throw new RuntimeException("Error running script. Cause: " + e, e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/SimpleDataSource.java Fri Mar 3 22:32:01 2006
@@ -16,7 +16,7 @@
package com.ibatis.common.jdbc;
import com.ibatis.common.beans.ClassInfo;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.resources.Resources;
import com.ibatis.common.logging.LogFactory;
import com.ibatis.common.logging.Log;
@@ -121,14 +121,14 @@
String prop_pool_ping_query = null;
if (props == null) {
- throw new NestedRuntimeException("SimpleDataSource: The properties map passed to the initializer was null.");
+ throw new RuntimeException("SimpleDataSource: The properties map passed to the initializer was null.");
}
if (!(props.containsKey(PROP_JDBC_DRIVER)
&& props.containsKey(PROP_JDBC_URL)
&& props.containsKey(PROP_JDBC_USERNAME)
&& props.containsKey(PROP_JDBC_PASSWORD))) {
- throw new NestedRuntimeException("SimpleDataSource: Some properties were not set.");
+ throw new RuntimeException("SimpleDataSource: Some properties were not set.");
} else {
jdbcDriver = (String) props.get(PROP_JDBC_DRIVER);
@@ -200,14 +200,14 @@
if ( poolPingEnabled && (!props.containsKey(PROP_POOL_PING_QUERY) ||
prop_pool_ping_query.trim().length() == 0) ) {
- throw new NestedRuntimeException("SimpleDataSource: property '" + PROP_POOL_PING_ENABLED + "' is true, but property '" +
+ throw new RuntimeException("SimpleDataSource: property '" + PROP_POOL_PING_ENABLED + "' is true, but property '" +
PROP_POOL_PING_QUERY + "' is not set correctly.");
}
}
} catch (Exception e) {
log.error("SimpleDataSource: Error while loading properties. Cause: " + e.toString(), e);
- throw new NestedRuntimeException("SimpleDataSource: Error while loading properties. Cause: " + e, e);
+ throw new RuntimeException("SimpleDataSource: Error while loading properties. Cause: " + e, e);
}
}
@@ -910,7 +910,7 @@
private Connection getValidConnection() {
if (!valid) {
- throw new NestedRuntimeException("Error accessing SimplePooledConnection. Connection is invalid.");
+ throw new RuntimeException("Error accessing SimplePooledConnection. Connection is invalid.");
}
return realConnection;
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/exception/RuntimeSQLException.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/exception/RuntimeSQLException.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/exception/RuntimeSQLException.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/exception/RuntimeSQLException.java Fri Mar 3 22:32:01 2006
@@ -15,14 +15,14 @@
*/
package com.ibatis.common.jdbc.exception;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import java.sql.SQLException;
/**
* Unchecked exception to allow passing an Exception with the original SQLException
*/
-public class RuntimeSQLException extends NestedRuntimeException {
+public class RuntimeSQLException extends RuntimeException {
/**
* Default constructor
@@ -32,7 +32,7 @@
/**
* Constructor to pass along a message
- * @see com.ibatis.common.exception.NestedRuntimeException
+ * @see com.ibatis.common.exception.RuntimeException
* @param msg - the message
*/
public RuntimeSQLException(String msg) {
@@ -41,7 +41,7 @@
/**
* Constructor to pass along another exception
- * @see com.ibatis.common.exception.NestedRuntimeException
+ * @see com.ibatis.common.exception.RuntimeException
* @param sqlException - the exception
*/
public RuntimeSQLException(SQLException sqlException) {
@@ -50,7 +50,7 @@
/**
* Constructor to pass along a message and an exception
- * @see com.ibatis.common.exception.NestedRuntimeException
+ * @see com.ibatis.common.exception.RuntimeException
* @param msg - the message
* @param sqlException - the exception
*/
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Throttle.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Throttle.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Throttle.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/Throttle.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.common.util;
-import com.ibatis.common.exception.NestedRuntimeException;
+
/**
* This is to help keep from getting too many resources
@@ -63,7 +63,7 @@
}
totalWaitTime += System.currentTimeMillis() - waitTime;
if (totalWaitTime > maxWait) {
- throw new NestedRuntimeException("Throttle waited too long (" + totalWaitTime + " milliseconds) for lock.");
+ throw new RuntimeException("Throttle waited too long (" + totalWaitTime + " milliseconds) for lock.");
}
} else {
try {
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/ThrottledPool.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/ThrottledPool.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/ThrottledPool.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/util/ThrottledPool.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.common.util;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import java.util.List;
import java.util.Collections;
@@ -45,7 +45,7 @@
this.pool.add(type.newInstance());
}
} catch (Exception e) {
- throw new NestedRuntimeException("Error instantiating class. Cause: " + e, e);
+ throw new RuntimeException("Error instantiating class. Cause: " + e, e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletException.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletException.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletException.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletException.java Fri Mar 3 22:32:01 2006
@@ -1,8 +1,8 @@
package com.ibatis.common.xml;
-import com.ibatis.common.exception.NestedException;
-public class NodeletException extends NestedException {
+
+public class NodeletException extends Exception {
public NodeletException() {
super();
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletParser.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/xml/NodeletParser.java Fri Mar 3 22:32:01 2006
@@ -11,7 +11,7 @@
import java.io.Reader;
import java.util.*;
-import com.ibatis.common.exception.NestedRuntimeException;
+
/**
* The NodeletParser is a callback based parser similar to SAX. The big
@@ -110,7 +110,7 @@
try {
nodelet.process(node);
} catch (Exception e) {
- throw new NestedRuntimeException("Error parsing XPath '" + pathString + "'. Cause: " + e, e);
+ throw new RuntimeException("Error parsing XPath '" + pathString + "'. Cause: " + e, e);
}
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/DaoException.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/DaoException.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/DaoException.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/client/DaoException.java Fri Mar 3 22:32:01 2006
@@ -15,14 +15,14 @@
*/
package com.ibatis.dao.client;
-import com.ibatis.common.exception.NestedRuntimeException;
+
/**
* General runtime exception thrown by the DAO framework.
* <p/>
* <p/>
*/
-public class DaoException extends NestedRuntimeException {
+public class DaoException extends RuntimeException {
public DaoException() {
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/builder/xml/XmlDaoManagerBuilder.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/builder/xml/XmlDaoManagerBuilder.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/builder/xml/XmlDaoManagerBuilder.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/dao/engine/builder/xml/XmlDaoManagerBuilder.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.dao.engine.builder.xml;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.io.ReaderInputStream;
import com.ibatis.common.resources.Resources;
import com.ibatis.dao.client.Dao;
@@ -317,7 +317,7 @@
Document doc = db.parse(new ReaderInputStream(reader));
return doc;
} catch (Exception e) {
- throw new NestedRuntimeException("XML Parser Error. Cause: " + e);
+ throw new RuntimeException("XML Parser Error. Cause: " + e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapException.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapException.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapException.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/client/SqlMapException.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.sqlmap.client;
-import com.ibatis.common.exception.NestedRuntimeException;
+
/**
* Thrown to indicate a problem with SQL Map configuration or state. Generally
@@ -25,7 +25,7 @@
* Note: Generally this wouldn't be used to indicate that an SQL execution error
* occurred (that's what SQLException is for).
*/
-public class SqlMapException extends NestedRuntimeException {
+public class SqlMapException extends RuntimeException {
/**
* Simple constructor
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/accessplan/PropertyAccessPlan.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/accessplan/PropertyAccessPlan.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/accessplan/PropertyAccessPlan.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/accessplan/PropertyAccessPlan.java Fri Mar 3 22:32:01 2006
@@ -16,7 +16,7 @@
package com.ibatis.sqlmap.engine.accessplan;
import com.ibatis.common.beans.ClassInfo;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import java.lang.reflect.Method;
@@ -48,7 +48,7 @@
}
}
} catch (Throwable t) {
- throw new NestedRuntimeException("Error setting properties of '" + object + "'. Cause: " + t, t);
+ throw new RuntimeException("Error setting properties of '" + object + "'. Cause: " + t, t);
}
}
@@ -63,7 +63,7 @@
}
}
} catch (Throwable t) {
- throw new NestedRuntimeException("Error getting properties of '" + object + "'. Cause: " + t, t);
+ throw new RuntimeException("Error getting properties of '" + object + "'. Cause: " + t, t);
}
return values;
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/BaseParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/BaseParser.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/BaseParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/BaseParser.java Fri Mar 3 22:32:01 2006
@@ -3,7 +3,7 @@
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
import com.ibatis.common.resources.Resources;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.engine.cache.CacheModel;
import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient;
import com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate;
@@ -53,7 +53,7 @@
Class javaClass = Resources.classForName(javaType);
handler = typeHandlerFactory.getTypeHandler(javaClass, jdbcType);
} catch (Exception e) {
- throw new NestedRuntimeException("Error. Could not set TypeHandler. Cause: " + e, e);
+ throw new RuntimeException("Error. Could not set TypeHandler. Cause: " + e, e);
}
}
} else if (typeHandlerFactory.getTypeHandler(clazz, jdbcType) != null) {
@@ -74,7 +74,7 @@
Class javaClass = Resources.classForName(javaType);
handler = typeHandlerFactory.getTypeHandler(javaClass, jdbcType);
} catch (Exception e) {
- throw new NestedRuntimeException("Error. Could not set TypeHandler. Cause: " + e, e);
+ throw new RuntimeException("Error. Could not set TypeHandler. Cause: " + e, e);
}
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapConfigParser.java Fri Mar 3 22:32:01 2006
@@ -4,7 +4,7 @@
import com.ibatis.common.xml.Nodelet;
import com.ibatis.common.xml.NodeletParser;
import com.ibatis.common.xml.NodeletUtils;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.beans.ClassInfo;
import com.ibatis.sqlmap.client.SqlMapClient;
import com.ibatis.sqlmap.client.SqlMapException;
@@ -79,7 +79,7 @@
parser.parse(reader);
return vars.client;
} catch (Exception e) {
- throw new NestedRuntimeException("Error occurred. Cause: " + e, e);
+ throw new RuntimeException("Error occurred. Cause: " + e, e);
}
}
@@ -98,7 +98,7 @@
if (statement != null) {
statement.addExecuteListener(cacheModel);
} else {
- throw new NestedRuntimeException("Could not find statement named '" + statementName + "' for use as a flush trigger for the cache model named '" + cacheName + "'.");
+ throw new RuntimeException("Could not find statement named '" + statementName + "' for use as a flush trigger for the cache model named '" + cacheName + "'.");
}
}
}
@@ -124,7 +124,7 @@
vars.errorCtx.setResource(url);
props = Resources.getUrlAsProperties(url);
} else {
- throw new NestedRuntimeException("The " + "properties" + " element requires either a resource or a url attribute.");
+ throw new RuntimeException("The " + "properties" + " element requires either a resource or a url attribute.");
}
if (vars.properties == null) {
@@ -134,7 +134,7 @@
vars.properties = props;
}
} catch (Exception e) {
- throw new NestedRuntimeException("Error loading properties. Cause: " + e);
+ throw new RuntimeException("Error loading properties. Cause: " + e);
}
}
});
@@ -226,7 +226,7 @@
} else if (impl instanceof TypeHandler) {
typeHandler = (TypeHandler) impl;
} else {
- throw new NestedRuntimeException ("The class '' is not a valid implementation of TypeHandler or TypeHandlerCallback");
+ throw new RuntimeException ("The class '' is not a valid implementation of TypeHandler or TypeHandlerCallback");
}
vars.errorCtx.setMoreInfo("Check the javaType attribute '" + javaType + "' (must be a classname) or the jdbcType '" + jdbcType + "' (must be a JDBC type name).");
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlMapParser.java Fri Mar 3 22:32:01 2006
@@ -7,7 +7,7 @@
import com.ibatis.common.xml.NodeletException;
import com.ibatis.common.xml.NodeletParser;
import com.ibatis.common.xml.NodeletUtils;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.client.extensions.TypeHandlerCallback;
import com.ibatis.sqlmap.engine.cache.CacheModel;
import com.ibatis.sqlmap.engine.mapping.parameter.BasicParameterMap;
@@ -80,7 +80,7 @@
id = applyNamespace(id);
}
if (vars.sqlIncludes.containsKey(id)) {
- // To be upgraded to throwing of a NestedRuntimeException later on
+ // To be upgraded to throwing of a RuntimeException later on
log.warn("Duplicate <sql>-include '" + id + "' found.");
}
else {
@@ -140,7 +140,7 @@
try {
vars.currentCacheModel.setControllerClassName(type);
} catch (Exception e) {
- throw new NestedRuntimeException("Error setting Cache Controller Class. Cause: " + e, e);
+ throw new RuntimeException("Error setting Cache Controller Class. Cause: " + e, e);
}
vars.errorCtx.setMoreInfo("Check the cache model configuration.");
@@ -186,10 +186,10 @@
if (seconds != null) t += Integer.parseInt(seconds) * 1000;
if (minutes != null) t += Integer.parseInt(minutes) * 60 * 1000;
if (hours != null) t += Integer.parseInt(hours) * 60 * 60 * 1000;
- if (t < 1) throw new NestedRuntimeException("A flush interval must specify one or more of milliseconds, seconds, minutes or hours.");
+ if (t < 1) throw new RuntimeException("A flush interval must specify one or more of milliseconds, seconds, minutes or hours.");
vars.currentCacheModel.setFlushInterval(t);
} catch (NumberFormatException e) {
- throw new NestedRuntimeException("Error building cache '" + vars.currentCacheModel.getId() + "' in '" + "resourceNAME" + "'. Flush interval milliseconds must be a valid long integer value. Cause: " + e, e);
+ throw new RuntimeException("Error building cache '" + vars.currentCacheModel.getId() + "' in '" + "resourceNAME" + "'. Flush interval milliseconds must be a valid long integer value. Cause: " + e, e);
}
}
});
@@ -265,10 +265,10 @@
} else if (impl instanceof TypeHandler) {
handler = (TypeHandler) impl;
} else {
- throw new NestedRuntimeException ("The class '"+callback+"' is not a valid implementation of TypeHandler or TypeHandlerCallback");
+ throw new RuntimeException ("The class '"+callback+"' is not a valid implementation of TypeHandler or TypeHandlerCallback");
}
} catch (Exception e) {
- throw new NestedRuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
+ throw new RuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
}
} else {
vars.errorCtx.setMoreInfo("Check the parameter mapping property type or name.");
@@ -289,7 +289,7 @@
mapping.setJavaType(Class.forName(javaType));
}
} catch (ClassNotFoundException e) {
- throw new NestedRuntimeException("Error setting javaType on parameter mapping. Cause: " + e);
+ throw new RuntimeException("Error setting javaType on parameter mapping. Cause: " + e);
}
vars.parameterMappingList.add(mapping);
@@ -345,7 +345,7 @@
vars.errorCtx.setMoreInfo("Check the result class.");
resultClass = Resources.classForName(resultClassName);
} catch (Exception e) {
- throw new NestedRuntimeException("Error configuring Result. Could not set ResultClass. Cause: " + e, e);
+ throw new RuntimeException("Error configuring Result. Could not set ResultClass. Cause: " + e, e);
}
@@ -403,10 +403,10 @@
} else if (impl instanceof TypeHandler) {
handler = (TypeHandler) impl;
} else {
- throw new NestedRuntimeException ("The class '"+callback+"' is not a valid implementation of TypeHandler or TypeHandlerCallback");
+ throw new RuntimeException ("The class '"+callback+"' is not a valid implementation of TypeHandler or TypeHandlerCallback");
}
} catch (Exception e) {
- throw new NestedRuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
+ throw new RuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
}
} else {
vars.errorCtx.setMoreInfo("Check the result mapping property type or name.");
@@ -432,7 +432,7 @@
mapping.setJavaType(Class.forName(javaType));
}
} catch (ClassNotFoundException e) {
- throw new NestedRuntimeException("Error setting javaType on result mapping. Cause: " + e);
+ throw new RuntimeException("Error setting javaType on result mapping. Cause: " + e);
}
if (columnIndex != null && columnIndex.length() > 0) {
@@ -449,7 +449,7 @@
parser.addNodelet("/sqlMap/resultMap/discriminator/subMap", new Nodelet() {
public void process(Node node) throws Exception {
if (vars.discriminator == null) {
- throw new NestedRuntimeException ("The discriminator is null, but somehow a subMap was reached. This is a bug.");
+ throw new RuntimeException ("The discriminator is null, but somehow a subMap was reached. This is a bug.");
}
Properties childAttributes = NodeletUtils.parseAttributes(node, vars.properties);
String value = childAttributes.getProperty("value");
@@ -481,10 +481,10 @@
} else if (impl instanceof TypeHandler) {
handler = (TypeHandler) impl;
} else {
- throw new NestedRuntimeException ("The class '' is not a valid implementation of TypeHandler or TypeHandlerCallback");
+ throw new RuntimeException ("The class '' is not a valid implementation of TypeHandler or TypeHandlerCallback");
}
} catch (Exception e) {
- throw new NestedRuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
+ throw new RuntimeException("Error occurred during custom type handler configuration. Cause: " + e, e);
}
} else {
vars.errorCtx.setMoreInfo("Check the result mapping property type or name.");
@@ -502,7 +502,7 @@
mapping.setJavaType(Class.forName(javaType));
}
} catch (ClassNotFoundException e) {
- throw new NestedRuntimeException("Error setting javaType on result mapping. Cause: " + e);
+ throw new RuntimeException("Error setting javaType on result mapping. Cause: " + e);
}
if (columnIndex != null && columnIndex.length() > 0) {
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/SqlStatementParser.java Fri Mar 3 22:32:01 2006
@@ -11,7 +11,7 @@
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.resources.Resources;
import com.ibatis.common.xml.NodeletUtils;
import com.ibatis.sqlmap.client.SqlMapException;
@@ -221,7 +221,7 @@
String nsrefid = applyNamespace(refid);
includeNode = (Node) vars.sqlIncludes.get(nsrefid);
if (includeNode == null) {
- throw new NestedRuntimeException("Could not find SQL statement to include with refid '" + refid + "'");
+ throw new RuntimeException("Could not find SQL statement to include with refid '" + refid + "'");
}
}
isDynamic = parseDynamicTags(includeNode, dynamic, sqlBuffer, isDynamic, false);
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/cache/CacheModel.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.sqlmap.engine.cache;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.resources.Resources;
import com.ibatis.sqlmap.engine.mapping.statement.ExecuteListener;
import com.ibatis.sqlmap.engine.mapping.statement.MappedStatement;
@@ -265,7 +265,7 @@
value = ois.readObject();
ois.close();
} catch (Exception e) {
- throw new NestedRuntimeException("Error caching serializable object. Be sure you're not attempting to use " +
+ throw new RuntimeException("Error caching serializable object. Be sure you're not attempting to use " +
"a serialized cache for an object that may be taking advantage of lazy loading. Cause: " + e, e);
}
}
@@ -295,7 +295,7 @@
oos.close();
value = bos.toByteArray();
} catch (IOException e) {
- throw new NestedRuntimeException("Error caching serializable object. Cause: " + e, e);
+ throw new RuntimeException("Error caching serializable object. Cause: " + e, e);
}
}
controller.putObject(this, key, value);
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/ComplexDataExchange.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/ComplexDataExchange.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/ComplexDataExchange.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/ComplexDataExchange.java Fri Mar 3 22:32:01 2006
@@ -17,7 +17,7 @@
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.resources.Resources;
import com.ibatis.sqlmap.engine.mapping.parameter.ParameterMap;
import com.ibatis.sqlmap.engine.mapping.parameter.ParameterMapping;
@@ -79,7 +79,7 @@
try {
object = Resources.instantiate(resultMap.getResultClass());
} catch (Exception e) {
- throw new NestedRuntimeException("JavaBeansDataExchange could not instantiate result class. Cause: " + e, e);
+ throw new RuntimeException("JavaBeansDataExchange could not instantiate result class. Cause: " + e, e);
}
}
ResultMapping[] mappings = resultMap.getResultMappings();
@@ -100,7 +100,7 @@
try {
object = Resources.instantiate(parameterMap.getParameterClass());
} catch (Exception e) {
- throw new NestedRuntimeException("JavaBeansDataExchange could not instantiate result class. Cause: " + e, e);
+ throw new RuntimeException("JavaBeansDataExchange could not instantiate result class. Cause: " + e, e);
}
}
ParameterMapping[] mappings = parameterMap.getParameterMappings();
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/JavaBeanDataExchange.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/JavaBeanDataExchange.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/JavaBeanDataExchange.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/JavaBeanDataExchange.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.sqlmap.engine.exchange;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.resources.Resources;
import com.ibatis.sqlmap.engine.accessplan.AccessPlan;
import com.ibatis.sqlmap.engine.accessplan.AccessPlanFactory;
@@ -105,7 +105,7 @@
try {
object = Resources.instantiate(resultMap.getResultClass());
} catch (Exception e) {
- throw new NestedRuntimeException("JavaBeansDataExchange could not instantiate result class. Cause: " + e, e);
+ throw new RuntimeException("JavaBeansDataExchange could not instantiate result class. Cause: " + e, e);
}
}
errorContext.setMoreInfo("The error happened while setting a property on the result object.");
@@ -124,7 +124,7 @@
try {
object = Resources.instantiate(parameterMap.getParameterClass());
} catch (Exception e) {
- throw new NestedRuntimeException("JavaBeansDataExchange could not instantiate parameter class. Cause: " + e, e);
+ throw new RuntimeException("JavaBeansDataExchange could not instantiate parameter class. Cause: " + e, e);
}
}
values = getOutputParamValues(parameterMap.getParameterMappings(), values);
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/MapDataExchange.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/MapDataExchange.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/MapDataExchange.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/exchange/MapDataExchange.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.sqlmap.engine.exchange;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.engine.mapping.parameter.ParameterMap;
import com.ibatis.sqlmap.engine.mapping.parameter.ParameterMapping;
import com.ibatis.sqlmap.engine.mapping.result.ResultMap;
@@ -39,7 +39,7 @@
public Object[] getData(RequestScope request, ParameterMap parameterMap, Object parameterObject) {
if (!(parameterObject instanceof Map)) {
- throw new NestedRuntimeException("Error. Object passed into MapDataExchange was not an instance of Map.");
+ throw new RuntimeException("Error. Object passed into MapDataExchange was not an instance of Map.");
}
Object[] data = new Object[parameterMap.getParameterMappings().length];
@@ -53,7 +53,7 @@
public Object setData(RequestScope request, ResultMap resultMap, Object resultObject, Object[] values) {
if (!(resultObject == null || resultObject instanceof Map)) {
- throw new NestedRuntimeException("Error. Object passed into MapDataExchange was not an instance of Map.");
+ throw new RuntimeException("Error. Object passed into MapDataExchange was not an instance of Map.");
}
Map map = (Map) resultObject;
@@ -71,7 +71,7 @@
public Object setData(RequestScope request, ParameterMap parameterMap, Object parameterObject, Object[] values) {
if (!(parameterObject == null || parameterObject instanceof Map)) {
- throw new NestedRuntimeException("Error. Object passed into MapDataExchange was not an instance of Map.");
+ throw new RuntimeException("Error. Object passed into MapDataExchange was not an instance of Map.");
}
Map map = (Map) parameterObject;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/AutoResultMap.java Fri Mar 3 22:32:01 2006
@@ -18,7 +18,7 @@
import com.ibatis.common.beans.ClassInfo;
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.client.SqlMapException;
import com.ibatis.sqlmap.engine.impl.SqlMapExecutorDelegate;
import com.ibatis.sqlmap.engine.scope.RequestScope;
@@ -108,7 +108,7 @@
setResultMappingList(resultMappingList);
} catch (SQLException e) {
- throw new NestedRuntimeException("Error automapping columns. Cause: " + e);
+ throw new RuntimeException("Error automapping columns. Cause: " + e);
}
}
@@ -128,7 +128,7 @@
}
setResultMappingList(resultMappingList);
} catch (SQLException e) {
- throw new NestedRuntimeException("Error automapping columns. Cause: " + e);
+ throw new RuntimeException("Error automapping columns. Cause: " + e);
}
}
@@ -149,7 +149,7 @@
setResultMappingList(resultMappingList);
} catch (SQLException e) {
- throw new NestedRuntimeException("Error automapping columns. Cause: " + e);
+ throw new RuntimeException("Error automapping columns. Cause: " + e);
}
}
@@ -169,7 +169,7 @@
setResultMappingList(resultMappingList);
} catch (SQLException e) {
- throw new NestedRuntimeException("Error automapping columns. Cause: " + e);
+ throw new RuntimeException("Error automapping columns. Cause: " + e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/BasicResultMap.java Fri Mar 3 22:32:01 2006
@@ -19,7 +19,7 @@
import com.ibatis.common.beans.ProbeFactory;
import com.ibatis.common.jdbc.exception.NestedSQLException;
import com.ibatis.common.resources.Resources;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.client.SqlMapException;
import com.ibatis.sqlmap.engine.exchange.DataExchange;
import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient;
@@ -501,7 +501,7 @@
doc.appendChild(doc.createElement(root));
return doc;
} catch (ParserConfigurationException e) {
- throw new NestedRuntimeException("Error creating XML document. Cause: " + e);
+ throw new RuntimeException("Error creating XML document. Cause: " + e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/EnhancedLazyResultLoader.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/EnhancedLazyResultLoader.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/EnhancedLazyResultLoader.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/EnhancedLazyResultLoader.java Fri Mar 3 22:32:01 2006
@@ -16,7 +16,7 @@
package com.ibatis.sqlmap.engine.mapping.result.loader;
import com.ibatis.common.beans.ClassInfo;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient;
import com.ibatis.sqlmap.engine.type.DomTypeMarker;
import net.sf.cglib.proxy.Enhancer;
@@ -129,7 +129,7 @@
loaded = true;
resultObject = ResultLoader.getResult(client, statementName, parameterObject, targetType);
} catch (SQLException e) {
- throw new NestedRuntimeException("Error lazy loading result. Cause: " + e, e);
+ throw new RuntimeException("Error lazy loading result. Cause: " + e, e);
}
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/LazyResultLoader.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/LazyResultLoader.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/LazyResultLoader.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/result/loader/LazyResultLoader.java Fri Mar 3 22:32:01 2006
@@ -16,7 +16,7 @@
package com.ibatis.sqlmap.engine.mapping.result.loader;
import com.ibatis.common.beans.ClassInfo;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient;
import java.lang.reflect.InvocationHandler;
@@ -97,7 +97,7 @@
loaded = true;
resultObject = ResultLoader.getResult(client, statementName, parameterObject, targetType);
} catch (SQLException e) {
- throw new NestedRuntimeException("Error lazy loading result. Cause: " + e, e);
+ throw new RuntimeException("Error lazy loading result. Cause: " + e, e);
}
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/dynamic/elements/ConditionalTagHandler.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/dynamic/elements/ConditionalTagHandler.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/dynamic/elements/ConditionalTagHandler.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/sql/dynamic/elements/ConditionalTagHandler.java Fri Mar 3 22:32:01 2006
@@ -17,7 +17,7 @@
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -109,7 +109,7 @@
} else if (compareValue != null) {
return compareValues(type, value1, compareValue);
} else {
- throw new NestedRuntimeException("Error comparing in conditional fragment. Uknown 'compare to' values.");
+ throw new RuntimeException("Error comparing in conditional fragment. Uknown 'compare to' values.");
}
}
@@ -158,7 +158,7 @@
try {
return DATE_FORMAT.parse(value);
} catch (ParseException e) {
- throw new NestedRuntimeException("Error parsing date. Cause: " + e, e);
+ throw new RuntimeException("Error parsing date. Cause: " + e, e);
}
} else if (type == BigInteger.class) {
return new BigInteger(value);
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/GeneralStatement.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/GeneralStatement.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/GeneralStatement.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/GeneralStatement.java Fri Mar 3 22:32:01 2006
@@ -17,7 +17,7 @@
import com.ibatis.common.jdbc.exception.NestedSQLException;
import com.ibatis.common.io.ReaderInputStream;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.sqlmap.client.event.RowHandler;
import com.ibatis.sqlmap.engine.execution.SqlExecutor;
import com.ibatis.sqlmap.engine.mapping.parameter.ParameterMap;
@@ -239,7 +239,7 @@
DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
return documentBuilder.parse(new ReaderInputStream(new StringReader(s)));
} catch (Exception e) {
- throw new NestedRuntimeException("Error occurred. Cause: " + e, e);
+ throw new RuntimeException("Error occurred. Cause: " + e, e);
}
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/PaginatedDataList.java Fri Mar 3 22:32:01 2006
@@ -15,7 +15,7 @@
*/
package com.ibatis.sqlmap.engine.mapping.statement;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import com.ibatis.common.util.PaginatedList;
import com.ibatis.sqlmap.client.SqlMapExecutor;
@@ -52,7 +52,7 @@
currentPageList = nextPageList;
nextPageList = getList(index + 1, pageSize);
} catch (SQLException e) {
- throw new NestedRuntimeException("Unexpected error while repaginating paged list. Cause: " + e, e);
+ throw new RuntimeException("Unexpected error while repaginating paged list. Cause: " + e, e);
}
}
@@ -66,7 +66,7 @@
prevPageList = new ArrayList();
}
} catch (SQLException e) {
- throw new NestedRuntimeException("Unexpected error while repaginating paged list. Cause: " + e, e);
+ throw new RuntimeException("Unexpected error while repaginating paged list. Cause: " + e, e);
}
}
@@ -74,7 +74,7 @@
try {
pageTo(idx);
} catch (SQLException e) {
- throw new NestedRuntimeException("Unexpected error while repaginating paged list. Cause: " + e, e);
+ throw new RuntimeException("Unexpected error while repaginating paged list. Cause: " + e, e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/RowHandlerCallback.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/RowHandlerCallback.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/RowHandlerCallback.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/mapping/statement/RowHandlerCallback.java Fri Mar 3 22:32:01 2006
@@ -19,7 +19,7 @@
import com.ibatis.sqlmap.engine.mapping.result.ResultMap;
import com.ibatis.sqlmap.engine.scope.RequestScope;
import com.ibatis.sqlmap.engine.type.XmlTypeMarker;
-import com.ibatis.common.exception.NestedRuntimeException;
+
import org.w3c.dom.Document;
import javax.xml.transform.*;
@@ -92,7 +92,7 @@
s = writer.getBuffer().toString();
} catch (TransformerException e) {
- throw new NestedRuntimeException("Error occurred. Cause: " + e, e);
+ throw new RuntimeException("Error occurred. Cause: " + e, e);
}
return s;
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionException.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionException.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionException.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionException.java Fri Mar 3 22:32:01 2006
@@ -15,9 +15,9 @@
*/
package com.ibatis.sqlmap.engine.transaction;
-import com.ibatis.common.exception.NestedException;
-public class TransactionException extends NestedException {
+
+public class TransactionException extends Exception {
public TransactionException() {
}
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/dao/BaseDaoTest.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/dao/BaseDaoTest.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/dao/BaseDaoTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/dao/BaseDaoTest.java Fri Mar 3 22:32:01 2006
@@ -1,6 +1,5 @@
package com.ibatis.dao;
-import com.ibatis.common.exception.NestedRuntimeException;
import com.ibatis.common.jdbc.ScriptRunner;
import com.ibatis.common.resources.Resources;
import com.ibatis.dao.client.DaoManager;
@@ -45,7 +44,7 @@
daoManager.startTransaction();
dao.createAccount(account);
dao.saveAccount(account2);
- throw new NestedRuntimeException("BOOM!");
+ throw new RuntimeException("BOOM!");
//daoManager.commitTransaction();
} catch (Exception e) {
// ignore
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/CacheStatementTest.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/CacheStatementTest.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/CacheStatementTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/CacheStatementTest.java Fri Mar 3 22:32:01 2006
@@ -3,7 +3,6 @@
import com.ibatis.sqlmap.client.SqlMapClient;
import com.ibatis.sqlmap.client.SqlMapSession;
import com.ibatis.sqlmap.engine.cache.CacheKey;
-import com.ibatis.common.exception.NestedRuntimeException;
import testdomain.Account;
import java.sql.SQLException;
@@ -204,7 +203,7 @@
results.put("list", list);
session.close();
} catch (SQLException e) {
- throw new NestedRuntimeException("Error. Cause: " + e);
+ throw new RuntimeException("Error. Cause: " + e);
}
}
@@ -214,7 +213,7 @@
try {
t.join();
} catch (InterruptedException e) {
- throw new NestedRuntimeException("Error. Cause: " + e);
+ throw new RuntimeException("Error. Cause: " + e);
}
}
}
Modified: ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DomStatementTest.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DomStatementTest.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DomStatementTest.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/com/ibatis/sqlmap/DomStatementTest.java Fri Mar 3 22:32:01 2006
@@ -2,7 +2,6 @@
import com.ibatis.common.beans.Probe;
import com.ibatis.common.beans.ProbeFactory;
-import com.ibatis.common.exception.NestedRuntimeException;
import org.w3c.dom.Document;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -86,7 +85,7 @@
doc.appendChild(doc.createElement(root));
return doc;
} catch (ParserConfigurationException e) {
- throw new NestedRuntimeException("Error creating XML document. Cause: " + e);
+ throw new RuntimeException("Error creating XML document. Cause: " + e);
}
}
Modified: ibatis/trunk/java/mapper/mapper2/test/xmltester/MiniParser.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/test/xmltester/MiniParser.java?rev=383055&r1=383054&r2=383055&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/test/xmltester/MiniParser.java (original)
+++ ibatis/trunk/java/mapper/mapper2/test/xmltester/MiniParser.java Fri Mar 3 22:32:01 2006
@@ -15,21 +15,18 @@
*/
package xmltester;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
+import com.ibatis.common.io.ReaderInputStream;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
import org.xml.sax.helpers.DefaultHandler;
-import com.ibatis.common.exception.NestedRuntimeException;
-import com.ibatis.common.io.ReaderInputStream;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
public class MiniParser extends DefaultHandler {
@@ -41,7 +38,7 @@
StringReader reader = new StringReader(string);
parse(reader);
} catch (Exception e) {
- throw new NestedRuntimeException("XmlDataExchange error parsing XML. Cause: " + e, e);
+ throw new RuntimeException("XmlDataExchange error parsing XML. Cause: " + e, e);
}
}
@@ -49,7 +46,7 @@
try {
parse(reader);
} catch (Exception e) {
- throw new NestedRuntimeException("XmlDataExchange error parsing XML. Cause: " + e, e);
+ throw new RuntimeException("XmlDataExchange error parsing XML. Cause: " + e, e);
}
}
@@ -101,7 +98,7 @@
public void fatalError(SAXParseException e) throws SAXException {
- throw new NestedRuntimeException("MiniXmlParser error parsing XML. Cause: " + e, e);
+ throw new RuntimeException("MiniXmlParser error parsing XML. Cause: " + e, e);
}
private void parse(Reader reader) throws ParserConfigurationException, SAXException, IOException {