Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-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 0EEE7E3DE for ; Tue, 12 Feb 2013 16:09:19 +0000 (UTC) Received: (qmail 3958 invoked by uid 500); 12 Feb 2013 16:09:18 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 3912 invoked by uid 500); 12 Feb 2013 16:09:18 -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 3904 invoked by uid 99); 12 Feb 2013 16:09:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2013 16:09:18 +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, 12 Feb 2013 16:09:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 739C3238896F; Tue, 12 Feb 2013 16:08:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1445227 - in /cxf/branches/2.6.x-fixes: ./ systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ Date: Tue, 12 Feb 2013 16:08:55 -0000 To: commits@cxf.apache.org From: ay@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130212160855.739C3238896F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ay Date: Tue Feb 12 16:08:54 2013 New Revision: 1445227 URL: http://svn.apache.org/r1445227 Log: Merged revisions 1445177 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1445177 | ay | 2013-02-12 15:16:38 +0100 (Tue, 12 Feb 2013) | 9 lines Merged revisions 1445150 via svn merge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1445150 | ay | 2013-02-12 13:55:34 +0100 (Tue, 12 Feb 2013) | 1 line make ServiceInvocation ws-rm systests to use fresh db ........ ........ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckPersistenceTest.java cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java?rev=1445227&r1=1445226&r2=1445227&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckBase.java Tue Feb 12 16:08:54 2013 @@ -51,9 +51,11 @@ public abstract class ServiceInvocationA public static class Server extends AbstractBusTestServerBase { String port; + String pfx; Endpoint ep; public Server(String args[]) { port = args[0]; + pfx = args[1]; } protected void run() { SpringBusFactory factory = new SpringBusFactory(); @@ -62,11 +64,14 @@ public abstract class ServiceInvocationA setBus(bus); ControlImpl implementor = new ControlImpl(); + implementor.setDbName(pfx + "-server"); implementor.setAddress("http://localhost:" + port + "/SoapContext/GreeterPort"); GreeterImpl greeterImplementor = new GreeterImpl(); implementor.setImplementor(greeterImplementor); ep = Endpoint.publish("http://localhost:" + port + "/SoapContext/ControlPort", implementor); LOG.fine("Published control endpoint."); + BusFactory.setDefaultBus(null); + BusFactory.setThreadDefaultBus(null); } public void tearDown() { ep.stop(); @@ -80,10 +85,14 @@ public abstract class ServiceInvocationA private Greeter greeter; public abstract String getPort(); + + public String getPrefix() { + return "rmdb"; + } - public static void startServer(String port) throws Exception { + public static void startServer(String port, String pfx) throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class, null, new String[] {port}, true)); + launchServer(Server.class, null, new String[] {port, pfx}, true)); } @@ -202,8 +211,10 @@ public abstract class ServiceInvocationA assertTrue("Failed to start greeter", control.startGreeter(cfgResource)); + System.setProperty("db.name", getPrefix()); greeterBus = bf.createBus(cfgResource); BusFactory.setDefaultBus(greeterBus); + System.clearProperty("db.name"); LOG.fine("Initialised greeter bus with configuration: " + cfgResource); GreeterService gs = new GreeterService(); Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckPersistenceTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckPersistenceTest.java?rev=1445227&r1=1445226&r2=1445227&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckPersistenceTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckPersistenceTest.java Tue Feb 12 16:08:54 2013 @@ -33,14 +33,19 @@ public class ServiceInvocationAckPersist @BeforeClass public static void startServers() throws Exception { RMTxStore.deleteDatabaseFiles("synack", true); - startServer(PORT); + RMTxStore.deleteDatabaseFiles("synack-server", true); + startServer(PORT, "synack"); } public String getPort() { return PORT; } + public String getPrefix() { + return "synack"; + } @AfterClass public static void cleanUpDerby() throws Exception { RMTxStore.deleteDatabaseFiles("synack", true); + RMTxStore.deleteDatabaseFiles("synack-server", true); } protected void setupGreeter() throws Exception { Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java?rev=1445227&r1=1445226&r2=1445227&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAckTest.java Tue Feb 12 16:08:54 2013 @@ -29,7 +29,7 @@ public class ServiceInvocationAckTest ex @BeforeClass public static void startServers() throws Exception { - startServer(PORT); + startServer(PORT, ""); } public String getPort() { return PORT; Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java?rev=1445227&r1=1445226&r2=1445227&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/ServiceInvocationAtMostOnceAckTest.java Tue Feb 12 16:08:54 2013 @@ -29,7 +29,7 @@ public class ServiceInvocationAtMostOnce @BeforeClass public static void startServers() throws Exception { - startServer(PORT); + startServer(PORT, ""); } public String getPort() { return PORT; Modified: cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml?rev=1445227&r1=1445226&r2=1445227&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml (original) +++ cxf/branches/2.6.x-fixes/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sync-ack-persistent-server.xml Tue Feb 12 16:08:54 2013 @@ -30,7 +30,9 @@ http://schemas.xmlsoap.org/ws/2005/02/rm/policy http://schemas.xmlsoap.org/ws/2005/02/rm/wsrm-policy.xsd http://cxf.apache.org/ws/rm/manager http://cxf.apache.org/schemas/configuration/wsrm-manager.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> - + + + @@ -50,6 +52,6 @@ - +