ou=apps group has been deleted

lib/whimsy/asf/ldap.rb

@@ -1509,37 +1509,6 @@ def add(people)
     end
   end
 
-  # <tt>ou=apps</tt> subtree of <tt>ou=groups,dc=apache,dc=org</tt>, currently
-  # only used for <tt>hudson-jobadmin</tt>
-  class AppGroup < Service
-    @base = 'ou=apps,ou=groups,dc=apache,dc=org'
-
-    # return a list of App groups (cns only), from LDAP.
-    def self.listcns(filter='cn=*')
-      # Note that hudson-job-admin is under ou=hudson hence need
-      # to override Service.listcns and use subtree search
-      ASF.search_subtree(base, filter, 'cn').flatten
-    end
-
-    # remove people from an application group.
-    def remove(people)
-      @members = nil
-      people = (Array(people) & members).map(&:dn)
-      ASF::LDAP.modify(self.dn, [ASF::Base.mod_delete('member', people)])
-    ensure
-      @members = nil
-    end
-
-    # add people to an application group.
-    def add(people)
-      @members = nil
-      people = (Array(people) - members).map(&:dn)
-      ASF::LDAP.modify(self.dn, [ASF::Base.mod_add('member', people)])
-    ensure
-      @members = nil
-    end
-  end
-
   # <tt>ou=auth</tt> subtree of <tt>ou=groups,dc=apache,dc=org</tt>, used for
   # subprojects and a variety of organizational constructs (accounting,
   # exec-officers, fundraising, trademarks, ...)
@@ -1570,5 +1539,4 @@ class RoleGroup < Service
   puts newids.length
   puts newids.first
   ASF::RoleGroup.listcns.map {|g| puts ASF::RoleGroup.find(g).dn}
-  ASF::AppGroup.listcns.map {|g| puts ASF::AppGroup.find(g).dn}
 end

www/roster/models/group.rb

@@ -22,13 +22,6 @@ def self.list
     # add authorization groups (LDAP)
     groups += ASF::AuthGroup.listcns.map {|group| [group, "LDAP Auth Group"]}
 
-    # add app groups
-    begin # HACK to bypass missing LDAP ou=apps group
-      groups += ASF::AppGroup.listcns.map {|app| [app, "LDAP app group"]}
-    rescue LDAP::ResultError => e
-      Wunderbar.warn "Ignoring LDAP error: #{e.inspect}"
-    end
-
     groups.sort
   end
 
@@ -51,11 +44,6 @@ def self.serialize(id, itype=nil)
       group = ASF::Service.find(id)
     end
 
-    unless group.hasLDAP?
-      type = 'LDAP app group'
-      group = ASF::AppGroup.find(id)
-    end
-
     if group.hasLDAP?
       # LDAP group
 

www/roster/views/group.js.rb

@@ -213,8 +213,6 @@ def post()
       action = 'actions/authgroup'
     elsif @@group.type == 'LDAP service'
       action = 'actions/service'
-    elsif @@group.type == 'LDAP app group'
-      action = 'actions/appgroup'
     else
       alert "unsupported group type: #{@@group.type}"
       return