Changeset 2999

Timestamp:

09/03/10 16:15:15

Author:

douglm

Message:

Changes to support ACCEPT header on GET

• Will enable fetching of calendars and address books when targeting collections
  
• Will be used by new web service to get XRD objects
  

Changes to XmlEmit? to support better abbreviating of namespaces and better handling of default namespace. Also changes to handle some new xrd needs.

CalDAV server has partial support for CalWS - supports GET of XRD object.

Files:

• trunk/config/bwbuild/jboss-postgresql/cal.options.xml (modified) (1 diff)
• trunk/config/bwbuild/jboss-postgresql/cal.properties (modified) (2 diffs)
• trunk/deployment/publiccalws (added)
• trunk/deployment/publiccalws/webapp (added)
• trunk/deployment/publiccalws/webapp/appjars.xml (added)
• trunk/deployment/publiccalws/webapp/build.xml (added)
• trunk/deployment/usercalws (added)
• trunk/deployment/usercalws/webapp (added)
• trunk/deployment/usercalws/webapp/appjars.xml (added)
• trunk/deployment/usercalws/webapp/build.xml (added)

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

@@ -479 +479 @@
-
-        <!-- ==================================================================
+                          User CalWS server Usercalws
+             ================================================================== -->
+        <Usercalws classname="org.bedework.caldav.util.CalDAVConfig">
+          <appType>usercalws</appType>
+          <!--
+          <publicAdmin>false</publicAdmin>
+          -->
+          <guestMode>false</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+        </Usercalws>
+
+        <!-- ==================================================================
+                          Public (unauthenticated) CalWS server Pubcalws
+             ================================================================== -->
+        <Pubcalws classname="org.bedework.caldav.util.CalDAVConfig">
+          <appType>publiccalws</appType>
+          <!--
+          <publicAdmin>false</publicAdmin>
+           -->
+          <guestMode>true</guestMode>
+
+          <sysintfImpl>org.bedework.caldav.bwserver.BwSysIntfImpl</sysintfImpl>
+        </Pubcalws>
+
+        <!-- ==================================================================
-                          CalDAV test suite
-             ================================================================== -->

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

@@ -18 +18 @@
-# Define the names of the applications we want to build
-org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
-
+
+
- sysevlog,iosched,monitor
-
@@ -434 +435 @@
-# --------------------------------------------------------------------
-#
+# Public Calws Server
+#
+org.bedework.app.Pubcalws.project=caldav
+org.bedework.app.Pubcalws.sou.dir=server
+org.bedework.app.Pubcalws.interface.jar=bw-caldav
+
+org.bedework.app.Pubcalws.web.xml=war/WEB-INF/publicws-web.xml
+org.bedework.app.Pubcalws.tomcat.context.xml=war/META-INF/publiccontext.xml
+org.bedework.app.Pubcalws.war.name=Pubcalws
+org.bedework.app.Pubcalws.context.root=/Pubcalws
+# Set for jboss
+#org.bedework.app.Pubcalws.virtual.host=
+
+org.bedework.app.Pubcalws.description=Bedework public calws server.
+org.bedework.app.Pubcalws.display.name=Bedework public calws
+org.bedework.app.Pubcalws.name=DemoPubcalws
+org.bedework.app.Pubcalws.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.Pubcalws.logprefix=Pubcalws
+
+#
+# --------------------------------------------------------------------
+#
+# Personal Calws Server
+#
+org.bedework.app.Usercalws.project=caldav
+org.bedework.app.Usercalws.sou.dir=server
+org.bedework.app.Usercalws.interface.jar=bw-caldav
+
+org.bedework.app.Usercalws.web.xml=war/WEB-INF/userws-web.xml
+org.bedework.app.Usercalws.tomcat.context.xml=war/META-INF/usercontext.xml
+org.bedework.app.Usercalws.war.name=ucalws
+org.bedework.app.Usercalws.context.root=/ucalws
+# Set for jboss
+#org.bedework.app.Usercalws.virtual.host=
+
+org.bedework.app.Usercalws.security.domain=bedeworkdemo
+org.bedework.app.Usercalws.security.prefix=demo
+org.bedework.app.Usercalws.transport.guarantee=NONE
+
+org.bedework.app.Usercalws.description=Bedework user calws server.
+org.bedework.app.Usercalws.display.name=Bedework Usercalws
+org.bedework.app.Usercalws.name=DemoUsrcalws
+org.bedework.app.Usercalws.deploy.dir=${org.bedework.appserver.deploy.dir}
+org.bedework.app.Usercalws.logprefix=Usercalws
+
+#
+# --------------------------------------------------------------------
+#
-# CalDAV test
-#