summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Vagelpohl <jens@dataflake.org>2011-12-18 21:53:42 +0100
committerJens Vagelpohl <jens@dataflake.org>2011-12-18 21:53:42 +0100
commitac04649370d83fdb44a92865abe1abebf6f56acb (patch)
tree77eb7678f74271ace008f9373546f21dbb35c869
parent5aa34062819fee63ff1886d6f4a84f66b53eb7f0 (diff)
downloadProducts.LDAPMultiPlugins-master.zip
Products.LDAPMultiPlugins-master.tar.gz
- Switched documentation to point to the new Git repositoryHEADmaster
- Refactoring: Moved documentary text files into egg root
-rw-r--r--.gitignore1
-rw-r--r--CHANGES.txt (renamed from Products/LDAPMultiPlugins/CHANGES.txt)3
-rw-r--r--COPYRIGHT.txt2
-rw-r--r--HISTORY.txt (renamed from Products/LDAPMultiPlugins/HISTORY.txt)0
-rw-r--r--Products/LDAPMultiPlugins/INSTALL.txt10
-rw-r--r--Products/LDAPMultiPlugins/README.txt60
-rw-r--r--Products/LDAPMultiPlugins/VERSION.txt1
-rw-r--r--README.txt53
-rw-r--r--docs/.templates/layout.html2
-rw-r--r--docs/development.rst13
-rw-r--r--setup.py26
11 files changed, 81 insertions, 90 deletions
diff --git a/.gitignore b/.gitignore
index b4d6019..832b6d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
# /
/*.egg-info
+/*.egg
/dist
/develop-eggs
/bin
diff --git a/Products/LDAPMultiPlugins/CHANGES.txt b/CHANGES.txt
index 127ae08..ec5793f 100644
--- a/Products/LDAPMultiPlugins/CHANGES.txt
+++ b/CHANGES.txt
@@ -5,6 +5,9 @@ To see earlier changes please see HISTORY.txt.
2.0 (unreleased)
----------------
+- Switched documentation to point to the new Git repository
+
+- Refactoring: Moved documentary text files into egg root
- Bug: Demangling user prefix could not deal with non-string user
ids, which may appear in certain cases.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index 7297827..22efdba 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2010 Jens Vagelpohl and contributors.
+Copyright (c) 2004-2011 Jens Vagelpohl and contributors.
All Rights Reserved.
This software is subject to the provisions of the Zope Public License,
diff --git a/Products/LDAPMultiPlugins/HISTORY.txt b/HISTORY.txt
index f025096..f025096 100644
--- a/Products/LDAPMultiPlugins/HISTORY.txt
+++ b/HISTORY.txt
diff --git a/Products/LDAPMultiPlugins/INSTALL.txt b/Products/LDAPMultiPlugins/INSTALL.txt
deleted file mode 100644
index f04cc52..0000000
--- a/Products/LDAPMultiPlugins/INSTALL.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Installation
-============
-Products.LDAPMultiPlugins is installed as an egg using
-setuptools[1], or by including it as a dependency in
-zc.buildout[2] buildout configurations.
-
-After installation you need to restart Zope to load the package.
-
-[1] http://peak.telecommunity.com/DevCenter/setuptools
-[2] http://www.buildout.org/
diff --git a/Products/LDAPMultiPlugins/README.txt b/Products/LDAPMultiPlugins/README.txt
deleted file mode 100644
index 5dbd7bc..0000000
--- a/Products/LDAPMultiPlugins/README.txt
+++ /dev/null
@@ -1,60 +0,0 @@
-===========================
- Products.LDAPMultiPlugins
-===========================
-
-.. contents::
-
-The LDAPMultiPlugins provides PluggableAuthService plugins that use LDAP as
-the backend for the services they provide. The PluggableAuthService is a
-Zope user folder product that can be extended in modular fashion using
-various plugins.
-
-
-Bug tracker
-===========
-Please post questions, bug reports or feature requests to the bug tracker
-at https://bugs.launchpad.net/products.ldapmultiplugins
-
-
-SVN version
-===========
-You can retrieve the latest code from Subversion using setuptools or
-zc.buildout via this URL:
-
-http://svn.dataflake.org/svn/Products.LDAPMultiPlugins/trunk#egg=Products.LDAPMultiPlugins
-
-
-Special features - Active Directory Multi Plugin
-================================================
-
-Properties of the ADMultiPlugin instance:
-
-- groupid_attr - the LDAP attribute used for group ids.
-
-- grouptitle_attr - the LDAP attribute used to compose group titles.
-
-- group_class - the LDAP class of group objects.
-
-- group_recurse - boolean indicating whether to determine group
- memberships of a user by unrolling nested group relationships
- (expensive). This feature is not guaranteed to work at this moment.
-
-
-Active Directory configuration hints
-====================================
-
-In order for groups support to work correctly, you may have to set the
-following properties. Every situation is different, but this has helped
-some people succeed:
-
-- On the "Properties" tab for the ActiveDirectoryMultiPlugin, set the
- groupid_attr property to "name".
-
-- On the contained LDAPUserFolder's "Configure" tab, choose a
- property other than "objectGUID", e.g. "sAMAccountName" for the
- User ID property. To get to the LDAPUserFolder, click on the
- ActiveDirectoryMultiPlugin "Content" tab.
-
-Please see README.ActiveDirectory from the LDAPUserFolder package for
-additional information.
-
diff --git a/Products/LDAPMultiPlugins/VERSION.txt b/Products/LDAPMultiPlugins/VERSION.txt
deleted file mode 100644
index 678e3b2..0000000
--- a/Products/LDAPMultiPlugins/VERSION.txt
+++ /dev/null
@@ -1 +0,0 @@
-2.0dev
diff --git a/README.txt b/README.txt
index 22920f0..f338e8f 100644
--- a/README.txt
+++ b/README.txt
@@ -1 +1,52 @@
-(see Products/LDAPMultiPlugins/README.txt)
+===========================
+ Products.LDAPMultiPlugins
+===========================
+
+.. contents::
+
+The LDAPMultiPlugins provides PluggableAuthService plugins that use LDAP as
+the backend for the services they provide. The PluggableAuthService is a
+Zope user folder product that can be extended in modular fashion using
+various plugins.
+
+
+Bug tracker
+===========
+Please post questions, bug reports or feature requests to the bug tracker
+at https://bugs.launchpad.net/products.ldapmultiplugins
+
+
+Special features - Active Directory Multi Plugin
+================================================
+
+Properties of the ADMultiPlugin instance:
+
+- groupid_attr - the LDAP attribute used for group ids.
+
+- grouptitle_attr - the LDAP attribute used to compose group titles.
+
+- group_class - the LDAP class of group objects.
+
+- group_recurse - boolean indicating whether to determine group
+ memberships of a user by unrolling nested group relationships
+ (expensive). This feature is not guaranteed to work at this moment.
+
+
+Active Directory configuration hints
+====================================
+
+In order for groups support to work correctly, you may have to set the
+following properties. Every situation is different, but this has helped
+some people succeed:
+
+- On the "Properties" tab for the ActiveDirectoryMultiPlugin, set the
+ groupid_attr property to "name".
+
+- On the contained LDAPUserFolder's "Configure" tab, choose a
+ property other than "objectGUID", e.g. "sAMAccountName" for the
+ User ID property. To get to the LDAPUserFolder, click on the
+ ActiveDirectoryMultiPlugin "Content" tab.
+
+Please see README.ActiveDirectory from the LDAPUserFolder package for
+additional information.
+
diff --git a/docs/.templates/layout.html b/docs/.templates/layout.html
index 9c698a8..e4cb53c 100644
--- a/docs/.templates/layout.html
+++ b/docs/.templates/layout.html
@@ -27,7 +27,7 @@
<h3>Related links</h3>
<ul>
<li><a class="reference external" href="http://pypi.python.org/pypi/{{ project|e }}/">Project home</a></li>
- <li><a class="reference external" href="http://svn.dataflake.org/viewvc/{{ project|e }}/">Browse sources</a></li>
+ <li><a class="reference external" href="https://git.dataflake.org/cgit/{{ project|e }}/">Browse sources</a></li>
<li><a class="reference external" href="https://bugs.launchpad.net/products.ldapmultiplugins">Bug tracker</a></li>
<li><a class="reference external" href="http://www.zetwork.com/">Commercial support</a></li>
</ul>
diff --git a/docs/development.rst b/docs/development.rst
index ad4eaca..939ff68 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -5,20 +5,13 @@ Development
Getting the source code
-----------------------
-The source code is maintained in the Dataflake Subversion
-repository at `http://svn.dataflake.org <http://svn.dataflake.org/>`_.
+The source code is maintained in the Dataflake Git repository.
To check out the trunk::
- svn co http://svn.dataflake.org/svn/Products.LDAPMultiPlugins/trunk/
+ $ git clone https://git.dataflake.org/git/Products.LDAPMultiPlugins
You can also browse the code online at
-`http://svn.dataflake.org/viewvc/Products.LDAPMultiPlugins
-<http://svn.dataflake.org/viewvc/Products.LDAPMultiPlugins/>`_.
-
-When using setuptools or zc.buildout you can use the following
-URL to retrieve the latest development code as Python egg::
-
- http://svn.dataflake.org/svn/Products.LDAPMultiPlugins/trunk#egg=Products.LDAPMultiPlugins
+http://git.dataflake.org/cgit/Products.LDAPMultiPlugins
Bug tracker
-----------
diff --git a/setup.py b/setup.py
index 8d5df5f..53f5fa4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,33 @@
+##############################################################################
+#
+# Copyright (c) 2010 Jens Vagelpohl and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+__version__ = '2.0dev'
+
import os
from setuptools import setup
from setuptools import find_packages
NAME = 'LDAPMultiPlugins'
here = os.path.abspath(os.path.dirname(__file__))
-package = os.path.join(here, 'Products', NAME)
def _read(name):
- f = open(os.path.join(package, name))
+ f = open(os.path.join(here, name))
return f.read()
_boundary = '\n' + ('-' * 60) + '\n\n'
setup(name='Products.%s' % NAME,
- version=_read('VERSION.txt').strip(),
+ version=__version__,
description='LDAP-backed plugins for the Zope2 PluggableAuthService',
long_description=( _read('README.txt')
+ _boundary
@@ -26,7 +40,7 @@ setup(name='Products.%s' % NAME,
"Framework :: Zope2",
"Intended Audience :: Developers",
"License :: OSI Approved :: Zope Public License",
- "Programming Language :: Python",
+ "Programming Language :: Python :: 2",
"Topic :: Internet :: WWW/HTTP :: Site Management",
"Topic :: Software Development",
"Topic :: System :: Systems Administration :: Authentication/Directory :: LDAP",
@@ -40,16 +54,16 @@ setup(name='Products.%s' % NAME,
include_package_data=True,
namespace_packages=['Products'],
zip_safe=False,
+ setup_requires=['setuptools-git'],
install_requires=[
- #Zope >= 2.9,
'setuptools',
+ 'Zope2',
'python-ldap >= 2.0.6',
'Products.LDAPUserFolder >= 2.9',
'Products.PluggableAuthService >= 1.4.0',
],
extras_require={
'exportimport': [
- # Zope >= 2.10.0
'Products.GenericSetup >= 1.4.0'
]
},