Changeset 3307

Timestamp:

08/11/11 13:58:57

Author:

douglm

Message:

Change the bedework end of things to use an extension of CalWs? for synch.

Schema changes related to that.

Another commit of the unfinished new synch service

Files:

• trunk/build/quickstart/linux/bw (modified) (4 diffs)
• trunk/config/bwbuild/jboss-postgresql/bedework-synch-ds.xml (added)
• trunk/config/bwbuild/jboss-postgresql/cal.options.xml (modified) (3 diffs)
• trunk/config/bwbuild/jboss-postgresql/cal.properties (modified) (4 diffs)
• trunk/config/bwbuild/jboss-postgresql/synch-config.xml (modified) (1 diff)
• trunk/deployment/bw-core-appjars.xml (modified) (1 diff)

trunk/build/quickstart/linux/bw

@@ -85 +85 @@
-  echo "     -catsvr      Target is for the Catsvr build"
-  echo "     -client      Target is for the bedework client application build"
-exsynch     Target is for the Exchang
+synch       Target is for th
-  echo "     -naming      Target is for the abstract naming api"
-  echo "     The default is a calendar build"
@@ -262 +262 @@
-catsvr=
-client=
-ex
+
-monitor=
-naming=
@@ -399 +399 @@
-      shift
-      ;;
-ex
-ex
+
+
-      pkgdefault=
-      shift
@@ -498 +498 @@
-fi
-
-ex
-exchg
+
+
-fi
-

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

@@ -797 +797 @@
-          <webcalServiceURI>/webcal</webcalServiceURI>
-
-exchange 
+
-               service called by the synch engine to get information out of
-               bedework and to update events and status.
@@ -806 +806 @@
-               Comment out or delete for no exchange synch service 
-               
-t
+
-               -->
-exsynchWsURI>@exsynchWsURI@</ex
+synchWsURI>@synchWsURI@</
-        </Pubcaldav>
-
@@ -916 +916 @@
-          <debugEntity>false</debugEntity>
-        </iosched>
-
-        <!-- ==================================================================
-                          Exchange synch
-             ================================================================== -->
-        <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
-          <appType>exsynch</appType>
-
-          <!-- location of the WSDL - modified to include server element 
-               This corresponds to the wsdl deploy location defined in the
-               build properties file.
-          -->
-          <exchangeWSDLURI>http://localhost:8080/wsdls/exchange/Services.wsdl</exchangeWSDLURI>
-
-          <!-- location of the WSDL for the remote web service 
-               This corresponds to the wsdl deploy location defined in the
-               build properties file.
-          -->
-          <remoteWSDLURI>http://localhost:8080/wsdls/exsynch/wssvc.wsdl</remoteWSDLURI>
-
-          <!-- Exchange sync callback. Comment out for no service -->
-          <exchangeWsPushURI>http://128.113.124.225:8080/exsynch/</exchangeWsPushURI>
-
-          <!-- Path to keystore - comment out to use default -->          
-          <keystore>@APPSERVER-DATA-DIR@/exsynchcerts</keystore>
-          
-          <remoteWsURL>http://localhost:8080/pubcaldav/exsynchws/</remoteWsURL>
-          
-          <!-- seconds  --> 
-          <remoteKeepAliveInterval>60</remoteKeepAliveInterval>
-        </Exsynch>
-
-        <!-- ===============================================================

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

@@ -74 +74 @@
-org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS
-org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS
-exsynch.datasource.jndiname=/Exs
+synch.datasource.jndiname=/S
-org.bedework.global.jboss.tzdb.datasource.jndiname=/TzDS
-
@@ -179 +179 @@
-org.bedework.global.copy.bedeworktzds.config=yes
-#
-exchange 
-ex
+
+
-
-# If set to true or yes will build the web (CASifiable) version of carddav also 
@@ -209 +209 @@
-org.bedework.exchange.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/exchange
-
-Exchange 
-exsynch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/ex
-Exchange 
-exsynch.uri=/ex
-exsynch.service=http://localhost:8080/pubcaldav${org.bedework.ex
+
+synch.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/
+
+synch.uri=/
+synch.service=http://localhost:8080/pubcaldav${org.bedework.
-
-org.bedework.calws.wsdl.deploy.dir=${org.bedework.wsdl.deploy.dir}/calws-soap
@@ -752 +752 @@
-# --------------------------------------------------------------------
-#
-Exchange synchronization Service - callback web server
-
-exsynchwcb.project=ex
-ex
-
-ex
-exsynchwcb.war.name=ex
-exsynchwcb.context.root=/ex
+Synchronization Service - callback web server.
+
+synchwcb.project=
+
+
+
+synchwcb.war.name=
+synchwcb.context.root=/
-# Set for jboss
-#org.bedework.app.usercarddav.virtual.host=events.rpi.edu
-
-exsynchwcb.description=Bedework ex
-exsynchwcb.display.name=Bedework ex
-exsynchwcb.name=Demoex
-ex
-exsynchwcb.wsdl,deploy.dir=/wsdl/ex
-exsynchwcb.logprefix=ex
-
-
+synchwcb.description=Bedework 
+synchwcb.display.name=Bedework 
+synchwcb.name=Demo
+
+synchwcb.wsdl,deploy.dir=/wsdl/
+synchwcb.logprefix=
+
+

trunk/config/bwbuild/jboss-postgresql/synch-config.xml

@@ -4 +4 @@
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-                http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
+
+  <!-- =====================================================================
+       Synch engine configuration
+       ===================================================================== -->
+  <bean id="synchConfig" 
+        class="org.bedework.synch.SynchConfig">
+    <!-- callback. Comment out for no service. MUST end in "/" -->
+    <property name="callbackURI"
+              value="http://128.113.124.225:8080/synch/" />
+              
+    <!-- Path to keystore - comment out to use default -->          
+    <property name="keystore"
+              value="@APPSERVER-DATA-DIR@/synchcerts" />
+              
+    <property name="connectors">
+      <map>
+        <entry key="exdemo" 
+               value="org.bedework.synch.cnctrs.exchange.ExchangeConnector" />
+        <entry key="bwdemo" 
+               value="org.bedework.synch.cnctrs.bedework.BedeworkConnector" />
+      </map>
+    </property>
+  </bean>
+
-  <!-- The connector "exdemo" will load the following config - 
-       the suffix "ExchangeConfig" is appended to the connector id -->

trunk/deployment/bw-core-appjars.xml

@@ -31 +31 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-ex
+
-              projecthome="${bw.project.home}/../bwxml" />
-