Index: releases/bedework-3.7/config/bwbuild/default/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/default/cal.options.xml (revision 3299)
+++ releases/bedework-3.7/config/bwbuild/default/cal.options.xml (revision 3346)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>@DATA_DIR@/privkeys</privKeys>
-        <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
+        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml (revision 3240)
+++ releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml (revision 3346)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>@DATA_DIR@/privkeys</privKeys>
-        <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
+        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml (revision 3308)
+++ releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml (revision 3346)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>@DATA_DIR@/privkeys</privKeys>
-        <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
+        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml (revision 3240)
+++ releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml (revision 3346)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>@DATA_DIR@/privkeys</privKeys>
-        <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
+        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3240)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3346)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>@DATA_DIR@/privkeys</privKeys>
-        <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
+        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml (revision 3240)
+++ releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml (revision 3346)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>@DATA_DIR@/privkeys</privKeys>
-        <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
+        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
+        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml
===================================================================
--- releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml (revision 3186)
+++ releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml (revision 3346)
@@ -9,8 +9,8 @@
          name="org.bedework:service=GenKeys">
     <attribute name="PrivKeyFileName"
-          >@DATA_DIR@/privkeys</attribute>
+          >${jboss.server.data.dir}/bedework/privkeys</attribute>
 
     <attribute name="PublicKeyFileName"
-          >@DATA_DIR@/pubkeys</attribute>
+          >${jboss.server.data.dir}/bedework/pubkeys</attribute>
 
   </mbean>