You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/06 23:16:09 UTC
svn commit: r1067786 [1/2] - in /directory/apacheds/branches/m1: ./ all/
core-annotations/ core-api/
core-api/src/main/java/org/apache/directory/server/core/ core-avl/
core-constants/ core-integ/
core-integ/src/test/java/org/apache/directory/server/cor...
Author: akarasulu
Date: Sun Feb 6 22:16:07 2011
New Revision: 1067786
URL: http://svn.apache.org/viewvc?rev=1067786&view=rev
Log:
merge minor changes from trunk: TRUNK ==> M1 branch
Added:
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/
- copied from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/apache/
- copied from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/apache/directory/
- copied from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/apache/directory/shared/
- copied from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/apache/directory/shared/client/
- copied from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/
- copied from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/
directory/apacheds/branches/m1/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
- copied unchanged from r1067785, directory/apacheds/trunk/ldap-client-test/src/main/java/org/apache/directory/shared/client/api/LdapApiIntegrationUtils.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java
- copied unchanged from r1067785, directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java
Modified:
directory/apacheds/branches/m1/ (props changed)
directory/apacheds/branches/m1/all/ (props changed)
directory/apacheds/branches/m1/core/ (props changed)
directory/apacheds/branches/m1/core-annotations/ (props changed)
directory/apacheds/branches/m1/core-api/ (props changed)
directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java (props changed)
directory/apacheds/branches/m1/core-avl/ (props changed)
directory/apacheds/branches/m1/core-constants/ (props changed)
directory/apacheds/branches/m1/core-integ/ (props changed)
directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (props changed)
directory/apacheds/branches/m1/core-jndi/ (props changed)
directory/apacheds/branches/m1/http-integration/ (props changed)
directory/apacheds/branches/m1/i18n/ (props changed)
directory/apacheds/branches/m1/installers/ (props changed)
directory/apacheds/branches/m1/installers-maven-plugin/ (props changed)
directory/apacheds/branches/m1/interceptor-kerberos/ (props changed)
directory/apacheds/branches/m1/jdbm/ (props changed)
directory/apacheds/branches/m1/jdbm-partition/ (props changed)
directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/ (props changed)
directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java (props changed)
directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/ (props changed)
directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/ (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java (props changed)
directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/ (props changed)
directory/apacheds/branches/m1/kerberos-test/ (props changed)
directory/apacheds/branches/m1/ldap-client-test/pom.xml
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
directory/apacheds/branches/m1/ldif-partition/ (props changed)
directory/apacheds/branches/m1/protocol-changepw/ (props changed)
directory/apacheds/branches/m1/protocol-dhcp/ (props changed)
directory/apacheds/branches/m1/protocol-dns/ (props changed)
directory/apacheds/branches/m1/protocol-kerberos/ (props changed)
directory/apacheds/branches/m1/protocol-ldap/ (props changed)
directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (props changed)
directory/apacheds/branches/m1/protocol-ntp/ (props changed)
directory/apacheds/branches/m1/protocol-shared/ (props changed)
directory/apacheds/branches/m1/server-annotations/ (props changed)
directory/apacheds/branches/m1/server-config/ (props changed)
directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/m1/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/m1/server-integ/ (props changed)
directory/apacheds/branches/m1/server-jndi/ (props changed)
directory/apacheds/branches/m1/server-replication/ (props changed)
directory/apacheds/branches/m1/server-tools/ (props changed)
directory/apacheds/branches/m1/service-builder/ (props changed)
directory/apacheds/branches/m1/test-framework/ (props changed)
directory/apacheds/branches/m1/xdbm-partition/ (props changed)
directory/apacheds/branches/m1/xdbm-tools/ (props changed)
Propchange: directory/apacheds/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -5,4 +5,4 @@
/directory/apacheds/branches/apacheds-schema:806623-896441
/directory/apacheds/branches/apacheds-subtree:965203-965686
/directory/apacheds/branches/xdbm-refactoring:945827-946347
-/directory/apacheds/trunk:1066126-1067490
+/directory/apacheds/trunk:1066126-1067785
Propchange: directory/apacheds/branches/m1/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/all:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/all:1040956-1043765
-/directory/apacheds/trunk/all:1066126-1067490
+/directory/apacheds/trunk/all:1066126-1067785
Propchange: directory/apacheds/branches/m1/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -3,4 +3,4 @@
/directory/apacheds/branches/apacheds-config/core:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core:1040956-1043765
-/directory/apacheds/trunk/core:1066126-1067490
+/directory/apacheds/trunk/core:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -3,4 +3,4 @@
/directory/apacheds/branches/apacheds-config/core-annotations:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-annotations:1040956-1043765
-/directory/apacheds/trunk/core-annotations:1066126-1067490
+/directory/apacheds/trunk/core-annotations:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/core-api:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-api:1040956-1043765
-/directory/apacheds/trunk/core-api:1066126-1067490
+/directory/apacheds/trunk/core-api:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -6,4 +6,4 @@
/directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:806623-896441
/directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347
-/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067490
+/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/core-avl:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-avl:1040956-1043765
-/directory/apacheds/trunk/core-avl:1066126-1067490
+/directory/apacheds/trunk/core-avl:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/core-constants:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-constants:1040956-1043765
-/directory/apacheds/trunk/core-constants:1066126-1067490
+/directory/apacheds/trunk/core-constants:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/core-integ:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-integ:1040956-1043765
-/directory/apacheds/trunk/core-integ:1066126-1067490
+/directory/apacheds/trunk/core-integ:1066126-1067785
Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Sun Feb 6 22:16:07 2011
@@ -69,12 +69,6 @@ public class AutzIntegUtils
}
- public static LdapConnection getConnectionAs( String host, int port, String dn, String password ) throws Exception
- {
- return IntegrationUtils.getNetworkConnectionAs( host, port, dn, password );
- }
-
-
/**
* Creates a group using the groupOfUniqueNames objectClass under the
* ou=groups,ou=sytem container with an initial member.
Propchange: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -7,4 +7,4 @@
/directory/apacheds/branches/apacheds-subtree/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:965202-966561
/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
/directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067490
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/core-jndi:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/core-jndi:1040956-1043765
-/directory/apacheds/trunk/core-jndi:1066126-1067490
+/directory/apacheds/trunk/core-jndi:1066126-1067785
Propchange: directory/apacheds/branches/m1/http-integration/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/http-integration:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/http-integration:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/http-integration:1040956-1043765
-/directory/apacheds/trunk/http-integration:1066126-1067490
+/directory/apacheds/trunk/http-integration:1066126-1067785
Propchange: directory/apacheds/branches/m1/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/i18n:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/i18n:1040956-1043765
-/directory/apacheds/trunk/i18n:1066126-1067490
+/directory/apacheds/trunk/i18n:1066126-1067785
Propchange: directory/apacheds/branches/m1/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/apacheds-config/installers:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
-/directory/apacheds/trunk/installers:1066126-1067490
+/directory/apacheds/trunk/installers:1066126-1067785
/directory/installers/branches/installers-schema/apacheds:806631-896441
Propchange: directory/apacheds/branches/m1/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067490
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785
/directory/daemon/branches/daemon-schema/plugin:806630-896441
Propchange: directory/apacheds/branches/m1/interceptor-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/interceptor-kerberos:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/interceptor-kerberos:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/interceptor-kerberos:1040956-1043765
-/directory/apacheds/trunk/interceptor-kerberos:1066126-1067490
+/directory/apacheds/trunk/interceptor-kerberos:1066126-1067785
Propchange: directory/apacheds/branches/m1/jdbm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/jdbm:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm:1040956-1043765
-/directory/apacheds/trunk/jdbm:1066126-1067490
+/directory/apacheds/trunk/jdbm:1066126-1067785
Propchange: directory/apacheds/branches/m1/jdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/jdbm-partition:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/jdbm-partition:980138-980935
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/jdbm-partition:1040956-1043765
-/directory/apacheds/trunk/jdbm-partition:1066126-1067490
+/directory/apacheds/trunk/jdbm-partition:1066126-1067785
Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -6,4 +6,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:806623-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067490
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree:498338-580500,806623-894866*,1066126-1067785
Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -6,4 +6,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:809853-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067490
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java:498338-580500,806623-894866,1066126-1067785
Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -6,4 +6,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:806623-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067490
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema:498338-580500,806623-894866*,1066126-1067785
Propchange: directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -6,4 +6,4 @@
/directory/apacheds/branches/apacheds-schema/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:806623-810034
/directory/apacheds/branches/apacheds-subtree/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:945827-946347
-/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067490
+/directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java:498338-580500,806623-894866,1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/server:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/apacheds-codec-merge/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:982369-987590
/directory/apacheds/branches/apacheds-config/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:980138-980936
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/PaDataType.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -1,4 +1,4 @@
/directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:982369-987590
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/types/SamType.java:980138-980936
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/Checksum.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKey.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/PaData.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/crypto/checksum/ChecksumType.java:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/messages/value/flags:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -5,4 +5,4 @@
/directory/apacheds/branches/apacheds-schema/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:806623-896441
/directory/apacheds/branches/apacheds-subtree/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:965203-965686
/directory/apacheds/branches/xdbm-refactoring/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/KrbError.java:945827-946347
-/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-shared/src/test/java/org/apache/directory/server:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/test/java/org/apache/directory/server:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-codec/src/test/java/org/apache/directory/server:1040956-1043765
-/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067490
+/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server:1066126-1067785
Propchange: directory/apacheds/branches/m1/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/kerberos-test:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
-/directory/apacheds/trunk/kerberos-test:1066126-1067490
+/directory/apacheds/trunk/kerberos-test:1066126-1067785
Modified: directory/apacheds/branches/m1/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/pom.xml?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/pom.xml (original)
+++ directory/apacheds/branches/m1/ldap-client-test/pom.xml Sun Feb 6 22:16:07 2011
@@ -99,6 +99,7 @@
</includes>
<excludes>
<exclude>**/*Test.java</exclude>
+ <exclude>**/*ISuite.java</exclude>
</excludes>
</configuration>
</plugin>
@@ -116,10 +117,14 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <includes>
+ <include>**/*ISuite.java</include>
+ </includes>
<excludes>
<exclude>**/Abstract*</exclude>
<exclude>**/*RegressionTest*</exclude>
<exclude>**/TestClientApiPerf.java</exclude>
+ <exclude>**/*Test.java</exclude>
</excludes>
</configuration>
</plugin>
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Sun Feb 6 22:16:07 2011
@@ -25,7 +25,6 @@ import static org.junit.Assert.assertFal
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.HashMap;
@@ -42,7 +41,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.StringValue;
-import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.filter.EqualityNode;
import org.apache.directory.shared.ldap.model.filter.SearchScope;
import org.apache.directory.shared.ldap.model.message.BindResponse;
@@ -69,24 +67,20 @@ public class LdapConnectionTest extends
private static final String ADMIN_DN = "uid=admin,ou=system";
- private static LdapConnection connection;
+ private LdapNetworkConnection connection;
@Before
- public void bindConnection() throws Exception
+ public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- connection.bind( ADMIN_DN, "secret" );
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
}
@After
- public void unbindConnection() throws Exception
+ public void shutdown() throws Exception
{
- if ( connection != null )
- {
- connection.close();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@@ -107,24 +101,12 @@ public class LdapConnectionTest extends
//connection.unBind();
}
- catch ( LdapException le )
- {
- fail();
- }
- catch ( IOException ioe )
- {
- fail();
- }
finally
{
- try
+ if ( connection != null )
{
connection.close();
}
- catch ( IOException ioe )
- {
- fail();
- }
}
}
@@ -233,10 +215,10 @@ public class LdapConnectionTest extends
@Test
public void testAnonBind() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection conn = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- BindResponse resp = connection.bind();
+ BindResponse resp = conn.bind();
assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
- connection.close();
+ conn.close();
}
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Sun Feb 6 22:16:07 2011
@@ -22,7 +22,6 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.List;
@@ -115,14 +114,12 @@ public class LdapSSLConnectionTest exten
assertNotNull( bindResponse );
}
- catch ( Exception le )
- {
- le.printStackTrace();
- fail();
- }
finally
{
- connection.close();
+ if ( connection != null )
+ {
+ connection.close();
+ }
}
}
@@ -163,13 +160,12 @@ public class LdapSSLConnectionTest exten
connection.unBind();
}
- catch ( Exception le )
- {
- fail();
- }
finally
{
- connection.close();
+ if ( connection != null )
+ {
+ connection.close();
+ }
}
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java Sun Feb 6 22:16:07 2011
@@ -23,7 +23,6 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.NetworkSchemaLoader;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -33,6 +32,8 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.model.schema.SchemaManager;
import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
import org.apache.directory.shared.util.exception.Exceptions;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -46,12 +47,26 @@ import org.junit.runner.RunWith;
{ @CreateTransport(protocol = "LDAP"), @CreateTransport(protocol = "LDAPS") })
public class NetworkSchemaLoaderTest extends AbstractLdapTestUnit
{
+ private LdapNetworkConnection connection;
+
+
+ @Before
+ public void setup() throws Exception
+ {
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
+ }
+
+
+ @After
+ public void shutdown() throws Exception
+ {
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
+ }
+
+
@Test
public void testNetworkSchemaLoader() throws Exception
{
- LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- connection.bind( "uid=admin,ou=system", "secret" );
-
NetworkSchemaLoader loader = new NetworkSchemaLoader( connection );
SchemaManager sm = new DefaultSchemaManager( loader );
@@ -64,8 +79,6 @@ public class NetworkSchemaLoaderTest ext
}
assertTrue( sm.getRegistries().getAttributeTypeRegistry().contains( "cn" ) );
-
- connection.close();
}
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Sun Feb 6 22:16:07 2011
@@ -23,16 +23,14 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.SearchFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
-import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -60,37 +58,20 @@ import org.junit.runner.RunWith;
public class ClientAbandonRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
-
- private CoreSession session;
+ private LdapNetworkConnection connection;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Sun Feb 6 22:16:07 2011
@@ -24,13 +24,10 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.AddFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -39,6 +36,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.csn.CsnFactory;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -66,38 +64,22 @@ import org.junit.runner.RunWith;
{ @CreateTransport(protocol = "LDAP"), @CreateTransport(protocol = "LDAPS") })
public class ClientAddRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
+ private LdapNetworkConnection connection;
private CoreSession session;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
-
- session = ldapServer.getDirectoryService().getSession();
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
+ session = ldapServer.getDirectoryService().getAdminSession();
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@@ -135,19 +117,12 @@ public class ClientAddRequestTest extend
AddFuture addFuture = connection.addAsync( addRequest );
- try
- {
- AddResponse addResponse = addFuture.get( 1000, TimeUnit.MILLISECONDS );
-
- assertNotNull( addResponse );
- assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() );
- assertTrue( connection.isAuthenticated() );
- assertTrue( session.exists( dn ) );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ AddResponse addResponse = addFuture.get( 1000, TimeUnit.MILLISECONDS );
+
+ assertNotNull( addResponse );
+ assertEquals( ResultCodeEnum.SUCCESS, addResponse.getLdapResult().getResultCode() );
+ assertTrue( connection.isAuthenticated() );
+ assertTrue( session.exists( dn ) );
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Sun Feb 6 22:16:07 2011
@@ -23,12 +23,9 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.CompareFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -36,6 +33,7 @@ import org.apache.directory.server.annot
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.message.CompareRequest;
import org.apache.directory.shared.ldap.model.message.CompareRequestImpl;
@@ -58,39 +56,22 @@ import org.junit.runner.RunWith;
{ @CreateTransport(protocol = "LDAP"), @CreateTransport(protocol = "LDAPS") })
public class ClientCompareRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
-
+ private LdapNetworkConnection connection;
private CoreSession session;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
-
- session = ldapServer.getDirectoryService().getSession();
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
+ session = ldapServer.getDirectoryService().getAdminSession();
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@@ -125,16 +106,9 @@ public class ClientCompareRequestTest ex
CompareFuture compareFuture = connection.compareAsync( compareRequest );
- try
- {
- CompareResponse compareResponse = compareFuture.get( 1000, TimeUnit.MILLISECONDS );
-
- assertNotNull( compareResponse );
- assertEquals( ResultCodeEnum.COMPARE_TRUE, compareResponse.getLdapResult().getResultCode() );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ CompareResponse compareResponse = compareFuture.get( 1000, TimeUnit.MILLISECONDS );
+
+ assertNotNull( compareResponse );
+ assertEquals( ResultCodeEnum.COMPARE_TRUE, compareResponse.getLdapResult().getResultCode() );
}
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Sun Feb 6 22:16:07 2011
@@ -30,7 +30,6 @@ import static org.junit.Assert.fail;
import java.lang.reflect.Method;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
@@ -41,6 +40,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.message.DeleteRequest;
import org.apache.directory.shared.ldap.model.message.DeleteRequestImpl;
@@ -85,39 +85,21 @@ import org.junit.runner.RunWith;
public class ClientDeleteRequestTest extends AbstractLdapTestUnit
{
private LdapNetworkConnection connection;
-
private CoreSession session;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
-
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
session = ldapServer.getDirectoryService().getAdminSession();
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@@ -239,18 +221,11 @@ public class ClientDeleteRequestTest ext
DeleteFuture deleteFuture = connection.deleteAsync( deleteRequest );
- try
- {
- DeleteResponse deleteResponse = deleteFuture.get( 1000, TimeUnit.MILLISECONDS );
+ DeleteResponse deleteResponse = deleteFuture.get( 1000, TimeUnit.MILLISECONDS );
- assertNotNull( deleteResponse );
- assertEquals( ResultCodeEnum.SUCCESS, deleteResponse.getLdapResult().getResultCode() );
- assertTrue( connection.isAuthenticated() );
- assertFalse( session.exists( dn ) );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ assertNotNull( deleteResponse );
+ assertEquals( ResultCodeEnum.SUCCESS, deleteResponse.getLdapResult().getResultCode() );
+ assertTrue( connection.isAuthenticated() );
+ assertFalse( session.exists( dn ) );
}
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Sun Feb 6 22:16:07 2011
@@ -23,27 +23,23 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
import javax.naming.ldap.StartTlsRequest;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.ExtendedFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
-import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.message.ExtendedRequest;
import org.apache.directory.shared.ldap.model.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.model.name.Dn;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -61,69 +57,61 @@ import org.junit.runner.RunWith;
{ StartTlsHandler.class })
public class ClientExtendedRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
- private CoreSession session;
+ private LdapNetworkConnection connection;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
-
- session = ldapServer.getDirectoryService().getSession();
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@Test
public void testExtended() throws Exception
{
- ExtendedResponse response = connection.extended( StartTlsRequest.OID );
- assertNotNull( response );
- assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
+ try
+ {
+ ExtendedResponse response = connection.extended( StartTlsRequest.OID );
+ assertNotNull( response );
+ assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
+ }
+ finally
+ {
+ // close connection to stop TLS
+ connection.close();
+ }
}
@Test
public void testExtendedAsync() throws Exception
{
- ExtendedRequest extendedRequest = new ExtendedRequestImpl();
- extendedRequest.setRequestName( StartTlsRequest.OID );
-
- ExtendedFuture extendedFuture = connection.extendedAsync( extendedRequest );
-
try
{
- ExtendedResponse extendedResponse = (ExtendedResponse) extendedFuture.get( 1000, TimeUnit.MILLISECONDS );
+ ExtendedRequest extendedRequest = new ExtendedRequestImpl();
+ extendedRequest.setRequestName( StartTlsRequest.OID );
+
+ ExtendedFuture extendedFuture = connection.extendedAsync( extendedRequest );
+
+ ExtendedResponse extendedResponse = ( ExtendedResponse ) extendedFuture.get( 1000, TimeUnit.MILLISECONDS );
assertNotNull( extendedResponse );
assertEquals( ResultCodeEnum.SUCCESS, extendedResponse.getLdapResult().getResultCode() );
assertTrue( connection.isAuthenticated() );
}
- catch ( TimeoutException toe )
+ finally
{
- fail();
+ // close connection to stop TLS
+ connection.close();
}
+
}
}
\ No newline at end of file
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Sun Feb 6 22:16:07 2011
@@ -24,12 +24,9 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.ModifyDnFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -38,6 +35,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequest;
import org.apache.directory.shared.ldap.model.message.ModifyDnRequestImpl;
@@ -62,51 +60,32 @@ import org.junit.runner.RunWith;
{ @CreateTransport(protocol = "LDAP"), @CreateTransport(protocol = "LDAPS") })
public class ClientModifyDnRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
-
+ private static final String DN = "cn=modDn,ou=system";
+ private LdapNetworkConnection connection;
private CoreSession session;
- private String dn = "cn=modDn,ou=system";
-
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
-
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
session = ldapServer.getDirectoryService().getAdminSession();
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@Test
public void testRename() throws Exception
{
- ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString" );
+ ModifyDnResponse resp = connection.rename( DN, "cn=modifyDnWithString" );
assertNotNull( resp );
- assertFalse( session.exists( new Dn( dn ) ) );
+ assertFalse( session.exists( new Dn( DN ) ) );
assertTrue( session.exists( new Dn( "cn=modifyDnWithString,ou=system" ) ) );
}
@@ -114,10 +93,10 @@ public class ClientModifyDnRequestTest e
@Test
public void testRenameWithoutDeleteOldRdn() throws Exception
{
- ModifyDnResponse resp = connection.rename( dn, "cn=modifyDnWithString", false );
+ ModifyDnResponse resp = connection.rename( DN, "cn=modifyDnWithString", false );
assertNotNull( resp );
- Dn oldDn = new Dn( dn );
+ Dn oldDn = new Dn( DN );
assertFalse( session.exists( oldDn ) );
Entry entry = session.lookup( new Dn( "cn=modifyDnWithString,ou=system" ) );
@@ -131,10 +110,10 @@ public class ClientModifyDnRequestTest e
@Test
public void testMove() throws Exception
{
- ModifyDnResponse resp = connection.move( dn, "ou=users,ou=system" );
+ ModifyDnResponse resp = connection.move( DN, "ou=users,ou=system" );
assertNotNull( resp );
- Dn oldDn = new Dn( dn );
+ Dn oldDn = new Dn( DN );
assertFalse( session.exists( oldDn ) );
assertTrue( session.exists( new Dn( "cn=modDn,ou=users,ou=system" ) ) );
@@ -144,7 +123,7 @@ public class ClientModifyDnRequestTest e
@Test
public void testModifyDnAsync() throws Exception
{
- Dn oldDn = new Dn( dn );
+ Dn oldDn = new Dn( DN );
Dn newDn = new Dn( "cn=modifyDnWithString,ou=system" );
ModifyDnRequest modDnReq = new ModifyDnRequestImpl();
@@ -154,20 +133,13 @@ public class ClientModifyDnRequestTest e
ModifyDnFuture modifyDnFuture = connection.modifyDnAsync( modDnReq );
- try
- {
- ModifyDnResponse response = modifyDnFuture.get( 1000, TimeUnit.MILLISECONDS );
-
- assertNotNull( response );
-
- assertTrue( connection.isAuthenticated() );
- assertFalse( session.exists( oldDn ) );
- assertTrue( session.exists( newDn ) );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ ModifyDnResponse response = modifyDnFuture.get( 1000, TimeUnit.MILLISECONDS );
+
+ assertNotNull( response );
+
+ assertTrue( connection.isAuthenticated() );
+ assertFalse( session.exists( oldDn ) );
+ assertTrue( session.exists( newDn ) );
assertTrue( session.exists( new Dn( "cn=modifyDnWithString,ou=system" ) ) );
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Sun Feb 6 22:16:07 2011
@@ -24,13 +24,10 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.ModifyFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -39,6 +36,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.csn.CsnFactory;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -77,40 +75,22 @@ import org.junit.runner.RunWith;
})
public class ClientModifyRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
-
+ private LdapNetworkConnection connection;
private CoreSession session;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
-
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
-
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
session = ldapServer.getDirectoryService().getAdminSession();
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@@ -202,25 +182,18 @@ public class ClientModifyRequestTest ext
ModifyFuture modifyFuture = connection.modifyAsync( modifyRequest );
- try
- {
- ModifyResponse response = modifyFuture.get( 1000, TimeUnit.MILLISECONDS );
+ ModifyResponse response = modifyFuture.get( 1000, TimeUnit.MILLISECONDS );
- assertNotNull( response );
+ assertNotNull( response );
- Entry entry = session.lookup( dn );
+ Entry entry = session.lookup( dn );
- String actual = entry.get( SchemaConstants.SN_AT ).getString();
+ String actual = entry.get( SchemaConstants.SN_AT ).getString();
- assertEquals( expected, actual );
+ assertEquals( expected, actual );
- assertTrue( connection.isAuthenticated() );
- assertTrue( session.exists( dn ) );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ assertTrue( connection.isAuthenticated() );
+ assertTrue( session.exists( dn ) );
}
@@ -246,17 +219,17 @@ public class ClientModifyRequestTest ext
// admin can modify the entryCsn
modResp = connection.modify( modifyRequest );
assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
-
- connection.close();
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection nonAdminConnection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
Dn bindDn = new Dn( "uid=billyd,ou=users,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
+ nonAdminConnection.bind( bindDn.getName(), "secret" );
// non-admin user cannot modify entryCSN
- modResp = connection.modify( modifyRequest );
+ modResp = nonAdminConnection.modify( modifyRequest );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
+
+ nonAdminConnection.close();
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Sun Feb 6 22:16:07 2011
@@ -84,18 +84,11 @@ public class SimpleBindRequestTest exten
* Close the LdapConnection
*/
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
+ if ( connection != null )
{
- fail();
+ connection.close();
}
}
@@ -133,18 +126,11 @@ public class SimpleBindRequestTest exten
BindFuture bindFuture = connection.bindAsync( bindRequest );
- try
- {
- BindResponse bindResponse = bindFuture.get( 1000, TimeUnit.MILLISECONDS );
+ BindResponse bindResponse = bindFuture.get( 1000, TimeUnit.MILLISECONDS );
- assertNotNull( bindResponse );
- assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
- assertTrue( connection.isAuthenticated() );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ assertNotNull( bindResponse );
+ assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
+ assertTrue( connection.isAuthenticated() );
}
}
@@ -366,18 +352,11 @@ public class SimpleBindRequestTest exten
assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
// Now get back the BindResponse
- try
- {
- BindResponse bindResponse = bindFuture.get( 2000, TimeUnit.MILLISECONDS );
+ BindResponse bindResponse = bindFuture.get( 2000, TimeUnit.MILLISECONDS );
- assertNotNull( bindResponse );
- assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
- assertTrue( connection.isAuthenticated() );
- }
- catch ( TimeoutException toe )
- {
- fail();
- }
+ assertNotNull( bindResponse );
+ assertEquals( ResultCodeEnum.SUCCESS, bindResponse.getLdapResult().getResultCode() );
+ assertTrue( connection.isAuthenticated() );
}
finally
{
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Sun Feb 6 22:16:07 2011
@@ -23,11 +23,9 @@ package org.apache.directory.shared.clie
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
import java.util.concurrent.TimeUnit;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.SearchFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -35,6 +33,7 @@ import org.apache.directory.server.annot
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -84,35 +83,20 @@ import org.junit.runner.RunWith;
})
public class ClientSearchRequestTest extends AbstractLdapTestUnit
{
- private LdapAsyncConnection connection;
+ private LdapNetworkConnection connection;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
}
- /**
- * Close the LdapConnection
- */
@After
- public void shutdown()
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
@@ -246,6 +230,5 @@ public class ClientSearchRequestTest ext
public void testSearchUTF8() throws Exception
{
connection.search( "ou=system", "(sn=Emmanuel L\u00e9charny)", SearchScope.ONELEVEL, "*", "+" );
- fail();
}
}
Modified: directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java?rev=1067786&r1=1067785&r2=1067786&view=diff
==============================================================================
--- directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java (original)
+++ directory/apacheds/branches/m1/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java Sun Feb 6 22:16:07 2011
@@ -25,15 +25,14 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.apache.directory.ldap.client.api.LdapConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.server.annotations.CreateLdapServer;
import org.apache.directory.server.annotations.CreateTransport;
import org.apache.directory.server.core.annotations.ApplyLdifs;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.client.api.LdapApiIntegrationUtils;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -43,7 +42,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.model.message.SearchResultEntry;
import org.apache.directory.shared.ldap.model.name.Dn;
-import org.junit.AfterClass;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -65,35 +64,20 @@ import org.junit.runner.RunWith;
"objectClass: extensibleObject", "aliasedObjectName: cn=user1,ou=users,ou=system", "cn: user1-alias" })
public class SearchRequestReturningAttributesTest extends AbstractLdapTestUnit
{
- private static LdapConnection connection;
+ private LdapNetworkConnection connection;
@Before
public void setup() throws Exception
{
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- Dn bindDn = new Dn( "uid=admin,ou=system" );
- connection.bind( bindDn.getName(), "secret" );
+ connection = LdapApiIntegrationUtils.getPooledAdminConnection( ldapServer );
}
- /**
- * Close the LdapConnection
- */
- @AfterClass
- public static void shutdown()
+ @After
+ public void shutdown() throws Exception
{
- try
- {
- if ( connection != null )
- {
- connection.close();
- }
- }
- catch ( Exception ioe )
- {
- fail();
- }
+ LdapApiIntegrationUtils.releasePooledAdminConnection( connection, ldapServer );
}
Propchange: directory/apacheds/branches/m1/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/ldif-partition:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
-/directory/apacheds/trunk/ldif-partition:1066126-1067490
+/directory/apacheds/trunk/ldif-partition:1066126-1067785
Propchange: directory/apacheds/branches/m1/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/protocol-changepw:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
-/directory/apacheds/trunk/protocol-changepw:1066126-1067490
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785
Propchange: directory/apacheds/branches/m1/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 6 22:16:07 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/protocol-dhcp:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067490
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785