Changeset 3032

Timestamp:

10/26/10 15:30:53

Author:

douglm

Message:

Move en/decryption classes into rpiutil.

Change configs to match

Files:

• trunk/config/bwbuild/default/cal.options.xml (modified) (3 diffs)
• trunk/config/bwbuild/jboss-mysql/cal.options.xml (modified) (3 diffs)
• trunk/config/bwbuild/jboss-postgresql/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-postgresql/cal.options.xml (modified) (3 diffs)
• trunk/config/bwbuild/jboss-postgresql/exsynch.options.xml (deleted)

trunk/config/bwbuild/default/cal.options.xml

@@ -40 +40 @@
-        <!-- Timezone server locations -->
-        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
+
+        <!-- Public/private key locations -->
+        <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
+        <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
-        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
@@ -117 +121 @@
-            <disabled>false</disabled>
-          </dummymail>
-
-          <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
-            <debug>true</debug>
-            <verbose>true</verbose>
-          </default-pwencrypt>
-        </module>
-      </global>
@@ -589 +585 @@
-          <debugEntity>false</debugEntity>
-        </iosched>
+
+        <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
+          <appType>exsynch</appType>
+
+          <!-- location of the WSDL - modified to include server element -->
+          <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+
+          <!-- Exchange sync callback. Comment out for no service -->
+          <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI>
+
+          <!-- Path to keystore - comment out to use default -->          
+          <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
+        </Exsynch>
-      </app>
-    </bedework>

trunk/config/bwbuild/jboss-mysql/cal.options.xml

@@ -40 +40 @@
-        <!-- Timezone server locations -->
-        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
+
+        <!-- Public/private key locations -->
+        <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
+        <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
-        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
@@ -117 +121 @@
-            <disabled>false</disabled>
-          </dummymail>
-
-          <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
-            <debug>true</debug>
-            <verbose>true</verbose>
-          </default-pwencrypt>
-        </module>
-      </global>
@@ -589 +585 @@
-          <debugEntity>false</debugEntity>
-        </iosched>
+
+        <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
+          <appType>exsynch</appType>
+
+          <!-- location of the WSDL - modified to include server element -->
+          <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+
+          <!-- Exchange sync callback. Comment out for no service -->
+          <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI>
+
+          <!-- Path to keystore - comment out to use default -->          
+          <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
+        </Exsynch>
-      </app>
-    </bedework>

trunk/config/bwbuild/jboss-postgresql/build.properties

@@ -25 +25 @@
-org.bedework.carddav.options=${env.BEDEWORK_CONFIG}/carddav.options.xml
-
-
+#
-
-# Enable/disable replacement of log4j config during deployment

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

@@ -40 +40 @@
-        <!-- Timezone server locations -->
-        <timezonesUri>http://localhost:8080/tzsvr</timezonesUri>
+
+        <!-- Public/private key locations -->
+        <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
+        <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
-        <systemRoots classname="org.bedework.calfacade.configs.SystemRoots" >
@@ -117 +121 @@
-            <disabled>false</disabled>
-          </dummymail>
-
-          <default-pwencrypt classname="org.bedework.calfacade.security.DefaultPwEncryptionConfig">
-            <privKeys>@DATA_DIR@/data/bedework/privkeys</privKeys>
-            <pubKeys>@DATA_DIR@/data/bedework/pubkeys</pubKeys>
-
-            <debug>true</debug>
-            <verbose>true</verbose>
-          </default-pwencrypt>
-        </module>
-      </global>
@@ -589 +585 @@
-          <debugEntity>false</debugEntity>
-        </iosched>
+
+        <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
+          <appType>exsynch</appType>
+
+          <!-- location of the WSDL - modified to include server element -->
+          <exchangeWSDLURI>http://localhost:8080/exchange/Services.wsdl</exchangeWSDLURI>
+
+          <!-- Exchange sync callback. Comment out for no service -->
+          <exchangeWsPushURI>http://128.113.124.221/exsynch/</exchangeWsPushURI>
+
+          <!-- Path to keystore - comment out to use default -->          
+          <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
+        </Exsynch>
-      </app>
-    </bedework>