[jboss-cvs] jbosscx/src/resources/stylesheets jboss-ds_1_0.dtd DataSourceTemplate.xsl

[Igor F. <ig...@us...>]

  User: igorfie 
  Date: 02/08/29 13:06:53

  Modified:    src/resources/stylesheets jboss-ds_1_0.dtd
                        DataSourceTemplate.xsl
  Log:
  Fixed deployment of jdbc xa datasources
  
  Revision  Changes    Path
  1.3       +7 -1      jbosscx/src/resources/stylesheets/jboss-ds_1_0.dtd
  
  Index: jboss-ds_1_0.dtd
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/jboss-ds_1_0.dtd,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- jboss-ds_1_0.dtd	19 Aug 2002 15:21:57 -0000	1.2
  +++ jboss-ds_1_0.dtd	29 Aug 2002 20:06:52 -0000	1.3
  @@ -33,13 +33,19 @@
   <!ELEMENT idle-timeout-minutes (#PCDATA)>
   
   
  -<!ELEMENT xa-datasource (jndi-name, database-url, xa-datasource-class, xa-datasource-property*, transaction-isolation? (application-managed-security | security-domain)?, min-pool-size?, max-pool-size?, blocking-timeout-millis?, idle-timeout-minutes?)>
  +<!ELEMENT xa-datasource (jndi-name, database-url, xa-datasource-class,
  +              managedconnectionfactory-class?,
  +              xa-datasource-property*, transaction-isolation?,
  +              (application-managed-security | security-domain)?,
  +              min-pool-size?, max-pool-size?, blocking-timeout-millis?, idle-timeout-minutes?)>
   
   <!ELEMENT database-url (#PCDATA)>
   
   <!ELEMENT xa-datasource-class (#PCDATA)>
   
   <!ELEMENT xa-datasource-property (#PCDATA)>
  +
  +<!ELEMENT managedconnectionfactory-class (#PCDATA)>
   
   <!ATTLIST xa-datasource-property
                 name CDATA #REQUIRED>
  
  
  
  1.5       +19 -6     jbosscx/src/resources/stylesheets/DataSourceTemplate.xsl
  
  Index: DataSourceTemplate.xsl
  ===================================================================
  RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/DataSourceTemplate.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DataSourceTemplate.xsl	22 Aug 2002 23:03:58 -0000	1.4
  +++ DataSourceTemplate.xsl	29 Aug 2002 20:06:52 -0000	1.5
  @@ -218,17 +218,29 @@
   
     <xsl:template match="xa-datasource">
   
  -    <mbean code="org.jboss.resource.connectionmanager.XATxConnectionManager" name="jboss.jca:service=XATxCM,name={jndi-name}">
  -
  +    <mbean code="org.jboss.resource.connectionmanager.XATxConnectionManager" 
  +          name="jboss.jca:service=XATxCM,name={jndi-name}">
         <xsl:apply-templates select="depends" mode="anonymous"/>
   
         <attribute name="JndiName"><xsl:value-of select="jndi-name"/></attribute>
   
         <depends optional-attribute-name="ManagedConnectionFactoryName">
           <!--embedded mbean-->
  -        <mbean code="org.jboss.resource.connectionmanager.RARDeployment" name="jboss.jca:service=XATxDS,name={jndi-name}">
  -          <!--hack-->
  -          <depends optional-attribute-name="OldRarDeployment">jboss.jca:service=RARDeployment,name=JBoss JDBC XATransaction ResourceAdapter</depends>
  +        <mbean code="org.jboss.resource.connectionmanager.RARDeployment"
  +              name="jboss.jca:service=XATxDS,name={jndi-name}">
  +
  +          <!-- not sure if following two are needed -->
  +          <attribute name="DisplayName" value="JBoss {jndi-name} JDBC XATransaction ResourceAdapter"/>
  +          <attribute name="ReauthenticationSupport">false</attribute>
  +
  +          <attribute name="ManagedConnectionFactoryClass">
  +            <xsl:choose>
  +              <xsl:when test="managedconnectionfactory-class">
  +                <xsl:value-of select="managedconnectionfactory-class"/>
  +              </xsl:when>
  +              <xsl:otherwise>org.jboss.resource.adapter.jdbc.xa.XAManagedConnectionFactory</xsl:otherwise>
  +            </xsl:choose>
  +          </attribute>
   
             <attribute name="ManagedConnectionFactoryProperties">
               <properties>
  @@ -249,7 +261,8 @@
         <depends optional-attribute-name="ManagedConnectionPool">
   
           <!--embedded mbean-->
  -        <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" name="jboss.jca:service=LocalTxPool,name={jndi-name}">
  +        <mbean code="org.jboss.resource.connectionmanager.JBossManagedConnectionPool" 
  +              name="jboss.jca:service=XATxPool,name={jndi-name}">
             <xsl:choose>
               <xsl:when test="min-pool-size">
                 <attribute name="MinSize"><xsl:value-of select="min-pool-size"/></attribute>