Author: cbegin
Date: Sun May 17 15:22:42 2009
New Revision: 775670
URL: http://svn.apache.org/viewvc?rev=775670&view=rev
Log:
Refactored exceptions and optimized imports
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/RuntimeSqlException.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/BindingException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/ExceptionFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ExecutorException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/KeyGenerator.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/SqlMapperException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/PluginException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SessionException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
ibatis/trunk/java/ibatis-3/version.properties
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/BindingException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/BindingException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/BindingException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/BindingException.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.binding;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.exceptions.IbatisException;
-public class BindingException extends SqlMapperException {
+public class BindingException extends IbatisException {
public BindingException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/binding/MapperRegistry.java
Sun May 17 15:22:42 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.binding;
-import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.builder.annotation.MapperAnnotationParser;
+import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.session.SqlSession;
import java.util.*;
@@ -21,7 +21,7 @@
try {
return MapperProxy.newMapperProxy(type, sqlSession);
} catch (Exception e) {
- throw new RuntimeException("Error getting mapper instance. Cause: " + e,
e);
+ throw new BindingException("Error getting mapper instance. Cause: " + e,
e);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.builder;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.exceptions.IbatisException;
-public class ParserException extends SqlMapperException {
+public class ParserException extends IbatisException {
public ParserException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
Sun May 17 15:22:42 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.builder;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.type.TypeHandler;
import org.apache.ibatis.parsing.GenericTokenParser;
import org.apache.ibatis.reflection.MetaClass;
+import org.apache.ibatis.type.TypeHandler;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationParser.java
Sun May 17 15:22:42 2009
@@ -2,13 +2,13 @@
import static org.apache.ibatis.annotations.Annotations.*;
import org.apache.ibatis.binding.BindingException;
-import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.mapping.*;
import org.apache.ibatis.builder.*;
import org.apache.ibatis.builder.xml.XMLMapperParser;
+import org.apache.ibatis.executor.keygen.*;
+import org.apache.ibatis.io.Resources;
+import org.apache.ibatis.mapping.*;
import org.apache.ibatis.reflection.MetaClass;
import org.apache.ibatis.type.JdbcType;
-import org.apache.ibatis.executor.keygen.*;
import java.io.*;
import java.lang.annotation.Annotation;
@@ -258,7 +258,7 @@
}
return null;
} catch (Exception e) {
- throw new RuntimeException("Could not find value method on SQL
annotation. Cause: " + e, e);
+ throw new ParserException("Could not find value method on SQL
annotation. Cause: " + e, e);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/annotation/ProviderSqlSource.java
Sun May 17 15:22:42 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.builder.annotation;
+import org.apache.ibatis.builder.*;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.builder.SqlSourceParser;
import java.lang.reflect.Method;
@@ -28,7 +28,7 @@
}
}
} catch (Exception e) {
- throw new RuntimeException("Error creating SqlSource for SqlProvider.
Cause: " + e, e);
+ throw new ParserException("Error creating SqlSource for SqlProvider.
Cause: " + e, e);
}
}
@@ -48,7 +48,7 @@
Class parameterType = parameterObject == null ? Object.class :
parameterObject.getClass();
return sqlSourceParser.parse(sql, parameterType);
} catch (Exception e) {
- throw new RuntimeException("Error invoking SqlProvider method ("
+ throw new ParserException("Error invoking SqlProvider method ("
+ providerType.getName() + "." + providerMethod.getName()
+ "). Cause: " + e, e);
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperConfigParser.java
Sun May 17 15:22:42 2009
@@ -1,15 +1,15 @@
package org.apache.ibatis.builder.xml;
+import org.apache.ibatis.builder.*;
import org.apache.ibatis.datasource.DataSourceFactory;
import org.apache.ibatis.executor.ErrorContext;
import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.builder.*;
+import org.apache.ibatis.parsing.*;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.reflection.*;
import org.apache.ibatis.transaction.TransactionFactory;
import org.apache.ibatis.type.TypeHandler;
-import org.apache.ibatis.parsing.*;
import java.io.Reader;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLMapperParser.java
Sun May 17 15:22:42 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.builder.xml;
-import org.apache.ibatis.mapping.*;
import org.apache.ibatis.builder.*;
-import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.mapping.*;
import org.apache.ibatis.parsing.*;
+import org.apache.ibatis.type.JdbcType;
import java.io.Reader;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/XMLStatementParser.java
Sun May 17 15:22:42 2009
@@ -1,19 +1,13 @@
package org.apache.ibatis.builder.xml;
-import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.builder.BaseParser;
-import org.apache.ibatis.builder.ParserException;
-import org.apache.ibatis.builder.SequentialMapperBuilder;
+import org.apache.ibatis.builder.*;
import org.apache.ibatis.builder.xml.dynamic.*;
-import org.apache.ibatis.parsing.NodeletContext;
import org.apache.ibatis.executor.keygen.*;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.parsing.NodeletContext;
+import org.w3c.dom.*;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class XMLStatementParser extends BaseParser {
@@ -152,7 +146,7 @@
String nsrefid = sequentialBuilder.applyNamespace(refid);
includeNode = xmlMapperParser.getSqlFragment(nsrefid);
if (includeNode == null) {
- throw new RuntimeException("Could not find SQL statement to include
with refid '" + refid + "'");
+ throw new ParserException("Could not find SQL statement to include
with refid '" + refid + "'");
}
}
MixedSqlNode mixedSqlNode = new MixedSqlNode(contents(includeNode));
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSource.java
Sun May 17 15:22:42 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.builder.xml.dynamic;
-import org.apache.ibatis.mapping.*;
import org.apache.ibatis.builder.SqlSourceParser;
+import org.apache.ibatis.mapping.*;
public class DynamicSqlSource implements SqlSource {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluator.java
Sun May 17 15:22:42 2009
@@ -1,7 +1,7 @@
package org.apache.ibatis.builder.xml.dynamic;
-import org.apache.ibatis.ognl.*;
import org.apache.ibatis.builder.ParserException;
+import org.apache.ibatis.ognl.*;
import java.math.BigDecimal;
import java.util.Arrays;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/cache/CacheException.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.cache;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.exceptions.IbatisException;
-public class CacheException extends SqlMapperException {
+public class CacheException extends IbatisException {
public CacheException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/datasource/DataSourceException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.datasource;
-public class DataSourceException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class DataSourceException extends IbatisException {
public DataSourceException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/ExceptionFactory.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/ExceptionFactory.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/ExceptionFactory.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/ExceptionFactory.java
Sun May 17 15:22:42 2009
@@ -5,7 +5,7 @@
public class ExceptionFactory {
public static RuntimeException wrapException(String message, Exception e) {
- return new
RuntimeSqlException(ErrorContext.instance().message(message).cause(e).toString(),
e);
+ return new
IbatisException(ErrorContext.instance().message(message).cause(e).toString(),
e);
}
}
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/IbatisException.java?rev=775670&view=auto
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/exceptions/IbatisException.java
Sun May 17 15:22:42 2009
@@ -0,0 +1,20 @@
+package org.apache.ibatis.exceptions;
+
+public class IbatisException extends RuntimeException {
+
+ public IbatisException() {
+ super();
+ }
+
+ public IbatisException(String message) {
+ super(message);
+ }
+
+ public IbatisException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public IbatisException(Throwable cause) {
+ super(cause);
+ }
+}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/BatchExecutor.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.executor;
+import org.apache.ibatis.executor.keygen.*;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.statement.StatementHandler;
-import org.apache.ibatis.executor.keygen.*;
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.transaction.Transaction;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ExecutorException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ExecutorException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ExecutorException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/ExecutorException.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.executor;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.exceptions.IbatisException;
-public class ExecutorException extends SqlMapperException {
+public class ExecutorException extends IbatisException {
public ExecutorException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/Jdbc3KeyGenerator.java
Sun May 17 15:22:42 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.executor.keygen;
+import org.apache.ibatis.executor.*;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.type.*;
import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.executor.*;
+import org.apache.ibatis.type.*;
import java.sql.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/KeyGenerator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/KeyGenerator.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/KeyGenerator.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/keygen/KeyGenerator.java
Sun May 17 15:22:42 2009
@@ -1,9 +1,9 @@
package org.apache.ibatis.executor.keygen;
-import org.apache.ibatis.mapping.MappedStatement;
import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
-import java.sql.*;
+import java.sql.Statement;
public interface KeyGenerator {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/BaseStatementHandler.java
Sun May 17 15:22:42 2009
@@ -5,8 +5,8 @@
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.resultset.ResultSetHandler;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.reflection.*;
-import org.apache.ibatis.type.*;
+import org.apache.ibatis.reflection.ObjectFactory;
+import org.apache.ibatis.type.TypeHandlerRegistry;
import java.sql.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/executor/statement/SimpleStatementHandler.java
Sun May 17 15:22:42 2009
@@ -3,7 +3,7 @@
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.executor.keygen.*;
import org.apache.ibatis.executor.result.ResultHandler;
-import org.apache.ibatis.mapping.*;
+import org.apache.ibatis.mapping.MappedStatement;
import java.sql.*;
import java.util.List;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/logging/LogException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.logging;
-public class LogException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class LogException extends IbatisException {
public LogException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/Configuration.java
Sun May 17 15:22:42 2009
@@ -8,7 +8,7 @@
import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
import org.apache.ibatis.executor.*;
-import org.apache.ibatis.executor.keygen.*;
+import org.apache.ibatis.executor.keygen.KeyGenerator;
import org.apache.ibatis.executor.parameter.*;
import org.apache.ibatis.executor.result.ResultHandler;
import org.apache.ibatis.executor.resultset.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/SqlMapperException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/SqlMapperException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/SqlMapperException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/mapping/SqlMapperException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.mapping;
-public class SqlMapperException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class SqlMapperException extends IbatisException {
public SqlMapperException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/migration/MigrationException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.migration;
-public class MigrationException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class MigrationException extends IbatisException {
public MigrationException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletContext.java
Sun May 17 15:22:42 2009
@@ -1,7 +1,6 @@
package org.apache.ibatis.parsing;
import org.w3c.dom.*;
-import org.apache.ibatis.parsing.PropertyParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/NodeletException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.parsing;
-public class NodeletException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class NodeletException extends IbatisException {
public NodeletException() {
super();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XNode.java
Sun May 17 15:22:42 2009
@@ -1,7 +1,6 @@
package org.apache.ibatis.parsing;
import org.w3c.dom.*;
-import org.apache.ibatis.parsing.PropertyParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parsing/XPathParser.java
Sun May 17 15:22:42 2009
@@ -1,21 +1,14 @@
package org.apache.ibatis.parsing;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
+import org.apache.ibatis.builder.ParserException;
+import org.w3c.dom.*;
import org.xml.sax.*;
-import org.apache.ibatis.parsing.PropertyParser;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathFactory;
-import javax.xml.xpath.XPathConstants;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.namespace.QName;
+import javax.xml.parsers.*;
+import javax.xml.xpath.*;
import java.io.Reader;
-import java.util.Properties;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.*;
public class XPathParser {
@@ -90,7 +83,7 @@
try {
return xpath.evaluate(expression, root, returnType);
} catch (Exception e) {
- throw new RuntimeException("Error evaluating XPath. Cause: " + e, e);
+ throw new ParserException("Error evaluating XPath. Cause: " + e, e);
}
}
@@ -121,7 +114,7 @@
});
return builder.parse(new InputSource(reader));
} catch (Exception e) {
- throw new RuntimeException("Error creating document instance. Cause: "
+ e, e);
+ throw new ParserException("Error creating document instance. Cause: " +
e, e);
}
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/PluginException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/PluginException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/PluginException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/plugin/PluginException.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.plugin;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.exceptions.IbatisException;
-public class PluginException extends SqlMapperException {
+public class PluginException extends IbatisException {
public PluginException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/reflection/ReflectionException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.reflection;
-public class ReflectionException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class ReflectionException extends IbatisException {
public ReflectionException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SessionException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SessionException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SessionException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SessionException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.session;
-public class SessionException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class SessionException extends IbatisException {
public SessionException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/session/SqlSessionFactoryBuilder.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.session;
+import org.apache.ibatis.builder.xml.XMLMapperConfigParser;
import org.apache.ibatis.exceptions.ExceptionFactory;
import org.apache.ibatis.mapping.Configuration;
-import org.apache.ibatis.builder.xml.XMLMapperConfigParser;
import org.apache.ibatis.session.defaults.DefaultSqlSessionFactory;
import java.io.Reader;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionException.java
Sun May 17 15:22:42 2009
@@ -1,6 +1,8 @@
package org.apache.ibatis.transaction;
-public class TransactionException extends RuntimeException {
+import org.apache.ibatis.exceptions.IbatisException;
+
+public class TransactionException extends IbatisException {
public TransactionException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/type/TypeException.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.type;
-import org.apache.ibatis.mapping.SqlMapperException;
+import org.apache.ibatis.exceptions.IbatisException;
-public class TypeException extends SqlMapperException {
+public class TypeException extends IbatisException {
public TypeException() {
super();
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/DynamicSqlSourceTest.java
Sun May 17 15:22:42 2009
@@ -1,15 +1,15 @@
package org.apache.ibatis.builder.xml.dynamic;
-import static org.junit.Assert.*;
-import org.junit.Test;
import org.apache.ibatis.BaseDataTest;
+import org.apache.ibatis.io.Resources;
import org.apache.ibatis.mapping.*;
import org.apache.ibatis.session.*;
-import org.apache.ibatis.io.Resources;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
-import java.util.*;
import java.io.*;
import java.sql.SQLException;
+import java.util.*;
public class DynamicSqlSourceTest extends BaseDataTest {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/xml/dynamic/ExpressionEvaluatorTest.java
Sun May 17 15:22:42 2009
@@ -1,8 +1,8 @@
package org.apache.ibatis.builder.xml.dynamic;
-import static org.junit.Assert.*;
-import org.junit.Test;
import domain.blog.*;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
import java.util.HashMap;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
Sun May 17 15:22:42 2009
@@ -3,8 +3,7 @@
import org.apache.ibatis.cache.decorators.*;
import org.apache.ibatis.cache.impl.PerpetualCache;
import static org.junit.Assert.*;
-import org.junit.Test;
-import org.junit.Ignore;
+import org.junit.*;
public class WeakCacheTest {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/exceptions/GeneralExceptionsTest.java
Sun May 17 15:22:42 2009
@@ -1,19 +1,19 @@
package org.apache.ibatis.exceptions;
import org.apache.ibatis.binding.BindingException;
+import org.apache.ibatis.builder.ParserException;
import org.apache.ibatis.cache.CacheException;
import org.apache.ibatis.datasource.DataSourceException;
import org.apache.ibatis.executor.ExecutorException;
import org.apache.ibatis.logging.LogException;
import org.apache.ibatis.mapping.SqlMapperException;
import org.apache.ibatis.migration.MigrationException;
-import org.apache.ibatis.builder.ParserException;
+import org.apache.ibatis.parsing.NodeletException;
import org.apache.ibatis.plugin.PluginException;
import org.apache.ibatis.reflection.ReflectionException;
import org.apache.ibatis.session.SessionException;
import org.apache.ibatis.transaction.TransactionException;
import org.apache.ibatis.type.TypeException;
-import org.apache.ibatis.parsing.NodeletException;
import static org.junit.Assert.*;
import org.junit.Test;
@@ -27,7 +27,7 @@
@Test
public void should() {
RuntimeException thrown = ExceptionFactory.wrapException(EXPECTED_MESSAGE,
EXPECTED_CAUSE);
- assertTrue("Exception should be wrapped in RuntimeSqlException.", thrown
instanceof RuntimeSqlException);
+ assertTrue("Exception should be wrapped in RuntimeSqlException.", thrown
instanceof IbatisException);
testThrowException(thrown);
}
@@ -44,7 +44,7 @@
ParserException.class,
PluginException.class,
ReflectionException.class,
- RuntimeSqlException.class,
+ IbatisException.class,
SessionException.class,
SqlMapperException.class,
TransactionException.class,
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
Sun May 17 15:22:42 2009
@@ -6,7 +6,7 @@
import org.apache.ibatis.transaction.Transaction;
import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
import static org.junit.Assert.*;
-import org.junit.*;
+import org.junit.Test;
import javax.sql.DataSource;
import java.sql.Connection;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/ExecutorTestHelper.java
Sun May 17 15:22:42 2009
@@ -1,13 +1,13 @@
package org.apache.ibatis.executor;
import domain.blog.*;
+import org.apache.ibatis.builder.StaticSqlSource;
import org.apache.ibatis.cache.Cache;
import org.apache.ibatis.cache.decorators.*;
import org.apache.ibatis.cache.impl.PerpetualCache;
+import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.builder.StaticSqlSource;
import org.apache.ibatis.type.*;
-import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/GenericTokenParserTest.java
Sun May 17 15:22:42 2009
@@ -2,7 +2,6 @@
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.apache.ibatis.parsing.GenericTokenParser;
import java.util.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parsing/XPathParserTest.java
Sun May 17 15:22:42 2009
@@ -1,9 +1,8 @@
package org.apache.ibatis.parsing;
-import static org.junit.Assert.*;
-import org.junit.Test;
import org.apache.ibatis.io.Resources;
-import org.apache.ibatis.parsing.XPathParser;
+import static org.junit.Assert.assertEquals;
+import org.junit.Test;
import java.io.Reader;
Modified: ibatis/trunk/java/ibatis-3/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/version.properties?rev=775670&r1=775669&r2=775670&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/version.properties (original)
+++ ibatis/trunk/java/ibatis-3/version.properties Sun May 17 15:22:42 2009
@@ -1,5 +1,5 @@
#Build version info
-#Mon May 11 23:39:12 MDT 2009
+#Sun May 17 00:55:24 MDT 2009
version=3.0.0
-buildDate=2009/05/11 23\:39
-buildNum=156
+buildDate=2009/05/17 00\:55
+buildNum=158
