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

matthew_swift

26.21.2007 5ceb2e9601d2501d021d0c61188ec913076555a0

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

@@ -39,7 +39,6 @@
  <adm:tag name="replication"/>
  <adm:profile name="ldap">
    <ldap:object-class>
      <ldap:oid>1.3.6.1.4.1.26027.1.2.57</ldap:oid>
      <ldap:name>ds-cfg-synchronization-provider</ldap:name>
      <ldap:superior>top</ldap:superior>
    </ldap:object-class>
@@ -55,12 +54,11 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.155</ldap:oid>
        <ldap:name>ds-cfg-synchronization-provider-enabled</ldap:name>
        <ldap:name>ds-cfg-enabled</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>
  <adm:property name="java-implementation-class" mandatory="true"
  <adm:property name="java-class" mandatory="true"
    multi-valued="false">
    <adm:synopsis>
      The fully-qualified name of the Java class that provides the
@@ -76,9 +74,8 @@
    </adm:syntax>
    <adm:profile name="ldap">
      <ldap:attribute>
        <ldap:oid>1.3.6.1.4.1.26027.1.1.154</ldap:oid>
        <ldap:name>ds-cfg-synchronization-provider-class</ldap:name>
        <ldap:name>ds-cfg-java-class</ldap:name>
      </ldap:attribute>
    </adm:profile>
  </adm:property>
</adm:managed-object>
</adm:managed-object>