Author: asoldano Date: 2014-05-20 06:21:21 -0400 (Tue, 20 May 2014) New Revision: 18680 Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java Log: [JBWS-3779] WIP Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Deployment.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, 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,12 +48,6 @@ /** Set the runtime class loader for this deployment */ void setRuntimeClassLoader(ClassLoader loader); - /** Get the deployment type */ - DeploymentType getType(); - - /** Set the deployment type */ - void setType(DeploymentType type); - /** Get the current deployment state */ DeploymentState getState(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspect.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -1,6 +1,6 @@ /* * JBoss, Home of Professional Open Source. - * Copyright 2006, 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. * @@ -60,15 +60,5 @@ public Set<String> getRequiresAsSet(); - public boolean canHandle(Deployment dep); - - public boolean isForJaxWs(); - - public void setForJaxWs(boolean isForJaxWs); - - public boolean isForJaxRpc(); - - public void setForJaxRpc(boolean isForJaxRpc); - public ClassLoader getLoader(); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManager.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -35,12 +35,6 @@ /** Get the name for this aspect manager */ String getName(); - /** Get the optional parent for this manager */ - DeploymentAspectManager getParent(); - - /** Set the optional parent for this manager */ - void setParent(DeploymentAspectManager dam); - /** Get the list of registered deployment aspects */ List<DeploymentAspect> getDeploymentAspects(); Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentAspectManagerFactory.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -1,39 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.wsf.spi.deployment; - - -/** - * Creates DeploymentAspectManager's by {@link org.jboss.wsf.spi.deployment.Deployment.DeploymentType} - * - * @author Heiko.Braun(a)jboss.com - * Created: Jul 20, 2007 - */ -public abstract class DeploymentAspectManagerFactory -{ - public abstract DeploymentAspectManager getDeploymentAspectManager(DeploymentType deploymentType); - - /** - * Get a named instance of a deployment aspect manager - */ - public abstract DeploymentAspectManager getDeploymentAspectManager(String beanName); -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/DeploymentType.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -1,33 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2011, 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. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.wsf.spi.deployment; - -/** - * WebService deployment type. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public enum DeploymentType -{ - JAXWS, JAXRPC, -} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/EndpointType.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -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. * @@ -29,5 +29,5 @@ */ public enum EndpointType { - JAXRPC_JSE, JAXRPC_EJB21, JAXWS_JSE, JAXWS_EJB3 + JAXWS_JSE, JAXWS_EJB3 } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ServletDelegateFactory.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -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. * @@ -30,5 +30,5 @@ */ public interface ServletDelegateFactory { - public ServletDelegate newServletDelegate(String delegateClassName, boolean isJaxWs); + public ServletDelegate newServletDelegate(String delegateClassName); } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/WSFServlet.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -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. * @@ -42,8 +42,9 @@ */ public class WSFServlet extends HttpServlet { + private static final long serialVersionUID = -1958443536378468262L; + public static final String STACK_SERVLET_DELEGATE_CLASS = "org.jboss.wsf.spi.deployment.stackServletDelegateClass"; - public static final String INTEGRATION_CLASSLOADER = "org.jboss.wsf.spi.deployment.integrationClassLoader"; private volatile ServletDelegate delegate = null; @@ -74,8 +75,7 @@ ClassLoader cl = clProvider.getWebServiceSubsystemClassLoader(); ServiceLoader<ServletDelegateFactory> sl = ServiceLoader.load(ServletDelegateFactory.class, cl); ServletDelegateFactory factory = sl.iterator().next(); - boolean isJaxWs = DeploymentType.JAXWS.toString().equals(servletConfig.getInitParameter(INTEGRATION_CLASSLOADER)); - return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS), isJaxWs); + return factory.newServletDelegate(servletConfig.getInitParameter(STACK_SERVLET_DELEGATE_CLASS)); } @Override Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -39,7 +39,6 @@ import org.jboss.wsf.spi.Loggers; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.serviceref.ServiceRefType; /** * The metadata from service-ref element in web.xml, ejb-jar.xml, @@ -60,8 +59,6 @@ // Standard properties - // Service reference type - either JAX-RPC or JAXWS - private volatile ServiceRefType type; //TODO REMOVE // The required <service-ref-name> element private final String serviceRefName; // The <service-interface> element @@ -141,7 +138,7 @@ - public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot, ServiceRefType type, String serviceRefName, + public UnifiedServiceRefMetaData(UnifiedVirtualFile vfsRoot, String serviceRefName, String serviceInterface, String serviceRefType, String wsdlFile, String mappingFile, QName serviceQName, List<UnifiedPortComponentRefMetaData> portComponentRefs, List<UnifiedHandlerMetaData> handlers, UnifiedHandlerChainsMetaData handlerChains, String serviceImplClass, String configName, String configFile, @@ -149,7 +146,6 @@ RespectBindingMetadata respectBindingMetadata) { this.vfsRoot = vfsRoot; - this.type = type; this.serviceRefName = serviceRefName; this.serviceInterface = serviceInterface; this.serviceRefType = serviceRefType; @@ -235,16 +231,6 @@ this.vfsRoot = vfsRoot; } - public ServiceRefType getType() - { - return type; - } - - public void setType(ServiceRefType type) - { - this.type = type; - } - public String getServiceRefName() { return serviceRefName; @@ -468,7 +454,6 @@ StringBuilder str = new StringBuilder(); str.append("\nUnifiedServiceRef"); str.append("\n serviceRefName=" + serviceRefName); - str.append("\n type=" + type); str.append("\n serviceInterface=" + serviceInterface); str.append("\n serviceImplClass=" + serviceImplClass); str.append("\n serviceRefType=" + serviceRefType); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaDataBuilder.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -29,7 +29,6 @@ import javax.xml.namespace.QName; import org.jboss.wsf.spi.deployment.UnifiedVirtualFile; -import org.jboss.wsf.spi.serviceref.ServiceRefType; /** * Utility class for building UnifiedServiceRefMetaData instances @@ -42,8 +41,6 @@ // Standard properties - // Service reference type - either JAX-RPC or JAXWS - private ServiceRefType type; // The required <service-ref-name> element private String serviceRefName; // The JAXRPC required <service-interface> element @@ -92,7 +89,6 @@ public UnifiedServiceRefMetaData build() { return new UnifiedServiceRefMetaData(vfsRoot, - type, serviceRefName, serviceInterface, serviceRefType, @@ -158,11 +154,6 @@ this.vfsRoot = vfsRoot; } - public void setType(ServiceRefType type) - { - this.type = type; - } - public String getServiceRefName() { return serviceRefName; Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/webservices/PortComponentMetaData.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -32,12 +32,6 @@ import org.jboss.wsf.spi.metadata.j2ee.serviceref.UnifiedHandlerMetaData; /** - * XML Binding and ws4ee meta-data element for - * <code>webservices/webservice-description/port-component</code> - * <p/> - * A port component is the equivalent of an ordinary Axis service (and - * as such it constitutes the building blocks for jaxrpc services). - * <p/> * * @author Thomas.Diesler(a)jboss.org * @author alessio.soldano(a)jboss.com Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java 2014-05-20 09:45:36 UTC (rev 18679) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefType.java 2014-05-20 10:21:21 UTC (rev 18680) @@ -1,32 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, 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. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * 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.wsf.spi.serviceref; - -/** - * Creates a ServiceReferenceable and binds it to JNDI. - * - * @author <a href="mailto:ropalka@redhat.com">Richard Opalka</a> - */ -public enum ServiceRefType -{ - JAXRPC, JAXWS -}