Changeset 2941

Show
Ignore:
Timestamp:
06/30/10 23:29:42
Author:
douglm
Message:

Modify carddav datasource so that it doesn't duplicate the derby mbean

Move the derby and h2 dialects out of calendarapi and into rpiutil where they can be used by carddav

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/config/bwbuild/jboss/bedework-card-ds.xml

    r2938 r2941  
    2020    <connection-url>jdbc:derby://localhost:1527/${jboss.server.data.dir}/bedework/derby/CardDb3p6;create=true</connection-url> 
    2121 
     22    <!-- If bedework calendar is deployed the DerbyDb mbean may be defined there  
     23      The definition is commented out below. 
     24    --> 
    2225    <depends>org.bedework:service=DerbyDb</depends> 
    23  
     26     
    2427    <user-name>sa</user-name> 
    2528    <password>bw</password> 
    …… 
    3538  </local-tx-datasource> 
    3639 
    37   <!-- mbean for server mode --> 
     40  <!-- mbean for server mode  
    3841  <mbean code="edu.rpi.cmt.jboss.jdbc.DerbyDb"  
    3942         name="org.bedework:service=DerbyDb"> 
    40     <!-- Should be done like this 
     43    < ! - - Should be done like this 
    4144    <attribute name="Port">         
    4245      <value-factory bean="ServiceBindingManager" method="getIntBinding"  
    4346           parameter="jboss:service=Hypersonic"/> 
    4447    </attribute> 
    45     --> 
     48    - - > 
    4649    <attribute name="Port">1527</attribute> 
    47     <!-- 
     50    < ! - - 
    4851    <attribute name="BindAddress">         
    4952        <value-factory bean="ServiceBindingManager" method="getStringBinding"  
    5053           parameter="jboss:service=Hypersonic"/> 
    5154    </attribute>      
    52     --> 
     55    - - > 
    5356    <attribute name="Account">sa</attribute> 
    5457    <attribute name="Pw">bw</attribute> 
    5558  </mbean> 
     59  --> 
    5660</datasources> 
    5761 

  • trunk/config/bwbuild/jboss/cal.properties

    r2938 r2941  
    3131# 
    3232#org.bedework.global.hibernate.dialect=org.hibernate.dialect.DerbyDialect 
    33 org.bedework.global.hibernate.dialect=org.bedework.calcore.DerbyDialect 
     33org.bedework.global.hibernate.dialect=edu.rpi.cmt.jboss.jdbc.DerbyDialect 
    3434 
    3535# DB Datasource for jboss services