Merge branches/temp-admin@3208 onto trunk@3208.

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

 opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerProviderConfiguration.xml

File was renamed from opends/src/admin/defn/org/opends/server/admin/std/BlindTrustManagerConfiguration.xml
@@ -26,9 +26,9 @@
!      Portions Copyright 2007 Sun Microsystems, Inc.
! -->

<adm:managed-object name="blind-trust-manager"
  plural-name="blind-trust-managers"
  package="org.opends.server.admin.std" extends="trust-manager"
<adm:managed-object name="blind-trust-manager-provider"
  plural-name="blind-trust-manager-providers"
  package="org.opends.server.admin.std" extends="trust-manager-provider"
  xmlns:adm="http://www.opends.org/admin"
  xmlns:ldap="http://www.opends.org/admin-ldap">

@@ -42,13 +42,12 @@

  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.154</ldap:oid>
      <ldap:name>ds-cfg-blind-trust-manager-provider</ldap:name>
      <ldap:superior>ds-cfg-trust-manager-provider</ldap:superior>
    </ldap:object-class>
  </adm:profile>

  <adm:property-override name="java-implementation-class">
  <adm:property-override name="java-class">
    <adm:default-behavior>
      <adm:defined>
        <adm:value>