Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 73736 invoked from network); 27 Jan 2010 16:33:38 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 27 Jan 2010 16:33:38 -0000 Received: (qmail 87880 invoked by uid 500); 27 Jan 2010 16:33:38 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 87802 invoked by uid 500); 27 Jan 2010 16:33:38 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 87783 invoked by uid 99); 27 Jan 2010 16:33:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Jan 2010 16:33:38 +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; Wed, 27 Jan 2010 16:33:37 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 65FE72388A02; Wed, 27 Jan 2010 16:33:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r903715 - in /cxf/dosgi/trunk/systests2: multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/ multi-bundle/src/test/resources/ single-bundle/src/test/resources/ Date: Wed, 27 Jan 2010 16:33:17 -0000 To: commits@cxf.apache.org From: davidb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100127163317.65FE72388A02@eris.apache.org> Author: davidb Date: Wed Jan 27 16:33:16 2010 New Revision: 903715 URL: http://svn.apache.org/viewvc?rev=903715&view=rev Log: Optimization to system tests. Removed: cxf/dosgi/trunk/systests2/multi-bundle/src/test/resources/ cxf/dosgi/trunk/systests2/single-bundle/src/test/resources/ Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java?rev=903715&r1=903714&r2=903715&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java (original) +++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/MultiBundleTools.java Wed Jan 27 16:33:16 2010 @@ -56,7 +56,10 @@ File fullDir = new File(distroDir, val.substring("file:".length())); bundles.put(i, fullDir.toURI().toASCIIString()); } else { - bundles.put(i, val); + if (!val.contains("org.osgi.compendium")) { + // We're skipping that one as it's pulled in explicitly in the test + bundles.put(i, val); + } } } } Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java?rev=903715&r1=903714&r2=903715&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java (original) +++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestExportService.java Wed Jan 27 16:33:16 2010 @@ -45,6 +45,7 @@ List