[jboss-cvs] JBossAS SVN: r59807 - in trunk/connector/src: resources/ha-local-rar/META-INF and 2 other directories.

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

Author: weston.price at jboss.com
Date: 2007-01-19 02:22:03 -0500 (Fri, 19 Jan 2007)
New Revision: 59807

Modified:
   trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/HAXAManagedConnectionFactory.java
   trunk/connector/src/resources/ha-local-rar/META-INF/ra.xml
   trunk/connector/src/resources/ha-xa-rar/META-INF/ra.xml
   trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
Log:
[JBAS-3828] Fixed typo in HA datasource.  

Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/HAXAManagedConnectionFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/HAXAManagedConnectionFactory.java	2007-01-19 05:31:55 UTC (rev 59806)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/xa/HAXAManagedConnectionFactory.java	2007-01-19 07:22:03 UTC (rev 59807)
@@ -48,7 +48,7 @@
    private static final long serialVersionUID = 1898242235188801452L;
 
    private String urlProperty;
-   private String urlDelimeter;
+   private String urlDelimiter;
    private XADataSelector xadsSelector;
 
    public String getURLProperty()
@@ -62,14 +62,14 @@
       initSelector();
    }
 
-   public String getURLDelimeter()
+   public String getURLDelimiter()
    {
-      return urlDelimeter;
+      return urlDelimiter;
    }
 
-   public void setURLDelimeter(String urlDelimeter) throws ResourceException
+   public void setURLDelimiter(String urlDelimiter) throws ResourceException
    {
-      this.urlDelimeter = urlDelimeter;
+      this.urlDelimiter = urlDelimiter;
       initSelector();
    }
 
@@ -92,7 +92,7 @@
             buffer.append(" No url property.");
          else if (xaProps.containsKey(urlProperty) == false)
             buffer.append(" ").append(urlProperty).append(" not found in datasource properties.");
-         if (urlDelimeter == null)
+         if (urlDelimiter == null)
             buffer.append(" No url-delimiter.");
          throw new JBossResourceException(buffer.toString());
       }
@@ -211,7 +211,7 @@
       if(urlProperty != null && urlProperty.length() > 0)
       {
          String urlsStr = xaProps.getProperty(urlProperty);
-         if(urlsStr != null && urlsStr.trim().length() > 0 && urlDelimeter != null && urlDelimeter.trim().length() > 0)
+         if(urlsStr != null && urlsStr.trim().length() > 0 && urlDelimiter != null && urlDelimiter.trim().length() > 0)
          {
             List xaDataList = new ArrayList();
 
@@ -226,7 +226,7 @@
             }
 
             int urlStart = 0;
-            int urlEnd = urlsStr.indexOf(urlDelimeter);
+            int urlEnd = urlsStr.indexOf(urlDelimiter);
             while(urlEnd > 0)
             {
                String url = urlsStr.substring(urlStart, urlEnd);
@@ -234,7 +234,7 @@
                XADataSource xads = createXaDataSource(xaPropsCopy);
                xaDataList.add(new XAData(xads, url));
                urlStart = ++urlEnd;
-               urlEnd = urlsStr.indexOf(urlDelimeter, urlEnd);
+               urlEnd = urlsStr.indexOf(urlDelimiter, urlEnd);
                log.debug("added XA HA connection url: " + url);
             }
 

Modified: trunk/connector/src/resources/ha-local-rar/META-INF/ra.xml
===================================================================
--- trunk/connector/src/resources/ha-local-rar/META-INF/ra.xml	2007-01-19 05:31:55 UTC (rev 59806)
+++ trunk/connector/src/resources/ha-local-rar/META-INF/ra.xml	2007-01-19 07:22:03 UTC (rev 59807)
@@ -58,7 +58,7 @@
             </config-property>
             <config-property>
                <description>The jdbc connection url delimeter class.</description>
-               <config-property-name>URLDelimeter</config-property-name>
+               <config-property-name>URLDelimiter</config-property-name>
                <config-property-type>java.lang.String</config-property-type>
             </config-property>
             <config-property>

Modified: trunk/connector/src/resources/ha-xa-rar/META-INF/ra.xml
===================================================================
--- trunk/connector/src/resources/ha-xa-rar/META-INF/ra.xml	2007-01-19 05:31:55 UTC (rev 59806)
+++ trunk/connector/src/resources/ha-xa-rar/META-INF/ra.xml	2007-01-19 07:22:03 UTC (rev 59807)
@@ -113,7 +113,7 @@
             </config-property>
             <config-property>
                <description>URL delimeter</description>
-               <config-property-name>URLDelimeter</config-property-name>
+               <config-property-name>URLDelimiter</config-property-name>
                <config-property-type>java.lang.String</config-property-type>
             </config-property>
             <config-property>

Modified: trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
===================================================================
--- trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	2007-01-19 05:31:55 UTC (rev 59806)
+++ trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	2007-01-19 07:22:03 UTC (rev 59807)
@@ -365,8 +365,8 @@
           <xsl:if test="query-timeout">
             <config-property name="QueryTimeout" type="int"><xsl:value-of select="normalize-space(query-timeout)"/></config-property>
           </xsl:if>
-          <xsl:if test="url-delimeter">
-            <config-property name="URLDelimeter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimeter)"/></config-property>
+          <xsl:if test="url-delimiter">
+            <config-property name="URLDelimiter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimiter)"/></config-property>
           </xsl:if>
           <!-- new matching/background validation-->
           <xsl:choose>