avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hamm...@apache.org
Subject cvs commit: jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks DefaultHypersonicSQL.java HypersonicSQLHandler.java
Date Mon, 13 May 2002 23:31:02 GMT
hammant     02/05/13 16:31:02

  Modified:    hsql     build.xml
               hsql/lib hsqldb.jar
               hsql/src/java/org/apache/avalon/hsql/blocks
                        DefaultHypersonicSQL.java HypersonicSQLHandler.java
  Added:       hsql/lib readme.txt
  Log:
  Updated to hsqldb 1.7 rc5
  
  Revision  Changes    Path
  1.16      +1 -1      jakarta-avalon-apps/hsql/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/build.xml,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- build.xml	28 Mar 2002 11:47:49 -0000	1.15
  +++ build.xml	13 May 2002 23:31:02 -0000	1.16
  @@ -106,7 +106,7 @@
     <!-- Compiles project -->
     <target name="compile">
   
  -    <available classname="org.hsqldb.HypersonicServerFactory" 
  +    <available classname="org.hsqldb.HsqlServerFactory" 
           classpathref="project.class.path" 
           property="hsql.present"/>
   
  
  
  
  1.2       +1083 -677 jakarta-avalon-apps/hsql/lib/hsqldb.jar
  
  	<<Binary file>>
  
  
  1.1                  jakarta-avalon-apps/hsql/lib/readme.txt
  
  Index: readme.txt
  ===================================================================
  This contains hsqldb 1.7 RC5
  
  
  1.6       +5 -5      jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java
  
  Index: DefaultHypersonicSQL.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/DefaultHypersonicSQL.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- DefaultHypersonicSQL.java	12 May 2002 10:38:11 -0000	1.5
  +++ DefaultHypersonicSQL.java	13 May 2002 23:31:02 -0000	1.6
  @@ -25,8 +25,8 @@
   import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
   import org.apache.avalon.cornerstone.services.sockets.SocketManager;
   import org.apache.avalon.cornerstone.services.sockets.ServerSocketFactory;
  -import org.hsqldb.HypersonicServerFactory;
  -import org.hsqldb.HypersonicSocketRequestHandler;
  +import org.hsqldb.HsqlServerFactory;
  +import org.hsqldb.HsqlSocketRequestHandler;
   
   import java.io.File;
   import java.net.InetAddress;
  @@ -52,7 +52,7 @@
       protected InetAddress         m_bindTo;
       protected int                 m_port;
       protected String m_DatabaseName;    
  -    HypersonicSocketRequestHandler m_HypersonicSocketRequestHandler;
  +    HsqlSocketRequestHandler m_HsqlSocketRequestHandler;
   
   
       public void contextualize( final Context context )
  @@ -84,7 +84,7 @@
           
           try
           {
  -            m_HypersonicSocketRequestHandler = HypersonicServerFactory.createHypersonicServer(m_DatabaseName,
true, false);
  +            m_HsqlSocketRequestHandler = HsqlServerFactory.createHsqlServer(m_DatabaseName,
true, false);
                       
               final String bindAddress = configuration.getChild( "bind" ).getValue();
               m_bindTo = InetAddress.getByName( bindAddress );
  @@ -127,7 +127,7 @@
       public ConnectionHandler createConnectionHandler()
           throws Exception
       {
  -        final HypersonicSQLHandler handler = new HypersonicSQLHandler(m_HypersonicSocketRequestHandler);
  +        final HypersonicSQLHandler handler = new HypersonicSQLHandler(m_HsqlSocketRequestHandler);
           setupLogger( handler );
           return handler;
       }
  
  
  
  1.8       +5 -5      jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/HypersonicSQLHandler.java
  
  Index: HypersonicSQLHandler.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-apps/hsql/src/java/org/apache/avalon/hsql/blocks/HypersonicSQLHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- HypersonicSQLHandler.java	12 May 2002 11:36:36 -0000	1.7
  +++ HypersonicSQLHandler.java	13 May 2002 23:31:02 -0000	1.8
  @@ -9,7 +9,7 @@
   
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.cornerstone.services.connection.ConnectionHandler;
  -import org.hsqldb.HypersonicSocketRequestHandler;
  +import org.hsqldb.HsqlSocketRequestHandler;
   
   import java.io.IOException;
   import java.net.Socket;
  @@ -24,11 +24,11 @@
       extends AbstractLogEnabled
       implements ConnectionHandler
   {
  -    protected HypersonicSocketRequestHandler m_HypersonicSocketRequestHandler;
  +    protected HsqlSocketRequestHandler m_HsqlSocketRequestHandler;
   
  -    protected HypersonicSQLHandler( final HypersonicSocketRequestHandler hypersonicSocketRequestHandler
)
  +    protected HypersonicSQLHandler( final HsqlSocketRequestHandler hypersonicSocketRequestHandler
)
       {
  -        m_HypersonicSocketRequestHandler = hypersonicSocketRequestHandler;
  +        m_HsqlSocketRequestHandler = hypersonicSocketRequestHandler;
       }
   
       /**
  @@ -44,7 +44,7 @@
           final String remoteHost = socket.getInetAddress().getHostName();
           final String remoteIP = socket.getInetAddress().getHostAddress();
   
  -        m_HypersonicSocketRequestHandler.handleConnection(socket);
  +        m_HsqlSocketRequestHandler.handleConnection(socket);
   
           getLogger().debug( "AvalonDBConnection from " + remoteHost + " (" + remoteIP +
")" );
       }
  
  
  

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


Mime
View raw message