Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 79849 invoked from network); 13 Dec 2007 19:37:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Dec 2007 19:37:07 -0000 Received: (qmail 63122 invoked by uid 500); 13 Dec 2007 19:36:56 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 62998 invoked by uid 500); 13 Dec 2007 19:36:56 -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 62989 invoked by uid 99); 13 Dec 2007 19:36:56 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2007 11:36:56 -0800 X-ASF-Spam-Status: No, hits=-96.5 required=10.0 tests=ALL_TRUSTED,URIBL_BLACK,WEIRD_PORT X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Dec 2007 19:36:34 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E578B1A9832; Thu, 13 Dec 2007 11:36:36 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r603998 - in /incubator/cxf/branches/2.0.x-fixes: ./ rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ systests/src/test/java/org/apache/cxf/systest/aegis/ systests/sr... Date: Thu, 13 Dec 2007 19:36:36 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071213193636.E578B1A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Dec 13 11:36:35 2007 New Revision: 603998 URL: http://svn.apache.org/viewvc?rev=603998&view=rev Log: Merged revisions 603363 via svnmerge from https://svn.apache.org/repos/asf/incubator/cxf/trunk ........ r603363 | dkulp | 2007-12-11 16:18:29 -0500 (Tue, 11 Dec 2007) | 4 lines Add system test from a bug report on the list That test found an unrelated bug with creating clients with Aegis using a WSDL. Fix that bug. ........ Added: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java - copied unchanged from r603363, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsService.java incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java - copied unchanged from r603363, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/SportsServiceImpl.java incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/Team.java - copied unchanged from r603363, incubator/cxf/trunk/systests/src/test/java/org/apache/cxf/systest/aegis/Team.java Modified: incubator/cxf/branches/2.0.x-fixes/ (props changed) incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java incubator/cxf/branches/2.0.x-fixes/systests/src/test/resources/webapp/WEB-INF/beans.xml Propchange: incubator/cxf/branches/2.0.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java?rev=603998&r1=603997&r2=603998&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/SimpleMethodDispatcher.java Thu Dec 13 11:36:35 2007 @@ -37,6 +37,10 @@ private Map methodToOp = new ConcurrentHashMap(); + public SimpleMethodDispatcher() { + //complete + } + public void bind(OperationInfo o, Method... methods) { Method primary = methods[0]; for (Method m : methods) { Modified: incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java?rev=603998&r1=603997&r2=603998&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java (original) +++ incubator/cxf/branches/2.0.x-fixes/rt/frontend/simple/src/main/java/org/apache/cxf/service/factory/ReflectionServiceFactoryBean.java Thu Dec 13 11:36:35 2007 @@ -255,20 +255,32 @@ } } + protected void setServiceProperties() { + getService().put(MethodDispatcher.class.getName(), getMethodDispatcher()); + if (properties != null) { + getService().putAll(properties); + } + + } + protected void buildServiceFromWSDL(String url) { LOG.info("Creating Service " + getServiceQName() + " from WSDL: " + url); WSDLServiceFactory factory = new WSDLServiceFactory(getBus(), url, getServiceQName()); setService(factory.create()); - if (properties != null) { - getService().putAll(properties); - } + setServiceProperties(); initializeWSDLOperations(); if (getDataBinding() != null) { getDataBinding().initialize(getService()); } + + for (ServiceInfo si : getService().getServiceInfos()) { + if (getExtraClass() != null) { + si.setProperty(EXTRA_CLASS, getExtraClass()); + } + } } protected void buildServiceFromClass() { @@ -284,17 +296,19 @@ setService(service); - if (properties != null) { - service.putAll(properties); - } - - service.put(MethodDispatcher.class.getName(), getMethodDispatcher()); + setServiceProperties(); serviceInfo.setName(getServiceQName()); serviceInfo.setTargetNamespace(serviceInfo.getName().getNamespaceURI()); createInterface(serviceInfo); + for (ServiceInfo si : getService().getServiceInfos()) { + if (getExtraClass() != null) { + si.setProperty(EXTRA_CLASS, getExtraClass()); + } + } + getDataBinding().initialize(service); boolean isWrapped = isWrapped(); Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java?rev=603998&r1=603997&r2=603998&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/aegis/AegisClientServerTest.java Thu Dec 13 11:36:35 2007 @@ -21,6 +21,7 @@ import java.net.URL; +import java.util.Collection; import java.util.List; import java.util.logging.Logger; @@ -131,5 +132,19 @@ dom = XMLUtils.parse(url.openStream()); util.assertValid("//wsdl:definitions[@targetNamespace='http://foo.bar.com']", dom); + } + + @Test + public void testCollection() throws Exception { + AegisDatabinding aegisBinding = new AegisDatabinding(); + JaxWsProxyFactoryBean proxyFactory = new JaxWsProxyFactoryBean(); + proxyFactory.setDataBinding(aegisBinding); + proxyFactory.setServiceClass(SportsService.class); + proxyFactory.setWsdlLocation("http://localhost:9002/jaxwsAndAegisSports?wsdl"); + SportsService service = (SportsService) proxyFactory.create(); + Collection teams = service.getTeams(); + assertEquals(1, teams.size()); + assertEquals("Patriots", teams.iterator().next().getName()); + } } Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/resources/webapp/WEB-INF/beans.xml URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/resources/webapp/WEB-INF/beans.xml?rev=603998&r1=603997&r2=603998&view=diff ============================================================================== --- incubator/cxf/branches/2.0.x-fixes/systests/src/test/resources/webapp/WEB-INF/beans.xml (original) +++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/resources/webapp/WEB-INF/beans.xml Thu Dec 13 11:36:35 2007 @@ -89,5 +89,16 @@ + + + + + + + + + +