[jboss-cvs] JBossAS SVN: r111018 - projects/jboss-jca/branches/performance/faban/src/main/java/org/jboss/jca/perf/services/ironjacamar.

[jboss-cvs-commits at lists.jboss.org]

Author: whitingjr
Date: 2011-03-24 07:44:03 -0400 (Thu, 24 Mar 2011)
New Revision: 111018

Modified:
   projects/jboss-jca/branches/performance/faban/src/main/java/org/jboss/jca/perf/services/ironjacamar/IronJacamarService.java
Log:
Updated the service with more properties.

Modified: projects/jboss-jca/branches/performance/faban/src/main/java/org/jboss/jca/perf/services/ironjacamar/IronJacamarService.java
===================================================================
--- projects/jboss-jca/branches/performance/faban/src/main/java/org/jboss/jca/perf/services/ironjacamar/IronJacamarService.java	2011-03-24 11:40:47 UTC (rev 111017)
+++ projects/jboss-jca/branches/performance/faban/src/main/java/org/jboss/jca/perf/services/ironjacamar/IronJacamarService.java	2011-03-24 11:44:03 UTC (rev 111018)
@@ -60,19 +60,22 @@
    private String serverStartScript;
    private String jcaCommand;
    private String interfaceBindname;
-   private String dbConnectUrl, dbDriverClass;
+   private String dbConnectUrl, dbDriverClass, dbUserName, dbPassword;
    private Long port;
    private static final String SERVER_HOME = "serverHome";
    private static final String RUN_SCRIPT = "runScript";
    private static final String INTERFACE_BINDNAME = "intefaceBindname";
    private static final String DB_CONNECT_URL = "dbConnectUrl";
    private static final String DB_DRIVER_CLASS = "dbDriverClass";
+   private static final String DB_USERNAME = "dbUsername";
+   private static final String DB_PASSWORD = "dbPassword";
    private static final String LISTEN_PORT = "listenPort";
    
    private static final String SCRIPT_PATH = "$1%s$2%sbin$2%s$3%s";
    private static final String COMMAND_WITH_INTERFACE_BINDING = "$1%s -b $2%s";
    private static final String COMMAND_WITH_DB_CONNECT_URL_PROPERTY = "$1%s -Ddb-vendor.connectionURL=$2%s";
    private static final String COMMAND_WITH_DB_DRIVER_FQCN_PROPERTY = "$1%s -Ddb-vendor.driverClass=$2%s";
+   private static final String COMMAND_WITH_DB_USERNAME_AND_PASSWORD = "$1%s -Ddb-vendor.driverClass=$2%s";
       
    /**
     * This method first extracts the properties from the configuration xml.
@@ -101,11 +104,11 @@
       this.serverStartScript = sc.getProperty(RUN_SCRIPT);
       if (null == serverStartScript )
       {
-         throw new ConfigurationException("Server home is undefined, enter a server path.");
+         throw new ConfigurationException("Start script file name is undefined, enter a file name.");
       }
       else if ("".equals(serverStartScript.trim()))
       {
-         throw new ConfigurationException("Server home is undefined, enter a server path.");
+         throw new ConfigurationException("Start script file name is undefined, enter a file name.");
       }
       
       this.dbConnectUrl  = sc.getProperty(DB_CONNECT_URL);
@@ -128,6 +131,19 @@
          throw new ConfigurationException("db driver class is undefined, enter a url.");
       }
       
+      this.dbUserName = sc.getProperty(DB_USERNAME);
+      if (null == this.dbUserName )
+      {
+         throw new ConfigurationException("db username is undefined, enter a username.");
+      }
+      else if ("".equals(this.dbUserName.trim()))
+      {
+         throw new ConfigurationException("db username is undefined, enter a username.");
+      }
+      
+      this.dbPassword = sc.getProperty(DB_PASSWORD);
+      // an empty value for the password is permitted
+      
       this.interfaceBindname = sc.getProperty(INTERFACE_BINDNAME);
       // an empty value is permitted