tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory Constants.java ResourceFactory.java TransactionFactory.java TyrexFactory.java TyrexResourceFactory.java TyrexTransactionFactory.java
Date Mon, 16 Jun 2003 21:32:43 GMT
remm        2003/06/16 14:32:43

  Modified:    catalina/src/share/org/apache/naming/factory Constants.java
                        ResourceFactory.java TransactionFactory.java
  Removed:     catalina/src/share/org/apache/naming/factory
                        TyrexFactory.java TyrexResourceFactory.java
                        TyrexTransactionFactory.java
  Log:
  - Remove bundled Tyrex support, as agreed on earlier (Tyrex is no longer
    supported, apparently; there are alternatives, readu to use with TC, such
    as JOTM).
  - As Tomcat provides a completely standard and quite powerful extension
    mechanism for its JNDI features, I don't see a need for providing anything
    but the most "common" resource factories.
  
  Revision  Changes    Path
  1.3       +3 -13     jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/Constants.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Constants.java	14 Dec 2002 14:05:12 -0000	1.2
  +++ Constants.java	16 Jun 2003 21:32:42 -0000	1.3
  @@ -94,18 +94,8 @@
       public static final String OPENEJB_EJB_FACTORY = 
           Package + ".OpenEjbFactory";
   
  -    public static final String TYREX_RESOURCE_FACTORY =
  -        Package + ".TyrexResourceFactory";
  -
  -    public static final String TYREX_TRANSACTION_FACTORY = 
  -        Package + ".TyrexTransactionFactory";
  -
       public static final String OBJECT_FACTORIES = "";
   
       public static final String FACTORY = "factory";
  -
  -    public static final String TYREX_DOMAIN_CONFIG = "tyrexDomainConfig";
  -
  -    public static final String TYREX_DOMAIN_NAME = "tyrexDomainName";
   
   }
  
  
  
  1.2       +4 -14     jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/ResourceFactory.java
  
  Index: ResourceFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/ResourceFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ResourceFactory.java	18 Jul 2002 16:47:36 -0000	1.1
  +++ ResourceFactory.java	16 Jun 2003 21:32:42 -0000	1.2
  @@ -170,16 +170,6 @@
                               .newInstance();
                       } catch(Throwable t) {
                       }
  -                } else if (ref.getClassName().equals("tyrex.resource.Resource")) {
  -                    String tyrexResourceFactoryClassName =
  -                        System.getProperty("tyrex.resource.Resource.Factory",
  -                                           Constants.TYREX_RESOURCE_FACTORY);
  -                    try {
  -                        factory = (ObjectFactory)
  -                            Class.forName(tyrexResourceFactoryClassName)
  -                            .newInstance();
  -                    } catch(Throwable t) {
  -                    }
                   }
               }
               if (factory != null) {
  
  
  
  1.2       +4 -16     jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/TransactionFactory.java
  
  Index: TransactionFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/naming/factory/TransactionFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TransactionFactory.java	18 Jul 2002 16:47:36 -0000	1.1
  +++ TransactionFactory.java	16 Jun 2003 21:32:42 -0000	1.2
  @@ -137,18 +137,6 @@
                       } catch(Throwable t) {
                       }
                   }
  -            } else {
  -                // Defaults to Tyrex
  -                String javaxTransactionUserTransactionFactoryClassName =
  -                    System.getProperty
  -                    ("javax.transaction.UserTransaction.Factory",
  -                     Constants.TYREX_TRANSACTION_FACTORY);
  -                try {
  -                    factory = (ObjectFactory) Class.forName
  -                        (javaxTransactionUserTransactionFactoryClassName)
  -                        .newInstance();
  -                } catch(Throwable t) {
  -                }
               }
               if (factory != null) {
                   return factory.getObjectInstance
  
  
  

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


Mime
View raw message