--- loncom/loncapa_apache.conf	2012/03/05 20:51:25	1.212
+++ loncom/loncapa_apache.conf	2012/05/02 00:09:15	1.215.2.1
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.212 2012/03/05 20:51:25 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.215.2.1 2012/05/02 00:09:15 raeburn Exp $
 ##
 
 #
@@ -40,7 +40,9 @@ Alias /prtspool/ /home/httpd/prtspool/
 Alias /captchaspool/ /home/httpd/captchaspool/
 Alias /webdav/ /home/httpd/html/priv/
 ScriptAlias /cgi-bin/ "/home/httpd/cgi-bin/"
-DAVLockDB /home/httpd/webdav/DAVLock
+<IfModule mod_dav_fs.c>
+    DAVLockDB /home/httpd/webdav/DAVLock
+</IfModule>
 
 # ================================================================= Directories
 
@@ -278,25 +280,33 @@ ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
 <LocationMatch "^/+webdav/[\w\-]+/[\w\-]+/">
-  <IfModule mod_ssl.c>
-    AuthType Basic
-    AuthName "LONCAPA username,domain"
-    Require valid-user
-    SSLRequireSSL
-    PerlAuthenHandler Apache::lonwebdavauth
-    PerlAuthzHandler Apache::lonwebdavacc
-    Dav On
-    DirectoryIndex index.missing
-    Options Indexes FollowSymLinks
-    ErrorDocument     403 /adm/nowebdav.html
-    ErrorDocument     404 /adm/notfound.html
-    ErrorDocument     406 /adm/unauthorized
-    ErrorDocument     500 /adm/errorhandler
-  </IfModule>
-  <IfModule !mod_ssl.c>
-    <IfModule mod_rewrite.c>
+  <IfModule mod_dav.c>
+    <IfModule mod_ssl.c>
+      AuthType Basic
+      AuthName "LONCAPA username,domain"
+      Require valid-user
+      SSLRequireSSL
+      PerlAuthenHandler Apache::lonwebdavauth
+      PerlAuthzHandler Apache::lonwebdavacc
+      Dav On
+      DirectoryIndex index.missing
+      Options Indexes FollowSymLinks
+      ErrorDocument     403 /adm/nowebdav.html
+      ErrorDocument     404 /adm/notfound.html
+      ErrorDocument     406 /adm/unauthorized
+      ErrorDocument     500 /adm/errorhandler
+    </IfModule>
+    <IfModule !mod_ssl.c>
+      <IfModule mod_rewrite.c>
         RewriteEngine on
         RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
+      </IfModule>
+    </IfModule>
+  </IfModule>
+  <IfModule !mod_dav.c>
+    <IfModule mod_rewrite.c>
+      RewriteEngine on
+      RewriteRule .* http://%{HTTP_HOST}/adm/nowebdav.html [L]
     </IfModule>
   </IfModule>
 </LocationMatch>
@@ -499,16 +509,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
 
-<Location /adm/indexcourse>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonindexcourse
-ErrorDocument     403 /adm/login
-ErrorDocument     500 /adm/errorhandler
-</Location>
-
 <Location /adm/statistics>
 AuthType LONCAPA
 Require valid-user
@@ -552,12 +552,12 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/pickresource>
+<Location /adm/remote>
 AuthType LONCAPA
 Require valid-user
 PerlAuthzHandler       Apache::lonacc
 SetHandler perl-script
-PerlHandler Apache::lonpickresource
+PerlHandler Apache::lonremote
 ErrorDocument     403 /adm/login
 ErrorDocument     500 /adm/errorhandler
 </Location>
@@ -613,6 +613,17 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/dependencies>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::londependencies
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/login>
 SetHandler perl-script
 PerlHandler Apache::lonlogin
@@ -679,6 +690,9 @@ PerlHandler Apache::migrateuser
     PerlAuthzHandler       Apache::lonshibacc
     PerlAuthzHandler       Apache::lonacc
   </IfModule>
+  <IfModule !mod_shib>
+    PerlTypeHandler        Apache::lonnoshib
+  </IfModule>
 </Location>
 
 <Location /adm/annotations>
@@ -701,6 +715,16 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
+<Location /adm/bookmarks>
+AuthType LONCAPA
+Require valid-user
+PerlAuthzHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::admbookmarks
+ErrorDocument     403 /adm/login
+ErrorDocument     500 /adm/errorhandler
+</Location>
+
 <Location /adm/flip>
 AuthType LONCAPA
 Require valid-user
@@ -1279,17 +1303,6 @@ ErrorDocument     403 /adm/login
 ErrorDocument	  500 /adm/errorhandler
 </Location>
 
-<Location /adm/wishlist>
-AuthType LONCAPA
-Require valid-user
-PerlAuthzHandler       Apache::lonacc
-SetHandler perl-script
-PerlHandler Apache::lonwishlistdisplay
-ErrorDocument     403 /adm/login
-ErrorDocument     406 /adm/roles
-ErrorDocument	  500 /adm/errorhandler
-</Location>
-
 <Location /adm/setblock>
 AuthType LONCAPA
 Require valid-user