[Bedework-commit] bedework r2999 - in trunk:
config/bwbuild/jboss-postgresql deployment
deployment/publiccalws deployment/publiccalws/webapp
deployment/usercalws deployment/usercalws/webapp
svnadmin at bedework.org
svnadmin at bedework.org
Fri Sep 3 16:15:16 EDT 2010
Author: douglm
Date: 2010-09-03 16:15:15 -0400 (Fri, 03 Sep 2010)
New Revision: 2999
Added:
trunk/deployment/publiccalws/
trunk/deployment/publiccalws/webapp/
trunk/deployment/publiccalws/webapp/appjars.xml
trunk/deployment/publiccalws/webapp/build.xml
trunk/deployment/usercalws/
trunk/deployment/usercalws/webapp/
trunk/deployment/usercalws/webapp/appjars.xml
trunk/deployment/usercalws/webapp/build.xml
Modified:
trunk/config/bwbuild/jboss-postgresql/cal.options.xml
trunk/config/bwbuild/jboss-postgresql/cal.properties
Log:
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.
Modified: trunk/config/bwbuild/jboss-postgresql/cal.options.xml
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.options.xml 2010-09-03 20:15:00 UTC (rev 2998)
+++ trunk/config/bwbuild/jboss-postgresql/cal.options.xml 2010-09-03 20:15:15 UTC (rev 2999)
@@ -478,6 +478,32 @@
</Pubcaldav>
<!-- ==================================================================
+ 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
================================================================== -->
<caldavTest classname="org.bedework.calfacade.configs.ConfigCommon">
Modified: trunk/config/bwbuild/jboss-postgresql/cal.properties
===================================================================
--- trunk/config/bwbuild/jboss-postgresql/cal.properties 2010-09-03 20:15:00 UTC (rev 2998)
+++ trunk/config/bwbuild/jboss-postgresql/cal.properties 2010-09-03 20:15:15 UTC (rev 2999)
@@ -17,7 +17,8 @@
#
# Define the names of the applications we want to build
org.bedework.install.app.names=CalAdmin,EventSubmit,Events,Feeder,\
- SoEDept,UserCal,Pubcaldav,Usercaldav,caldavTest,test,indexer,dumpres,\
+ SoEDept,UserCal,Pubcaldav,Usercaldav,Pubcalws,Usercalws,caldavTest,\
+ test,indexer,dumpres,\
sysevlog,iosched,monitor
#
@@ -433,6 +434,54 @@
#
# --------------------------------------------------------------------
#
+# 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
#
Added: trunk/deployment/publiccalws/webapp/appjars.xml
===================================================================
--- trunk/deployment/publiccalws/webapp/appjars.xml (rev 0)
+++ trunk/deployment/publiccalws/webapp/appjars.xml 2010-09-03 20:15:15 UTC (rev 2999)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Fetch extra jars for this application
+ =================================================================== -->
+<project name="extraJars" basedir="." default="">
+ <macrodef name="getExtraJars">
+ <sequential>
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-caldav" version="3.6"
+ projecthome="${bw.project.home}/projects/caldavimpl" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-cdvutil" version="3.6"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-cdvserver" version="3.6"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-webdavserver" version="3.6"
+ projecthome="${bw.project.home}/projects/webdav" />
+ </sequential>
+ </macrodef>
+</project>
Added: trunk/deployment/publiccalws/webapp/build.xml
===================================================================
--- trunk/deployment/publiccalws/webapp/build.xml (rev 0)
+++ trunk/deployment/publiccalws/webapp/build.xml 2010-09-03 20:15:15 UTC (rev 2999)
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Default public caldav servlet deployer
+ =================================================================== -->
+
+<project name="bwpubcaldav.deploy" default="deploy" >
+ <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+ <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
+
+ <dirname property="this.dir" file="${ant.file}"/>
+
+ <import file="${this.dir}/appjars.xml" />
+
+ <target name="init" >
+ <getExtraJars />
+
+ <!-- dist.home is bedework dist.home -->
+ <property name="app.war.file"
+ location="${dist.home}/${propval.app.war.name}.war" />
+
+ <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
+
+ <!-- Properties that differ from the personal client -->
+ <!--
+ <property name="app.web.xml"
+ value="${app.sou.dir}/war/WEB-INF/web.xml" />
+ -->
+ </target>
+
+ <!-- =================================================================
+ The "deploy" target first builds a configured component then copies
+ all required files to the appropriate servlet container directories.
+
+ Currently this only works for the quickstart distribution.
+ For example, it does not handle deploying into jboss and copying
+ resource files (images, stylesheets) to external locations.
+ ================================================================= -->
+
+ <target name="deploy" depends="init,build.configured" >
+ <!-- Platform specific -->
+ <antcall target="deployWar" inheritRefs="true" />
+ </target>
+
+ <target name="build.configured" depends="init" >
+ <!-- ===============================================================
+ Build the war
+ =============================================================== -->
+
+ <ant antfile="${buildwar}" inheritRefs="true" target="build" />
+ </target>
+</project>
Added: trunk/deployment/usercalws/webapp/appjars.xml
===================================================================
--- trunk/deployment/usercalws/webapp/appjars.xml (rev 0)
+++ trunk/deployment/usercalws/webapp/appjars.xml 2010-09-03 20:15:15 UTC (rev 2999)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Fetch extra jars for this application
+ =================================================================== -->
+<project name="extraJars" basedir="." default="">
+ <macrodef name="getExtraJars">
+ <sequential>
+ <delete dir="${org.bedework.temp.extrajars.dir}" />
+ <mkdir dir="${org.bedework.temp.extrajars.dir}" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-caldav" version="3.6"
+ projecthome="${bw.project.home}/projects/caldavimpl" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-cdvutil" version="3.6"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-cdvserver" version="3.6"
+ projecthome="${bw.project.home}/projects/caldav" />
+
+ <getJar lib="${org.bedework.temp.extrajars.dir}"
+ libcache="${org.bedework.libcache.dir}"
+ name="bw-webdavserver" version="3.6"
+ projecthome="${bw.project.home}/projects/webdav" />
+ </sequential>
+ </macrodef>
+</project>
Added: trunk/deployment/usercalws/webapp/build.xml
===================================================================
--- trunk/deployment/usercalws/webapp/build.xml (rev 0)
+++ trunk/deployment/usercalws/webapp/build.xml 2010-09-03 20:15:15 UTC (rev 2999)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+
+<!-- ===================================================================
+ Default personal caldav servlet deployer
+ =================================================================== -->
+
+<project name="bwusercaldav.deploy" default="deploy" >
+ <import file="${org.bedework.deployment.base}/deployprops.xml" />
+
+ <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}War.xml" />
+
+ <dirname property="this.dir" file="${ant.file}"/>
+
+ <import file="${this.dir}/appjars.xml" />
+
+ <target name="init" >
+ <getExtraJars />
+
+ <property name="app.war.file"
+ location="${dist.home}/${propval.app.war.name}.war" />
+
+ <property name="app.sou.dir" location="${org.bedework.deploy.app.sou}" />
+
+ <!-- Properties that differ from the personal client -->
+ <!--
+ <property name="app.web.xml"
+ value="${app.sou.dir}/war/WEB-INF/web.xml" />
+ -->
+ </target>
+
+ <!-- =================================================================
+ The "deploy" target first builds a configured component then copies
+ all required files to the appropriate servlet container directories.
+
+ Currently this only works for the quickstart distribution.
+ For example, it does not handle deploying into jboss and copying
+ resource files (images, stylesheets) to external locations.
+ ================================================================= -->
+
+ <target name="deploy" depends="init,build.configured" >
+ <!-- Platform specific -->
+ <antcall target="deployWar" inheritRefs="true" />
+ </target>
+
+ <target name="build.configured" depends="init" >
+ <!-- ===============================================================
+ Build the war
+ =============================================================== -->
+
+ <ant antfile="${buildwar}" inheritRefs="true" target="build" />
+ </target>
+</project>
More information about the Bedework-commit
mailing list