[LON-CAPA-cvs] cvs: loncom(version_2_11_X) / loncapa_apache.conf

[raeburn]

raeburn		Wed May  2 00:09:15 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom	loncapa_apache.conf 
  Log:
  - Changes for 2.11 branch.
    - Remote Control, Bookmarks retained
    - wishlist, index course pick resource not currently supported.
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.215 loncom/loncapa_apache.conf:1.215.2.1
--- loncom/loncapa_apache.conf:1.215	Wed Apr 18 18:51:08 2012
+++ loncom/loncapa_apache.conf	Wed May  2 00:09:15 2012
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.215 2012/04/18 18:51:08 raeburn Exp $
+## $Id: loncapa_apache.conf,v 1.215.2.1 2012/05/02 00:09:15 raeburn Exp $
 ##
 
 #
@@ -509,16 +509,6 @@
 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
@@ -562,12 +552,12 @@
 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>
@@ -725,6 +715,16 @@
 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
@@ -1303,17 +1303,6 @@
 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