Index: releases/bedework-3.7/build/buildfilters.xml
===================================================================
--- releases/bedework-3.7/build/buildfilters.xml (revision 3104)
+++ releases/bedework-3.7/build/buildfilters.xml (revision 3348)
@@ -121,4 +121,7 @@
       <filter token="RESTORE-CLASS"
               value="org.bedework.dumprestore.restore.Restore"/>
+
+    <filter token="KEYFILE-DIR"
+            value="${org.bedework.global.keyfile.dir}"/>
   </filterset>
 
Index: releases/bedework-3.7/config/bwbuild/default/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/default/cal.options.xml (revision 3346)
+++ releases/bedework-3.7/config/bwbuild/default/cal.options.xml (revision 3348)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
-        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
+        <privKeys>@KEYFILE-DIR@/privkeys</privKeys>
+        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/default/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/default/cal.properties (revision 3299)
+++ releases/bedework-3.7/config/bwbuild/default/cal.properties (revision 3348)
@@ -77,4 +77,11 @@
 # How would you like your wars sir? zipped or unzipped?
 org.bedework.global.wars.zipped=no
+
+#
+# ------------------------------------------------------------------------
+# Key files
+# ------------------------------------------------------------------------
+
+org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml (revision 3346)
+++ releases/bedework-3.7/config/bwbuild/jboss-h2/cal.options.xml (revision 3348)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
-        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
+        <privKeys>@KEYFILE-DIR@/privkeys</privKeys>
+        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties (revision 3234)
+++ releases/bedework-3.7/config/bwbuild/jboss-h2/cal.properties (revision 3348)
@@ -70,4 +70,11 @@
 # How would you like your wars sir? zipped or unzipped?
 org.bedework.global.wars.zipped=no
+
+#
+# ------------------------------------------------------------------------
+# Key files
+# ------------------------------------------------------------------------
+
+org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml (revision 3346)
+++ releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.options.xml (revision 3348)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
-        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
+        <privKeys>@KEYFILE-DIR@/privkeys</privKeys>
+        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.properties (revision 3308)
+++ releases/bedework-3.7/config/bwbuild/jboss-hsql/cal.properties (revision 3348)
@@ -76,4 +76,11 @@
 # How would you like your wars sir? zipped or unzipped?
 org.bedework.global.wars.zipped=no
+
+#
+# ------------------------------------------------------------------------
+# Key files
+# ------------------------------------------------------------------------
+
+org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml (revision 3346)
+++ releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.options.xml (revision 3348)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
-        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
+        <privKeys>@KEYFILE-DIR@/privkeys</privKeys>
+        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties (revision 3234)
+++ releases/bedework-3.7/config/bwbuild/jboss-mysql/cal.properties (revision 3348)
@@ -75,4 +75,11 @@
 # How would you like your wars sir? zipped or unzipped?
 org.bedework.global.wars.zipped=no
+
+#
+# ------------------------------------------------------------------------
+# Key files
+# ------------------------------------------------------------------------
+
+org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
 
 #
Index: releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3346)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.options.xml (revision 3348)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
-        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
+        <privKeys>@KEYFILE-DIR@/privkeys</privKeys>
+        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties (revision 3190)
+++ releases/bedework-3.7/config/bwbuild/jboss-postgresql/cal.properties (revision 3348)
@@ -76,4 +76,11 @@
 # How would you like your wars sir? zipped or unzipped?
 org.bedework.global.wars.zipped=no
+
+#
+# ------------------------------------------------------------------------
+# Key files
+# ------------------------------------------------------------------------
+
+org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
 
 #
Index: releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml
===================================================================
--- releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml (revision 3346)
+++ releases/bedework-3.7/config/bwbuild/oracle10g/cal.options.xml (revision 3348)
@@ -46,6 +46,6 @@
 
         <!-- Public/private key locations -->
-        <privKeys>${jboss.server.data.dir}/bedework/privkeys</privKeys>
-        <pubKeys>${jboss.server.data.dir}/bedework/pubkeys</pubKeys>
+        <privKeys>@KEYFILE-DIR@/privkeys</privKeys>
+        <pubKeys>@KEYFILE-DIR@/pubkeys</pubKeys>
 
         <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
Index: releases/bedework-3.7/config/bwbuild/oracle10g/cal.properties
===================================================================
--- releases/bedework-3.7/config/bwbuild/oracle10g/cal.properties (revision 3244)
+++ releases/bedework-3.7/config/bwbuild/oracle10g/cal.properties (revision 3348)
@@ -104,4 +104,11 @@
 #
 # ------------------------------------------------------------------------
+# Key files
+# ------------------------------------------------------------------------
+
+org.bedework.global.keyfile.dir=${jboss.server.data.dir}/bedework
+
+#
+# ------------------------------------------------------------------------
 # ------------------------------------------------------------------------
 #    bedework calendar default deployment definitions.
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 3346)
+++ releases/bedework-3.7/deployment/genkeys/shellscr/META-INF/jboss-service.xml (revision 3348)
@@ -9,8 +9,8 @@
          name="org.bedework:service=GenKeys">
     <attribute name="PrivKeyFileName"
-          >${jboss.server.data.dir}/bedework/privkeys</attribute>
+          >@KEYFILE-DIR@/privkeys</attribute>
 
     <attribute name="PublicKeyFileName"
-          >${jboss.server.data.dir}/bedework/pubkeys</attribute>
+          >@KEYFILE-DIR@/bedework/pubkeys</attribute>
 
   </mbean>