Changeset 3037

Timestamp:

11/08/10 23:45:37

Author:

douglm

Message:

Commit the start of the bedework end of the exchange synch process.

New wsimport task for caldav build.
XML schema files in resource directory.
New web service classes

Also make a start on easing process of changing version. Versions defined in build.properties files.

Files:

• trunk/config/bwbuild/default/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-h2/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-mysql/build.properties (modified) (1 diff)
• trunk/config/bwbuild/jboss-postgresql/bedework-exsynch-ds.xml (added)
• 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/cal.properties (modified) (2 diffs)
• trunk/deployment/publiccaldav/webapp/appjars.xml (modified) (1 diff)
• trunk/deployment/usercaldav/webapp/appjars.xml (modified) (1 diff)
• trunk/resources/exsynchwsdefs (added)
• trunk/resources/exsynchwsdefs/iCalendar-params.xsd (added)
• trunk/resources/exsynchwsdefs/iCalendar-props.xsd (added)
• trunk/resources/exsynchwsdefs/iCalendar-valtypes.xsd (added)
• trunk/resources/exsynchwsdefs/iCalendar.xsd (added)
• trunk/resources/exsynchwsdefs/wsmessages.xsd (added)
• trunk/resources/exsynchwsdefs/wssvc.wsdl (added)

trunk/config/bwbuild/default/build.properties

@@ -16 +16 @@
-compile.debug=yes
-
+# Version we are building and including
+org.bedework.version=3.6
+org.bedework.caldav.version=3.6
+org.bedework.webdav.version=3.6
+
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-org.bedework.config.home=${env.BEDEWORK_CONFIG}

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

@@ -16 +16 @@
-compile.debug=yes
-
+# Version we are building and including
+org.bedework.version=3.6
+org.bedework.caldav.version=3.6
+org.bedework.webdav.version=3.6
+
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-org.bedework.config.home=${env.BEDEWORK_CONFIG}

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

@@ -16 +16 @@
-compile.debug=yes
-
+# Version we are building and including
+org.bedework.version=3.6
+org.bedework.caldav.version=3.6
+org.bedework.webdav.version=3.6
+
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-org.bedework.config.home=${env.BEDEWORK_CONFIG}

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

@@ -16 +16 @@
-compile.debug=yes
-
+# Version we are building and including
+org.bedework.version=3.6
+org.bedework.caldav.version=3.6
+org.bedework.webdav.version=3.6
+
-org.bedework.configurations.home=${env.BEDEWORK_CONFIGS_HOME}
-org.bedework.config.home=${env.BEDEWORK_CONFIG}

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

@@ -478 +478 @@
-          <!-- Comment out or delete for no web calendar service -->
-          <webcalServiceURI>/webcal</webcalServiceURI>
+
+          <!-- The bedework end of the exchnage 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 -->
+          <exsynchWsURI>/exsynchws/</exsynchWsURI>
-        </Pubcaldav>
-
@@ -586 +596 @@
-        </iosched>
-
+        <!-- ==================================================================
+                          Exchange synch
+             ================================================================== -->
-        <Exsynch classname="org.bedework.exchgsynch.ExsynchConfig">
-          <appType>exsynch</appType>
@@ -597 +610 @@
-          <!-- 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>
+          
+          <!-- seconds  --> 
+          <remoteKeepAliveInterval>60</remoteKeepAliveInterval>
-        </Exsynch>
-      </app>

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

@@ -49 +49 @@
-org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS
-org.bedework.global.jboss.carddb.datasource.jndiname=/CardDS
+org.bedework.global.jboss.exsynch.datasource.jndiname=/ExsynchDS
-
-# Hibernate caching parameters
@@ -151 +152 @@
-# If set to true or yes will copy in the bedework card db datasource def bedework-ds.xml
-org.bedework.global.copy.bedeworkcardds.config=yes
+#
+# If set to true or yes will copy in the bedework exchnage synch db datasource def 
+org.bedework.global.copy.bedeworkexsynchds.config=yes
-
-# ------------------------------------------------------------------------

trunk/deployment/publiccaldav/webapp/appjars.xml

@@ -17 +17 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
+
+
+
+
+
+
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webdav.version}
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>

trunk/deployment/usercaldav/webapp/appjars.xml

@@ -17 +17 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.caldav.version}
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
+
+
+
+
+
+
-              projecthome="${bw.project.home}/projects/caldav" />
-
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-3.6
+${org.bedework.webdav.version}
-              projecthome="${bw.project.home}/projects/webdav" />
-    </sequential>