diff --git a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java b/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java deleted file mode 100644 index b6d8bec02f1..00000000000 --- a/org.springframework.jdbc/src/main/java/org/springframework/jdbc/support/nativejdbc/XAPoolNativeJdbcExtractor.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright 2002-2007 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.jdbc.support.nativejdbc; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; - -import org.enhydra.jdbc.core.CoreConnection; -import org.enhydra.jdbc.core.CorePreparedStatement; - -/** - * Implementation of the {@link NativeJdbcExtractor} interface for - * ObjectWeb's XAPool, as shipped with JOTM and used in JOnAS. - * - *
Returns underlying native Connections and native PreparedStatements to
- * application code instead of XAPool's wrapper implementations; unwraps the
- * Connection for native Statements and native CallableStatements.
- * The returned JDBC classes can then safely be cast, e.g. to
- * oracle.jdbc.OracleConnection.
- *
- *
This NativeJdbcExtractor can be set just to allow working with
- * an XAPool DataSource: If a given object is not an XAPool wrapper, it will
- * be returned as-is.
- *
- * @author Juergen Hoeller
- * @since 06.02.2004
- */
-public class XAPoolNativeJdbcExtractor extends NativeJdbcExtractorAdapter {
-
- /**
- * Return true, as CoreStatement does not allow access to the
- * underlying Connection.
- */
- @Override
- public boolean isNativeConnectionNecessaryForNativeStatements() {
- return true;
- }
-
- /**
- * Return true, as CoreCallableStatement does not allow access to the
- * underlying Connection.
- */
- @Override
- public boolean isNativeConnectionNecessaryForNativeCallableStatements() {
- return true;
- }
-
- @Override
- protected Connection doGetNativeConnection(Connection con) throws SQLException {
- if (con instanceof CoreConnection) {
- return ((CoreConnection) con).con;
- }
- return con;
- }
-
- @Override
- public PreparedStatement getNativePreparedStatement(PreparedStatement ps) throws SQLException {
- if (ps instanceof CorePreparedStatement) {
- return ((CorePreparedStatement) ps).ps;
- }
- return ps;
- }
-
-}
diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JotmFactoryBean.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JotmFactoryBean.java
deleted file mode 100644
index 1d681605617..00000000000
--- a/org.springframework.transaction/src/main/java/org/springframework/transaction/jta/JotmFactoryBean.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Copyright 2002-2008 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.transaction.jta;
-
-import javax.naming.NamingException;
-import javax.transaction.SystemException;
-
-import org.objectweb.jotm.Current;
-import org.objectweb.jotm.Jotm;
-
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-
-/**
- * {@link FactoryBean} that retrieves the JTA UserTransaction/TransactionManager
- * for ObjectWeb's JOTM. Will retrieve
- * an already active JOTM instance if found (e.g. if running in JOnAS),
- * else create a new local JOTM instance.
- *
- *
With JOTM, the same object implements both the - * {@link javax.transaction.UserTransaction} and the - * {@link javax.transaction.TransactionManager} interface, - * as returned by this FactoryBean. - * - *
A local JOTM instance is well-suited for working in conjunction with - * ObjectWeb's XAPool, e.g. with bean - * definitions like the following: - * - *
- * <bean id="jotm" class="org.springframework.transaction.jta.JotmFactoryBean"/> - * - * <bean id="transactionManager" class="org.springframework.transaction.jta.JtaTransactionManager"> - * <property name="userTransaction" ref="jotm"/> - * </bean> - * - * <bean id="innerDataSource" class="org.enhydra.jdbc.standard.StandardXADataSource" destroy-method="shutdown"> - * <property name="transactionManager" ref="jotm"/> - * <property name="driverName" value="..."/> - * <property name="url" value="..."/> - * <property name="user" value="..."/> - * <property name="password" value="..."/> - * </bean> - * - * <bean id="dataSource" class="org.enhydra.jdbc.pool.StandardXAPoolDataSource" destroy-method="shutdown"> - * <property name="dataSource" ref="innerDataSource"/> - * <property name="user" value="..."/> - * <property name="password" value="..."/> - * <property name="maxSize" value="..."/> - * </bean>- * - * Note that Spring's {@link JtaTransactionManager} will automatically detect - * that the passed-in UserTransaction reference also implements the - * TransactionManager interface. Hence, it is not necessary to specify a - * separate reference for JtaTransactionManager's "transactionManager" property. - * - *
Implementation note: This FactoryBean uses JOTM's static access method - * to obtain the JOTM {@link org.objectweb.jotm.Current} object, which - * implements both the UserTransaction and the TransactionManager interface, - * as mentioned above. - * - * @author Juergen Hoeller - * @since 21.01.2004 - * @see JtaTransactionManager#setUserTransaction - * @see JtaTransactionManager#setTransactionManager - * @see org.objectweb.jotm.Current - */ -public class JotmFactoryBean implements FactoryBean, DisposableBean { - - private Current jotmCurrent; - - private Jotm jotm; - - - public JotmFactoryBean() throws NamingException { - // Check for already active JOTM instance. - this.jotmCurrent = Current.getCurrent(); - - // If none found, create new local JOTM instance. - if (this.jotmCurrent == null) { - // Only for use within the current Spring context: - // local, not bound to registry. - this.jotm = new Jotm(true, false); - this.jotmCurrent = Current.getCurrent(); - } - } - - /** - * Set the default transaction timeout for the JOTM instance. - *
Should only be called for a local JOTM instance,
- * not when accessing an existing (shared) JOTM instance.
- */
- public void setDefaultTimeout(int defaultTimeout) {
- this.jotmCurrent.setDefaultTimeout(defaultTimeout);
- // The following is a JOTM oddity: should be used for demarcation transaction only,
- // but is required here in order to actually get rid of JOTM's default (60 seconds).
- try {
- this.jotmCurrent.setTransactionTimeout(defaultTimeout);
- }
- catch (SystemException ex) {
- // should never happen
- }
- }
-
-
- /**
- * Return the JOTM instance created by this factory bean, if any.
- * Will be null if an already active JOTM instance is used.
- *
Application code should never need to access this. - */ - public Jotm getJotm() { - return this.jotm; - } - - public Object getObject() { - return this.jotmCurrent; - } - - public Class getObjectType() { - return this.jotmCurrent.getClass(); - } - - public boolean isSingleton() { - return true; - } - - - /** - * Stop the local JOTM instance, if created by this FactoryBean. - */ - public void destroy() { - if (this.jotm != null) { - this.jotm.stop(); - } - } - -}