#i101955# adapted LDAP backend to new interface, dropped registry/ldap/*-attr.map files, replaced registry/data/org/openoffice/LDAP.xcu.sample with registry/oo-ldap.xcd.sample and registry/oo-ad-ldap.xcd.sample

8 files changed, 316 insertions, 188 deletions

diff --git a/officecfg/prj/d.lst b/officecfg/prj/d.lst
index 66ba41abd60e..debb9659a9e7 100644
--- a/officecfg/prj/d.lst
+++ b/officecfg/prj/d.lst
@@ -27,10 +27,8 @@ mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\OOoImprovement
 mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
 mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
 
-..\registry\schema\oo-ldap-attr.map %_DEST%\xml%_EXT%\registry\schema\oo-ldap-attr.map
-..\registry\schema\oo-ad-ldap-attr.map %_DEST%\xml%_EXT%\registry\schema\oo-ad-ldap-attr.map
-
-..\%__SRC%\misc\registry\data\org\openoffice\*.xcu.sample %_DEST%\xml%_EXT%\registry\data\org\openoffice\*.xcu.sample
+..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ldap.xcd.sample
+..\registry\schema\oo-ad-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ad-ldap.xcd.sample
 
 ..\%__SRC%\misc\registry\data\org\openoffice\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice
 ..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
diff --git a/officecfg/registry/data/org/openoffice/LDAP.xcu.sample b/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
deleted file mode 100644
index b59cd7d5fe81..000000000000
--- a/officecfg/registry/data/org/openoffice/LDAP.xcu.sample
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- * 
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: LDAP.xcu.sample,v $
- * $Revision: 1.4 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************ -->
-<!-- This file is an example of an LDAP.xcu ldap configuration file.
-    
-     To use user data from LDAP in your installation, you need to provide a 
-     customized version of this file named 'LDAP.xcu'.
-
-     To customize values in this file, please replace the data within
-     <value>...</value> elements with the values for your organization.
-
-     If a certain setting is not necessary for your installation, you may remove the
-     entire 'prop' element, i.e. everything from '<prop oor:name="[SettingName]"' to 
-     the closing '</prop>'.
--->
-<oor:component-data oor:name="LDAP" oor:package="org.openoffice" 
-        xmlns:oor="http://openoffice.org/2001/registry" 
-        xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<node oor:name="UserDirectory">
-  		<node oor:name="ServerDefinition">
-   			<prop oor:name="Server" oor:type="xs:string">
-    			<value>ldapserver.mycorp.com</value>
-   			</prop>
-			<prop oor:name="BaseDN" oor:type="xs:string">
-    			<value>dc=mycorp,dc=com</value>
-   			</prop>
-			<prop oor:name="Port" oor:type="xs:int">
-    			<value>389</value>
-   			</prop>
-  		</node>
-        <!-- The following settings should be omitted, if anonymous access is possible
-  		<prop oor:name="SearchUser" oor:type="xs:string"><value>MyUserLogin</value></prop>
-    	<prop oor:name="SearchPassword" oor:type="xs:string"><value>MyPassword</value></prop>
-        -->
-    	<prop oor:name="UserObjectClass" oor:type="xs:string">
-            <value>inetorgperson</value>
-   		</prop>
-    	<prop oor:name="UserUniqueAttribute" oor:type="xs:string">
-            <value>uid</value>
-   		</prop>
-        <prop oor:name="Mapping" oor:type="xs:string">
-            <value>oo-ldap</value>
-   		</prop>
-	</node>
-</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
index 97b52b3a9d44..f0e5150ebfcf 100644
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/makefile.mk
@@ -67,18 +67,8 @@ MODULEFILES= \
 
 LOCALIZEDFILES=Setup.xcu
 
-SAMPLEFILES= \
-    LDAP.xcu.sample
-
 .INCLUDE :  target.mk
 
 LANGUAGEPACKS=$(MISC)$/registry$/spool$/Langpack-{$(alllangiso)}.xcu
-SAMPLETARGETS=$(MISC)$/registry$/data$/$(PACKAGEDIR)$/{$(SAMPLEFILES)}
 
 ALLTAR : $(LANGUAGEPACKS)
