You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ojb-dev@db.apache.org by to...@apache.org on 2005/12/21 23:27:48 UTC

cvs commit: db-ojb/src/java/org/apache/ojb/broker/transaction/tm TransactionManagerFactoryFactory.java SunOneTransactionManagerFactory.java AbstractTransactionManagerFactory.java TransactionManagerFactory.java WebSphereTransactionManagerFactory.java JBossTransactionManagerFactory.java WeblogicTransactionManagerFactory.java TransactionManagerFactoryException.java JOnASTransactionManagerFactory.java OrionTransactionManagerFactory.java

tomdz       2005/12/21 14:27:48

  Modified:    src/java/org/apache/ojb/broker/util Tag: OJB_1_0_RELEASE
                        WrappedConnection.java ConstructorHelper.java
                        JdbcTypesHelper.java IdentityMapFactory.java
                        ExceptionHelper.java BrokerHelper.java
                        ObjectModificationDefaultImpl.java GUID.java
                        ObjectModification.java Base64.java Version.java
                        SqlHelper.java XmlHelper.java DoubleHashtable.java
                        IdentityHashMap.java IdentityArrayList.java
                        ReferenceMap.java ClassHelper.java
               src/java/org/apache/ojb/broker/util/batch Tag:
                        OJB_1_0_RELEASE
                        PreparedStatementInvocationHandler.java
                        BatchConnection.java BatchPreparedStatement.java
               src/java/org/apache/ojb/broker/transaction/tm Tag:
                        OJB_1_0_RELEASE
                        TransactionManagerFactoryFactory.java
                        SunOneTransactionManagerFactory.java
                        AbstractTransactionManagerFactory.java
                        TransactionManagerFactory.java
                        WebSphereTransactionManagerFactory.java
                        JBossTransactionManagerFactory.java
                        WeblogicTransactionManagerFactory.java
                        TransactionManagerFactoryException.java
                        JOnASTransactionManagerFactory.java
                        OrionTransactionManagerFactory.java
  Log:
  Updated license
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.2   +1 -1      db-ojb/src/java/org/apache/ojb/broker/util/WrappedConnection.java
  
  Index: WrappedConnection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/WrappedConnection.java,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- WrappedConnection.java	27 Jul 2004 00:33:12 -0000	1.4.2.1
  +++ WrappedConnection.java	21 Dec 2005 22:27:47 -0000	1.4.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/ConstructorHelper.java
  
  Index: ConstructorHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ConstructorHelper.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- ConstructorHelper.java	3 May 2004 23:05:56 -0000	1.7
  +++ ConstructorHelper.java	21 Dec 2005 22:27:47 -0000	1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.11.2.3  +4 -4      db-ojb/src/java/org/apache/ojb/broker/util/Attic/JdbcTypesHelper.java
  
  Index: JdbcTypesHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/Attic/JdbcTypesHelper.java,v
  retrieving revision 1.11.2.2
  retrieving revision 1.11.2.3
  diff -u -r1.11.2.2 -r1.11.2.3
  --- JdbcTypesHelper.java	16 Aug 2005 15:04:39 -0000	1.11.2.2
  +++ JdbcTypesHelper.java	21 Dec 2005 22:27:47 -0000	1.11.2.3
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -import org.apache.ojb.broker.metadata.JdbcType;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,6 +15,8 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.metadata.JdbcType;
  +
   /**
    * Helper class centralise all SQL Types operations and make
    * available {@link JdbcType} inner class implementations.
  
  
  
  1.4.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/broker/util/IdentityMapFactory.java
  
  Index: IdentityMapFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/IdentityMapFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- IdentityMapFactory.java	1 Jun 2004 19:15:23 -0000	1.4
  +++ IdentityMapFactory.java	21 Dec 2005 22:27:47 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.2.2.3   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/ExceptionHelper.java
  
  Index: ExceptionHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ExceptionHelper.java,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- ExceptionHelper.java	27 Oct 2005 17:34:54 -0000	1.2.2.2
  +++ ExceptionHelper.java	21 Dec 2005 22:27:47 -0000	1.2.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.57.2.23 +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java
  
  Index: BrokerHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/BrokerHelper.java,v
  retrieving revision 1.57.2.22
  retrieving revision 1.57.2.23
  diff -u -r1.57.2.22 -r1.57.2.23
  --- BrokerHelper.java	18 Dec 2005 16:43:19 -0000	1.57.2.22
  +++ BrokerHelper.java	21 Dec 2005 22:27:47 -0000	1.57.2.23
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.5.2.2   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/ObjectModificationDefaultImpl.java
  
  Index: ObjectModificationDefaultImpl.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ObjectModificationDefaultImpl.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- ObjectModificationDefaultImpl.java	10 Oct 2005 00:35:43 -0000	1.5.2.1
  +++ ObjectModificationDefaultImpl.java	21 Dec 2005 22:27:47 -0000	1.5.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.7.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/GUID.java
  
  Index: GUID.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/GUID.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- GUID.java	4 Apr 2004 23:53:37 -0000	1.7
  +++ GUID.java	21 Dec 2005 22:27:47 -0000	1.7.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.6.2.2   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/ObjectModification.java
  
  Index: ObjectModification.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ObjectModification.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- ObjectModification.java	10 Oct 2005 00:35:43 -0000	1.6.2.1
  +++ ObjectModification.java	21 Dec 2005 22:27:47 -0000	1.6.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.8.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/broker/util/Base64.java
  
  Index: Base64.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/Base64.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- Base64.java	17 Jun 2004 12:03:25 -0000	1.8
  +++ Base64.java	21 Dec 2005 22:27:47 -0000	1.8.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -import org.apache.ojb.broker.util.logging.LoggerFactory;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.broker.util.logging.LoggerFactory;
  +
   public class Base64
   {
       
  
  
  
  1.6.2.1   +3 -2      db-ojb/src/java/org/apache/ojb/broker/util/Version.java
  
  Index: Version.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/Version.java,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- Version.java	4 Apr 2004 23:53:37 -0000	1.6
  +++ Version.java	21 Dec 2005 22:27:47 -0000	1.6.2.1
  @@ -1,5 +1,6 @@
   package org.apache.ojb.broker.util;
  -/* Copyright 2002-2004 The Apache Software Foundation
  +
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.24.2.4  +7 -7      db-ojb/src/java/org/apache/ojb/broker/util/SqlHelper.java
  
  Index: SqlHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/SqlHelper.java,v
  retrieving revision 1.24.2.3
  retrieving revision 1.24.2.4
  diff -u -r1.24.2.3 -r1.24.2.4
  --- SqlHelper.java	5 Oct 2005 18:01:28 -0000	1.24.2.3
  +++ SqlHelper.java	21 Dec 2005 22:27:47 -0000	1.24.2.4
  @@ -1,11 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -import java.sql.ResultSet;
  -import java.sql.SQLException;
  -
  -import org.apache.commons.lang.StringUtils;
  -
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -20,6 +15,11 @@
    * limitations under the License.
    */
   
  +import java.sql.ResultSet;
  +import java.sql.SQLException;
  +
  +import org.apache.commons.lang.StringUtils;
  +
   /**
    * Helper class for all SQL related stuff.
    * 
  
  
  
  1.1.2.2   +16 -1     db-ojb/src/java/org/apache/ojb/broker/util/Attic/XmlHelper.java
  
  Index: XmlHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/Attic/XmlHelper.java,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- XmlHelper.java	26 Apr 2005 03:41:36 -0000	1.1.2.1
  +++ XmlHelper.java	21 Dec 2005 22:27:47 -0000	1.1.2.2
  @@ -1,5 +1,20 @@
   package org.apache.ojb.broker.util;
   
  +/* Copyright 2002-2005 The Apache Software Foundation
  + *
  + * 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.
  + */
  +
   import org.apache.commons.lang.SystemUtils;
   
   import java.util.Properties;
  
  
  
  1.4.2.1   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/DoubleHashtable.java
  
  Index: DoubleHashtable.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/DoubleHashtable.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- DoubleHashtable.java	4 Apr 2004 23:53:37 -0000	1.4
  +++ DoubleHashtable.java	21 Dec 2005 22:27:47 -0000	1.4.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.8.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/broker/util/IdentityHashMap.java
  
  Index: IdentityHashMap.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/IdentityHashMap.java,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- IdentityHashMap.java	4 Apr 2004 23:53:37 -0000	1.8
  +++ IdentityHashMap.java	21 Dec 2005 22:27:47 -0000	1.8.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/broker/util/IdentityArrayList.java
  
  Index: IdentityArrayList.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/IdentityArrayList.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- IdentityArrayList.java	4 Apr 2004 23:53:37 -0000	1.3
  +++ IdentityArrayList.java	21 Dec 2005 22:27:47 -0000	1.3.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -import java.util.ArrayList;
  -
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import java.util.ArrayList;
  +
   public class IdentityArrayList extends ArrayList
   {
       public boolean contains(Object elem)
  
  
  
  1.6.2.2   +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/ReferenceMap.java
  
  Index: ReferenceMap.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ReferenceMap.java,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- ReferenceMap.java	6 Dec 2005 12:33:01 -0000	1.6.2.1
  +++ ReferenceMap.java	21 Dec 2005 22:27:47 -0000	1.6.2.2
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.10.2.3  +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/ClassHelper.java
  
  Index: ClassHelper.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/ClassHelper.java,v
  retrieving revision 1.10.2.2
  retrieving revision 1.10.2.3
  diff -u -r1.10.2.2 -r1.10.2.3
  --- ClassHelper.java	11 Mar 2005 11:27:51 -0000	1.10.2.2
  +++ ClassHelper.java	21 Dec 2005 22:27:47 -0000	1.10.2.3
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.12.2.1  +1 -1      db-ojb/src/java/org/apache/ojb/broker/util/batch/Attic/PreparedStatementInvocationHandler.java
  
  Index: PreparedStatementInvocationHandler.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/batch/Attic/PreparedStatementInvocationHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.12.2.1
  diff -u -r1.12 -r1.12.2.1
  --- PreparedStatementInvocationHandler.java	22 May 2004 10:03:02 -0000	1.12
  +++ PreparedStatementInvocationHandler.java	21 Dec 2005 22:27:48 -0000	1.12.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.batch;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.20.2.1  +2 -2      db-ojb/src/java/org/apache/ojb/broker/util/batch/Attic/BatchConnection.java
  
  Index: BatchConnection.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/batch/Attic/BatchConnection.java,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- BatchConnection.java	22 May 2004 11:24:50 -0000	1.20
  +++ BatchConnection.java	21 Dec 2005 22:27:48 -0000	1.20.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.batch;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  1.3.2.1   +1 -1      db-ojb/src/java/org/apache/ojb/broker/util/batch/Attic/BatchPreparedStatement.java
  
  Index: BatchPreparedStatement.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/util/batch/Attic/BatchPreparedStatement.java,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- BatchPreparedStatement.java	4 Apr 2004 23:53:37 -0000	1.3
  +++ BatchPreparedStatement.java	21 Dec 2005 22:27:48 -0000	1.3.2.1
  @@ -1,6 +1,6 @@
   package org.apache.ojb.broker.util.batch;
   
  -/* Copyright 2002-2004 The Apache Software Foundation
  +/* Copyright 2002-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +7 -6      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/Attic/TransactionManagerFactoryFactory.java
  
  Index: TransactionManagerFactoryFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/Attic/TransactionManagerFactoryFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TransactionManagerFactoryFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ TransactionManagerFactoryFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,11 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.util.factory.ConfigurableFactory;
  -import org.apache.ojb.broker.util.logging.Logger;
  -import org.apache.ojb.broker.util.logging.LoggerFactory;
  -import org.apache.ojb.broker.transaction.tm.TransactionManagerFactory;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -19,6 +14,12 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.broker.util.factory.ConfigurableFactory;
  +import org.apache.ojb.broker.util.logging.Logger;
  +import org.apache.ojb.broker.util.logging.LoggerFactory;
  +import org.apache.ojb.broker.transaction.tm.TransactionManagerFactory;
  +
   public class TransactionManagerFactoryFactory
   {
       private static Logger log = LoggerFactory.getLogger(TransactionManagerFactoryFactory.class);
  
  
  
  1.1.2.1   +3 -5      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java
  
  Index: SunOneTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/SunOneTransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- SunOneTransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ SunOneTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  -
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,7 +15,7 @@
    * limitations under the License.
    */
   
  -
  +import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
   
   /**
    * SunOne {@link javax.transaction.TransactionManager} lookup.
  
  
  
  1.2.2.2   +10 -10    db-ojb/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java
  
  Index: AbstractTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/AbstractTransactionManagerFactory.java,v
  retrieving revision 1.2.2.1
  retrieving revision 1.2.2.2
  diff -u -r1.2.2.1 -r1.2.2.2
  --- AbstractTransactionManagerFactory.java	8 Sep 2004 22:22:17 -0000	1.2.2.1
  +++ AbstractTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.2.2.2
  @@ -1,14 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import javax.transaction.TransactionManager;
  -
  -import org.apache.commons.lang.SystemUtils;
  -import org.apache.ojb.broker.core.NamingLocator;
  -import org.apache.ojb.broker.util.ClassHelper;
  -import org.apache.ojb.broker.util.logging.Logger;
  -import org.apache.ojb.broker.util.logging.LoggerFactory;
  -
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -23,6 +15,14 @@
    * limitations under the License.
    */
   
  +import javax.transaction.TransactionManager;
  +
  +import org.apache.commons.lang.SystemUtils;
  +import org.apache.ojb.broker.core.NamingLocator;
  +import org.apache.ojb.broker.util.ClassHelper;
  +import org.apache.ojb.broker.util.logging.Logger;
  +import org.apache.ojb.broker.util.logging.LoggerFactory;
  +
   /**
    * Abstract base class implementation of the {@link TransactionManagerFactory} interface, all
    * derived classes have to implement method {@link #getLookupInfo()}.
  
  
  
  1.1.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactory.java
  
  Index: TransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ TransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import javax.transaction.TransactionManager;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import javax.transaction.TransactionManager;
  +
   public interface TransactionManagerFactory
   {
   	TransactionManager getTransactionManager() throws TransactionManagerFactoryException;
  
  
  
  1.1.2.1   +5 -4      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java
  
  Index: WebSphereTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/WebSphereTransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- WebSphereTransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ WebSphereTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,6 +15,9 @@
    * limitations under the License.
    */
   
  +
  +import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  +
   /**
    * Websphere (4 and above) {@link javax.transaction.TransactionManager} lookup.
    *
  
  
  
  1.1.2.1   +3 -3      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java
  
  Index: JBossTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/JBossTransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- JBossTransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ JBossTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,6 +15,8 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  +
   /**
    * JBoss {@link javax.transaction.TransactionManager} lookup.
    *
  
  
  
  1.1.2.1   +4 -4      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java
  
  Index: WeblogicTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/WeblogicTransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- WeblogicTransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ WeblogicTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,6 +15,8 @@
    * limitations under the License.
    */
   
  +import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  +
   /**
    * Weblogic {@link javax.transaction.TransactionManager} lookup.
    *
  
  
  
  1.1.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java
  
  Index: TransactionManagerFactoryException.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/TransactionManagerFactoryException.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- TransactionManagerFactoryException.java	3 May 2004 23:05:56 -0000	1.1
  +++ TransactionManagerFactoryException.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.OJBException;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.broker.OJBException;
  +
   public class TransactionManagerFactoryException extends OJBException
   {
   	/**
  
  
  
  1.1.2.1   +4 -3      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java
  
  Index: JOnASTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/JOnASTransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- JOnASTransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ JOnASTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  -
  -/* Copyright 2004-2004 The Apache Software Foundation
  +/* Copyright 2004-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -16,6 +14,9 @@
    * See the License for the specific language governing permissions and
    * limitations under the License.
    */
  +
  +import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  +
   public class JOnASTransactionManagerFactory extends AbstractTransactionManagerFactory
   {
       private static final String[][] config = {{"JOnAS", "javax.transaction.UserTransaction", null}};
  
  
  
  1.1.2.1   +3 -5      db-ojb/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java
  
  Index: OrionTransactionManagerFactory.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/transaction/tm/OrionTransactionManagerFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- OrionTransactionManagerFactory.java	3 May 2004 23:05:56 -0000	1.1
  +++ OrionTransactionManagerFactory.java	21 Dec 2005 22:27:48 -0000	1.1.2.1
  @@ -1,8 +1,6 @@
   package org.apache.ojb.broker.transaction.tm;
   
  -import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
  -
  -/* Copyright 2003-2004 The Apache Software Foundation
  +/* Copyright 2003-2005 The Apache Software Foundation
    *
    * Licensed under the Apache License, Version 2.0 (the "License");
    * you may not use this file except in compliance with the License.
  @@ -17,7 +15,7 @@
    * limitations under the License.
    */
   
  -
  +import org.apache.ojb.broker.transaction.tm.AbstractTransactionManagerFactory;
   
   /**
    * Orion {@link javax.transaction.TransactionManager} lookup.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org