svn commit: r721781 - in /ibatis/trunk/java/ibatis-3: ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/external/ ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jd
Author: cbegin
Date: Sat Nov 29 23:59:55 2008
New Revision: 721781
URL: http://svn.apache.org/viewvc?rev=721781view=rev
Log:
Added support for real autocommit
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/user/UserProvidedTransaction.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/TransactionFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransaction.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/jdbc/JdbcTransactionFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransaction.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/transaction/managed/ManagedTransactionFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/executor/BaseExecutorTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java?rev=721781r1=721780r2=721781view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/external/ExternalTransaction.java
Sat Nov 29 23:59:55 2008
@@ -44,7 +44,7 @@
connection.setAutoCommit(defaultAutoCommit);
}
}
-executor = configuration.newExecutor(new JdbcTransaction(connection));
+executor = configuration.newExecutor(new
JdbcTransaction(connection,false));
}
public void commit(boolean required) throws SQLException,
TransactionException {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java?rev=721781r1=721780r2=721781view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jdbc/JdbcTransaction.java
Sat Nov 29 23:59:55 2008
@@ -36,7 +36,7 @@
if (connection.getAutoCommit()) {
connection.setAutoCommit(false);
}
-executor = configuration.newExecutor(new
org.apache.ibatis.transaction.jdbc.JdbcTransaction(connection));
+executor = configuration.newExecutor(new
org.apache.ibatis.transaction.jdbc.JdbcTransaction(connection, false));
}
public void commit(boolean required) throws SQLException,
TransactionException {
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java?rev=721781r1=721780r2=721781view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-compat/src/main/java/com/ibatis/sqlmap/engine/transaction/jta/JtaTransaction.java
Sat Nov 29 23:59:55 2008
@@ -56,7 +56,7 @@
if (connection.getAutoCommit()) {
connection.setAutoCommit(false);
}
-executor = configuration.newExecutor(new JdbcTransaction(connection));
+executor = configuration.newExecutor(new
JdbcTransaction(connection,false));
}
public void commit(boolean required) throws SQLException,
TransactionException {
Modified:
svn commit: r721812 - in /ibatis/trunk/java/tools/ibator/core: build/ htmldoc/reference/ src/org/apache/ibatis/ibator/api/ src/org/apache/ibatis/ibator/internal/
Author: jgbutler
Date: Sun Nov 30 05:49:27 2008
New Revision: 721812
URL: http://svn.apache.org/viewvc?rev=721812view=rev
Log:
[ibator] Some API changes to aid the Eclipse plugin
Modified:
ibatis/trunk/java/tools/ibator/core/build/version.properties
ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ProgressCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/ShellCallback.java
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/internal/DefaultShellCallback.java
Modified: ibatis/trunk/java/tools/ibator/core/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/build/version.properties?rev=721812r1=721811r2=721812view=diff
==
--- ibatis/trunk/java/tools/ibator/core/build/version.properties (original)
+++ ibatis/trunk/java/tools/ibator/core/build/version.properties Sun Nov 30
05:49:27 2008
@@ -1,4 +1,4 @@
#ibator build version info
-#Wed Nov 12 13:18:01 CST 2008
+#Thu Nov 27 07:43:20 CST 2008
version=1.2.0
-buildNum=639
+buildNum=642
Modified: ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html?rev=721812r1=721811r2=721812view=diff
==
--- ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html
(original)
+++ ibatis/trunk/java/tools/ibator/core/htmldoc/reference/extending.html Sun
Nov 30 05:49:27 2008
@@ -68,6 +68,26 @@
a primary key). The base codeIntrospectedTable/code class holds an
instance
of codeorg.apache.ibatis.ibator.internal.rules.IbatorRules/code that can
be queried
to determine many of the rules for code generation./p
+pIbator supplies two implementations of introspected table. The
implementation is chosen
+bases on the value of the codetargetRuntime/code attribute of the
+codelt;ibatorContextgt;/code element. In many cases it will be fer
simpler
+to extend one of the built in implementations, rather than creating an
implementation
+from scratch. The following table shows the built in implementations:/p
+table cellspacing=0 cellpadding=5 border=1
+ tr
+thTargetRuntime/th
+thImplementation/th
+ /tr
+ tr
+tdIbatis2Java2 (default)/td
+
tdcodeorg.apache.ibatis.ibator.generator.ibatis2.IntrospectedTableIbatis2Java2Impl/code/td
+ /tr
+ tr
+tdIbatis2Java5/td
+
tdcodeorg.apache.ibatis.ibator.generator.ibatis2.IntrospectedTableIbatis2Java5Impl/code/td
+ /tr
+/table
+
pIf you choose to implement this extension point, specify the fully qualified
class name of your implementation with the codetargetRuntime/code
attribute of the codelt;ibatorContextgt;/code element./p
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java?rev=721812r1=721811r2=721812view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/GeneratedJavaFile.java
Sun Nov 30 05:49:27 2008
@@ -66,14 +66,14 @@
* Java merge function, you may return null from this method.
*
* @return the CompilationUnit associated with this file, or
- * null if the file is not mergable.
+ * null if the file is not mergeable.
*/
public CompilationUnit getCompilationUnit() {
return compilationUnit;
}
/**
- * A Java file is mergable if the getCompilationUnit() method
+ * A Java file is mergeable if the getCompilationUnit() method
* returns a valid compilation unit.
*
*/
Modified:
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java?rev=721812r1=721811r2=721812view=diff
==
---
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
(original)
+++
ibatis/trunk/java/tools/ibator/core/src/org/apache/ibatis/ibator/api/Ibator.java
Sun Nov 30 05:49:27 2008
@@ -219,7 +219,7 @@
String source;
try {
File directory = shellCallback.getDirectory(gxf
-.getTargetProject(),
svn commit: r721957 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/api/ main/java/org/apache/ibatis/api/defaults/ main/java/org/apache/ibatis/builder/ test/java/org/ap
Author: cbegin
Date: Sun Nov 30 19:45:25 2008
New Revision: 721957
URL: http://svn.apache.org/viewvc?rev=721957view=rev
Log:
added new opensession options, and renamed SqlMapper to SqlSessionFactory
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java
- copied, changed from r721781,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java
- copied, changed from r721781,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java
(from r721781,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.javap1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.javar1=721781r2=721957rev=721957view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlMapper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactory.java
Sun Nov 30 19:45:25 2008
@@ -1,17 +1,16 @@
package org.apache.ibatis.api;
-import org.apache.ibatis.mapping.Configuration;
+import org.apache.ibatis.mapping.*;
import java.sql.Connection;
-public interface SqlMapper {
+public interface SqlSessionFactory {
SqlSession openSession();
-
SqlSession openSession(boolean autoCommit);
-
+ SqlSession openSession(ExecutorType execType);
SqlSession openSession(Connection connection);
-
+ SqlSession openSession(Connection connection, ExecutorType execType);
Configuration getConfiguration();
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java?rev=721957r1=721956r2=721957view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
Sun Nov 30 19:45:25 2008
@@ -12,15 +12,12 @@
public class DefaultSqlSession implements SqlSession {
- private boolean commitRequired;
-
private Configuration configuration;
private Executor executor;
public DefaultSqlSession(Configuration configuration, Executor executor) {
this.configuration = configuration;
this.executor = executor;
-this.commitRequired = false;
}
public List selectList(String statement) {
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java
(from r721781,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.javap1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.javar1=721781r2=721957rev=721957view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlMapper.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSessionFactory.java
Sun Nov 30 19:45:25 2008
@@ -1,10 +1,9 @@
package org.apache.ibatis.api.defaults;
-import org.apache.ibatis.api.SqlMapper;
+import org.apache.ibatis.api.SqlSessionFactory;
import
svn commit: r721963 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/api/ main/java/org/apache/ibatis/builder/ test/java/org/apache/ibatis/api/ test/java/org/apache/ibat
Author: cbegin
Date: Sun Nov 30 20:44:38 2008
New Revision: 721963
URL: http://svn.apache.org/viewvc?rev=721963view=rev
Log:
refactored sql mapper builder vs parser vs factory
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
- copied, changed from r721958,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/ParserException.java
- copied, changed from r721958,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
- copied, changed from r721958,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BuilderException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/SqlMapperBuilderTest.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/MapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlSourceParser.java
Copied:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
(from r721958,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java)
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java?p2=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.javap1=ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.javar1=721958r2=721963rev=721963view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/SqlMapperBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
Sun Nov 30 20:44:38 2008
@@ -1,13 +1,14 @@
-package org.apache.ibatis.builder;
+package org.apache.ibatis.api;
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.api.defaults.DefaultSqlSessionFactory;
import org.apache.ibatis.api.SqlSessionFactory;
+import org.apache.ibatis.builder.MapperConfigParser;
import java.io.Reader;
import java.util.Properties;
-public class SqlMapperBuilder {
+public class SqlSessionFactoryBuilder {
public SqlSessionFactory build(Reader reader) {
return build(reader,null,null);
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java?rev=721963r1=721962r2=721963view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/BaseParser.java
Sun Nov 30 20:44:38 2008
@@ -2,11 +2,6 @@
import org.apache.ibatis.type.*;
import org.apache.ibatis.mapping.*;
-import org.apache.ibatis.transaction.jdbc.JdbcTransaction;
-import org.apache.ibatis.transaction.managed.ManagedTransaction;
-import org.apache.ibatis.datasource.jndi.JndiDataSourceFactory;
-import org.apache.ibatis.datasource.pooled.PooledDataSourceFactory;
-import org.apache.ibatis.datasource.unpooled.UnpooledDataSourceFactory;
public class BaseParser {
protected Configuration configuration;
@@ -30,7 +25,7 @@
try {
return JdbcType.valueOf(resolveAlias(alias));
} catch (IllegalArgumentException e) {
- throw new BuilderException(Error resolving JdbcType. Cause: + e, e);
+ throw new ParserException(Error resolving JdbcType. Cause: + e, e);
}
}
@@ -39,7 +34,7 @@
try {
return ResultSetType.valueOf(resolveAlias(alias));
} catch (IllegalArgumentException e) {
- throw new BuilderException(Error resolving ResultSetType. Cause: + e,
e);
+ throw new ParserException(Error resolving ResultSetType. Cause: + e,
e);
}
}
@@ -48,7 +43,7
svn commit: r721964 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src: main/java/org/apache/ibatis/api/ main/java/org/apache/ibatis/builder/ main/java/org/apache/ibatis/parser/ test/java/org/apache/i
Author: cbegin
Date: Sun Nov 30 21:04:16 2008
New Revision: 721964
URL: http://svn.apache.org/viewvc?rev=721964view=rev
Log:
renamed builder package to parser
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/
- copied from r721963,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/
- copied from r721963,
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/
Removed:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/builder/
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/builder/
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/InlineSqlSource.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperConfigParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperEntityResolver.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/MapperParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/ParserException.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/SqlSourceParser.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleObjectFactory.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExamplePlugin.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/ExampleTypeHandler.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/parser/MapperConfig.xml
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java?rev=721964r1=721963r2=721964view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSessionFactoryBuilder.java
Sun Nov 30 21:04:16 2008
@@ -2,8 +2,7 @@
import org.apache.ibatis.mapping.Configuration;
import org.apache.ibatis.api.defaults.DefaultSqlSessionFactory;
-import org.apache.ibatis.api.SqlSessionFactory;
-import org.apache.ibatis.builder.MapperConfigParser;
+import org.apache.ibatis.parser.MapperConfigParser;
import java.io.Reader;
import java.util.Properties;
@@ -11,17 +10,21 @@
public class SqlSessionFactoryBuilder {
public SqlSessionFactory build(Reader reader) {
-return build(reader,null,null);
+return build(reader, null, null);
}
public SqlSessionFactory build(Reader reader, String environment) {
-return build(reader,environment,null);
+return build(reader, environment, null);
+ }
+
+ public SqlSessionFactory build(Reader reader, Properties properties) {
+return build(reader, null, properties);
}
public SqlSessionFactory build(Reader reader, String environment, Properties
props) {
-MapperConfigParser parser = new
MapperConfigParser(reader,environment,props);
+MapperConfigParser parser = new MapperConfigParser(reader, environment,
props);
Configuration config = parser.parse();
return new DefaultSqlSessionFactory(config);
}
-
+
}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java?rev=721964r1=721963r2=721964view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/BaseParser.java
Sun Nov 30 21:04:16 2008
@@ -1,4 +1,4 @@
-package org.apache.ibatis.builder;
+package org.apache.ibatis.parser;
import org.apache.ibatis.type.*;
import org.apache.ibatis.mapping.*;
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/parser/InlineSqlSource.java
URL:
svn commit: r721972 - in /ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api: ApiException.java SqlSession.java defaults/DefaultSqlSession.java
Author: cbegin
Date: Sun Nov 30 21:45:40 2008
New Revision: 721972
URL: http://svn.apache.org/viewvc?rev=721972view=rev
Log:
added selectOne
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/ApiException.java
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
Added:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/ApiException.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/ApiException.java?rev=721972view=auto
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/ApiException.java
(added)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/ApiException.java
Sun Nov 30 21:45:40 2008
@@ -0,0 +1,20 @@
+package org.apache.ibatis.api;
+
+public class ApiException extends RuntimeException {
+
+ public ApiException() {
+super();
+ }
+
+ public ApiException(String message) {
+super(message);
+ }
+
+ public ApiException(String message, Throwable cause) {
+super(message, cause);
+ }
+
+ public ApiException(Throwable cause) {
+super(cause);
+ }
+}
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java?rev=721972r1=721971r2=721972view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java
Sun Nov 30 21:45:40 2008
@@ -6,6 +6,8 @@
public interface SqlSession {
+ Object selectOne(String statement);
+ Object selectOne(String statement, Object parameter);
List selectList(String statement);
List selectList(String statement, Object parameter);
List selectList(String statement, Object parameter, int offset, int limit);
Modified:
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java?rev=721972r1=721971r2=721972view=diff
==
---
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
(original)
+++
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
Sun Nov 30 21:45:40 2008
@@ -1,6 +1,7 @@
package org.apache.ibatis.api.defaults;
import org.apache.ibatis.api.SqlSession;
+import org.apache.ibatis.api.ApiException;
import org.apache.ibatis.api.exceptions.ExceptionFactory;
import org.apache.ibatis.executor.Executor;
import org.apache.ibatis.executor.result.ResultHandler;
@@ -20,6 +21,18 @@
this.executor = executor;
}
+ public Object selectOne(String statement) {
+return selectOne(statement,null);
+ }
+
+ public Object selectOne(String statement, Object parameter) {
+List list = selectList(statement, parameter);
+if (list.size() != 1) {
+ throw new ApiException(Expected one result to be returned by
selectOne(), but found: + list.size());
+}
+return list.get(0);
+ }
+
public List selectList(String statement) {
return selectList(statement, null);
}