-ALLTAR : $(SAMPLETARGETS)
-
-$(SAMPLETARGETS) : $(SAMPLEFILES)
-    -$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
diff --git a/officecfg/registry/schema/oo-ad-ldap-attr.map b/officecfg/registry/schema/oo-ad-ldap-attr.map
deleted file mode 100644
index 8e4d09b7e582..000000000000
--- a/officecfg/registry/schema/oo-ad-ldap-attr.map
+++ /dev/null
@@ -1,50 +0,0 @@
-# User.givenName
-org.openoffice.UserProfile/Data/givenname = givenName
-
-# User.sn
-org.openoffice.UserProfile/Data/sn = sn
-
-# User.initials
-org.openoffice.UserProfile/Data/initials = initials
-
-# User.street
-org.openoffice.UserProfile/Data/street = street,postalAddress
-
-# User.l (city)
-org.openoffice.UserProfile/Data/l = l
-
-# User.st (state)
-org.openoffice.UserProfile/Data/st = st
-
-# User.postalCode
-org.openoffice.UserProfile/Data/postalcode = postalCode
-
-# User.c (country)
-org.openoffice.UserProfile/Data/c = c,co
-
-# User.department (company)
-org.openoffice.UserProfile/Data/o = department
-
-# deprecated -- no LDAP corollary
-org.openoffice.UserProfile/Data/position =
-
-# User.title
-org.openoffice.UserProfile/Data/title = title
-
-# User.homePhone
-org.openoffice.UserProfile/Data/homephone = homePhone
-
-# User.telephoneNumber
-org.openoffice.UserProfile/Data/telephonenumber = telephoneNumber
-
-# UserfacsimileTelephoneNumber
-org.openoffice.UserProfile/Data/facsimiletelephonenumber = facsimileTelephoneNumber
-
-# User.mail
-org.openoffice.UserProfile/Data/mail = mail
-
-# Deprecated
-#UserGroup =
-
-
-
diff --git a/officecfg/registry/schema/oo-ad-ldap.xcd.sample b/officecfg/registry/schema/oo-ad-ldap.xcd.sample
new file mode 100644
index 000000000000..83786dc8aaa8
--- /dev/null
+++ b/officecfg/registry/schema/oo-ad-ldap.xcd.sample
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: code,v $
+*
+* $Revision: 1.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+**********************************************************************-->
+
+<!-- This file is an example of an LDAP configuration file.
+
+     To use user data from LDAP in your installation, you need to provide a
+     customized version of this file, removing the ".sample" suffix.
+
+     This sample file is designed to work with a Windows Active Directory
+     Server.  There is another sample file designed to work with a Sun Java
+     System Directory Server.  Only one of those files should be activated by
+     removing its ".sample" suffix.
+
+     To customize values in this file, replace the data within <value>...
+     </value> elements flagged as "CUSTOMIZE" with the values for your
+     organization.  If a certain setting is not necessary for your installation,
+     you can remove the compelete corresponding <value>...</value> element.
+-->
+
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+  <dependency file="main"/>
+  <oor:component-data oor:package="org.openoffice" oor:name="LDAP">
+    <node oor:name="UserDirectory">
+      <prop oor:name="SearchUser">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyUserLogin</value> -->
+      </prop>
+      <prop oor:name="SearchPassword">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyPassword</value> -->
+      </prop>
+      <prop oor:name="UserObjectClass">
+        <!-- CUSTOMIZE --><value>inetorgperson</value>
+      </prop>
+      <prop oor:name="UserUniqueAttribute">
+        <!-- CUSTOMIZE --><value>uid</value>
+      </prop>
+      <node oor:name="ServerDefinition">
+        <prop oor:name="Server">
+          <!-- CUSTOMIZE --><value>ldapserver.mycorp.com</value>
+        </prop>
+        <prop oor:name="Port">
+          <!-- CUSTOMIZE --><value>389</value>
+        </prop>
+        <prop oor:name="BaseDN">
+          <!-- CUSTOMIZE --><value>dc=mycorp,dc=com</value>
+        </prop>
+      </node>
+    </node>
+  </oor:component-data>
+  <oor:component-data oor:package="org.openoffice" oor:name="UserProfile">
+    <node oor:name="Data">
+      <prop oor:name="o">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe department"/>
+      </prop>
+      <prop oor:name="givenname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe givenname"/>
+      </prop>
+      <prop oor:name="sn">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe sn"/>
+      </prop>
+      <prop oor:name="initials">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe initials"/>
+      </prop>
+      <prop oor:name="street">
+        <value oor:external=
+   "com.sun.star.configuration.backend.LdapUserProfileBe street,postalAddress"/>
+      </prop>
+      <prop oor:name="l">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe l"/>
+      </prop>
+      <prop oor:name="st">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe st"/>
+      </prop>
+      <prop oor:name="postalcode">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe postalCode"/>
+      </prop>
+      <prop oor:name="c">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe c,co"/>
+      </prop>
+      <prop oor:name="title">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe title"/>
+      </prop>
+      <prop oor:name="position">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe position"/>
+      </prop>
+      <prop oor:name="homephone">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe homePhone"/>
+      </prop>
+      <prop oor:name="telephonenumber">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe telephoneNumber"/>
+      </prop>
+      <prop oor:name="facsimiletelephonenumber">
+        <value oor:external=
+ "com.sun.star.configuration.backend.LdapUserProfileBe facsimileTelephoneNumber"
+/>
+      </prop>
+      <prop oor:name="mail">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe mail"/>
+      </prop>
+      <!--
+      <prop oor:name="fathersname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+      <!--
+      <prop oor:name="apartment">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+    </node>
+  </oor:component-data>
+</oor:data>
diff --git a/officecfg/registry/schema/oo-ldap-attr.map b/officecfg/registry/schema/oo-ldap-attr.map
deleted file mode 100644
index caf6be58cac2..000000000000
--- a/officecfg/registry/schema/oo-ldap-attr.map
+++ /dev/null
@@ -1,50 +0,0 @@
-# inetOrgPerson.givenName
-org.openoffice.UserProfile/Data/givenname = givenname
-
-# person.sn
-org.openoffice.UserProfile/Data/sn = sn
-
-# inetOrgPerson.initials
-org.openoffice.UserProfile/Data/initials = initials
-
-# organizationalPerson.street
-org.openoffice.UserProfile/Data/street = street,postalAddress,streetAddress
-
-# organizationalPerson.l (city)
-org.openoffice.UserProfile/Data/l = l
-
-# organizationalPerson.st (state)
-org.openoffice.UserProfile/Data/st = st
-
-# organizationalPerson.postalCode
-org.openoffice.UserProfile/Data/postalcode = postalcode
-
-# country.c (country)
-org.openoffice.UserProfile/Data/c =
-
-# organizationalPerson.o (company)
-org.openoffice.UserProfile/Data/o = o,organizationName
-
-# deprecated -- no LDAP corollary
-org.openoffice.UserProfile/Data/position =
-
-# organizationalPerson.title
-org.openoffice.UserProfile/Data/title = title
-
-# inetOrgPerson.homePhone
-org.openoffice.UserProfile/Data/homephone = homephone
-
-# organizationalPerson.telephoneNumber
-org.openoffice.UserProfile/Data/telephonenumber = telephonenumber
-
-# organizationalPerson.facsimileTelephoneNumber
-org.openoffice.UserProfile/Data/facsimiletelephonenumber = facsimiletelephonenumber,officeFax
-
-# inetOrgPerson.mail
-org.openoffice.UserProfile/Data/mail = mail
-
-# Deprecated
-#UserGroup =
-
-
-
diff --git a/officecfg/registry/schema/oo-ldap.xcd.sample b/officecfg/registry/schema/oo-ldap.xcd.sample
new file mode 100644
index 000000000000..fb3af4f02db8
--- /dev/null
+++ b/officecfg/registry/schema/oo-ldap.xcd.sample
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2009 by Sun Microsystems, Inc.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* $RCSfile: code,v $
+*
+* $Revision: 1.4 $
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+**********************************************************************-->
+
+<!-- This file is an example of an LDAP configuration file.
+
+     To use user data from LDAP in your installation, you need to provide a
+     customized version of this file, removing the ".sample" suffix.
+
+     This sample file is designed to work with a Sun Java System Directory
+     Server.  There is another sample file designed to work with a Windows
+     Active Directory Server.  Only one of those files should be activated by
+     removing its ".sample" suffix.
+
+     To customize values in this file, replace the data within <value>...
+     </value> elements flagged as "CUSTOMIZE" with the values for your
+     organization.  If a certain setting is not necessary for your installation,
+     you can remove the compelete corresponding <value>...</value> element.
+-->
+
+<oor:data xmlns:oor="http://openoffice.org/2001/registry">
+  <dependency file="main"/>
+  <oor:component-data oor:package="org.openoffice" oor:name="LDAP">
+    <node oor:name="UserDirectory">
+      <prop oor:name="SearchUser">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyUserLogin</value> -->
+      </prop>
+      <prop oor:name="SearchPassword">
+        <!-- CUSTOMIZE, activate unless anonymous access is possible:
+        <value>MyPassword</value> -->
+      </prop>
+      <prop oor:name="UserObjectClass">
+        <!-- CUSTOMIZE --><value>inetorgperson</value>
+      </prop>
+      <prop oor:name="UserUniqueAttribute">
+        <!-- CUSTOMIZE --><value>uid</value>
+      </prop>
+      <node oor:name="ServerDefinition">
+        <prop oor:name="Server">
+          <!-- CUSTOMIZE --><value>ldapserver.mycorp.com</value>
+        </prop>
+        <prop oor:name="Port">
+          <!-- CUSTOMIZE --><value>389</value>
+        </prop>
+        <prop oor:name="BaseDN">
+          <!-- CUSTOMIZE --><value>dc=mycorp,dc=com</value>
+        </prop>
+      </node>
+    </node>
+  </oor:component-data>
+  <oor:component-data oor:package="org.openoffice" oor:name="UserProfile">
+    <node oor:name="Data">
+      <prop oor:name="o">
+        <value oor:external=
+     "com.sun.star.configuration.backend.LdapUserProfileBe o,organizationName"/>
+      </prop>
+      <prop oor:name="givenname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe givenname"/>
+      </prop>
+      <prop oor:name="sn">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe sn"/>
+      </prop>
+      <prop oor:name="initials">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe initials"/>
+      </prop>
+      <prop oor:name="street">
+        <value oor:external=
+"com.sun.star.configuration.backend.LdapUserProfileBe street,postalAddress,streetAddress"
+/>
+      </prop>
+      <prop oor:name="l">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe l"/>
+      </prop>
+      <prop oor:name="st">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe st"/>
+      </prop>
+      <prop oor:name="postalcode">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe postalcode"/>
+      </prop>
+      <!--
+      <prop oor:name="c">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+      <prop oor:name="title">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe title"/>
+      </prop>
+      <prop oor:name="position">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe position"/>
+      </prop>
+      <prop oor:name="homephone">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe homephone"/>
+      </prop>
+      <prop oor:name="telephonenumber">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe telephonenumber"/>
+      </prop>
+      <prop oor:name="facsimiletelephonenumber">
+        <value oor:external=
+"com.sun.star.configuration.backend.LdapUserProfileBe facsimiletelephonenumber,officeFax"
+/>
+      </prop>
+      <prop oor:name="mail">
+        <value oor:external=
+        "com.sun.star.configuration.backend.LdapUserProfileBe mail"/>
+      </prop>
+      <!--
+      <prop oor:name="fathersname">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+      <!--
+      <prop oor:name="apartment">
+        <value oor:external=
+            "com.sun.star.configuration.backend.LdapUserProfileBe ..."/>
+      </prop>
+      -->
+    </node>
+  </oor:component-data>
+</oor:data>
diff --git a/officecfg/registry/schema/org/openoffice/LDAP.xcs b/officecfg/registry/schema/org/openoffice/LDAP.xcs
index ef851d0f22ce..4ce17cbcf29f 100644
--- a/officecfg/registry/schema/org/openoffice/LDAP.xcs
+++ b/officecfg/registry/schema/org/openoffice/LDAP.xcs
@@ -57,7 +57,7 @@
 			</prop>
 			<prop oor:name="UserUniqueAttribute" oor:type="xs:string"><info><desc>Name of User entity unique attribute in LDAP repository</desc></info>
 			</prop>
-			<prop oor:name="Mapping" oor:type="xs:string"><info><desc>Name of OOo to LDAP mapping file</desc></info>
+			<prop oor:name="Mapping" oor:type="xs:string"><info><desc>Obsolete and unused</desc></info>
             </prop>
 			<node-ref oor:name="ServerDefinition" oor:node-type="ServerDefinition">
 				<info><desc>Specifies the LDAP related settings</desc></info>