Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 5799 invoked from network); 6 May 2010 11:36:11 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 6 May 2010 11:36:11 -0000 Received: (qmail 73913 invoked by uid 500); 6 May 2010 11:36:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 73833 invoked by uid 500); 6 May 2010 11:36:10 -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 73826 invoked by uid 99); 6 May 2010 11:36:10 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 May 2010 11:36:10 +0000 X-ASF-Spam-Status: No, hits=-1161.1 required=10.0 tests=ALL_TRUSTED,AWL 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; Thu, 06 May 2010 11:36:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8657723889FA; Thu, 6 May 2010 11:35:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r941670 - in /cxf/dosgi/trunk: discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/ systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/ systests2/multi-bundle/... Date: Thu, 06 May 2010 11:35:19 -0000 To: commits@cxf.apache.org From: davidb@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100506113519.8657723889FA@eris.apache.org> Author: davidb Date: Thu May 6 11:35:19 2010 New Revision: 941670 URL: http://svn.apache.org/viewvc?rev=941670&view=rev Log: Fixed a small typo and add a short sleep to make the system tests pass on my poor old machine... Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Modified: cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java?rev=941670&r1=941669&r2=941670&view=diff ============================================================================== --- cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java (original) +++ cxf/dosgi/trunk/discovery/distributed/zookeeper-server-config/src/main/java/org/apache/cxf/dosgi/discovery/zookeeper/server/config/Activator.java Thu May 6 11:35:19 2010 @@ -30,7 +30,7 @@ import org.osgi.service.cm.ManagedServic import org.osgi.util.tracker.ServiceTracker; public class Activator implements BundleActivator { - private static final String ZOOKEEPER_PORT = "org.apache.cxf.dosgi.discovery.zookeeper.pport"; + private static final String ZOOKEEPER_PORT = "org.apache.cxf.dosgi.discovery.zookeeper.port"; private static final String PID = "org.apache.cxf.dosgi.discovery.zookeeper.server"; private ServiceTracker st; Modified: cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java?rev=941670&r1=941669&r2=941670&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java (original) +++ cxf/dosgi/trunk/systests2/common/src/main/java/org/apache/cxf/dosgi/systests2/common/AbstractTestImportService.java Thu May 6 11:35:19 2010 @@ -85,6 +85,9 @@ public abstract class AbstractTestImport try { Thread.currentThread().setContextClassLoader(ServerFactoryBean.class.getClassLoader()); server = factory.create(); + + System.out.println("Give the system a few seconds to breathe..."); + Thread.sleep(3000); Hashtable props = new Hashtable(); props.put("testName", "test1"); Modified: cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java URL: http://svn.apache.org/viewvc/cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java?rev=941670&r1=941669&r2=941670&view=diff ============================================================================== --- cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java (original) +++ cxf/dosgi/trunk/systests2/multi-bundle/src/test/java/org/apache/cxf/dosgi/systests2/multi/TestImportService.java Thu May 6 11:35:19 2010 @@ -29,6 +29,8 @@ import org.junit.runner.RunWith; import org.ops4j.pax.exam.CoreOptions; import org.ops4j.pax.exam.Inject; import org.ops4j.pax.exam.Option; +import org.ops4j.pax.exam.container.def.PaxRunnerOptions; +import org.ops4j.pax.exam.container.def.options.VMOption; import org.ops4j.pax.exam.junit.Configuration; import org.ops4j.pax.exam.junit.JUnit4TestRunner; import org.osgi.framework.BundleContext; @@ -59,6 +61,11 @@ public class TestImportService extends A opts.add(CoreOptions.mavenBundle().groupId("org.apache.cxf.dosgi.systests").artifactId("cxf-dosgi-ri-systests2-common").versionAsInProject()); opts.add(CoreOptions.provision(getTestClientBundle())); + // For debugging... + // opts.add(PaxRunnerOptions.vmOption( "-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005" )); + // opts.add(CoreOptions.waitForFrameworkStartup()); + // end debugging section. + return CoreOptions.options(opts.toArray(new Option[opts.size()])); }