Changeset 3473

Timestamp:

02/10/12 14:43:50

Author:

douglm

Message:

1. Update the ischedule support:

New handler for host information with associated jboss service.
Move all support for hosts out of directory classes.
Various small fixes to ischedule
ischedule log in now done as a service to avoid some overhead

2. Fix problems with storing of resources

Broken in many ways. Postgres blob support completely broken.
Content type was set incorrectly
Upgrade to hibernate 3.6 as first step.
Had to update implementation of GenericEnumUserType? in rpiutil. Used in synch.
Changed sess.lock(o, ?) to sess.buildLockRequest(LockOptions?.?).lock(o);
Delete AbbrevValUserType? - hibernate types have changed. Was used for venue
Change hibernate property hibernate.jdbc.use_streams_for_binary - value is now false
Added some support for quotas. Currently only checking resources created/updated via WebDAV PUT.

Had to use preferences to store current quota use to avoid schema change

Removed option to email freebusy requests. Does not make sense. Changed to an iSchedule option which implies emailing invitations.

3. Small fix to ensure we close calendar-data element when we get an exception. Response still bad but at least valid XML

Files:

• trunk/build/license-mappings.xml (modified) (2 diffs)
• trunk/build/platforms/jbossService.xml (modified) (1 diff)
• trunk/build/platforms/runnableService.xml (modified) (1 diff)
• trunk/deployment/bw-core-appjars.xml (modified) (2 diffs)
• trunk/deployment/ear.meta/jboss-service.xml (modified) (1 diff)
• trunk/deployment/resources/hibernate/properties/hibernate.properties (modified) (1 diff)
• trunk/docs/CalWs-SOAP.odt (modified) (previous)
• trunk/docs/NOTICE (modified) (19 diffs)

trunk/build/license-mappings.xml

@@ -603 +603 @@
-    </artifact>
-    <artifact>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto</artifactId>
+        <license>Apache License, Version 2.0</license>
+    </artifact>
+    <artifact>
-        <groupId>org.apache.portals.bridges</groupId>
-        <artifactId>portals-bridges-common</artifactId>
@@ -731 +736 @@
-    </artifact>
-    <artifact>
+        <groupId>org.hibernate</groupId>
+        <artifactId>hibernate-validator</artifactId>
+        <license>LGPL, v2.1</license>
+    </artifact>
+    <artifact>
-        <groupId>org.hibernate.javax.persistence</groupId>
-        <artifactId>hibernate-jpa-2.0-api</artifactId>

trunk/build/platforms/jbossService.xml

@@ -31 +31 @@
-hibernate.bytecode.use_reflection_optimizer=false
-hibernate.cache.use_second_level_cache=false
+
+hibernate.jdbc.use_streams_for_binary false
-#
-# Here for better debugging

trunk/build/platforms/runnableService.xml

@@ -22 +22 @@
-hibernate.bytecode.use_reflection_optimizer=false
-hibernate.cache.use_second_level_cache=false
+
+hibernate.jdbc.use_streams_for_binary false
-#
-# Here for better debugging

trunk/deployment/bw-core-appjars.xml

@@ -257 +257 @@
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-
+
+
+
+
+
-      
-      <!--
@@ -263 +267 @@
-              libcache="${org.bedework.libcache.dir}"
-              name="hibernate-annotations" version="3.4.0.GA" />
-      
-      <getJar lib="${org.bedework.temp.extrajars.dir}"
-              libcache="${org.bedework.libcache.dir}"
-              name="hibernate-validator" version="3.1.0.GA" />
-      
-      <getJar lib="${org.bedework.temp.extrajars.dir}"

trunk/deployment/ear.meta/jboss-service.xml

@@ -13 +13 @@
-    <!-- We need activemq -->    
-    <depends>jboss.jca:service=ConnectionFactoryBinding,name=activemq/QueueConnectionFactory</depends>
+    
+    <!-- We also need the bedework database -->
+    <depends>jboss.jca:service=DataSourceBinding,name=CalendarDS</depends>
+  </mbean>
+  
+  <mbean code="org.bedework.calsvc.scheduling.ischedule.BwIschedule"
+         name="org.bedework:service=Ischedule">
+    <attribute name="Account">admin</attribute>
-    
-    <!-- We also need the bedework database -->

