avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject cvs commit: avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource ResourceLimitingJdbcDataSource.java
Date Tue, 30 Mar 2004 15:58:50 GMT
niclas      2004/03/30 07:58:50

  Modified:    .        project.properties
               datasource project.xml
               datasource/src/java/org/apache/avalon/excalibur/datasource
                        ResourceLimitingJdbcDataSource.java
  Log:
  Some steps forward.
  
  Revision  Changes    Path
  1.12      +1 -7      avalon-excalibur/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/project.properties,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- project.properties	30 Mar 2004 12:51:44 -0000	1.11
  +++ project.properties	30 Mar 2004 15:58:50 -0000	1.12
  @@ -1,19 +1,13 @@
   
  -maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven,http://lsd.student.utwente.nl/repository
  -
  -maven.docs.src = ${basedir}/site/xdocs
  -maven.docs.outputencoding = UTF-8
  +maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
   
   #
   # Banner background and foreground colors.
   #
   
  -maven.ui.banner.background = #fff
  -maven.ui.banner.foreground = #000
   maven.xdoc.jsl = file:${avalon.buildsysten}/site.jsl
   maven.javadoc.stylesheet = ${avalon.buildsystem}/stylesheet.css
   maven.javadoc.links = ${sun.j2se.link},${avalon.logkit.link},${avalon.framework.link},${excalibur.thread.link},${excalibur.event.link}
  -maven.license.licenseFile = ${basedir}/LICENSE.txt
   maven.xdoc.poweredby.image=
   
   #
  
  
  
  1.5       +12 -2     avalon-excalibur/datasource/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/datasource/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	30 Mar 2004 12:15:15 -0000	1.4
  +++ project.xml	30 Mar 2004 15:58:50 -0000	1.5
  @@ -62,8 +62,18 @@
           </dependency>
           <dependency>
               <groupId>excalibur-pool</groupId>
  -            <artifactId>excalibur-pool</artifactId>
  -            <version>1.3</version>
  +            <artifactId>excalibur-pool-api</artifactId>
  +            <version>2.0</version>
  +        </dependency>
  +        <dependency>
  +            <groupId>excalibur-pool</groupId>
  +            <artifactId>excalibur-pool-impl</artifactId>
  +            <version>2.0</version>
  +        </dependency>
  +        <dependency>
  +            <groupId>excalibur-pool</groupId>
  +            <artifactId>excalibur-pool-instrumented</artifactId>
  +            <version>2.0</version>
           </dependency>
           <dependency>
               <id>commons-collections</id>
  
  
  
  1.5       +5 -2      avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ResourceLimitingJdbcDataSource.java
  
  Index: ResourceLimitingJdbcDataSource.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/datasource/src/java/org/apache/avalon/excalibur/datasource/ResourceLimitingJdbcDataSource.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ResourceLimitingJdbcDataSource.java	28 Feb 2004 11:47:14 -0000	1.4
  +++ ResourceLimitingJdbcDataSource.java	30 Mar 2004 15:58:50 -0000	1.5
  @@ -24,9 +24,12 @@
   import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.configuration.ConfigurationException;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  +
   import org.apache.excalibur.instrument.Instrument;
   import org.apache.excalibur.instrument.Instrumentable;
   
  +import org.apache.avalon.excalibur.pool.InstrumentedResourceLimitingPool;
  +
   /**
    * The ResourceLimiting implementation for DataSources in Avalon.
    * This uses the normal <code>java.sql.Connection</code> object and
  @@ -154,7 +157,7 @@
   {
       private boolean m_configured;
       private boolean m_disposed;
  -    protected ResourceLimitingJdbcConnectionPool m_pool;
  +    protected InstrumentedResourceLimitingPool m_pool;
   
       /** Instrumentable Name assigned to this Instrumentable */
       private String m_instrumentableName;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message