You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/01/14 19:15:59 UTC
svn commit: r1059091 - in /directory/apacheds/branches/apacheds-AP:
server-annotations/ server-config/
server-config/src/main/java/org/apache/directory/server/config/
server-config/src/main/resources/
server-config/src/test/java/org/apache/directory/se...
Author: elecharny
Date: Fri Jan 14 18:15:59 2011
New Revision: 1059091
URL: http://svn.apache.org/viewvc?rev=1059091&view=rev
Log:
Merged back the trunk into my branch
Modified:
directory/apacheds/branches/apacheds-AP/server-annotations/ (props changed)
directory/apacheds/branches/apacheds-AP/server-config/ (props changed)
directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java (props changed)
directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/ (props changed)
directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (props changed)
directory/apacheds/branches/apacheds-AP/server-integ/ (props changed)
directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
directory/apacheds/branches/apacheds-AP/server-jndi/ (props changed)
directory/apacheds/branches/apacheds-AP/server-replication/ (props changed)
directory/apacheds/branches/apacheds-AP/service/ (props changed)
directory/apacheds/branches/apacheds-AP/service-builder/ (props changed)
directory/apacheds/branches/apacheds-AP/test-framework/ (props changed)
directory/apacheds/branches/apacheds-AP/wrapper/ (props changed)
directory/apacheds/branches/apacheds-AP/xdbm-partition/ (props changed)
directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
directory/apacheds/branches/apacheds-AP/xdbm-tools/ (props changed)
Propchange: directory/apacheds/branches/apacheds-AP/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -2,3 +2,4 @@
/directory/apacheds/branches/apacheds-config/server-annotations:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
+/directory/apacheds/trunk/server-annotations:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -4,4 +4,4 @@
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
/directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1049007-1056408
+/directory/apacheds/trunk/server-config:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -8,4 +8,4 @@
/directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
/directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1056408
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -11,4 +11,4 @@
/directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
/directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1049007-1056408
+/directory/apacheds/trunk/server-config/src/main/resources:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -10,4 +10,4 @@
/directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
/directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
/directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1056408
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -3,3 +3,4 @@
/directory/apacheds/branches/apacheds-config/server-integ:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
+/directory/apacheds/trunk/server-integ:1049007-1059083
Modified: directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java?rev=1059091&r1=1059090&r2=1059091&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java (original)
+++ directory/apacheds/branches/apacheds-AP/server-integ/src/test/java/org/apache/directory/server/operations/bind/MiscBindIT.java Fri Jan 14 18:15:59 2011
@@ -82,7 +82,7 @@ import org.junit.runner.RunWith;
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
@RunWith ( FrameworkRunner.class )
-@CreateDS( allowAnonAccess=true, name="SaslBindIT-class",
+@CreateDS( allowAnonAccess=true, name="MiscBindIT-class",
partitions =
{
@CreatePartition(
Propchange: directory/apacheds/branches/apacheds-AP/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -2,3 +2,4 @@
/directory/apacheds/branches/apacheds-config/server-jndi:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
+/directory/apacheds/trunk/server-jndi:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -2,3 +2,4 @@
/directory/apacheds/branches/apacheds-config/server-replication:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
+/directory/apacheds/trunk/server-replication:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/service/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -0,0 +1,8 @@
+/directory/apacheds/branches/apacheds-codec-merge/service:982369-987590
+/directory/apacheds/branches/apacheds-config/service:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/service:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/service:749790-764110
+/directory/apacheds/branches/apacheds-schema/service:806623-896441
+/directory/apacheds/branches/apacheds-subtree/service:965203-965686
+/directory/apacheds/branches/xdbm-refactoring/service:945827-946347
+/directory/apacheds/trunk/service:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -1,2 +1,2 @@
/directory/apacheds/branches/antoine/service-builder:1038305-1044163
-/directory/apacheds/trunk/service-builder:1049007-1051328
+/directory/apacheds/trunk/service-builder:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -8,3 +8,4 @@
/directory/apacheds/branches/apacheds-schema/test-framework:806623-893782
/directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
/directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
+/directory/apacheds/trunk/test-framework:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/wrapper/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -0,0 +1,8 @@
+/directory/apacheds/branches/apacheds-codec-merge/wrapper:982369-987590
+/directory/apacheds/branches/apacheds-config/wrapper:1023442-1029077
+/directory/apacheds/branches/apacheds-kerberos-codec-2.0/wrapper:1040956-1043765
+/directory/apacheds/branches/apacheds-replication/wrapper:749790-764110
+/directory/apacheds/branches/apacheds-schema/wrapper:806623-896441
+/directory/apacheds/branches/apacheds-subtree/wrapper:965203-965686
+/directory/apacheds/branches/xdbm-refactoring/wrapper:945827-946347
+/directory/apacheds/trunk/wrapper:1049007-1059083
Propchange: directory/apacheds/branches/apacheds-AP/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -2,4 +2,4 @@
/directory/apacheds/branches/apacheds-config/xdbm-partition:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
-/directory/apacheds/trunk/xdbm-partition:1049007-1051100
+/directory/apacheds/trunk/xdbm-partition:1049007-1059083
Modified: directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java?rev=1059091&r1=1059090&r2=1059091&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java (original)
+++ directory/apacheds/branches/apacheds-AP/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java Fri Jan 14 18:15:59 2011
@@ -305,4 +305,34 @@ public class OneLevelScopeCursor<ID exte
{
return scopeCursor.isElementReused() || ( dereferencedCursor != null && dereferencedCursor.isElementReused() );
}
+
+
+ @Override
+ public void close() throws Exception
+ {
+ scopeCursor.close();
+
+ if ( dereferencedCursor != null )
+ {
+ dereferencedCursor.close();
+ }
+
+ super.close();
+ }
+
+
+ @Override
+ public void close( Exception cause ) throws Exception
+ {
+ scopeCursor.close( cause );
+
+ if ( dereferencedCursor != null )
+ {
+ dereferencedCursor.close( cause );
+ }
+
+ super.close( cause );
+ }
+
+
}
\ No newline at end of file
Propchange: directory/apacheds/branches/apacheds-AP/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 14 18:15:59 2011
@@ -2,3 +2,4 @@
/directory/apacheds/branches/apacheds-config/xdbm-tools:1023442-1029077
/directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
/directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
+/directory/apacheds/trunk/xdbm-tools:1049007-1059083