trunk/deployment/resources/hibernate/properties/hibernate.properties

@@ -203 +203 @@
-## use streams when writing binary types to / from JDBC
-
-tru
+fals
-
-

trunk/docs/NOTICE

@@ -26 +26 @@
-   Bedework interfaces
-   Bedework misc package
-   Bedework tools
-   Bedework web apps
-   bedework indexer package
@@ -65 +64 @@
-   Bedework interfaces
-   Bedework misc package
-   Bedework tools
-   Bedework web apps
-   bedework indexer package
@@ -163 +161 @@
-   Bedework icalendar
-   Bedework sysevents
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-Jar: bw-misc-3.8   Licence: Apache License, Version 2.0
@@ -208 +201 @@
-   dump/restore package
-
-Jar: bw-tools-3.8   Licence: 
-Referenced by the following components:
-   Bedework tools
-
-Jar: bw-tzschema-3.8   Licence: Apache License, Version 2.0
-Referenced by the following components:
@@ -257 +246 @@
-Jar: commons-codec-1.3   Licence: Apache License, Version 2.0
-Referenced by the following components:
-   Bedework timezones server
-   Bedework tools
-   Carddav package
-   bedework main project
@@ -264 +251 @@
-Jar: commons-codec-1.5   Licence: Apache License, Version 2.0
-Referenced by the following components:
-   Bedework timezones server
-   Bedework tools
-   Carddav package
-   RPI utility package
@@ -289 +274 @@
-Jar: commons-httpclient-3.0   Licence: 
-Referenced by the following components:
-
-
-
-
-
-
+
-
-Jar: commons-lang-2.1   Licence: Apache License, Version 2.0
-Referenced by the following components:
-   Bedework timezones server
-   Bedework tools
-   Carddav package
-   synch engine
@@ -305 +283 @@
-Jar: commons-lang-2.6   Licence: Apache License, Version 2.0
-Referenced by the following components:
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-Referenced by the following components:
-   bedework main project
@@ -328 +298 @@
-   RPI utility package
-
-
-
-
-
-
+
-Referenced by the following components:
-   bedework main project
@@ -372 +338 @@
-   RPI utility package
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   synch engine
-
-Jar: httpclient-4.1.2   Licence: Apache License, Version 2.0
-Referenced by the following components:
+   Bedework timezones server
-   RPI utility package
-   bedework main project
@@ -399 +368 @@
-Referenced by the following components:
-   Bedework misc package
+   Bedework timezones server
-   Carddav package
-   RPI utility package
@@ -432 +402 @@
-   bedework main project
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-Jar: jboss-j2se-5.1.0.GA   Licence: LGPL, v2.1
@@ -463 +449 @@
-Jar: jgroups-2.2.8   Licence: 
-Referenced by the following components:
-
-
-
-
+
+
+
-Referenced by the following components:
-   Bedework calendar api classes and definitions
@@ -509 +494 @@
-   Bedework sysevents
-   Bedework timezones server
-   Bedework tools
-   Bedework web apps
-   Carddav package
@@ -532 +516 @@
-   bedework main project
-
-
+Commons Development and Distribution License, Version 1.0
-Referenced by the following components:
-   Bedework misc package
@@ -541 +525 @@
-   Bedework web apps
-
-
+Commons Development and Distribution License, Version 1.0
-Referenced by the following components:
-   bedework main project
@@ -586 +570 @@
-   Bedework sysevents
-   Bedework timezones server
-   Bedework tools
-   Bedework web apps
-   Carddav package
@@ -615 +598 @@
-   synch engine
-
-
+Commons Development and Distribution License, Version 1.0
-Referenced by the following components:
-   bedework main project
@@ -631 +614 @@
-   synch engine
-
+Jar: stax-ex-2.2.1   Licence: Commons Development and Distribution License, Version 1.0
+Referenced by the following components:
+   Bedework xml schema
+
+Jar: streambuffer-1.0   Licence: Dual license consisting of the CDDL v1.1 and GPL v2
+Referenced by the following components:
+   Bedework xml schema
+
-Jar: struts-1.2.9   Licence: Apache License, Version 2.0
-Referenced by the following components: