[jbossws-commits] JBossWS SVN: r18635 - in container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices: webserviceref and 1 other directory.

Author: asoldano Date: 2014-05-12 13:49:46 -0400 (Mon, 12 May 2014) New Revision: 18635 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java Log: [JBWS-3793] changes to use latest spi Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java 2014-05-12 17:49:01 UTC (rev 18634) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java 2014-05-12 17:49:46 UTC (rev 18635) @@ -144,18 +144,14 @@ } private static void buildSecurityMetaData(final EJBMetaData wsEjbMD, final EJBEndpoint ejbEndpoint, final JBossPortComponentMetaData portComponentMD) { - final EJBSecurityMetaData smd = new EJBSecurityMetaData(); // auth method final String authMethod = getAuthMethod(ejbEndpoint, portComponentMD); - smd.setAuthMethod(authMethod); // transport guarantee final String transportGuarantee = getTransportGuarantee(ejbEndpoint, portComponentMD); - smd.setTransportGuarantee(transportGuarantee); // secure wsdl access final boolean secureWsdlAccess = isSecureWsdlAccess(ejbEndpoint, portComponentMD); - smd.setSecureWSDLAccess(secureWsdlAccess); // propagate - wsEjbMD.setSecurityMetaData(smd); + wsEjbMD.setSecurityMetaData(new EJBSecurityMetaData(authMethod, transportGuarantee, secureWsdlAccess)); } private static String getAuthMethod(final EJBEndpoint ejbEndpoint, final JBossPortComponentMetaData portComponentMD) { Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java 2014-05-12 17:49:01 UTC (rev 18634) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefDDProcessor.java 2014-05-12 17:49:46 UTC (rev 18635) @@ -89,8 +89,8 @@ throw MESSAGES.jaxRpcNotSupported(); } // construct service ref - final UnifiedServiceRefMetaData serviceRefUMDM = new UnifiedServiceRefMetaData(getUnifiedVirtualFile(unit)); - translate(serviceRefMD, serviceRefUMDM); + final UnifiedServiceRefMetaData serviceRefUMDM = translate(serviceRefMD); + serviceRefUMDM.setVfsRoot(getUnifiedVirtualFile(unit)); processWSFeatures(unit, serviceRefMD.getInjectionTargets(), serviceRefUMDM); final WSRefRegistry wsRefRegistry = ASHelper.getWSRefRegistry(unit); wsRefRegistry.add(getCacheKey(componentDescription, serviceRefUMDM), serviceRefUMDM); Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-12 17:49:01 UTC (rev 18634) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-12 17:49:46 UTC (rev 18635) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat, Inc., and individual contributors + * Copyright 2014, Red Hat, Inc., and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -53,12 +53,17 @@ import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerChainsMetaData; import org.jboss.metadata.javaee.spec.ServiceReferenceHandlerMetaData; import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.AddressingMetadata; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.MTOMMetadata; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.RespectBindingMetadata; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerChainsMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedInitParamMetaData; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedPortComponentRefMetaDataBuilder; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; +import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaDataBuilder; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedStubPropertyMetaData; import org.jboss.wsf.spi.serviceref.ServiceRefType; @@ -74,22 +79,22 @@ private WSRefUtils() { } - static UnifiedServiceRefMetaData translate(final ServiceReferenceMetaData serviceRefMD, final UnifiedServiceRefMetaData serviceRefUMDM) { - serviceRefUMDM.setServiceRefName(serviceRefMD.getName()); - serviceRefUMDM.setServiceRefType(serviceRefMD.getServiceRefType()); - serviceRefUMDM.setServiceInterface(serviceRefMD.getServiceInterface()); - serviceRefUMDM.setWsdlFile(serviceRefMD.getWsdlFile()); - serviceRefUMDM.setMappingFile(serviceRefMD.getJaxrpcMappingFile()); - serviceRefUMDM.setServiceQName(serviceRefMD.getServiceQname()); + static UnifiedServiceRefMetaData translate(final ServiceReferenceMetaData serviceRefMD) { + UnifiedServiceRefMetaDataBuilder builder = new UnifiedServiceRefMetaDataBuilder(); + builder.setServiceRefName(serviceRefMD.getName()); + builder.setServiceRefType(serviceRefMD.getServiceRefType()); + builder.setServiceInterface(serviceRefMD.getServiceInterface()); + builder.setWsdlFile(serviceRefMD.getWsdlFile()); + builder.setMappingFile(serviceRefMD.getJaxrpcMappingFile()); + builder.setServiceQName(serviceRefMD.getServiceQname()); // propagate port components final Collection<? extends PortComponentRef> portComponentsMD = serviceRefMD.getPortComponentRef(); if (portComponentsMD != null) { for (final PortComponentRef portComponentMD : portComponentsMD) { - final UnifiedPortComponentRefMetaData portComponentUMDM = getUnifiedPortComponentRefMetaData(serviceRefUMDM, - portComponentMD); + final UnifiedPortComponentRefMetaData portComponentUMDM = getUnifiedPortComponentRefMetaData(portComponentMD); if (portComponentUMDM.getServiceEndpointInterface() != null || portComponentUMDM.getPortQName() != null) { - serviceRefUMDM.addPortComponentRef(portComponentUMDM); + builder.addPortComponentRef(portComponentUMDM); } else { ROOT_LOGGER.ignoringPortComponentRef(portComponentUMDM); } @@ -101,7 +106,7 @@ if (handlersMD != null) { for (final ServiceReferenceHandlerMetaData handlerMD : handlersMD) { final UnifiedHandlerMetaData handlerUMDM = getUnifiedHandlerMetaData(handlerMD); - serviceRefUMDM.addHandler(handlerUMDM); + builder.addHandler(handlerUMDM); } } @@ -109,81 +114,73 @@ ServiceReferenceHandlerChainsMetaData handlerChainsMD = serviceRefMD.getHandlerChains(); if (handlerChainsMD != null) { final UnifiedHandlerChainsMetaData handlerChainsUMDM = getUnifiedHandlerChainsMetaData(handlerChainsMD); - serviceRefUMDM.setHandlerChains(handlerChainsUMDM); + builder.setHandlerChains(handlerChainsUMDM); } // propagate jboss specific MD if (serviceRefMD instanceof JBossServiceReferenceMetaData) { - processUnifiedJBossServiceRefMetaData(serviceRefUMDM, serviceRefMD); + final JBossServiceReferenceMetaData jbossServiceRefMD = (JBossServiceReferenceMetaData) serviceRefMD; + builder.setServiceImplClass(jbossServiceRefMD.getServiceClass()); + builder.setConfigName(jbossServiceRefMD.getConfigName()); + builder.setConfigFile(jbossServiceRefMD.getConfigFile()); + builder.setWsdlOverride(jbossServiceRefMD.getWsdlOverride()); + builder.setHandlerChain(jbossServiceRefMD.getHandlerChain()); } - serviceRefUMDM.setType(ServiceRefType.JAXWS); + builder.setType(ServiceRefType.JAXWS); - return serviceRefUMDM; + return builder.build(); } - private static void processUnifiedJBossServiceRefMetaData(final UnifiedServiceRefMetaData serviceRefUMDM, final ServiceReferenceMetaData serviceRefMD) { - final JBossServiceReferenceMetaData jbossServiceRefMD = (JBossServiceReferenceMetaData) serviceRefMD; - serviceRefUMDM.setServiceImplClass(jbossServiceRefMD.getServiceClass()); - serviceRefUMDM.setConfigName(jbossServiceRefMD.getConfigName()); - serviceRefUMDM.setConfigFile(jbossServiceRefMD.getConfigFile()); - serviceRefUMDM.setWsdlOverride(jbossServiceRefMD.getWsdlOverride()); - serviceRefUMDM.setHandlerChain(jbossServiceRefMD.getHandlerChain()); - } + private static UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData(final PortComponentRef portComponentMD) { + final UnifiedPortComponentRefMetaDataBuilder builder = new UnifiedPortComponentRefMetaDataBuilder(); - private static UnifiedPortComponentRefMetaData getUnifiedPortComponentRefMetaData(final UnifiedServiceRefMetaData serviceRefUMDM, final PortComponentRef portComponentMD) { - final UnifiedPortComponentRefMetaData portComponentUMDM = new UnifiedPortComponentRefMetaData(serviceRefUMDM); - // propagate service endpoint interface - portComponentUMDM.setServiceEndpointInterface(portComponentMD.getServiceEndpointInterface()); + builder.setServiceEndpointInterface(portComponentMD.getServiceEndpointInterface()); // propagate MTOM properties - portComponentUMDM.setMtomEnabled(portComponentMD.isEnableMtom()); - portComponentUMDM.setMtomThreshold(portComponentMD.getMtomThreshold()); + builder.setMtomEnabled(portComponentMD.isEnableMtom()); + builder.setMtomThreshold(portComponentMD.getMtomThreshold()); // propagate addressing properties final Addressing addressingMD = portComponentMD.getAddressing(); if (addressingMD != null) { - portComponentUMDM.setAddressingAnnotationSpecified(true); - portComponentUMDM.setAddressingEnabled(addressingMD.isEnabled()); - portComponentUMDM.setAddressingRequired(addressingMD.isRequired()); - portComponentUMDM.setAddressingResponses(addressingMD.getResponses()); + builder.setAddressingAnnotationSpecified(true); + builder.setAddressingEnabled(addressingMD.isEnabled()); + builder.setAddressingRequired(addressingMD.isRequired()); + builder.setAddressingResponses(addressingMD.getResponses()); } // propagate respect binding properties if (portComponentMD.getRespectBinding() != null) { - portComponentUMDM.setRespectBindingAnnotationSpecified(true); - portComponentUMDM.setRespectBindingEnabled(true); + builder.setRespectBindingAnnotationSpecified(true); + builder.setRespectBindingEnabled(true); } // propagate link - portComponentUMDM.setPortComponentLink(portComponentMD.getPortComponentLink()); + builder.setPortComponentLink(portComponentMD.getPortComponentLink()); // propagate jboss specific MD if (portComponentMD instanceof JBossPortComponentRef) { - processUnifiedJBossPortComponentRefMetaData(portComponentUMDM, portComponentMD); - } + final JBossPortComponentRef jbossPortComponentMD = (JBossPortComponentRef) portComponentMD; - return portComponentUMDM; - } + // propagate port QName + builder.setPortQName(jbossPortComponentMD.getPortQname()); - private static void processUnifiedJBossPortComponentRefMetaData(final UnifiedPortComponentRefMetaData portComponentUMDM, final PortComponentRef portComponentMD) { - final JBossPortComponentRef jbossPortComponentMD = (JBossPortComponentRef) portComponentMD; + // propagate configuration properties + builder.setConfigName(jbossPortComponentMD.getConfigName()); + builder.setConfigFile(jbossPortComponentMD.getConfigFile()); - // propagate port QName - portComponentUMDM.setPortQName(jbossPortComponentMD.getPortQname()); - - // propagate configuration properties - portComponentUMDM.setConfigName(jbossPortComponentMD.getConfigName()); - portComponentUMDM.setConfigFile(jbossPortComponentMD.getConfigFile()); - - // propagate stub properties - final List<StubPropertyMetaData> stubPropertiesMD = jbossPortComponentMD.getStubProperties(); - if (stubPropertiesMD != null) { - for (final StubPropertyMetaData stubPropertyMD : stubPropertiesMD) { - portComponentUMDM.addStubProperty(new UnifiedStubPropertyMetaData(stubPropertyMD.getPropName(), stubPropertyMD.getPropValue())); + // propagate stub properties + final List<StubPropertyMetaData> stubPropertiesMD = jbossPortComponentMD.getStubProperties(); + if (stubPropertiesMD != null) { + for (final StubPropertyMetaData stubPropertyMD : stubPropertiesMD) { + builder.addStubProperty(new UnifiedStubPropertyMetaData(stubPropertyMD.getPropName(), stubPropertyMD.getPropValue())); + } } } + + return builder.build(); } private static UnifiedHandlerMetaData getUnifiedHandlerMetaData(ServiceReferenceHandlerMetaData srhmd) { @@ -230,10 +227,10 @@ final javax.xml.ws.soap.Addressing addressingAnnotation = getAnnotation(anElement, javax.xml.ws.soap.Addressing.class); if (addressingAnnotation != null) { - serviceRefUMDM.setAddressingAnnotationSpecified(true); - serviceRefUMDM.setAddressingEnabled(addressingAnnotation.enabled()); - serviceRefUMDM.setAddressingRequired(addressingAnnotation.required()); - serviceRefUMDM.setAddressingResponses(addressingAnnotation.responses().toString()); + serviceRefUMDM.setAddressingMedadata(new AddressingMetadata(true, + addressingAnnotation.enabled(), + addressingAnnotation.required(), + addressingAnnotation.responses().toString())); } } @@ -241,9 +238,7 @@ final MTOM mtomAnnotation = getAnnotation(anElement, MTOM.class); if (mtomAnnotation != null) { - serviceRefUMDM.setMtomAnnotationSpecified(true); - serviceRefUMDM.setMtomEnabled(mtomAnnotation.enabled()); - serviceRefUMDM.setMtomThreshold(mtomAnnotation.threshold()); + serviceRefUMDM.setMTOMMetadata(new MTOMMetadata(true, mtomAnnotation.enabled(), mtomAnnotation.threshold())); } } @@ -251,8 +246,7 @@ final javax.xml.ws.RespectBinding respectBindingAnnotation = getAnnotation(anElement, javax.xml.ws.RespectBinding.class); if (respectBindingAnnotation != null) { - serviceRefUMDM.setRespectBindingAnnotationSpecified(true); - serviceRefUMDM.setRespectBindingEnabled(respectBindingAnnotation.enabled()); + serviceRefUMDM.setRespectBindingMetadata(new RespectBindingMetadata(true, respectBindingAnnotation.enabled())); } } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-12 17:49:01 UTC (rev 18634) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-12 17:49:46 UTC (rev 18635) @@ -45,8 +45,7 @@ final WSRefRegistry wsRefRegistry = ASHelper.getWSRefRegistry(unit); UnifiedServiceRefMetaData serviceRefUMDM = wsRefRegistry.get(refKey); if (serviceRefUMDM == null) { - serviceRefUMDM = new UnifiedServiceRefMetaData(getUnifiedVirtualFile(unit)); - serviceRefUMDM.setServiceRefName(bindingName); + serviceRefUMDM = new UnifiedServiceRefMetaData(getUnifiedVirtualFile(unit), bindingName); wsRefRegistry.add(refKey, serviceRefUMDM); } initServiceRef(unit, serviceRefUMDM, type, annotation);