Author: heiko.braun(a)jboss.com Date: 2007-04-10 04:32:15 -0400 (Tue, 10 Apr 2007) New Revision: 2779 Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java Log: Rollback to prev. version Modified: trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java =================================================================== --- trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-04-09 20:20:07 UTC (rev 2778) +++ trunk/jbossws-core/src/java/org/jboss/ws/metadata/builder/jaxrpc/JAXRPCClientMetaDataBuilder.java 2007-04-10 08:32:15 UTC (rev 2779) @@ -26,7 +26,6 @@ import java.io.IOException; import java.net.URL; import java.util.Set; -import java.util.Iterator; import javax.xml.namespace.QName; @@ -35,7 +34,8 @@ import org.jboss.ws.WSException; import org.jboss.ws.integration.ResourceLoaderAdapter; import org.jboss.ws.integration.UnifiedVirtualFile; -import org.jboss.ws.metadata.j2ee.serviceref.*; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedHandlerMetaData; +import org.jboss.ws.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMapping; import org.jboss.ws.metadata.jaxrpcmapping.JavaWsdlMappingFactory; import org.jboss.ws.metadata.jaxrpcmapping.ServiceEndpointInterfaceMapping; @@ -65,7 +65,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, URL mappingURL, URL securityURL, - UnifiedServiceRefMetaData serviceRefMetaData, ClassLoader loader) + UnifiedServiceRefMetaData serviceRefMetaData, ClassLoader loader) { try { @@ -97,7 +97,7 @@ /** Build from WSDL and jaxrpc-mapping.xml */ public ServiceMetaData buildMetaData(QName serviceQName, URL wsdlURL, JavaWsdlMapping javaWsdlMapping, WSSecurityConfiguration securityConfig, - UnifiedServiceRefMetaData usrMetaData, ClassLoader loader) + UnifiedServiceRefMetaData usrMetaData, ClassLoader loader) { if(log.isDebugEnabled()) log.debug("START buildMetaData: [service=" + serviceQName + "]"); try @@ -149,7 +149,7 @@ } private void buildMetaDataInternal(ServiceMetaData serviceMetaData, WSDLDefinitions wsdlDefinitions, JavaWsdlMapping javaWsdlMapping, - UnifiedServiceRefMetaData serviceRefMetaData) throws IOException + UnifiedServiceRefMetaData serviceRefMetaData) throws IOException { QName serviceQName = serviceMetaData.getServiceName(); @@ -212,32 +212,6 @@ } } - if(serviceRefMetaData!=null) - { - Iterator<UnifiedPortComponentRefMetaData> it = serviceRefMetaData.getPortComponentRefs().iterator(); - while(it.hasNext()) - { - UnifiedPortComponentRefMetaData portComp = it.next(); - - if(epMetaData.matches(portComp)) - { - log.debug("Processing service-ref contribution on portType: "+epMetaData.getPortTypeName()); - - // process stub properties - for(UnifiedStubPropertyMetaData stubProp: portComp.getStubProperties()) - { - epMetaData.getProperties().put(stubProp.getPropName(), stubProp.getPropValue()); - } - - // process call properties - for(UnifiedCallPropertyMetaData callProp: portComp.getCallProperties()) - { - epMetaData.getProperties().put(callProp.getPropName(), callProp.getPropValue()); - } - } - } - } - processEndpointMetaDataExtensions(epMetaData, wsdlDefinitions); setupOperationsFromWSDL(epMetaData, wsdlEndpoint, seiMapping); setupHandlers(serviceRefMetaData, portName, epMetaData);