[jboss-cvs] JBoss Messaging SVN: r2650 - projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration.

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

Author: sergeypk
Date: 2007-05-04 08:42:03 -0400 (Fri, 04 May 2007)
New Revision: 2650

Modified:
   projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java
   projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/JobConfiguration.java
Log:
Add support for <jndi-property> element to Configuration, to specify custom JNDI properties.
Eliminate dependency on JBM's XMLUtil since we're not going to support JDKs before 1.4

Modified: projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java
===================================================================
--- projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java	2007-05-04 12:29:02 UTC (rev 2649)
+++ projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/Configuration.java	2007-05-04 12:42:03 UTC (rev 2650)
@@ -6,7 +6,6 @@
  */
 package org.jboss.jms.perf.framework.configuration;
 
-import org.jboss.jms.util.XMLUtil;
 import org.jboss.jms.perf.framework.data.PerformanceTest;
 import org.jboss.jms.perf.framework.data.Execution;
 import org.jboss.jms.perf.framework.data.JobList;
@@ -22,10 +21,12 @@
 import org.jboss.jms.perf.framework.protocol.Job;
 import org.jboss.jms.perf.framework.protocol.PingJob;
 import org.jboss.jms.perf.framework.protocol.JobSupport;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.w3c.dom.Node;
 import org.w3c.dom.NamedNodeMap;
+import org.xml.sax.InputSource;
 
 import java.io.File;
 import java.io.Reader;
@@ -39,6 +40,8 @@
 import java.util.StringTokenizer;
 import java.awt.*;
 
+import javax.xml.parsers.DocumentBuilderFactory;
+
 /**
  * A performance run configuration.
  *
@@ -186,7 +189,11 @@
 
       try
       {
-         Element root = XMLUtil.readerToElement(reader);
+         Document doc = DocumentBuilderFactory
+            .newInstance()
+            .newDocumentBuilder()
+            .parse(new InputSource(reader));
+         Element root = doc.getDocumentElement();
 
          if (!"benchmark".equals(root.getNodeName()))
          {
@@ -203,23 +210,23 @@
 
                if ("db-url".equals(name))
                {
-                  dbURL = XMLUtil.getTextContent(n);
+                  dbURL = n.getTextContent();
                }
                else if ("report-directory".equals(name))
                {
-                  reportDirectory = XMLUtil.getTextContent(n);
+                  reportDirectory = n.getTextContent();
                }
                else if ("start-executors".equals(name))
                {
-                  startExecutors = toBoolean(XMLUtil.getTextContent(n));
+                  startExecutors = toBoolean(n.getTextContent());
                }
                else if ("default-executor-url".equals(name))
                {
-                  defaultExecutorURL = XMLUtil.getTextContent(n);
+                  defaultExecutorURL = n.getTextContent();
                }
                else if ("color-step".equals(name))
                {
-                  colorStep = Integer.parseInt(XMLUtil.getTextContent(n));
+                  colorStep = Integer.parseInt(n.getTextContent());
                }
                else if ("providers".equals(name))
                {
@@ -269,6 +276,22 @@
       }
    }
 
+   private static String getAttributeValue(Node n, String attributeName)
+   {
+      if (!n.hasAttributes())
+      {
+         return null;
+      }
+      
+      Node attributeNode = n.getAttributes().getNamedItem(attributeName);
+      if (attributeNode == null)
+      {
+         return null;
+      }
+      
+      return attributeNode.getTextContent();
+   }
+
    private void addProvider(Node pn) throws Exception
    {
       NamedNodeMap attrs = pn.getAttributes();
@@ -285,7 +308,7 @@
          {
             Node n = nl.item(i);
             String name = n.getNodeName();
-            String value = XMLUtil.getTextContent(n);
+            String value = n.getTextContent();
             if ("factory".equals(name))
             {
                props.setProperty("java.naming.factory.initial", value);
@@ -306,6 +329,11 @@
             {
                addColor(provider, n);
             }
+            else if ("jndi-property".equals(name))
+            {
+               String propertyName = getAttributeValue(n, "name");
+               props.setProperty(propertyName, value);
+            }
             else if (name.startsWith("#"))
             {
                // ignore
@@ -331,7 +359,7 @@
 
    private void addColor(Provider provider, Node n) throws Exception
    {
-      String color = XMLUtil.getTextContent(n);
+      String color = n.getTextContent();
       StringTokenizer st = new StringTokenizer(color, ",; ");
 
       String reds = st.nextToken();
@@ -541,7 +569,7 @@
             String name = n.getNodeName();
             if ("provider".equals(name))
             {
-               providerName = XMLUtil.getTextContent(n);
+               providerName = n.getTextContent();
             }
          }
       }

Modified: projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/JobConfiguration.java
===================================================================
--- projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/JobConfiguration.java	2007-05-04 12:29:02 UTC (rev 2649)
+++ projects/perf/trunk/src/main/org/jboss/jms/perf/framework/configuration/JobConfiguration.java	2007-05-04 12:42:03 UTC (rev 2650)
@@ -7,7 +7,6 @@
 package org.jboss.jms.perf.framework.configuration;
 
 import org.w3c.dom.Node;
-import org.jboss.jms.util.XMLUtil;
 import org.jboss.jms.perf.framework.protocol.Job;
 
 import javax.jms.Session;
@@ -315,7 +314,7 @@
    public void add(Node n) throws Exception
    {
       String name = n.getNodeName();
-      String value = XMLUtil.getTextContent(n);
+      String value = n.getTextContent();
 
       if (value == null)
       {