Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 74130 invoked from network); 26 Sep 2006 16:13:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 26 Sep 2006 16:13:36 -0000 Received: (qmail 21702 invoked by uid 500); 26 Sep 2006 16:13:36 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 21662 invoked by uid 500); 26 Sep 2006 16:13:36 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 21653 invoked by uid 99); 26 Sep 2006 16:13:36 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Sep 2006 09:13:36 -0700 Authentication-Results: idunn.apache.osuosl.org smtp.mail=andreasmyth@apache.org; spf=permerror X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received-SPF: error (idunn.apache.osuosl.org: domain apache.org from 140.211.166.113 cause and error) Received: from [140.211.166.113] ([140.211.166.113:59983] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id F0/A0-13661-FA159154 for ; Tue, 26 Sep 2006 09:13:35 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 415081A981A; Tue, 26 Sep 2006 09:13:33 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r450102 - in /incubator/cxf/trunk/rt: core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Date: Tue, 26 Sep 2006 16:13:32 -0000 To: cxf-commits@incubator.apache.org From: andreasmyth@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060926161333.415081A981A@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: andreasmyth Date: Tue Sep 26 09:13:31 2006 New Revision: 450102 URL: http://svn.apache.org/viewvc?view=rev&rev=450102 Log: Improved the test included in r450092 to use properties passed to bus instead of system properties. Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java?view=diff&rev=450102&r1=450101&r2=450102 ============================================================================== --- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java (original) +++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/bus/cxf/CXFBusImpl.java Tue Sep 26 09:13:31 2006 @@ -60,6 +60,12 @@ protected CXFBusImpl(Map e, Map properties) { extensions = e; + if (null == extensions) { + extensions = new HashMap(); + } + if (null == properties) { + properties = new HashMap(); + } Configurer configurer = (Configurer)extensions.get(Configurer.class); if (null == configurer) { Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?view=diff&rev=450102&r1=450101&r2=450102 ============================================================================== --- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original) +++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Tue Sep 26 09:13:31 2006 @@ -20,14 +20,15 @@ package org.apache.cxf.jaxws; import java.lang.reflect.Proxy; +import java.util.HashMap; import java.util.List; +import java.util.Map; import javax.xml.namespace.QName; import junit.framework.TestCase; import org.apache.cxf.Bus; -import org.apache.cxf.BusFactory; import org.apache.cxf.bus.cxf.CXFBusFactory; import org.apache.cxf.configuration.Configurer; import org.apache.cxf.endpoint.Client; @@ -46,7 +47,7 @@ private static final QName PORT_NAME = new QName("http://apache.org/hello_world_soap_http", "SoapPort"); - private BusFactory factory; + private CXFBusFactory factory; public void setUp() { factory = new CXFBusFactory(); @@ -58,17 +59,16 @@ } public void tearDown() { - System.clearProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME); Bus bus = factory.getDefaultBus(); if (null != bus) { bus.shutdown(true); factory.setDefaultBus(null); } } - - - - public void testDefaultClientEndpoint() { + + public void testDefaultClientEndpoint() { + factory.setDefaultBus(factory.createBus()); + javax.xml.ws.Service service = new SOAPService(); Greeter greeter = service.getPort(PORT_NAME, Greeter.class); @@ -101,8 +101,10 @@ @SuppressWarnings("unchecked") public void testConfiguredClientEndpoint() { - System.setProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME, - "org/apache/cxf/jaxws/configured-endpoints.xml"); + Map properties = new HashMap(); + properties.put(Configurer.USER_CFG_FILE_PROPERTY_NAME, + "org/apache/cxf/jaxws/configured-endpoints.xml"); + factory.setDefaultBus(factory.createBus(null, properties)); javax.xml.ws.Service service = new SOAPService(); Greeter greeter = service.getPort(PORT_NAME, Greeter.class); @@ -150,6 +152,7 @@ } public void testDefaultServerEndpoint() { + factory.setDefaultBus(factory.createBus()); Object implementor = new GreeterImpl(); EndpointImpl ei = (EndpointImpl)(javax.xml.ws.Endpoint.create(implementor)); @@ -181,8 +184,10 @@ @SuppressWarnings("unchecked") public void testConfiguredServerEndpoint() { - System.setProperty(Configurer.USER_CFG_FILE_PROPERTY_NAME, - "org/apache/cxf/jaxws/configured-endpoints.xml"); + Map properties = new HashMap(); + properties.put(Configurer.USER_CFG_FILE_PROPERTY_NAME, + "org/apache/cxf/jaxws/configured-endpoints.xml"); + factory.setDefaultBus(factory.createBus(null, properties)); Object implementor = new GreeterImpl(); EndpointImpl ei = (EndpointImpl)(javax.xml.ws.Endpoint.create(implementor));