Permalink
Browse files

Result of merge -r119:HEAD

  • Loading branch information...
1 parent 27e834e commit 8a893f3cdcca88f8e7081647021cf8eb96e835e4 @cyrusdaboo cyrusdaboo committed Sep 15, 2006
Showing with 4 additions and 139 deletions.
  1. +0 −135 Makefile
  2. +1 −1 conf/repository.xml
  3. +1 −1 run
  4. +1 −1 twistedcaldav/repository.py
  5. +1 −1 twistedcaldav/resource.py
View
135 Makefile
@@ -1,135 +0,0 @@
-##
-# Makefile for CalendarServer
-##
-# Copyright (c) 2005-2006 Apple Computer, Inc. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# DRI: Wilfredo Sanchez, wsanchez@apple.com
-##
-
-# Project info
-Project = CalendarServer
-ProjectName = CalendarServer
-UserType = Server
-ToolType = Applications
-
-# Include common makefile targets for B&I
-include $(MAKEFILEPATH)/CoreOS/ReleaseControl/Common.make
-
-PYTHON = /usr/bin/python
-PY_INSTALL_FLAGS = --root="$(DSTROOT)" --home="$(SHAREDIR)/caldavd"
-
-USER = 93 # FIXME: calendar
-GROUP = 93 # FIXME: calendar
-
-#
-# Build
-#
-
-.phony: $(Project) vobject Twisted setup prep
-
-PyKerberos:: $(BuildDirectory)/PyKerberos
-PyOpenDirectory:: $(BuildDirectory)/PyOpenDirectory
-vobject:: $(BuildDirectory)/vobject
-Twisted:: $(BuildDirectory)/Twisted
-$(Project):: $(BuildDirectory)/$(Project)
-
-build:: PyKerberos PyOpenDirectory vobject Twisted $(Project)
-
-setup:
- $(_v) $(Sources)/run -s
-
-prep:: setup PyKerberos.tgz PyOpenDirectory.tgz vobject.tgz Twisted.tgz
-
-PyKerberos PyOpenDirectory vobject $(Project)::
- @echo "Building $@..."
- $(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
-
-TwistedSubEnvironment = $(Environment) PYTHONPATH="$(DSTROOT)$(SHAREDIR)/caldavd/lib/python"
-
-Twisted::
- @echo "Building Twisted..."
- $(_v) cd $(BuildDirectory)/Twisted && $(Environment) $(PYTHON) twisted/topfiles/setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web/topfiles/setup.py build
- $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py build
-
-install:: build
- $(_v) cd $(BuildDirectory)/$(Project) && $(Environment) $(PYTHON) setup.py install \
- $(PY_INSTALL_FLAGS) \
- --install-scripts="$(USRSBINDIR)" \
- --install-data="$(ETCDIR)"
- $(_v) cd $(BuildDirectory)/PyKerberos && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/PyOpenDirectory && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/vobject && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web/topfiles/setup.py install $(PY_INSTALL_FLAGS)
- $(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py install $(PY_INSTALL_FLAGS)
- $(_v) for so in $$(find "$(DSTROOT)$(SHAREDIR)/caldavd/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done
- $(_v) for f in $$(find "$(DSTROOT)$(ETCDIR)" -type f ! -name '*.default'); do cp "$${f}" "$${f}.default"; done
-
-install::
- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(MANDIR)/man8
- $(_v) $(INSTALL_FILE) $(Sources)/doc/caldavd.8 $(DSTROOT)$(MANDIR)/man8
- $(_v) gzip -9 -f $(DSTROOT)$(MANDIR)/man8/*.8
- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(NSLIBRARYDIR)/$(Project)
- $(_v) $(INSTALL_DIRECTORY) -o $(USER) -g $(GROUP) $(DSTROOT)$(NSLOCALDIR)/$(NSLIBRARYSUBDIR)/$(Project)/Documents
- $(_v) $(INSTALL_DIRECTORY) -o $(USER) -g $(GROUP) $(DSTROOT)$(VARDIR)/log/caldavd
- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons
- $(_v) $(INSTALL_FILE) $(Sources)/conf/launchd.plist $(DSTROOT)$(NSLIBRARYDIR)/LaunchDaemons/org.darwin.calendarserver.plist
-
-#
-# Automatic Extract
-#
-
-$(BuildDirectory)/$(Project):
- @echo "Copying source for $(Project)..."
- $(_v) $(MKDIR) -p "$@"
- $(_v) pax -rw bin conf Makefile patches setup.py twistedcaldav "$@/"
-
-$(BuildDirectory)/%: %.tgz
- @echo "Extracting source for $(notdir $<)..."
- $(_v) $(MKDIR) -p "$(BuildDirectory)"
- $(_v) $(RMDIR) "$@"
- $(_v) $(TAR) -C "$(BuildDirectory)" -xzf $<
-
-%.tgz: ../%
- @echo "Archiving sources for $(notdir $<)..."
- $(_v) $(TAR) -C "$(dir $<)" \
- --exclude=.svn \
- --exclude=build \
- --exclude=_trial_temp \
- --exclude=dropin.cache \
- -czf $@ "$(notdir $<)"
-
-#
-# Open Source Hooey
-#
-
-OSV = /usr/local/OpenSourceVersions
-OSL = /usr/local/OpenSourceLicenses
-
-#install:: install-ossfiles
-
-install-ossfiles::
- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSV)
- $(_v) $(INSTALL_FILE) $(Sources)/$(ProjectName).plist $(DSTROOT)/$(OSV)/$(ProjectName).plist
- $(_v) $(INSTALL_DIRECTORY) $(DSTROOT)/$(OSL)
- $(_v) $(INSTALL_FILE) $(BuildDirectory)/$(Project)/LICENSE $(DSTROOT)/$(OSL)/$(ProjectName).txt
-
-#
-# B&I Hooey
-#
-
-buildit: prep
- @echo "Running buildit..."
- $(_v) sudo ~rc/bin/buildit $(CC_Archs) $(Sources)
View
@@ -40,7 +40,7 @@ limitations under the License.
<!-- Must explicitly set which principal hierarchies will be listed in WebDAV properties.
The order of these will determine how a user id will map to a principal in a particular hierarchy
if an id appears in more than one. -->
- <prop><principal-collection-set xmlns='http://twistedmatrix.com/xml_namespace/dav/private/'><href xmlns='DAV:'>/principals/users/</href><href xmlns='DAV:'>/principals/groups/</href><href xmlns='DAV:'>/principals/resources/</href></principal-collection-set></prop>
+ <prop><principal-collection-set xmlns='http://twistedmatrix.com/xml_namespace/dav/private/'><href xmlns='DAV:'>/principals/users/</href><href xmlns='DAV:'>/principals/groups/</href><href xmlns='DAV:'>/principals/resources/</href></principal-collection-set></prop>
</properties>
<members>
<!-- We must define the calendar home location before the principals as
View
2 run
@@ -412,7 +412,7 @@ if ! "${disable_setup}"; then
svn_uri="svn://svn.twistedmatrix.com/svn/Twisted/branches/acl-1608-8";
fi;
- svn_get "Twisted" "${twisted}" "${svn_uri}" 18092;
+ svn_get "Twisted" "${twisted}" "${svn_uri}" 18155;
fi;
py_install "Twisted" "${twisted}";
@@ -25,7 +25,7 @@
from twisted.python import log
from twisted.python.filepath import FilePath
from twisted.web2.dav import davxml
-from twisted.web2.dav.acl import TwistedPasswordProperty
+from twisted.web2.dav.auth import TwistedPasswordProperty
from twisted.web2.dav.element.base import PCDATAElement
from twisted.web2.dav.element.parser import lookupElement
from twisted.web2.dav.resource import TwistedACLInheritable
@@ -42,7 +42,7 @@
from twisted.internet.defer import deferredGenerator, waitForDeferred
from twisted.web2 import responsecode
from twisted.web2.dav import auth, davxml
-from twisted.web2.dav.acl import DAVPrincipalResource
+from twisted.web2.dav.resource import DAVPrincipalResource
from twisted.web2.dav.davxml import dav_namespace
from twisted.web2.dav.http import ErrorResponse
from twisted.web2.dav.resource import DAVResource, TwistedACLInheritable

0 comments on commit 8a893f3

Please sign in to comment.