Author: bgoodin
Date: Sat Oct 20 03:47:46 2007
New Revision: 586699
URL: http://svn.apache.org/viewvc?rev=586699&view=rev
Log:
- added deprecated ExtendedSqlMapClient for Spring integration compatibility
- set SqlMapClient to implement ExtendedSqlMapClient for Spring integration
compatibility
- added deprecated getMaxTransactions to SqlMapExecutorDelegate for Spring
integration compat
- added deprecated public int getMaximumConcurrentTransactions(),public void
setMaximumConcurrentTransactions(int maximumConcurrentTransactions), public
void initialize(Properties props) to TransactionConfig and
BaseTransactionConfig for Spring integration compat
- removed dtd check on selectKey type attribute to allow for placeholder to be
put into the attribute. otherwise it fails
M build/version.properties
M src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
A src/com/ibatis/sqlmap/engine/impl/ExtendedSqlMapClient.java
M src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
M src/com/ibatis/sqlmap/engine/transaction/BaseTransactionConfig.java
M src/com/ibatis/sqlmap/engine/transaction/TransactionConfig.java
M src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
Added:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/ExtendedSqlMapClient.java
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/BaseTransactionConfig.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionConfig.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=586699&r1=586698&r2=586699&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Sat Oct 20
03:47:46 2007
@@ -1,5 +1,5 @@
#Build version info
-#Mon Mar 19 23:25:50 MDT 2007
+#Sat Oct 20 05:27:49 CDT 2007
version=2.3.1
-buildDate=2007/03/19 23\:25
-buildNum=689
+buildDate=2007/10/20 05\:27
+buildNum=694
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd?rev=586699&r1=586698&r2=586699&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/builder/xml/sql-map-2.dtd
Sat Oct 20 03:47:46 2007
@@ -156,7 +156,7 @@
<!ATTLIST selectKey
resultClass CDATA #IMPLIED
keyProperty CDATA #IMPLIED
-type (pre|post) #IMPLIED
+type CDATA #IMPLIED
>
<!ELEMENT update (#PCDATA | include | dynamic | iterate | isParameterPresent |
isNotParameterPresent | isEmpty | isNotEmpty | isNotNull | isNull | isNotEqual
| isEqual | isGreaterThan | isGreaterEqual | isLessThan | isLessEqual |
isPropertyAvailable | isNotPropertyAvailable)*>
Added:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/ExtendedSqlMapClient.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/ExtendedSqlMapClient.java?rev=586699&view=auto
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/ExtendedSqlMapClient.java
(added)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/ExtendedSqlMapClient.java
Sat Oct 20 03:47:46 2007
@@ -0,0 +1,18 @@
+package com.ibatis.sqlmap.engine.impl;
+
+import com.ibatis.sqlmap.client.SqlMapClient;
+
+/**
+ * @deprecated - this class is uneccessary and should be removed as soon as
possible. Currently spring integration depends on it.
+ */
+public interface ExtendedSqlMapClient extends SqlMapClient {
+
+ /**
+ * only here to avoid Spring breakage. DO NOT USE.
+ * @deprecated
+ * @return delegate
+ */
+ public SqlMapExecutorDelegate getDelegate();
+
+
+}
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java?rev=586699&r1=586698&r2=586699&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
Sat Oct 20 03:47:46 2007
@@ -34,7 +34,7 @@
/**
* Implementation of ExtendedSqlMapClient
*/
-public class SqlMapClientImpl implements SqlMapClient {
+public class SqlMapClientImpl implements SqlMapClient, ExtendedSqlMapClient {
private static final Log log = LogFactory.getLog(SqlMapClientImpl.class);
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java?rev=586699&r1=586698&r2=586699&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
Sat Oct 20 03:47:46 2007
@@ -90,6 +90,14 @@
}
/**
+ * DO NOT DEPEND ON THIS. Here to avoid breaking spring integration.
+ * @deprecated
+ */
+ public int getMaxTransactions() {
+ return -1;
+ }
+
+ /**
* Getter for the DataExchangeFactory
*
* @return - the DataExchangeFactory
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/BaseTransactionConfig.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/BaseTransactionConfig.java?rev=586699&r1=586698&r2=586699&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/BaseTransactionConfig.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/BaseTransactionConfig.java
Sat Oct 20 03:47:46 2007
@@ -16,6 +16,8 @@
package com.ibatis.sqlmap.engine.transaction;
import javax.sql.DataSource;
+import java.util.Properties;
+import java.sql.SQLException;
public abstract class BaseTransactionConfig implements TransactionConfig {
@@ -38,4 +40,27 @@
this.dataSource = ds;
}
+ /**
+ * @deprecated
+ * @return -1
+ */
+ public int getMaximumConcurrentTransactions() {
+ return -1;
+ }
+
+ /**
+ * @deprecated
+ * @param maximumConcurrentTransactions - do not use here for Spring
integration
+ */
+ public void setMaximumConcurrentTransactions(int
maximumConcurrentTransactions) {
+ }
+
+ /**
+ * @deprecated
+ * @param props - propertes
+ */
+ public void initialize(Properties props)
+ throws SQLException, TransactionException {
+ setProperties(props);
+ }
}
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionConfig.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionConfig.java?rev=586699&r1=586698&r2=586699&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionConfig.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/transaction/TransactionConfig.java
Sat Oct 20 03:47:46 2007
@@ -27,8 +27,31 @@
DataSource getDataSource();
void setDataSource(DataSource ds);
+ /**
+ * This should not be used and is here purely to avoid spring integration
from breaking
+ * @deprecated
+ * @return -1
+ */
+ int getMaximumConcurrentTransactions();
+
+ /**
+ * This should not be used. It does nothing and is here purely to prevent
Spring integration from breaking
+ * @deprecated
+ * @param maximumConcurrentTransactions
+ */
+ void setMaximumConcurrentTransactions(int maximumConcurrentTransactions);
+
boolean isForceCommit();
void setForceCommit(boolean forceCommit);
+
+ /**
+ * This method should call setProperties. It is here simply to ease
transition
+ *
+ * @deprecated
+ * @param props - Properties
+ */
+ void initialize(Properties props)
+ throws SQLException, TransactionException;
void setProperties(Properties props)
throws SQLException, TransactionException;
