Changeset 3350

Show
Ignore:
Timestamp:
09/13/11 23:11:45
Author:
douglm
Message:

Fix setting of key files

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r3331 r3350  
    114114            value="${propval.app.schema.delimiter}" /> 
    115115 
     116    <filter token="KEYFILE-DIR" 
     117            value="${org.bedework.global.keyfile.dir}"/> 
     118 
    116119    <filter token="calSoapWsURI" 
    117120            value="${org.bedework.calws-soap.uri}" /> 

  • trunk/config/bwbuild/.defaults/cal.options.xml

    r3345 r3350  
    4949 
    5050        <!-- Public/private key locations --> 
    51         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    52         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     51        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     52        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5353 
    5454        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 

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

    r3344 r3350  
    101101# 
    102102# ------------------------------------------------------------------------ 
     103# Key files 
     104# ------------------------------------------------------------------------ 
     105 
     106org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
     107 
     108# 
     109# ------------------------------------------------------------------------ 
    103110# ------------------------------------------------------------------------ 
    104111#    bedework calendar default deployment definitions. 

  • trunk/config/bwbuild/jboss-postgresql-devel/cal.options.xml

    r3343 r3350  
    4949 
    5050        <!-- Public/private key locations --> 
    51         <privKeys>@DATA_DIR@/privkeys</privKeys> 
    52         <pubKeys>@DATA_DIR@/pubkeys</pubKeys> 
     51        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     52        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5353 
    5454        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 

  • trunk/deployment/genkeys/shellscr/META-INF/jboss-service.xml

    r3345 r3350  
    99         name="org.bedework:service=GenKeys"> 
    1010    <attribute name="PrivKeyFileName" 
    11           >${jboss.server.data.dir}/bedework/privkeys</attribute> 
     11          >@KEYFILE-DIR@/privkeys</attribute> 
    1212 
    1313    <attribute name="PublicKeyFileName" 
    14           >${jboss.server.data.dir}/bedework/pubkeys</attribute> 
     14          >@KEYFILE-DIR@/pubkeys</attribute> 
    1515 
    1616  </mbean>