Author: alessio.soldano(a)jboss.com Date: 2013-01-08 09:25:03 -0500 (Tue, 08 Jan 2013) New Revision: 17199 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java Log: [JBPAPP6-1768] JBossWS - Fix MetadataBuilder.processWSDDContribution() port-component matching (JSR 109) Merged revisions 17126 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r17126 | richard.opalka(a)jboss.com | 2012-12-18 14:13:42 +0100 (Tue, 18 Dec 2012) | 1 line [JBWS-3579] fixed PortComponentMD matching to be JSR 109 compliant ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16646,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067,17130,17138-17141,17171 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784,15794,15806-15808,15824,15835,15837-15857,15859,15866,15879-15881,15886-15889,15896,15900-15920,15936,15965,15967,15973,16067,16071,16086-16087,16096,16176,16183,16204-16205,16227,16230,16244-16245,16306,16315,16323,16407-16408,16412,16418,16516,16530-16532,16619,16636-16644,16646,16691,16729-16730,16738,16782,16817,16914,16943-16944,16951,16996-16997,17042,17061,17067,17126,17130,17138-17141,17171 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-01-08 14:22:10 UTC (rev 17198) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/server/src/main/java/org/jboss/wsf/stack/cxf/metadata/MetadataBuilder.java 2013-01-08 14:25:03 UTC (rev 17199) @@ -114,70 +114,55 @@ { for (PortComponentMetaData portComp : wsDesc.getPortComponents()) { - // We match portComp's by SEI first and portQName second - // In the first case the portComp may override the portQName that derives from the annotation - String portCompSEI = portComp.getServiceEndpointInterface(); - boolean doesMatch = portCompSEI != null ? portCompSEI.equals(endpoint.getEpClass().getName()) : false; - if (!doesMatch) - { - doesMatch = portComp.getWsdlPort().equals(endpoint.getPortName()); + final String linkedId = portComp.getEjbLink() != null ? portComp.getEjbLink() : portComp.getServletLink(); + final String id = endpoint.getId(); + if (!id.equals(linkedId)) continue; + + // PortQName overrides + if (portComp.getWsdlPort() != null) { + if (log.isDebugEnabled()) + log.debug("Override portName " + endpoint.getPortName() + " with " + portComp.getWsdlPort()); + endpoint.setPortName(portComp.getWsdlPort()); } + // ServiceQName overrides + if (portComp.getWsdlService() != null) { + if (log.isDebugEnabled()) + log.debug("Override serviceName " + endpoint.getServiceName() + " with " + portComp.getWsdlService()); + endpoint.setServiceName(portComp.getWsdlService()); + } - if (doesMatch) - { - // PortQName overrides - if (portComp.getWsdlPort() != null) - { - if (log.isDebugEnabled()) - log.debug("Override portName " + endpoint.getPortName() + " with " + portComp.getWsdlPort()); - endpoint.setPortName(portComp.getWsdlPort()); - } - //ServiceQName overrides - if (portComp.getWsdlService() != null) - { - if (log.isDebugEnabled()) - log.debug("Override serviceName " + endpoint.getServiceName() + " with " + portComp.getWsdlService()); - endpoint.setServiceName(portComp.getWsdlService()); - } - - //HandlerChain contributions - UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains(); - if (chainWrapper != null) - { - endpoint.setHandlers(convertEndpointHandlers(chainWrapper.getHandlerChains())); - } + // HandlerChain contributions + UnifiedHandlerChainsMetaData chainWrapper = portComp.getHandlerChains(); + if (chainWrapper != null) { + endpoint.setHandlers(convertEndpointHandlers(chainWrapper.getHandlerChains())); + } - // MTOM settings - if (portComp.isMtomEnabled()) - { - log.debug("Enabling MTOM"); - endpoint.setMtomEnabled(true); - endpoint.setMtomThreshold(portComp.getMtomThreshold()); - } - - //Addressing - if (portComp.isAddressingEnabled()) - { - log.debug("Enabling Addressing"); - endpoint.setAddressingEnabled(true); - endpoint.setAddressingRequired(portComp.isAddressingRequired()); - endpoint.setAddressingResponses(portComp.getAddressingResponses()); - } - //RespectBinding - if (portComp.isRespectBindingEnabled()) - { - log.debug("RepectBinging..."); - endpoint.setRespectBindingEnabled(true); - } - //wsdlLocation override - String wsdlFile = portComp.getWebserviceDescription().getWsdlFile(); - if (wsdlFile != null) - { - if (log.isDebugEnabled()) - log.debug("Override wsdlFile location with " + wsdlFile); - endpoint.setWsdlLocation(wsdlFile); - } + // MTOM settings + if (portComp.isMtomEnabled()) { + log.debug("Enabling MTOM"); + endpoint.setMtomEnabled(true); + endpoint.setMtomThreshold(portComp.getMtomThreshold()); } + + // Addressing + if (portComp.isAddressingEnabled()) { + log.debug("Enabling Addressing"); + endpoint.setAddressingEnabled(true); + endpoint.setAddressingRequired(portComp.isAddressingRequired()); + endpoint.setAddressingResponses(portComp.getAddressingResponses()); + } + // RespectBinding + if (portComp.isRespectBindingEnabled()) { + log.debug("RepectBinging..."); + endpoint.setRespectBindingEnabled(true); + } + // wsdlLocation override + String wsdlFile = portComp.getWebserviceDescription().getWsdlFile(); + if (wsdlFile != null) { + if (log.isDebugEnabled()) + log.debug("Override wsdlFile location with " + wsdlFile); + endpoint.setWsdlLocation(wsdlFile); + } } } }