[Bedework-commit] bedework r3185 - in releases/bedework-3.6: config/bwbuild/jboss config/bwbuild/jboss-h2 config/bwbuild/jboss-mysql config/bwbuild/jboss-postgresql config/bwbuild/liferay5 config/bwbuild/mysql config/bwbuild/oracle10g deployment/genkeys/shellscr/META-INF

svnadmin at bedework.org svnadmin at bedework.org
Fri Feb 18 10:16:24 EST 2011


Author: douglm
Date: 2011-02-18 10:16:23 -0500 (Fri, 18 Feb 2011)
New Revision: 3185

Modified:
   releases/bedework-3.6/config/bwbuild/jboss-h2/cal.options.xml
   releases/bedework-3.6/config/bwbuild/jboss-mysql/cal.options.xml
   releases/bedework-3.6/config/bwbuild/jboss-postgresql/cal.options.xml
   releases/bedework-3.6/config/bwbuild/jboss/cal.options.xml
   releases/bedework-3.6/config/bwbuild/liferay5/cal.options.xml
   releases/bedework-3.6/config/bwbuild/mysql/cal.options.xml
   releases/bedework-3.6/config/bwbuild/oracle10g/cal.options.xml
   releases/bedework-3.6/deployment/genkeys/shellscr/META-INF/jboss-service.xml
Log:
Fix privkeys/pubkeys locations.

Modified: releases/bedework-3.6/config/bwbuild/jboss/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/jboss/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/jboss/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -100,8 +100,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/config/bwbuild/jboss-h2/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/jboss-h2/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/jboss-h2/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -100,8 +100,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/config/bwbuild/jboss-mysql/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/jboss-mysql/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/jboss-mysql/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -100,8 +100,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/jboss-postgresql/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/jboss-postgresql/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -118,8 +118,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/config/bwbuild/liferay5/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/liferay5/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/liferay5/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -100,8 +100,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@QUICKSTART_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/config/bwbuild/mysql/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/mysql/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/mysql/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -100,8 +100,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@QUICKSTART_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/config/bwbuild/oracle10g/cal.options.xml
===================================================================
--- releases/bedework-3.6/config/bwbuild/oracle10g/cal.options.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/config/bwbuild/oracle10g/cal.options.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -100,8 +100,8 @@
           </dummymail>
 
           <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@QUICKSTART_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@QUICKSTART_DIR@/data/bedework/pubkeys</pubKeys>
+            <privKeys>@DATA_DIR@/privkeys</privKeys>
+            <pubKeys>@DATA_DIR@/pubkeys</pubKeys>
 
             <debug>true</debug>
             <verbose>true</verbose>

Modified: releases/bedework-3.6/deployment/genkeys/shellscr/META-INF/jboss-service.xml
===================================================================
--- releases/bedework-3.6/deployment/genkeys/shellscr/META-INF/jboss-service.xml	2011-02-17 13:22:36 UTC (rev 3184)
+++ releases/bedework-3.6/deployment/genkeys/shellscr/META-INF/jboss-service.xml	2011-02-18 15:16:23 UTC (rev 3185)
@@ -8,10 +8,10 @@
   <mbean code="org.bedework.calfacade.security.GenKeys"
          name="org.bedework:service=GenKeys">
     <attribute name="PrivKeyFileName"
-          >${jboss.server.data.dir}/bedework/privkeys</attribute>
+          >@DATA_DIR@/privkeys</attribute>
 
     <attribute name="PublicKeyFileName"
-          >${jboss.server.data.dir}/bedework/pubkeys</attribute>
+          >@DATA_DIR@/pubkeys</attribute>
 
   </mbean>
 </server>



More information about the Bedework-commit mailing list