From 687524926f1be49ae4eb2e0651bbd4e2c8973076 Mon Sep 17 00:00:00 2001 From: Matvey Aksenov Date: Sat, 11 Apr 2015 16:22:19 +0000 Subject: [PATCH] Minor adjustments --- README.markdown | 3 --- ldap-client.cabal | 5 +++++ src/Ldap/Client.hs | 15 ++++++++------- src/Ldap/Client/Add.hs | 3 +++ src/Ldap/Client/Bind.hs | 3 +++ src/Ldap/Client/Compare.hs | 3 +++ src/Ldap/Client/Delete.hs | 3 +++ src/Ldap/Client/Extended.hs | 3 +++ src/Ldap/Client/Modify.hs | 3 +++ src/Ldap/Client/Search.hs | 3 +++ 10 files changed, 34 insertions(+), 10 deletions(-) diff --git a/README.markdown b/README.markdown index 8e8f208..98544e8 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,3 @@ -:warning: -**This is work in progress. Use [LDAP][LDAP] if you need LDAP integration.** - ldap-client =========== [![Build Status](https://travis-ci.org/supki/ldap-client.svg?branch=master)](https://travis-ci.org/supki/ldap-client) diff --git a/ldap-client.cabal b/ldap-client.cabal index c9b3e1a..8c1e0bc 100644 --- a/ldap-client.cabal +++ b/ldap-client.cabal @@ -12,12 +12,17 @@ copyright: 2015 Matvey Aksenov category: Network build-type: Simple cabal-version: >= 1.10 +tested-with: + GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.1 extra-source-files: README.markdown source-repository head type: git location: git@github.com:supki/ldap-client + tag: 0.1.0 library default-language: diff --git a/src/Ldap/Client.hs b/src/Ldap/Client.hs index 9c03ad8..4786c41 100644 --- a/src/Ldap/Client.hs +++ b/src/Ldap/Client.hs @@ -2,15 +2,19 @@ {-# LANGUAGE BangPatterns #-} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE NamedFieldPuns #-} --- | Pure Haskell LDAP client library. +-- | This module is intended to be imported qualified +-- +-- @ +-- import qualified Ldap.Client as Ldap +-- @ module Ldap.Client - ( Host(..) + ( with + , Host(..) + , PortNumber , Ldap , LdapError(..) , ResponseError(..) , Type.ResultCode(..) - , Async - , with -- * Bind , Password(..) , bind @@ -43,8 +47,6 @@ module Ldap.Client -- * Extended , Oid(..) , extended - -- * Waiting for completion - , wait -- * Miscellanous , Dn(..) , Attr(..) @@ -52,7 +54,6 @@ module Ldap.Client , AttrList -- * Re-exports , NonEmpty - , PortNumber ) where #if __GLASGOW_HASKELL__ < 710 diff --git a/src/Ldap/Client/Add.hs b/src/Ldap/Client/Add.hs index f76aa7b..158439a 100644 --- a/src/Ldap/Client/Add.hs +++ b/src/Ldap/Client/Add.hs @@ -16,6 +16,9 @@ module Ldap.Client.Add , addEither , addAsync , addAsyncSTM + , Async + , wait + , waitSTM ) where import Control.Monad.STM (STM, atomically) diff --git a/src/Ldap/Client/Bind.hs b/src/Ldap/Client/Bind.hs index 3ad766c..cff7fa2 100644 --- a/src/Ldap/Client/Bind.hs +++ b/src/Ldap/Client/Bind.hs @@ -17,6 +17,9 @@ module Ldap.Client.Bind , bindEither , bindAsync , bindAsyncSTM + , Async + , wait + , waitSTM ) where import Control.Monad.STM (STM, atomically) diff --git a/src/Ldap/Client/Compare.hs b/src/Ldap/Client/Compare.hs index 1dd6441..9d54fac 100644 --- a/src/Ldap/Client/Compare.hs +++ b/src/Ldap/Client/Compare.hs @@ -17,6 +17,9 @@ module Ldap.Client.Compare , compareEither , compareAsync , compareAsyncSTM + , Async + , wait + , waitSTM ) where import Control.Monad.STM (STM, atomically) diff --git a/src/Ldap/Client/Delete.hs b/src/Ldap/Client/Delete.hs index 68facc3..c877ce7 100644 --- a/src/Ldap/Client/Delete.hs +++ b/src/Ldap/Client/Delete.hs @@ -16,6 +16,9 @@ module Ldap.Client.Delete , deleteEither , deleteAsync , deleteAsyncSTM + , Async + , wait + , waitSTM ) where import Control.Concurrent.STM (STM, atomically) diff --git a/src/Ldap/Client/Extended.hs b/src/Ldap/Client/Extended.hs index 6ee1255..37e162a 100644 --- a/src/Ldap/Client/Extended.hs +++ b/src/Ldap/Client/Extended.hs @@ -23,6 +23,9 @@ module Ldap.Client.Extended , startTlsEither , startTlsAsync , startTlsAsyncSTM + , Async + , wait + , waitSTM ) where import Control.Monad ((<=<)) diff --git a/src/Ldap/Client/Modify.hs b/src/Ldap/Client/Modify.hs index 4a587dd..656c862 100644 --- a/src/Ldap/Client/Modify.hs +++ b/src/Ldap/Client/Modify.hs @@ -25,6 +25,9 @@ module Ldap.Client.Modify , modifyDnEither , modifyDnAsync , modifyDnAsyncSTM + , Async + , wait + , waitSTM ) where import Control.Monad.STM (STM, atomically) diff --git a/src/Ldap/Client/Search.hs b/src/Ldap/Client/Search.hs index d4d074e..681aaa7 100644 --- a/src/Ldap/Client/Search.hs +++ b/src/Ldap/Client/Search.hs @@ -29,6 +29,9 @@ module Ldap.Client.Search , derefAliases , Filter(..) , SearchEntry(..) + , Async + , wait + , waitSTM ) where import Control.Monad.STM (STM, atomically)