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 517799DC2 for ; Mon, 26 Dec 2011 11:10:04 +0000 (UTC) Received: (qmail 3765 invoked by uid 500); 26 Dec 2011 11:10:04 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 3732 invoked by uid 500); 26 Dec 2011 11:10:04 -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 3725 invoked by uid 99); 26 Dec 2011 11:10:04 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Dec 2011 11:10:04 +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; Mon, 26 Dec 2011 11:10:03 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8A5A523889C5 for ; Mon, 26 Dec 2011 11:09:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1224711 - in /directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component: ADSComponent.java utilities/LdifConfigHelper.java Date: Mon, 26 Dec 2011 11:09:42 -0000 To: commits@directory.apache.org From: gokturk@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111226110942.8A5A523889C5@eris.apache.org> Author: gokturk Date: Mon Dec 26 11:09:42 2011 New Revision: 1224711 URL: http://svn.apache.org/viewvc?rev=1224711&view=rev Log: * ComponentManager methods are embedded in ADSComponent to let it manage itself. * Bugfix in LdifConfigHelper,(DN attributes were not in entry's attribute list). Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/ADSComponent.java directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/ADSComponent.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/ADSComponent.java?rev=1224711&r1=1224710&r2=1224711&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/ADSComponent.java (original) +++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/ADSComponent.java Mon Dec 26 11:09:42 2011 @@ -88,6 +88,41 @@ public class ADSComponent /** + * Creates and return an instance, and add it into internal instances list. + * + * @return Created instance as ADSComponentInstance reference + */ + public ADSComponentInstance createInstance() + { + return componentManager.createInstance( this ); + } + + + /** + * Loads all the cached instances of this component and return them in list. + * + * @return Loaded instances + */ + public List loadCachedInstances() + { + return componentManager.loadCachedInstances( this ); + } + + + /** + * Loads the specified cached instance of this component and return it. + * TODO loadInstance. + * + * @param cachedInstance Cached instance reference to resurrect + * @return Resurrected instance reference + */ + public ADSComponentInstance loadInstance( CachedComponentInstance cachedInstance ) + { + return componentManager.loadInstance( this, cachedInstance ); + } + + + /** * Adds an instance to a instances list * * @param instance instance reference to add to a list Modified: directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java?rev=1224711&r1=1224710&r2=1224711&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java (original) +++ directory/apacheds/branches/apacheds-osgi/component-hub/src/main/java/org/apache/directory/server/component/utilities/LdifConfigHelper.java Mon Dec 26 11:09:42 2011 @@ -71,12 +71,14 @@ public class LdifConfigHelper { if ( key.equals( ADSConstants.ADS_COMPONENT_INSTANCE_PROP_NAME ) ) { - continue; + String dnAttrib = ADSSchemaConstants.ADS_COMPONENT_INSTANCE_ATTRIB_NAME + "=" + instanceName; + attributes.add( dnAttrib ); } String attribute = ( String ) key + "=" + ( String ) instanceConfiguration.get( key ); attributes.add( attribute ); } + LdifEntry instanceEntry; try {