From commits-return-32730-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Thu Nov 3 13:03:55 2011 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C32F47402 for ; Thu, 3 Nov 2011 13:03:55 +0000 (UTC) Received: (qmail 70442 invoked by uid 500); 3 Nov 2011 13:03:55 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 70399 invoked by uid 500); 3 Nov 2011 13:03:55 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 70392 invoked by uid 99); 3 Nov 2011 13:03:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 13:03:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Nov 2011 13:03:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 812582388A02 for ; Thu, 3 Nov 2011 13:03:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1197090 [3/3] - in /directory/shared/branches/shared-osgi: ./ all/ distribution/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml/parser/s... Date: Thu, 03 Nov 2011 13:03:24 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111103130331.812582388A02@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Propchange: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 3 13:03:20 2011 @@ -7,7 +7,7 @@ /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351 -/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1185684-1188093,1188104-1189123 +/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1185684-1188093,1188104-1189123,1189132-1197055 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502 /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1075328 Modified: directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java?rev=1197090&r1=1197089&r2=1197090&view=diff ============================================================================== --- directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java (original) +++ directory/shared/branches/shared-osgi/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/comparators/SerializableComparator.java Thu Nov 3 13:03:20 2011 @@ -114,5 +114,6 @@ public class SerializableComparator e ( ( LdapComparator ) wrapped ).setSchemaManager( schemaManager ); super.setSchemaManager( schemaManager ); + this.schemaManager = schemaManager; } } Propchange: directory/shared/branches/shared-osgi/ldap/net/mina/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 3 13:03:20 2011 @@ -6,6 +6,6 @@ /directory/shared/branches/shared-osgi/ldap/net/mina:1103720-1124653 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351 /directory/shared/trunk/ldap:1066124-1067784 -/directory/shared/trunk/ldap/net/mina:1185684-1188093,1188104-1189123 +/directory/shared/trunk/ldap/net/mina:1185684-1188093,1188104-1189123,1189132-1197055 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1074636 /directory/shared/trunk/ldap-protocol-codec:1074637-1075328 Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 3 13:03:20 2011 @@ -10,5 +10,5 @@ /directory/shared/branches/shared-subtree/ldap-schema:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-schema:980350-980351 -/directory/shared/trunk/ldap/schema/data:1185684-1188093,1188104-1189123 +/directory/shared/trunk/ldap/schema/data:1185684-1188093,1188104-1189123,1189132-1197055 /directory/shared/trunk/ldap-schema:1066124-1067995,1068025-1072732,1072797-1075328 Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 3 13:03:20 2011 @@ -9,6 +9,6 @@ /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980350-980351 -/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1185684-1188093,1188104-1189123 +/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1185684-1188093,1188104-1189123,1189132-1197055 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1066124-1067995,1068025-1072732,1072797-1075328 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844* Propchange: directory/shared/branches/shared-osgi/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 3 13:03:20 2011 @@ -9,6 +9,6 @@ /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980350-980351 -/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1185684-1188093,1188104-1189123 +/directory/shared/trunk/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1185684-1188093,1188104-1189123,1189132-1197055 /directory/shared/trunk/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1066124-1067995,1068025-1072732,1072797-1075328 /directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844