[jboss-cvs] JBossAS SVN: r111736 - in projects/jboss-jca/branches/performance: perfenv/src/main/java/org/jboss/jca/performance/perfenv and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri Jul 8 13:55:31 EDT 2011


Author: jesper.pedersen
Date: 2011-07-08 13:55:31 -0400 (Fri, 08 Jul 2011)
New Revision: 111736

Added:
   projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/DatabaseTester.java
Removed:
   projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/AbstractDatabaseTester.java
   projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSMulti.java
   projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSSingle.java
Modified:
   projects/jboss-jca/branches/performance/doc/perfguide/en-US/modules/perfenv.xml
   projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/CLI.java
   projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/Communication.java
Log:
Added support for test parameters

Modified: projects/jboss-jca/branches/performance/doc/perfguide/en-US/modules/perfenv.xml
===================================================================
--- projects/jboss-jca/branches/performance/doc/perfguide/en-US/modules/perfenv.xml	2011-07-08 17:28:17 UTC (rev 111735)
+++ projects/jboss-jca/branches/performance/doc/perfguide/en-US/modules/perfenv.xml	2011-07-08 17:55:31 UTC (rev 111736)
@@ -150,6 +150,7 @@
 help
 reload
 run <java.lang.String>
+set <java.lang.String> <java.lang.String>
 shutdown
 undeploy <java.lang.String>
      </programlisting>
@@ -186,7 +187,7 @@
 
      <programlisting>
 ./cli.sh deactivate            # Deactivates current profile
-./cli.sh activate sjc false    # Activates 'sjc' profile using NoopTS
+./cli.sh activate daily false  # Activates 'daily' profile using NoopTS
 ./cli.sh deploy jdbc-local.rar # Deploys jdbc-local.rar artifact
 ./cli.sh deploy h2-ds.xml      # Deploys h2-ds.xml artifact
 ./cli.sh run MyH2Test          # Runs MyH2Test (fully qualified class name)

Modified: projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/CLI.java
===================================================================
--- projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/CLI.java	2011-07-08 17:28:17 UTC (rev 111735)
+++ projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/CLI.java	2011-07-08 17:55:31 UTC (rev 111736)
@@ -89,6 +89,7 @@
             ObjectOutputStream oos = new ObjectOutputStream(socket.getOutputStream());
             
             oos.writeUTF("getcommand");
+            oos.writeInt(1);
             oos.writeObject(command);
             
             oos.flush();
@@ -101,16 +102,32 @@
             {
                Class[] parameterTypes = (Class[])result;
                Serializable[] arguments = null;
+               
+               int length = Math.max(parameterTypes != null ? parameterTypes.length : 0, args.length - counter);
+               int i = 0;
+
                if (parameterTypes != null)
                {
-                  arguments = new Serializable[parameterTypes.length];
-                  for (int i = 0; i < parameterTypes.length; i++)
+                  arguments = new Serializable[length];
+                  for (i = 0; i < parameterTypes.length; i++)
                   {
                      arguments[i] = getValue(parameterTypes[i], args[counter]);
                      counter++;
                   }
                }
 
+               if (i < length)
+               {
+                  if (arguments == null)
+                     arguments = new Serializable[length];
+
+                  for (int j = i; j < length; j++)
+                  {
+                     arguments[j] = args[counter];
+                     counter++;
+                  }
+               }
+
                executeCommand(host, port, command, arguments);
             }
             else
@@ -156,6 +173,7 @@
          ObjectOutputStream oos = new ObjectOutputStream(socket.getOutputStream());
          
          oos.writeUTF(command);
