Menu
▾
▴
[Hibernate-commits] Hibernate2/src/net/sf/hibernate/transaction JBossTransactionManagerLookup.java,1.1.1.1,1.2 JDBCTransaction.java,1.1.1.1,1.2 JDBCTransactionFactory.java,1.1.1.1,1.2 JNDITransactionManagerLookup.java,1.1.1.1,1.2 JTATransaction.java,1.1.1.1,1.2 JTATransactionFactory.java,1.1.1.1,1.2 OrionTransactionManagerLookup.java,1.1.1.1,1.2 ResinTransactionManagerLookup.java,1.1.1.1,1.2 TransactionFactory.java,1.1.1.1,1.2 TransactionManagerLookup.java,1.1.1.1,1.2 WebSphereTransactionManagerLookup.java,1.1.1.1,1.2 WeblogicTransactionManagerLookup.java,1.1.1.1,1.2
Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction
In directory sc8-pr-cvs1:/tmp/cvs-serv14211/src/net/sf/hibernate/transaction
Modified Files:
JBossTransactionManagerLookup.java JDBCTransaction.java
JDBCTransactionFactory.java JNDITransactionManagerLookup.java
JTATransaction.java JTATransactionFactory.java
OrionTransactionManagerLookup.java
ResinTransactionManagerLookup.java TransactionFactory.java
TransactionManagerLookup.java
WebSphereTransactionManagerLookup.java
WeblogicTransactionManagerLookup.java
Log Message:
reformatted code with beautiful, shiny, happy TABS!
improved an exception
Index: JBossTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/JBossTransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JBossTransactionManagerLookup.java 1 Jan 2003 13:57:53 -0000 1.1.1.1
--- JBossTransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 3,7 ****
public final class JBossTransactionManagerLookup extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
--- 3,7 ----
public final class JBossTransactionManagerLookup extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
***************
*** 14,17 ****
return "UserTransaction";
}
!
}
--- 14,20 ----
return "UserTransaction";
}
!
}
+
+
+
Index: JDBCTransaction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/JDBCTransaction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JDBCTransaction.java 1 Jan 2003 13:57:53 -0000 1.1.1.1
--- JDBCTransaction.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 15,19 ****
/**
* Implements a basic transaction strategy for JDBC connections.This is the
! * default <tt>Transaction</tt> implementation used if none is explicitly
* specified.
*/
--- 15,19 ----
/**
* Implements a basic transaction strategy for JDBC connections.This is the
! * default <tt>Transaction</tt> implementation used if none is explicitly
* specified.
*/
***************
*** 25,34 ****
private static final Log log = LogFactory.getLog(JDBCTransaction.class);
!
public JDBCTransaction(SessionImplementor session) throws HibernateException {
this.session = session;
begin();
}
!
private void begin() throws HibernateException {
--- 25,34 ----
private static final Log log = LogFactory.getLog(JDBCTransaction.class);
!
public JDBCTransaction(SessionImplementor session) throws HibernateException {
this.session = session;
begin();
}
!
private void begin() throws HibernateException {
***************
*** 38,48 ****
toggleAutoCommit = session.connection().getAutoCommit();
if (toggleAutoCommit) session.connection().setAutoCommit(false);
! }
catch (SQLException e) {
log.error("Begin failed", e);
throw new TransactionException("Begin failed with SQL exception: ", e);
! }
}
!
public void commit() throws HibernateException, SQLException {
--- 38,48 ----
toggleAutoCommit = session.connection().getAutoCommit();
if (toggleAutoCommit) session.connection().setAutoCommit(false);
! }
catch (SQLException e) {
log.error("Begin failed", e);
throw new TransactionException("Begin failed with SQL exception: ", e);
! }
}
!
public void commit() throws HibernateException, SQLException {
***************
*** 65,69 ****
toggleAutoCommit();
}
!
public void rollback() throws HibernateException {
--- 65,69 ----
toggleAutoCommit();
}
!
public void rollback() throws HibernateException {
***************
*** 74,78 ****
rolledBack=true;
! }
catch (SQLException e) {
log.error("Rollback failed", e);
--- 74,78 ----
rolledBack=true;
! }
catch (SQLException e) {
log.error("Rollback failed", e);
***************
*** 101,103 ****
return committed;
}
! }
\ No newline at end of file
--- 101,105 ----
return committed;
}
! }
!
!
Index: JDBCTransactionFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/JDBCTransactionFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JDBCTransactionFactory.java 1 Jan 2003 13:57:53 -0000 1.1.1.1
--- JDBCTransactionFactory.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 13,24 ****
*/
public final class JDBCTransactionFactory implements TransactionFactory {
!
public JDBCTransactionFactory() throws HibernateException {
}
!
public Transaction beginTransaction(SessionImplementor session) throws HibernateException {
return new JDBCTransaction(session);
}
public void configure(Properties props) throws HibernateException {}
- }
\ No newline at end of file
--- 13,26 ----
*/
public final class JDBCTransactionFactory implements TransactionFactory {
!
public JDBCTransactionFactory() throws HibernateException {
}
!
public Transaction beginTransaction(SessionImplementor session) throws HibernateException {
return new JDBCTransaction(session);
}
public void configure(Properties props) throws HibernateException {}
+
+ }
+
Index: JNDITransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/JNDITransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JNDITransactionManagerLookup.java 1 Jan 2003 13:57:53 -0000 1.1.1.1
--- JNDITransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 14,18 ****
*/
public abstract class JNDITransactionManagerLookup implements TransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.TransactionManagerLookup#getTransactionManager(java.util.Properties)
--- 14,18 ----
*/
public abstract class JNDITransactionManagerLookup implements TransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.TransactionManagerLookup#getTransactionManager(java.util.Properties)
***************
*** 28,31 ****
protected abstract String getName();
!
}
--- 28,34 ----
protected abstract String getName();
!
}
+
+
+
Index: JTATransaction.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/JTATransaction.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JTATransaction.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- JTATransaction.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 25,29 ****
* Implements a basic transaction strategy for JTA transactions. Instances check to
* see if there is an existing JTA transaction. If none exists, a new transaction
! * is started. If one exists, all work is done in the existing context. The
* following properties are used to locate the underlying <tt>UserTransaction</tt>:
* <br><br>
--- 25,29 ----
* Implements a basic transaction strategy for JTA transactions. Instances check to
* see if there is an existing JTA transaction. If none exists, a new transaction
! * is started. If one exists, all work is done in the existing context. The
* following properties are used to locate the underlying <tt>UserTransaction</tt>:
* <br><br>
***************
*** 42,46 ****
static final Log log = LogFactory.getLog(JTATransaction.class);
!
public void commit() throws HibernateException, SQLException {
--- 42,46 ----
static final Log log = LogFactory.getLog(JTATransaction.class);
!
public void commit() throws HibernateException, SQLException {
***************
*** 61,65 ****
}
}
!
public void rollback() throws HibernateException {
--- 61,65 ----
}
}
!
public void rollback() throws HibernateException {
***************
*** 130,134 ****
final int status;
try {
! status = ut.getStatus();
}
catch (SystemException se) {
--- 130,134 ----
final int status;
try {
! status = ut.getStatus();
}
catch (SystemException se) {
***************
*** 140,153 ****
}
else {
! return status==Status.STATUS_MARKED_ROLLBACK ||
! status == Status.STATUS_ROLLING_BACK ||
! status == Status.STATUS_ROLLEDBACK;
}
}
!
public boolean wasCommitted() throws TransactionException {
final int status;
try {
! status = ut.getStatus();
}
catch (SystemException se) {
--- 140,153 ----
}
else {
! return status==Status.STATUS_MARKED_ROLLBACK ||
! status == Status.STATUS_ROLLING_BACK ||
! status == Status.STATUS_ROLLEDBACK;
}
}
!
public boolean wasCommitted() throws TransactionException {
final int status;
try {
! status = ut.getStatus();
}
catch (SystemException se) {
***************
*** 162,173 ****
}
}
!
public void afterCompletion(int status) {
log.trace("transaction completion callback");
session.afterTransactionCompletion();
}
!
public void beforeCompletion() {
}
!
}
--- 162,176 ----
}
}
!
public void afterCompletion(int status) {
log.trace("transaction completion callback");
session.afterTransactionCompletion();
}
!
public void beforeCompletion() {
}
!
}
+
+
+
Index: JTATransactionFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/JTATransactionFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** JTATransactionFactory.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- JTATransactionFactory.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 25,29 ****
Log log = LogFactory.getLog(JTATransactionFactory.class);
!
private static final String DEFAULT_USER_TRANSACTION_NAME = "java:comp/UserTransaction";
--- 25,29 ----
Log log = LogFactory.getLog(JTATransactionFactory.class);
!
private static final String DEFAULT_USER_TRANSACTION_NAME = "java:comp/UserTransaction";
***************
*** 36,40 ****
public void configure(Properties props) throws HibernateException {
!
try {
context = NamingHelper.getInitialContext(props);
--- 36,40 ----
public void configure(Properties props) throws HibernateException {
!
try {
context = NamingHelper.getInitialContext(props);
***************
*** 46,50 ****
utName = props.getProperty(Environment.USER_TRANSACTION);
!
String tmLookupClass = props.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY);
if (tmLookupClass==null) {
--- 46,50 ----
utName = props.getProperty(Environment.USER_TRANSACTION);
!
String tmLookupClass = props.getProperty(Environment.TRANSACTION_MANAGER_STRATEGY);
if (tmLookupClass==null) {
***************
*** 70,81 ****
}
}
!
if (utName==null) utName = DEFAULT_USER_TRANSACTION_NAME;
!
}
!
public Transaction beginTransaction(SessionImplementor session) throws HibernateException {
return new JTATransaction(session, context, utName, transactionManager);
}
!
}
--- 70,84 ----
}
}
!
if (utName==null) utName = DEFAULT_USER_TRANSACTION_NAME;
!
}
!
public Transaction beginTransaction(SessionImplementor session) throws HibernateException {
return new JTATransaction(session, context, utName, transactionManager);
}
!
}
+
+
+
Index: OrionTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/OrionTransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** OrionTransactionManagerLookup.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- OrionTransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 3,8 ****
public class OrionTransactionManagerLookup
! extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
--- 3,8 ----
public class OrionTransactionManagerLookup
! extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
***************
*** 11,18 ****
return "java:comp/UserTransaction";
}
!
public String getUserTransactionName() {
return "java:comp/UserTransaction";
}
!
}
--- 11,21 ----
return "java:comp/UserTransaction";
}
!
public String getUserTransactionName() {
return "java:comp/UserTransaction";
}
!
}
+
+
+
Index: ResinTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/ResinTransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ResinTransactionManagerLookup.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- ResinTransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 3,8 ****
public class ResinTransactionManagerLookup
! extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
--- 3,8 ----
public class ResinTransactionManagerLookup
! extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
***************
*** 15,18 ****
return "java:comp/UserTransaction";
}
!
}
--- 15,21 ----
return "java:comp/UserTransaction";
}
!
}
+
+
+
Index: TransactionFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/TransactionFactory.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TransactionFactory.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- TransactionFactory.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 9,13 ****
/**
! * An abstract factory for <tt>Transaction</tt> instances. Concrete implementations
* are specified by <tt>hibernate.transaction.factory_class</tt>.<br>
* <br>
--- 9,13 ----
/**
! * An abstract factory for <tt>Transaction</tt> instances. Concrete implementations
* are specified by <tt>hibernate.transaction.factory_class</tt>.<br>
* <br>
***************
*** 30,32 ****
*/
public void configure(Properties props) throws HibernateException;
! }
\ No newline at end of file
--- 30,34 ----
*/
public void configure(Properties props) throws HibernateException;
! }
!
!
Index: TransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/TransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** TransactionManagerLookup.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- TransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 8,16 ****
/**
! * Concrete implementations locate and return the JTA
* <tt>TransactionManager</tt>.
*/
public interface TransactionManagerLookup {
!
/**
* Obtain the JTA <tt>TransactionManager</tt>
--- 8,16 ----
/**
! * Concrete implementations locate and return the JTA
* <tt>TransactionManager</tt>.
*/
public interface TransactionManagerLookup {
!
/**
* Obtain the JTA <tt>TransactionManager</tt>
***************
*** 22,26 ****
* or <tt>null</tt> (optional operation).
*/
! public String getUserTransactionName();
!
}
--- 22,29 ----
* or <tt>null</tt> (optional operation).
*/
! public String getUserTransactionName();
!
}
+
+
+
Index: WebSphereTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/WebSphereTransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** WebSphereTransactionManagerLookup.java 1 Jan 2003 13:57:55 -0000 1.1.1.1
--- WebSphereTransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 14,18 ****
private static final Log log = LogFactory.getLog(WebSphereTransactionManagerLookup.class);
!
/**
* @see net.sf.hibernate.transaction.TransactionManagerLookup#getTransactionManager(Properties)
--- 14,18 ----
private static final Log log = LogFactory.getLog(WebSphereTransactionManagerLookup.class);
!
/**
* @see net.sf.hibernate.transaction.TransactionManagerLookup#getTransactionManager(Properties)
***************
*** 30,35 ****
}
return (TransactionManager) clazz
! .getMethod("getTransactionManager", null)
! .invoke(null, null);
}
catch (Exception e) {
--- 30,35 ----
}
return (TransactionManager) clazz
! .getMethod("getTransactionManager", null)
! .invoke(null, null);
}
catch (Exception e) {
***************
*** 37,44 ****
}
}
!
public String getUserTransactionName() {
return "jta/usertransaction";
}
!
}
--- 37,47 ----
}
}
!
public String getUserTransactionName() {
return "jta/usertransaction";
}
!
}
+
+
+
Index: WeblogicTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/transaction/WeblogicTransactionManagerLookup.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** WeblogicTransactionManagerLookup.java 1 Jan 2003 13:57:54 -0000 1.1.1.1
--- WeblogicTransactionManagerLookup.java 4 Jan 2003 11:15:31 -0000 1.2
***************
*** 3,7 ****
public final class WeblogicTransactionManagerLookup extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
--- 3,7 ----
public final class WeblogicTransactionManagerLookup extends JNDITransactionManagerLookup {
!
/**
* @see net.sf.hibernate.transaction.JNDITransactionManagerLookup#getName()
***************
*** 10,17 ****
return "javax.transaction.TransactionCoordinator";
}
!
public String getUserTransactionName() {
return "javax.transaction.UserTransaction";
}
!
}
--- 10,20 ----
return "javax.transaction.TransactionCoordinator";
}
!
public String getUserTransactionName() {
return "javax.transaction.UserTransaction";
}
!
}
+
+
+
|
