Return-Path: Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org Received: (qmail 4027 invoked from network); 13 Jul 2010 19:47:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 13 Jul 2010 19:47:33 -0000 Received: (qmail 7941 invoked by uid 500); 13 Jul 2010 19:47:33 -0000 Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org Received: (qmail 7920 invoked by uid 500); 13 Jul 2010 19:47:33 -0000 Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ace-dev@incubator.apache.org Delivered-To: mailing list ace-commits@incubator.apache.org Received: (qmail 7912 invoked by uid 99); 13 Jul 2010 19:47:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jul 2010 19:47:33 +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; Tue, 13 Jul 2010 19:47:30 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 437662388900; Tue, 13 Jul 2010 19:46:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r963833 - in /incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl: Activator.java RepositoryAdminImpl.java Date: Tue, 13 Jul 2010 19:46:07 -0000 To: ace-commits@incubator.apache.org From: marrs@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100713194607.437662388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marrs Date: Tue Jul 13 19:46:06 2010 New Revision: 963833 URL: http://svn.apache.org/viewvc?rev=963833&view=rev Log: Fixes for the latest dependency manager snapshot. Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java?rev=963833&r1=963832&r2=963833&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/Activator.java Tue Jul 13 19:46:06 2010 @@ -42,7 +42,7 @@ import org.apache.ace.client.repository. import org.apache.ace.server.log.store.LogStore; import org.apache.felix.dm.DependencyActivatorBase; import org.apache.felix.dm.DependencyManager; -import org.apache.felix.dm.service.Service; +import org.apache.felix.dm.Service; import org.osgi.framework.BundleContext; import org.osgi.framework.Constants; import org.osgi.service.event.EventAdmin; Modified: incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java?rev=963833&r1=963832&r2=963833&view=diff ============================================================================== --- incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java (original) +++ incubator/ace/trunk/ace-client-repository-impl/src/main/java/org/apache/ace/client/repository/impl/RepositoryAdminImpl.java Tue Jul 13 19:46:06 2010 @@ -60,7 +60,7 @@ import org.apache.ace.repository.impl.Ca import org.apache.ace.repository.impl.FilebasedBackupRepository; import org.apache.ace.repository.impl.RemoteRepository; import org.apache.felix.dm.DependencyManager; -import org.apache.felix.dm.service.Service; +import org.apache.felix.dm.Service; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; import org.osgi.service.event.EventConstants;