+         oos.writeInt(arguments != null ? arguments.length : 0);
          
          if (arguments != null)
          {
@@ -185,7 +203,8 @@
       }
       catch (EOFException ee)
       {
-         // Nothing
+         if (!"shutdown".equals(command))
+            ee.printStackTrace(System.err);
       }
       finally
       {

Modified: projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/Communication.java
===================================================================
--- projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/Communication.java	2011-07-08 17:28:17 UTC (rev 111735)
+++ projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/Communication.java	2011-07-08 17:55:31 UTC (rev 111736)
@@ -67,6 +67,8 @@
          ObjectInputStream ois = new ObjectInputStream(socket.getInputStream());
 
          String commandName = ois.readUTF();
+         int length = ois.readInt();
+
          Command command = cs.getCommand(commandName);
          Serializable result = null;
 
@@ -74,16 +76,29 @@
          {
             Class[] parameterTypes = command.getParameterTypes();
             Serializable[] arguments = null;
+            int i = 0;
 
+            if (length > 0)
+            {
+               arguments = new Serializable[length];
+            }
+
             if (parameterTypes != null)
             {
-               arguments = new Serializable[parameterTypes.length];
-               for (int i = 0; i < parameterTypes.length; i++)
+               for (i = 0; i < parameterTypes.length; i++)
                {
                   arguments[i] = (Serializable)ois.readObject();
                }
             }
 
+            if (i < length)
+            {
+               for (int j = i; j < length; j++)
+               {
+                  arguments[j] = (Serializable)ois.readObject();
+               }
+            }
+
             result = command.invoke(arguments);
          }
          else

Deleted: projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/AbstractDatabaseTester.java
===================================================================
--- projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/AbstractDatabaseTester.java	2011-07-08 17:28:17 UTC (rev 111735)
+++ projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/AbstractDatabaseTester.java	2011-07-08 17:55:31 UTC (rev 111736)
@@ -1,305 +0,0 @@
- /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2010, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jca.performance.perfenv.tests;
-
-import org.jboss.jca.performance.perfenv.Test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringWriter;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-import javax.transaction.UserTransaction;
-
-import org.jboss.logging.Logger;
-
-/**
- * A test application for database access
- * 
- * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
- */
-public abstract class AbstractDatabaseTester implements Test
-{
-   /** The logger */
-   private static Logger log = Logger.getLogger("DatabaseTester");
-
-   /** User transaction JNDI name */
-   private static final String JNDI_USER_TRANSACTION = "java:/UserTransaction";
-
-   /** Multithreaded execution */
-   private boolean multiThreaded;
-
-   /** Max number of threads */
-   private int maxThreads;
-
-   /** The JNDI for the datasource */
-   private String dbJndiName;
-
-   /** Iterations */
-   private int iterations;
-
-   /** The list of SQL statements to execute */
-   private List<String> sqls;
-
-   /**
-    * Constructor
-    * @param multithreaded multithreaded
-    * @param maxthreads maxthreads
-    * @param dbjndiname dbjndiname
-    * @param iterations iterations
-    */
-   public AbstractDatabaseTester(boolean multithreaded, int maxthreads, String dbjndiname, int iterations)
-   {
-      this.multiThreaded = multithreaded;
-      this.maxThreads = maxthreads;
-      this.dbJndiName = dbjndiname;
-      this.iterations = iterations;
-      this.sqls = new ArrayList<String>(1);
-      this.sqls.add("SELECT 1");
-   }
-
-   /**
-    * {@inheritDoc}
-    */
-   public Serializable run(Serializable[] args)
-   {
-      /*
-      if (args == null || args.length == 0)
-         return new IllegalArgumentException("Unsupported argument list: " + Arrays.toString(args));
-      */
-
-      try
-      {
-         /*
-         dbJndiName = (String)args[0];
-
-         if (args.length > 1)
-            multiThreaded = ((Boolean)args[1]).booleanValue();
-
-         if (args.length > 2)
-            maxThreads = ((Integer)args[2]).intValue();
-
-         if (args.length > 3)
-            iterations = ((Integer)args[3]).intValue();
-
-         if (dbJndiName == null || dbJndiName.trim().equals(""))
-            throw new IllegalArgumentException("No datasource JNDI name defined");
-         */
-
-         long start = 0;
-         long end = 0;
-
-         Context context = new InitialContext();
-         UserTransaction userTransaction = (UserTransaction)context.lookup(JNDI_USER_TRANSACTION);
-         DataSource dataSource = (DataSource)context.lookup(dbJndiName);
-
-         if (multiThreaded)
-         {
-            try
-            {
-               CountDownLatch cdl = new CountDownLatch(iterations);
-
-               BlockingQueue<Runnable> threadPoolQueue = new LinkedBlockingQueue<Runnable>(iterations);
-               ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(maxThreads, maxThreads,
-                                                                              60, TimeUnit.SECONDS,
-                                                                              threadPoolQueue);
-
-               threadPoolExecutor.allowCoreThreadTimeOut(true);
-               threadPoolExecutor.prestartAllCoreThreads();
-               
-               start = System.currentTimeMillis();
-               for (int counter = 0; counter < iterations; counter++)
-               {
-                  TestCase t = new TestCase(dataSource, userTransaction, sqls, cdl);
-                  threadPoolExecutor.submit(t);
-               }
-               cdl.await();
-               end = System.currentTimeMillis();
-
-               threadPoolExecutor.shutdown();
-            }
-            catch (Throwable t)
-            {
-               // Ignore
-            }
-         }
-         else
-         {
-            start = System.currentTimeMillis();
-            TestCase t = new TestCase(dataSource, userTransaction, sqls);
-            for (int counter = 0; counter < iterations; counter++)
-            {
-               t.run();
-            }
-            end = System.currentTimeMillis();
-         }
-         
-         long elapsed = end - start;
-         
-         if (elapsed <= 0)
-            elapsed = 1;
-
-         log.info("Took: " + elapsed + " ms");
-         log.info("Unit of work/ms: " + (iterations / (double)elapsed));
-
-         context.close();      
-
-         return new Double((iterations * 1000L) / (double)elapsed);
-      }
-      catch (Throwable t)
-      {
-         StringWriter sw = new StringWriter();
-         sw.write(t.getMessage());
-         sw.write('\n');
-
-         t.printStackTrace(new PrintWriter(sw));
-
-         return new Exception(sw.toString());
-      }
-   }
-
-   /**
-    * Test class
-    */
-   private static class TestCase implements Runnable
-   {
-      private DataSource dataSource;
-      private UserTransaction userTransaction;
-      private List<String> sqls;
-      private CountDownLatch cdl;
-
-      TestCase(DataSource db, UserTransaction ut, List<String> sqls)
-      {
-         this(db, ut, sqls, null);
-      }
-
-      TestCase(DataSource db, UserTransaction ut, List<String> sqls, CountDownLatch cdl)
-      {
-         this.dataSource = db;
-         this.userTransaction = ut;
-         this.sqls = sqls;
-         this.cdl = cdl;
-      }
-
-      public void run()
-      {
-         if (dataSource == null)
-            throw new IllegalArgumentException("No datasource defined");
-
-         if (userTransaction == null)
-            throw new IllegalArgumentException("UserTransaction is null");
-
-         Connection connection = null;
-
-         try
-         {
-            userTransaction.begin();
-
-            connection = dataSource.getConnection();
-
-            PreparedStatement ps = null;
-            ResultSet resultSet = null;
-
-            if (sqls != null)
-            {
-               for (String sqlStatement : sqls)
-               {
-                  log.debug("Executing: " + sqlStatement);
-
-                  try
-                  {
-                     ps = connection.prepareStatement(sqlStatement);
-                     resultSet = ps.executeQuery();
-                  }
-                  finally
-                  {
-                     try
-                     {
-                        if (resultSet != null)
-                           resultSet.close();
-                     }
-                     catch (SQLException se) 
-                     {
-                        // Ignore
-                     }
-                     try
-                     {
-                        if (ps != null)
-                           ps.close();
-                     }
-                     catch (SQLException se)
-                     {
-                        // Ignore
-                     }
-                  }
-               }
-            }
-            
-            userTransaction.commit();
-         }
-         catch (Throwable t)
-         {
-            try
-            {
-               if (userTransaction != null)
-                  userTransaction.rollback();
-            }
-            catch (Throwable inner)
-            {
-               // Ignore
-            }
-
-            log.error(t.getMessage(), t);
-         }
-         finally
-         {
-            try
-            {
-               if (connection != null)
-                  connection.close();
-            }
-            catch (SQLException se)
-            {
-               // Ignore
-            }
-
-            if (cdl != null)
-               cdl.countDown();
-         }
-      }
-   }
-}

Copied: projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/DatabaseTester.java (from rev 111730, projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/AbstractDatabaseTester.java)
===================================================================
--- projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/DatabaseTester.java	                        (rev 0)
+++ projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/DatabaseTester.java	2011-07-08 17:55:31 UTC (rev 111736)
@@ -0,0 +1,297 @@
+ /*
+  * JBoss, Home of Professional Open Source
+  * Copyright 2010, JBoss Inc., and individual contributors as indicated
+  * by the @authors tag. See the copyright.txt in the distribution for a
+  * full listing of individual contributors.
+  *
+  * This is free software; you can redistribute it and/or modify it
+  * under the terms of the GNU Lesser General Public License as
+  * published by the Free Software Foundation; either version 2.1 of
+  * the License, or (at your option) any later version.
+  *
+  * This software is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  * Lesser General Public License for more details.
+  *
+  * You should have received a copy of the GNU Lesser General Public
+  * License along with this software; if not, write to the Free
+  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  */
+package org.jboss.jca.performance.perfenv.tests;
+
+import org.jboss.jca.performance.perfenv.Test;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.io.StringWriter;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+import javax.transaction.UserTransaction;
+
+import org.jboss.logging.Logger;
+
+/**
+ * A test application for database access
+ * 
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class DatabaseTester implements Test
+{
+   /** The logger */
+   private static Logger log = Logger.getLogger("DatabaseTester");
+
+   /** User transaction JNDI name */
+   private static final String JNDI_USER_TRANSACTION = "java:/UserTransaction";
+
+   /** Multithreaded execution */
+   private boolean multiThreaded;
+
+   /** Max number of threads */
+   private int maxThreads;
+
+   /** The JNDI for the datasource */
+   private String dbJndiName;
+
+   /** Iterations */
+   private int iterations;
+
+   /** The list of SQL statements to execute */
+   private List<String> sqls;
+
+   /**
+    * Constructor
+    */
+   public DatabaseTester()
+   {
+      this.multiThreaded = false;
+      this.maxThreads = 100;
+      this.dbJndiName = null;
+      this.iterations = 100000;
+      this.sqls = new ArrayList<String>(1);
+      this.sqls.add("SELECT 1");
+   }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Serializable run(Serializable[] args)
+   {
+      if (args == null || args.length == 0)
+         return new IllegalArgumentException("Unsupported argument list: " + Arrays.toString(args));
+
+      try
+      {
+         dbJndiName = (String)args[0];
+
+         if (args.length > 1)
+            multiThreaded = Boolean.valueOf((String)args[1]);
+
+         if (args.length > 2)
+            maxThreads = Integer.valueOf((String)args[2]);
+
+         if (args.length > 3)
+            iterations = Integer.valueOf((String)args[3]);
+
+         if (dbJndiName == null || dbJndiName.trim().equals(""))
+            throw new IllegalArgumentException("No datasource JNDI name defined");
+
+         long start = 0;
+         long end = 0;
+
+         Context context = new InitialContext();
+         UserTransaction userTransaction = (UserTransaction)context.lookup(JNDI_USER_TRANSACTION);
+         DataSource dataSource = (DataSource)context.lookup(dbJndiName);
+
+         if (multiThreaded)
+         {
+            try
+            {
+               CountDownLatch cdl = new CountDownLatch(iterations);
+
+               BlockingQueue<Runnable> threadPoolQueue = new LinkedBlockingQueue<Runnable>(iterations);
+               ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(maxThreads, maxThreads,
+                                                                              60, TimeUnit.SECONDS,
+                                                                              threadPoolQueue);
+
+               threadPoolExecutor.allowCoreThreadTimeOut(true);
+               threadPoolExecutor.prestartAllCoreThreads();
+               
+               start = System.currentTimeMillis();
+               for (int counter = 0; counter < iterations; counter++)
+               {
+                  TestCase t = new TestCase(dataSource, userTransaction, sqls, cdl);
+                  threadPoolExecutor.submit(t);
+               }
+               cdl.await();
+               end = System.currentTimeMillis();
+
+               threadPoolExecutor.shutdown();
+            }
+            catch (Throwable t)
+            {
+               // Ignore
+            }
+         }
+         else
+         {
+            start = System.currentTimeMillis();
+            TestCase t = new TestCase(dataSource, userTransaction, sqls);
+            for (int counter = 0; counter < iterations; counter++)
+            {
+               t.run();
+            }
+            end = System.currentTimeMillis();
+         }
+         
+         long elapsed = end - start;
+         
+         if (elapsed <= 0)
+            elapsed = 1;
+
+         log.info("Took: " + elapsed + " ms");
+         log.info("Unit of work/ms: " + (iterations / (double)elapsed));
+
+         context.close();      
+
+         return new Double((iterations * 1000L) / (double)elapsed);
+      }
+      catch (Throwable t)
+      {
+         StringWriter sw = new StringWriter();
+         sw.write(t.getMessage());
+         sw.write('\n');
+
+         t.printStackTrace(new PrintWriter(sw));
+
+         return new Exception(sw.toString());
+      }
+   }
+
+   /**
+    * Test class
+    */
+   private static class TestCase implements Runnable
+   {
+      private DataSource dataSource;
+      private UserTransaction userTransaction;
+      private List<String> sqls;
+      private CountDownLatch cdl;
+
+      TestCase(DataSource db, UserTransaction ut, List<String> sqls)
+      {
+         this(db, ut, sqls, null);
+      }
+
+      TestCase(DataSource db, UserTransaction ut, List<String> sqls, CountDownLatch cdl)
+      {
+         this.dataSource = db;
+         this.userTransaction = ut;
+         this.sqls = sqls;
+         this.cdl = cdl;
+      }
+
+      public void run()
+      {
+         if (dataSource == null)
+            throw new IllegalArgumentException("No datasource defined");
+
+         if (userTransaction == null)
+            throw new IllegalArgumentException("UserTransaction is null");
+
+         Connection connection = null;
+
+         try
+         {
+            userTransaction.begin();
+
+            connection = dataSource.getConnection();
+
+            PreparedStatement ps = null;
+            ResultSet resultSet = null;
+
+            if (sqls != null)
+            {
+               for (String sqlStatement : sqls)
+               {
+                  log.debug("Executing: " + sqlStatement);
+
+                  try
+                  {
+                     ps = connection.prepareStatement(sqlStatement);
+                     resultSet = ps.executeQuery();
+                  }
+                  finally
+                  {
+                     try
+                     {
+                        if (resultSet != null)
+                           resultSet.close();
+                     }
+                     catch (SQLException se) 
+                     {
+                        // Ignore
+                     }
+                     try
+                     {
+                        if (ps != null)
+                           ps.close();
+                     }
+                     catch (SQLException se)
+                     {
+                        // Ignore
+                     }
+                  }
+               }
+            }
+            
+            userTransaction.commit();
+         }
+         catch (Throwable t)
+         {
+            try
+            {
+               if (userTransaction != null)
+                  userTransaction.rollback();
+            }
+            catch (Throwable inner)
+            {
+               // Ignore
+            }
+
+            log.error(t.getMessage(), t);
+         }
+         finally
+         {
+            try
+            {
+               if (connection != null)
+                  connection.close();
+            }
+            catch (SQLException se)
+            {
+               // Ignore
+            }
+
+            if (cdl != null)
+               cdl.countDown();
+         }
+      }
+   }
+}

