Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 13109 invoked from network); 12 Sep 2008 20:22:25 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Sep 2008 20:22:25 -0000 Received: (qmail 97841 invoked by uid 500); 12 Sep 2008 20:22:22 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 97776 invoked by uid 500); 12 Sep 2008 20:22:22 -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 97767 invoked by uid 99); 12 Sep 2008 20:22:22 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Sep 2008 13:22:22 -0700 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; Fri, 12 Sep 2008 20:21:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CCB9723889B7; Fri, 12 Sep 2008 13:22:04 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r694796 - in /cxf/branches/2.1.x-fixes: ./ rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/ rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/ systests/src/test/java/org/apache/cxf/systest/versioning/ Date: Fri, 12 Sep 2008 20:22:04 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080912202204.CCB9723889B7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Fri Sep 12 13:22:03 2008 New Revision: 694796 URL: http://svn.apache.org/viewvc?rev=694796&view=rev Log: Merged revisions 694795 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r694795 | dkulp | 2008-09-12 16:19:46 -0400 (Fri, 12 Sep 2008) | 2 lines Don't go into multiplex mode if mulitplexing won't actually accomplish anything. ........ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/servers.xml cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/Server.java Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 12 13:22:03 2008 @@ -1 +1 @@ -/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747 +/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java?rev=694796&r1=694795&r2=694796&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/soap/src/main/java/org/apache/cxf/binding/soap/SoapBindingFactory.java Fri Sep 12 13:22:03 2008 @@ -724,6 +724,33 @@ if (mo instanceof ChainInitiationObserver) { ChainInitiationObserver cio = (ChainInitiationObserver) mo; + + Binding b = e.getBinding(); + Binding b2 = cio.getEndpoint().getBinding(); + if (b == b2) { + //re-registering the same endpoint? + return; + } + Object o = cio.getEndpoint().get("allow-multiplex-endpoint"); + if (o instanceof String) { + o = Boolean.parseBoolean((String)o); + } else if (o == null) { + o = Boolean.FALSE; + } + + if (b instanceof org.apache.cxf.binding.soap.SoapBinding + && b2 instanceof org.apache.cxf.binding.soap.SoapBinding + && ((org.apache.cxf.binding.soap.SoapBinding)b).getSoapVersion() + .equals(((org.apache.cxf.binding.soap.SoapBinding)b2).getSoapVersion()) + && Boolean.FALSE.equals(o)) { + + throw new RuntimeException("Soap " + + ((org.apache.cxf.binding.soap.SoapBinding)b) + .getSoapVersion().getVersion() + + " endpoint already registered on address " + + e.getEndpointInfo().getAddress()); + } + MultipleEndpointObserver newMO = new MultipleEndpointObserver(getBus()) { @Override protected Message createMessage(Message message) { Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml?rev=694796&r1=694795&r2=694796&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml (original) +++ cxf/branches/2.1.x-fixes/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spring/endpoints.xml Fri Sep 12 13:22:03 2008 @@ -52,7 +52,7 @@ implementor="#greeter" address="http://localhost:8080/simpeWithHttpBinding" bindingUri="http://cxf.apache.org/bindings/xformat"/> - + @@ -61,13 +61,13 @@ + implementor="#greeter" address="http://localhost:8080/simpleWithAddress3"> - + @@ -88,12 +88,12 @@ implementor="org.apache.cxf.jaxws.service.Hello" endpointName="e:HelloEndpointCustomized" serviceName="s:HelloServiceCustomized" - address="http://localhost:8080/test" + address="http://localhost:8080/test0" xmlns:e="http://service.jaxws.cxf.apache.org/endpoint" xmlns:s="http://service.jaxws.cxf.apache.org/service"/> @@ -101,7 +101,7 @@ + address="http://localhost:8080/test1"> @@ -113,13 +113,13 @@ + address="http://localhost:8080/test2"/> + address="http://localhost:8080/test3"/> + - + - + serviceBean="#greeter" address="http://localhost:8080/simpleWithAddress1"/> - + - - @@ -125,13 +126,11 @@ + address="http://localhost:8080/test1"> - - - + Modified: cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/Server.java URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/Server.java?rev=694796&r1=694795&r2=694796&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/Server.java (original) +++ cxf/branches/2.1.x-fixes/systests/src/test/java/org/apache/cxf/systest/versioning/Server.java Fri Sep 12 13:22:03 2008 @@ -36,15 +36,16 @@ EndpointImpl ep1 = (EndpointImpl) Endpoint.publish(address, implementor1); ep1.getServer().getEndpoint().put("version", "1"); - + ep1.getServer().getEndpoint().put("allow-multiplex-endpoint", Boolean.TRUE); + + //Register a MediatorInInterceptor on this dummy service + Object implementor2 = new GreeterImplMixedStyle(" version2"); EndpointImpl ep2 = (EndpointImpl) Endpoint.publish(address, implementor2); ep2.getServer().getEndpoint().put("version", "2"); - //Register a MediatorInInterceptor on this dummy service - MultipleEndpointObserver meo = (MultipleEndpointObserver) - ep2.getServer().getDestination().getMessageObserver(); + ep1.getServer().getDestination().getMessageObserver(); meo.getRoutingInterceptors().clear(); meo.getRoutingInterceptors().add(new MediatorInInterceptor()); }