db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl ConfigurationAbstractImpl.java OjbConfiguration.java OjbConfigurator.java
Date Tue, 24 Dec 2002 13:28:59 GMT
arminw      2002/12/24 05:28:58

  Modified:    src/java/org/apache/ojb/broker/util/configuration/impl
                        ConfigurationAbstractImpl.java
                        OjbConfiguration.java OjbConfigurator.java
  Log:
  some minor changes for better usage
  
  Revision  Changes    Path
  1.5       +5 -6      jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/ConfigurationAbstractImpl.java
  
  Index: ConfigurationAbstractImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/ConfigurationAbstractImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ConfigurationAbstractImpl.java	29 Sep 2002 09:18:24 -0000	1.4
  +++ ConfigurationAbstractImpl.java	24 Dec 2002 13:28:58 -0000	1.5
  @@ -74,15 +74,15 @@
    */
   public abstract class ConfigurationAbstractImpl implements Configuration
   {
  +    /**the logger used in this class.*/
  +    private Logger logger = LoggerFactory.getBootLogger();
  +
       /**the name of the properties file*/
       protected String filename;
   
       /**the properties object holding the configuration data*/
       protected Properties properties;
   
  -    /**the logger used in this class.*/
  -    private Logger logger;
  -
       /**
        * Contains all legal values for boolean configuration entries that represent
        * <code>true</code>.
  @@ -99,7 +99,6 @@
        */
       public ConfigurationAbstractImpl()
       {
  -        logger = LoggerFactory.getBootLogger();
           load();
       }
   
  @@ -336,7 +335,7 @@
           {
           	if (defaultValue == null)
           	{
  -        		return null;	
  +        		return null;
           	}
           	else
           	{
  
  
  
  1.18      +14 -3     jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfiguration.java
  
  Index: OjbConfiguration.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfiguration.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- OjbConfiguration.java	23 Dec 2002 09:26:45 -0000	1.17
  +++ OjbConfiguration.java	24 Dec 2002 13:28:58 -0000	1.18
  @@ -64,6 +64,7 @@
   import org.apache.ojb.broker.cache.ObjectCacheDefaultImpl;
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentField;
   import org.apache.ojb.broker.metadata.fieldaccess.PersistentFieldDefaultImpl;
  +import org.apache.ojb.broker.metadata.MetadataConfiguration;
   import org.apache.ojb.broker.platforms.PlatformConfiguration;
   import org.apache.ojb.broker.server.BrokerPool;
   import org.apache.ojb.broker.server.PersistenceBrokerServer;
  @@ -99,7 +100,7 @@
           extends ConfigurationAbstractImpl
           implements LoggingConfiguration, OdmgConfiguration, LockingConfiguration,
           PersistenceBrokerConfiguration, SequenceConfiguration, PlatformConfiguration,
  -        PBPoolConfiguration, ConnectionFactoryConfiguration
  +        PBPoolConfiguration, ConnectionFactoryConfiguration, MetadataConfiguration
   {
       /** use Server or local broker*/
       private boolean serverUsed;
  @@ -139,9 +140,18 @@
       private Class lockManagerClass;
       private Class lockMapClass;
   
  +    // Metadata configuration
  +    private boolean useSerializedRepository;
  +
   
       public OjbConfiguration()
       {
  +        super();
  +    }
  +
  +    public boolean useSerializedRepository()
  +    {
  +        return useSerializedRepository;
       }
   
       public boolean lockAssociationAsWrites()
  @@ -391,6 +401,8 @@
   
           //load configuration for connection pools
           con_maxActive = getInteger("maxConnectionsInPool", 10);
  +
  +        useSerializedRepository = getBoolean("useSerializedRepository", false);
       }
   
       /**
  @@ -418,5 +430,4 @@
       {
           return useImplicitLocking;
       }
  -
   }
  
  
  
  1.4       +4 -4      jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfigurator.java
  
  Index: OjbConfigurator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ojb/src/java/org/apache/ojb/broker/util/configuration/impl/OjbConfigurator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OjbConfigurator.java	28 Jun 2002 22:36:47 -0000	1.3
  +++ OjbConfigurator.java	24 Dec 2002 13:28:58 -0000	1.4
  @@ -73,12 +73,12 @@
   	 * the configuration to be used throught OJB
   	 */
       private static OjbConfiguration configuration;
  -    
  +
       /**
        * the logger instance.
        */
       private static Logger log;
  -    
  +
       /**
        * the singleton instance of this class.
        */
  @@ -89,7 +89,6 @@
       {
           configuration = new OjbConfiguration();
           log = LoggerFactory.getBootLogger();
  -        instance = new OjbConfigurator();
       }
   
   	/**
  @@ -107,6 +106,7 @@
   	 */
       public static OjbConfigurator getInstance()
       {
  +        if(instance == null) instance = new OjbConfigurator();
           return instance;
       }
   
  
  
  

Mime
View raw message