Deleted: projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSMulti.java
===================================================================
--- projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSMulti.java	2011-07-08 17:28:17 UTC (rev 111735)
+++ projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSMulti.java	2011-07-08 17:55:31 UTC (rev 111736)
@@ -1,38 +0,0 @@
- /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2010, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jca.performance.perfenv.tests;
-
-/**
- * H2DS multi-threaded
- * 
- * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
- */
-public class H2DSMulti extends AbstractDatabaseTester
-{
-   /**
-    * Constructor
-    */
-   public H2DSMulti()
-   {
-      super(true, 100, "java:/H2DS", 100000);
-   }
-}

Deleted: projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSSingle.java
===================================================================
--- projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSSingle.java	2011-07-08 17:28:17 UTC (rev 111735)
+++ projects/jboss-jca/branches/performance/perfenv/src/main/java/org/jboss/jca/performance/perfenv/tests/H2DSSingle.java	2011-07-08 17:55:31 UTC (rev 111736)
@@ -1,38 +0,0 @@
- /*
-  * JBoss, Home of Professional Open Source
-  * Copyright 2010, JBoss Inc., and individual contributors as indicated
-  * by the @authors tag. See the copyright.txt in the distribution for a
-  * full listing of individual contributors.
-  *
-  * This is free software; you can redistribute it and/or modify it
-  * under the terms of the GNU Lesser General Public License as
-  * published by the Free Software Foundation; either version 2.1 of
-  * the License, or (at your option) any later version.
-  *
-  * This software is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  * Lesser General Public License for more details.
-  *
-  * You should have received a copy of the GNU Lesser General Public
-  * License along with this software; if not, write to the Free
-  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-  */
-package org.jboss.jca.performance.perfenv.tests;
-
-/**
- * H2DS single-threaded
- * 
- * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
- */
-public class H2DSSingle extends AbstractDatabaseTester
-{
-   /**
-    * Constructor
-    */
-   public H2DSSingle()
-   {
-      super(false, 100, "java:/H2DS", 100000);
-   }
-}



More information about the jboss-cvs-commits mailing list