Author: asoldano Date: 2014-05-20 06:23:19 -0400 (Tue, 20 May 2014) New Revision: 18683 Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.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 container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java Log: [JBWS-3779] WIP Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/AspectDeploymentProcessor.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -66,17 +66,15 @@ if (isWebServiceDeployment(unit)) { ensureAspectInitialized(); final Deployment dep = ASHelper.getRequiredAttachment(unit, WSAttachmentKeys.DEPLOYMENT_KEY); - if (aspect.canHandle(dep)) { - ROOT_LOGGER.aspectStart(aspect, unit.getName()); - ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged(); - try { - WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader()); - dep.addAttachment(ServiceTarget.class, phaseContext.getServiceTarget()); - aspect.start(dep); - dep.removeAttachment(ServiceTarget.class); - } finally { - WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader); - } + ROOT_LOGGER.aspectStart(aspect, unit.getName()); + ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged(); + try { + WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader()); + dep.addAttachment(ServiceTarget.class, phaseContext.getServiceTarget()); + aspect.start(dep); + dep.removeAttachment(ServiceTarget.class); + } finally { + WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader); } } } @@ -85,15 +83,13 @@ public void undeploy(final DeploymentUnit unit) { if (isWebServiceDeployment(unit)) { final Deployment dep = ASHelper.getRequiredAttachment(unit, WSAttachmentKeys.DEPLOYMENT_KEY); - if (aspect.canHandle(dep)) { - ROOT_LOGGER.aspectStop(aspect, unit.getName()); - ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged(); - try { - WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader()); - aspect.stop(dep); - } finally { - WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader); - } + ROOT_LOGGER.aspectStop(aspect, unit.getName()); + ClassLoader origClassLoader = WildFlySecurityManager.getCurrentContextClassLoaderPrivileged(); + try { + WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(aspect.getLoader()); + aspect.stop(dep); + } finally { + WildFlySecurityManager.setCurrentContextClassLoaderPrivileged(origClassLoader); } } } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/EndpointServiceDeploymentAspect.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -70,8 +70,6 @@ public Object clone() { EndpointServiceDeploymentAspect clone = new EndpointServiceDeploymentAspect(); - clone.setForJaxRpc(isForJaxRpc()); - clone.setForJaxWs(isForJaxWs()); clone.setLast(isLast()); clone.setProvides(getProvides()); clone.setRelativeOrder(getRelativeOrder()); Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/AbstractDeploymentModelBuilder.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -48,7 +48,6 @@ import org.jboss.wsf.spi.deployment.ArchiveDeployment; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.DeploymentModelFactory; -import org.jboss.wsf.spi.deployment.DeploymentType; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.EndpointType; import org.jboss.wsf.spi.metadata.webservices.JBossWebservicesMetaData; @@ -65,21 +64,17 @@ /** Deployment model factory. */ private final DeploymentModelFactory deploymentModelFactory; - /** Deployment type this builder creates. */ - private final DeploymentType deploymentType; - /** Endpoint type this builder creates. */ private final EndpointType endpointType; /** * Constructor. */ - protected AbstractDeploymentModelBuilder(final DeploymentType deploymentType, final EndpointType endpointType) { + protected AbstractDeploymentModelBuilder(final EndpointType endpointType) { // deployment factory final ClassLoader cl = AbstractDeploymentModelBuilder.class.getClassLoader(); final SPIProvider spiProvider = SPIProviderResolver.getInstance(cl).getProvider(); this.deploymentModelFactory = spiProvider.getSPI(DeploymentModelFactory.class, cl); - this.deploymentType = deploymentType; this.endpointType = endpointType; } @@ -210,7 +205,6 @@ dep.setRootFile(new ResourceLoaderAdapter(classLoader)); } dep.setRuntimeClassLoader(classLoader); - dep.setType(deploymentType); //add an AnnotationInfo attachment that uses composite jandex index dep.addAttachment(AnnotationsInfo.class, new JandexAnnotationsInfo(unit)); Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_EJB.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2009, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -24,7 +24,6 @@ import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER; import static org.jboss.as.webservices.metadata.model.AbstractEndpoint.COMPONENT_VIEW_NAME; import static org.jboss.as.webservices.util.ASHelper.getJaxwsEjbs; -import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS; import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_EJB3; import org.jboss.as.server.deployment.DeploymentUnit; @@ -40,7 +39,7 @@ final class DeploymentModelBuilderJAXWS_EJB extends AbstractDeploymentModelBuilder { DeploymentModelBuilderJAXWS_EJB() { - super(JAXWS, JAXWS_EJB3); + super(JAXWS_EJB3); } @Override Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_JMS.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -24,7 +24,6 @@ import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER; import static org.jboss.as.webservices.util.ASHelper.getOptionalAttachment; import static org.jboss.as.webservices.util.WSAttachmentKeys.JMS_ENDPOINT_METADATA_KEY; -import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS; import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE; import org.jboss.as.server.deployment.DeploymentUnit; @@ -40,7 +39,7 @@ final class DeploymentModelBuilderJAXWS_JMS extends AbstractDeploymentModelBuilder { DeploymentModelBuilderJAXWS_JMS() { - super(JAXWS, JAXWS_JSE); + super(JAXWS_JSE); } @Override Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/deployers/deployment/DeploymentModelBuilderJAXWS_POJO.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -24,7 +24,6 @@ import static org.jboss.as.webservices.WSLogger.ROOT_LOGGER; import static org.jboss.as.webservices.metadata.model.AbstractEndpoint.COMPONENT_VIEW_NAME; import static org.jboss.as.webservices.util.ASHelper.getJaxwsPojos; -import static org.jboss.wsf.spi.deployment.DeploymentType.JAXWS; import static org.jboss.wsf.spi.deployment.EndpointType.JAXWS_JSE; import org.jboss.as.server.deployment.DeploymentUnit; @@ -40,7 +39,7 @@ final class DeploymentModelBuilderJAXWS_POJO extends AbstractDeploymentModelBuilder { DeploymentModelBuilderJAXWS_POJO() { - super(JAXWS, JAXWS_JSE); + super(JAXWS_JSE); } @Override Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/injection/InjectionDeploymentAspect.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -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. * @@ -19,7 +19,6 @@ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ - package org.jboss.as.webservices.injection; import java.security.AccessController; @@ -35,7 +34,6 @@ import org.jboss.msc.service.ServiceName; import org.jboss.ws.common.deployment.ReferenceFactory; import org.jboss.ws.common.integration.AbstractDeploymentAspect; -import org.jboss.ws.common.integration.WSHelper; import org.jboss.wsf.spi.deployment.Deployment; import org.jboss.wsf.spi.deployment.Endpoint; import org.jboss.wsf.spi.deployment.InstanceProvider; @@ -48,8 +46,6 @@ @Override public void start(final Deployment dep) { - if (WSHelper.isJaxrpcDeployment(dep)) return; - for (final Endpoint ep : dep.getService().getEndpoints()) { setInjectionAwareInstanceProvider(ep); } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/invocation/AbstractInvocationHandler.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -36,6 +36,7 @@ import org.jboss.as.ee.component.Component; import org.jboss.as.ee.component.ComponentView; import org.jboss.as.naming.ManagedReference; +import org.jboss.as.webservices.WSLogger; import org.jboss.as.webservices.injection.WSComponent; import org.jboss.invocation.InterceptorContext; import org.jboss.msc.service.ServiceName; @@ -132,7 +133,7 @@ wsInvocation.setReturnValue(retObj); } catch (Throwable t) { - log.error(MESSAGES.methodInvocationFailed(t.getLocalizedMessage()), t); + WSLogger.ROOT_LOGGER.error(MESSAGES.methodInvocationFailed(t.getLocalizedMessage()), t); handleInvocationException(t); } finally { Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/publish/EndpointPublisherImpl.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2012, 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. * @@ -324,7 +324,6 @@ depAspects.add(aspect); //add another aspect to set InvocationHandlerJAXWS to each endpoint ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect(); - handlerAspect.setForJaxRpc(false); depAspects.add(handlerAspect); } else { depAspects.add(aspect); @@ -349,7 +348,6 @@ publisherDepAspects.add(aspect); //add another aspect to set InvocationHandlerJAXWS to each endpoint ForceJAXWSInvocationHandlerDeploymentAspect handlerAspect = new ForceJAXWSInvocationHandlerDeploymentAspect(); - handlerAspect.setForJaxRpc(false); publisherDepAspects.add(handlerAspect); } else { publisherDepAspects.add(aspect); Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/ServletDelegateFactoryImpl.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -28,7 +28,7 @@ import org.jboss.wsf.spi.deployment.ServletDelegateFactory; /** - * AS7 implementation of {@link org.jboss.wsf.spi.deployment.ServletDelegateFactory} + * WildFly implementation of {@link org.jboss.wsf.spi.deployment.ServletDelegateFactory} * that uses modular classloading for creating the delegate instance. * * @author alessio.soldano(a)jboss.com @@ -38,11 +38,10 @@ public final class ServletDelegateFactoryImpl implements ServletDelegateFactory { @Override - public ServletDelegate newServletDelegate(final String servletClassName, final boolean isJaxWs) { + public ServletDelegate newServletDelegate(final String servletClassName) { final ClassLoaderProvider provider = ClassLoaderProvider.getDefaultProvider(); - final ClassLoader classLoader = isJaxWs ? provider.getServerIntegrationClassLoader() : provider.getServerJAXRPCIntegrationClassLoader(); try { - final Class<?> clazz = classLoader.loadClass(servletClassName); + final Class<?> clazz = provider.getServerIntegrationClassLoader().loadClass(servletClassName); return (ServletDelegate) clazz.newInstance(); } catch (final Exception e) { throw MESSAGES.cannotInstantiateServletDelegate(e, servletClassName); Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/tomcat/WebMetaDataModifier.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2011, Red Hat Middleware LLC, and individual contributors + * Copyright 2014, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the * distribution for a full listing of individual contributors. * @@ -94,8 +94,6 @@ final List<ParamValueMetaData> initParams = WebMetaDataHelper.getServletInitParams(servletMD); // configure transport class name WebMetaDataHelper.newParamValue(WSFServlet.STACK_SERVLET_DELEGATE_CLASS, transportClassName, initParams); - // configure the integration classloader to be used (JAXRPC or JAXWS) - WebMetaDataHelper.newParamValue(WSFServlet.INTEGRATION_CLASSLOADER, dep.getType().toString(), initParams); // configure webservice endpoint WebMetaDataHelper.newParamValue(Endpoint.SEPID_DOMAIN_ENDPOINT, endpointClassName, initParams); } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/util/VirtualFileAdaptor.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -43,7 +43,7 @@ private static final long serialVersionUID = -4509594124653184349L; - private transient VirtualFile file; + private final transient VirtualFile file; public VirtualFileAdaptor(VirtualFile file) { this.file = file; 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-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WSRefUtils.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -65,7 +65,6 @@ 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; /** * Translates WS Refs from JBossAS MD to JBossWS UMDM format. @@ -127,8 +126,6 @@ builder.setHandlerChain(jbossServiceRefMD.getHandlerChain()); } - builder.setType(ServiceRefType.JAXWS); - return builder.build(); } 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-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/main/java/org/jboss/as/webservices/webserviceref/WebServiceReferences.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -1,5 +1,7 @@ package org.jboss.as.webservices.webserviceref; +import static org.jboss.as.webservices.webserviceref.WSRefUtils.processAnnotatedElement; + import java.lang.reflect.AnnotatedElement; import javax.xml.ws.Service; @@ -14,11 +16,8 @@ import org.jboss.modules.Module; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedServiceRefMetaData; -import org.jboss.wsf.spi.serviceref.ServiceRefType; import org.wildfly.security.manager.WildFlySecurityManager; -import static org.jboss.as.webservices.webserviceref.WSRefUtils.processAnnotatedElement; - /** * Utility class that encapsulates the creation of web service ref factories. * <p/> @@ -74,8 +73,6 @@ } else { serviceRefUMDM.setServiceInterface(Service.class.getName()); } - // ref type - serviceRefUMDM.setType(ServiceRefType.JAXWS); return serviceRefUMDM; } Modified: container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java =================================================================== --- container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java 2014-05-20 10:23:04 UTC (rev 18682) +++ container/wildfly80/branches/jbossws-wildfly800/server-integration/src/test/java/org/jboss/as/webservices/parser/TestDA1.java 2014-05-20 10:23:19 UTC (rev 18683) @@ -89,31 +89,6 @@ } @Override - public boolean canHandle(Deployment dep) { - return false; - } - - @Override - public boolean isForJaxWs() { - return false; - } - - @Override - public void setForJaxWs(boolean isForJaxWs) { - - } - - @Override - public boolean isForJaxRpc() { - return false; - } - - @Override - public void setForJaxRpc(boolean isForJaxRpc) { - - } - - @Override public ClassLoader getLoader() { return null; }