Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-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 9B425106F5 for ; Tue, 7 May 2013 12:23:17 +0000 (UTC) Received: (qmail 66304 invoked by uid 500); 7 May 2013 12:23:17 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 66248 invoked by uid 500); 7 May 2013 12:23:17 -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 66239 invoked by uid 99); 7 May 2013 12:23:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 May 2013 12:23:17 +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; Tue, 07 May 2013 12:23:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B3D46238897A; Tue, 7 May 2013 12:22:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1479879 [2/2] - in /felix/trunk/ipojo/runtime: api-it/ api-it/src/it/ipojo-api-test/src/test/java/org/apache/felix/ipojo/runtime/core/api/ composite-it/ composite-it/src/it/ipojo-composite-import-export-test/src/test/java/org/apache/felix/... Date: Tue, 07 May 2013 12:22:52 -0000 To: commits@felix.apache.org From: clement@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130507122253.B3D46238897A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java?rev=1479879&r1=1479878&r2=1479879&view=diff ============================================================================== --- felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java (original) +++ felix/trunk/ipojo/runtime/core-it/src/it/ipojo-core-factory-version-test/src/test/java/org/apache/felix/ipojo/tests/core/VersionConflictTest.java Tue May 7 12:22:52 2013 @@ -186,7 +186,7 @@ public class VersionConflictTest extends //Assert.assertEquals(bundles[i].getSymbolicName() + " is not active", Bundle.ACTIVE, bundles[i].getState()); } - Bundle consBundle = osgiHelper.getBundle("MyCons"); +// Bundle consBundle = osgiHelper.getBundle("MyCons"); // BundleWiring wiring = consBundle.adapt(BundleWiring.class); // System.out.println("Bundle Wiring req: "); // for (BundleWire wire : wiring.getRequiredWires(null)) {