Changeset 3348

Show
Ignore:
Timestamp:
09/13/11 22:29:50
Author:
douglm
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • releases/bedework-3.7/build/buildfilters.xml

    r3104 r3348  
    121121      <filter token="RESTORE-CLASS" 
    122122              value="org.bedework.dumprestore.restore.Restore"/> 
     123 
     124    <filter token="KEYFILE-DIR" 
     125            value="${org.bedework.global.keyfile.dir}"/> 
    123126  </filterset> 
    124127 
  • releases/bedework-3.7/config/bwbuild/default/cal.options.xml

    r3346 r3348  
    4646 
    4747        <!-- Public/private key locations --> 
    48         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    49         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     48        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     49        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5050 
    5151        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
  • releases/bedework-3.7/config/bwbuild/default/cal.properties

    r3299 r3348  
    7777# How would you like your wars sir? zipped or unzipped? 
    7878org.bedework.global.wars.zipped=no 
     79 
     80# 
     81# ------------------------------------------------------------------------ 
     82# Key files 
     83# ------------------------------------------------------------------------ 
     84 
     85org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
    7986 
    8087# 
  • releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml

    r3346 r3348  
    4646 
    4747        <!-- Public/private key locations --> 
    48         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    49         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     48        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     49        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5050 
    5151        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
  • releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties

    r3234 r3348  
    7070# How would you like your wars sir? zipped or unzipped? 
    7171org.bedework.global.wars.zipped=no 
     72 
     73# 
     74# ------------------------------------------------------------------------ 
     75# Key files 
     76# ------------------------------------------------------------------------ 
     77 
     78org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
    7279 
    7380# 
  • releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml

    r3346 r3348  
    4646 
    4747        <!-- Public/private key locations --> 
    48         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    49         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     48        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     49        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5050 
    5151        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
  • releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.properties

    r3308 r3348  
    7676# How would you like your wars sir? zipped or unzipped? 
    7777org.bedework.global.wars.zipped=no 
     78 
     79# 
     80# ------------------------------------------------------------------------ 
     81# Key files 
     82# ------------------------------------------------------------------------ 
     83 
     84org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
    7885 
    7986# 
  • releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml

    r3346 r3348  
    4646 
    4747        <!-- Public/private key locations --> 
    48         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    49         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     48        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     49        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5050 
    5151        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
  • releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties

    r3234 r3348  
    7575# How would you like your wars sir? zipped or unzipped? 
    7676org.bedework.global.wars.zipped=no 
     77 
     78# 
     79# ------------------------------------------------------------------------ 
     80# Key files 
     81# ------------------------------------------------------------------------ 
     82 
     83org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
    7784 
    7885# 
  • releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml

    r3346 r3348  
    4646 
    4747        <!-- Public/private key locations --> 
    48         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    49         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     48        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     49        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5050 
    5151        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
  • releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties

    r3190 r3348  
    7676# How would you like your wars sir? zipped or unzipped? 
    7777org.bedework.global.wars.zipped=no 
     78 
     79# 
     80# ------------------------------------------------------------------------ 
     81# Key files 
     82# ------------------------------------------------------------------------ 
     83 
     84org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
    7885 
    7986# 
  • releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml

    r3346 r3348  
    4646 
    4747        <!-- Public/private key locations --> 
    48         <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys> 
    49         <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys> 
     48        <privKeys>@KEYFILE-DIR@/privkeys</privKeys> 
     49        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys> 
    5050 
    5151        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" > 
  • releases/bedework-3.7/config/bwbuild/oracle10g/cal.properties

    r3244 r3348  
    104104# 
    105105# ------------------------------------------------------------------------ 
     106# Key files 
     107# ------------------------------------------------------------------------ 
     108 
     109org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework 
     110 
     111# 
     112# ------------------------------------------------------------------------ 
    106113# ------------------------------------------------------------------------ 
    107114#    bedework calendar default deployment definitions. 
  • releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml

    r3346 r3348  
    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@/bedework/pubkeys</attribute> 
    1515 
    1616  </mbean>