Changeset 3262

Timestamp:

05/05/11 15:52:44

Author:

douglm

Message:

Bring default (hsql) schema up to date with postgres

Files:

• trunk/config/bwbuild/default/cal.options.xml (modified) (3 diffs)
• trunk/config/bwbuild/default/cal.properties (modified) (2 diffs)

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

@@ -757 +757 @@
-          <!-- Comment out or delete for no web calendar service -->
-          <webcalServiceURI>/webcal</webcalServiceURI>
+
+          <!-- SOAP web service 
+               This corresponds to the full uri in the properties file.
+               Defined as a global deployment property
+               
+               NOTE: tthe value below is defined in the build properties 
+                -->
+          <calSoapWsURI>@calSoapWsURI@</calSoapWsURI>
+          
+          <!-- This corresponds to the deployment path in the properties file.
+               Defined as a global deployment property  -->
+          <calSoapWsWSDLURI>http://localhost:8080/wsdls/calws-soap/wssvc.wsdl</calSoapWsWSDLURI>
-        </Usercaldav>
-
@@ -784 +796 @@
-          <!-- Comment out or delete for no web calendar service -->
-          <webcalServiceURI>/webcal</webcalServiceURI>
+
+          <!-- The bedework end of the exchange synch service. This is a web
+               service called by the synch engine to get information out of
+               bedework and to update events and status.
+               
+               This path should probably be restricted to a given host only.
+               
+               Coming up on a separate port might help to lock it down.
+               Comment out or delete for no exchange synch service 
+               
+               NOTE: tthe value below is defined in the build properties 
+               -->
+          <exsynchWsURI>@exsynchWsURI@</exsynchWsURI>
-        </Pubcaldav>
-
@@ -898 +923 @@
-          <appType>exsynch</appType>
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-          <!-- Exchange sync callback. Comment out for no service -->
-1
+5:8080
-
-          <!-- Path to keystore - comment out to use default -->          
-          <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
-
-          <!-- location of the WSDL for the remote web service -->
-          <remoteWSDLURI>http://localhost:8080/exchange/wssvc.wsdl</remoteWSDLURI>
-          
-          <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL>

trunk/config/bwbuild/default/cal.properties

@@ -189 +189 @@
-org.bedework.global.copy.activemq.config=yes
-
+# ------------------------------------------------------------------------
+# Deployment locations for the wsdls and associated files.
+# For each related service there is a run time URL to allow client services 
+# to access these deployed wsdls.
+#
+# In addition we define the location of the associated service which has to be
+# embedded in the wsdl.
+# ------------------------------------------------------------------------
+
+# All wsdls are under this directory
+org.bedework.wsdl.deploy.dir=${org.bedework.appserver.dir}/${org.bedework.server.resource.root.dir}/wsdls
+
+# The exchange web service - needed for exchnage synch service
+org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange
+
+# Exchange synch - wsdl
+org.bedework.exsynch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exsynch
+# Exchange synch - service
+org.bedework.exsynch.uri=/exsynchws/
+org.bedework.exsynch.service=http://localhost:8080/pubcaldav${org.bedework.exsynch.uri}
+
+org.bedework.calws.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/calws-soap
+org.bedework.calws-soap.uri=/calws-soap/
+org.bedework.calws-soap.service=http://localhost:8080/ucaldav${org.bedework.calws-soap.uri}
+
+org.bedework.exchange.ws.url=https://exchange.mysite.edu/EWS/Exchange.asmx
+
-#
-# ------------------------------------------------------------------------
@@ -711 +738 @@
-org.bedework.app.exsynchwcb.name=Demoexsynchw
-#org.bedework.app.exsynchwcb.deploy.dir=${org.bedework.appserver.deploy.dir}
-exchange
+wsdl/exsynch
-org.bedework.app.exsynchwcb.logprefix=exsynch
-