Return-Path: Delivered-To: apmail-felix-commits-archive@www.apache.org Received: (qmail 91675 invoked from network); 4 Dec 2009 22:50:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 4 Dec 2009 22:50:55 -0000 Received: (qmail 66162 invoked by uid 500); 4 Dec 2009 22:50:55 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 66088 invoked by uid 500); 4 Dec 2009 22:50:55 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 66079 invoked by uid 99); 4 Dec 2009 22:50:55 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 04 Dec 2009 22:50:55 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Fri, 04 Dec 2009 22:50:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F299C2388962; Fri, 4 Dec 2009 22:50:31 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r887412 - /felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java Date: Fri, 04 Dec 2009 22:50:31 -0000 To: commits@felix.apache.org From: pderop@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091204225031.F299C2388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pderop Date: Fri Dec 4 22:50:31 2009 New Revision: 887412 URL: http://svn.apache.org/viewvc?rev=887412&view=rev Log: renamed package to org.apache.felix.dm.impl.dependencies; the setCallback method returns now a ConfigurationDependency instead of a Dependency Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java Modified: felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java URL: http://svn.apache.org/viewvc/felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java?rev=887412&r1=887411&r2=887412&view=diff ============================================================================== --- felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java (original) +++ felix/trunk/dependencymanager/core/src/main/java/org/apache/felix/dm/impl/dependencies/ConfigurationDependencyImpl.java Fri Dec 4 22:50:31 2009 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.felix.dependencymanager.dependencies; +package org.apache.felix.dm.impl.dependencies; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -27,10 +27,11 @@ import java.util.Properties; import java.util.Set; -import org.apache.felix.dependencymanager.Dependency; -import org.apache.felix.dependencymanager.DependencyService; -import org.apache.felix.dependencymanager.impl.Logger; -import org.apache.felix.dependencymanager.management.ServiceComponentDependency; +import org.apache.felix.dm.dependencies.ConfigurationDependency; +import org.apache.felix.dm.dependencies.Dependency; +import org.apache.felix.dm.dependencies.ServiceDependency; +import org.apache.felix.dm.impl.Logger; +import org.apache.felix.dm.management.ServiceComponentDependency; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.framework.ServiceRegistration; @@ -57,7 +58,7 @@ * * @author Felix Project Team */ -public class ConfigurationDependency implements Dependency, ManagedService, ServiceComponentDependency { +public class ConfigurationDependencyImpl implements ConfigurationDependency, ManagedService, ServiceComponentDependency, DependencyActivation { private BundleContext m_context; private String m_pid; private ServiceRegistration m_registration; @@ -69,7 +70,7 @@ private boolean m_isStarted; private final Set m_updateInvokedCache = new HashSet(); - public ConfigurationDependency(BundleContext context, Logger logger) { + public ConfigurationDependencyImpl(BundleContext context, Logger logger) { m_context = context; m_logger = logger; } @@ -135,7 +136,7 @@ } } - public Dependency setCallback(String callback) { + public ConfigurationDependency setCallback(String callback) { m_callback = callback; return this; }