cvs commit: jakarta-jetspeed-2/src/java/org/apache/jetspeed/dbutil HSQLServer.java

[weaver]

weaver      2004/02/24 08:28:59

  Modified:    .        maven.xml
               src/java/org/apache/jetspeed/dbutil HSQLServer.java
  Log:
  quietly kills HSQL server
  
  Revision  Changes    Path
  1.21      +12 -9     jakarta-jetspeed-2/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- maven.xml 24 Feb 2004 15:43:02 -0000      1.20
  +++ maven.xml 24 Feb 2004 16:28:59 -0000      1.21
  @@ -180,15 +180,18 @@
     <postGoal name="allBuild">
        <echo message="====================================" />
        <echo message="        Stopping HSQL server        " />         
  -     <echo message="====================================" />         
  -     <sql driver="${database.test.driver}"
  -         classpathref="maven.dependency.classpath"
  -         url="${database.test.url}"
  -         userid="${database.test.username}"
  -         password="${database.test.password}">
  -         <!-- SQL command to shut down the server -->
  -         SHUTDOWN
  -    </sql>
  +     <echo message="====================================" />
  +     <java classname="org.apache.jetspeed.dbutil.HSQLServer" fork="true" >
  +       <classpath>
  +         <path refid="maven.dependency.classpath"/>
  +         <pathelement path="${maven.build.dest}"/>
  +        </classpath>
  +         <arg value="kill" />
  +         <arg value="9001" />     
  +         <arg value="sa" />
  +         <arg value="" />
  +      </java>        
  +     
     </postGoal>
   
   </project>
  
  
  
  1.2       +33 -0     
jakarta-jetspeed-2/src/java/org/apache/jetspeed/dbutil/HSQLServer.java
  
  Index: HSQLServer.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed-2/src/java/org/apache/jetspeed/dbutil/HSQLServer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- HSQLServer.java   24 Feb 2004 15:29:53 -0000      1.1
  +++ HSQLServer.java   24 Feb 2004 16:28:59 -0000      1.2
  @@ -6,6 +6,11 @@
    */
   package org.apache.jetspeed.dbutil;
   
  +import java.sql.Connection;
  +import java.sql.DriverManager;
  +import java.sql.SQLException;
  +import java.sql.Statement;
  +
   import org.hsqldb.Server;
   
   
  @@ -20,6 +25,11 @@
   
       public static void main(String[] args)
       {
  +        if(args[0].equals("kill"))
  +        {
  +            kill(Integer.parseInt(args[1]), args[2], args[3]);
  +            return;
  +        }
           
           try
           {
  @@ -31,6 +41,26 @@
               
           }
       }
  +    
  +    private static void kill(int port, String user, String password)
  +    {
  +        try
  +        {
  +            Class.forName("org.hsqldb.jdbcDriver");
  +            String url = "jdbc:hsqldb:hsql://127.0.0.1:" + port;
  +            Connection con = DriverManager.getConnection(url, user, password);
  +            String sql = "SHUTDOWN";
  +            Statement stmt = con.createStatement();
  +            stmt.executeUpdate(sql);
  +            stmt.close();
  +        }
  +        catch (Exception e)
  +        {
  +           
  +        }
  +        
  +        
  +    }
   }
   
   class HSQLServerThread extends Thread
  @@ -40,6 +70,7 @@
   
       HSQLServerThread(String args[])
       {
  +       
           this.args = args; 
           setDaemon(true);
         
  @@ -54,4 +85,6 @@
           Server.main(args);
           
       }
  +    
  +   
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]