Author: ropalka Date: 2011-12-16 09:22:47 -0500 (Fri, 16 Dec 2011) New Revision: 15405 Removed: spi/trunk/src/main/java/org/jboss/wsf/spi/ioc/ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/injection/ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java Log: [JBWS-3393] removing all deprecated stuff Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/ArchiveDeployment.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -50,12 +50,6 @@ /** The concatenated names including all parents. */ String getCanonicalName(); - /** Get the URL for a given resource path - * Deprecated, use getResourceResolver().resolve(String resourcePath). - */ - @Deprecated - URL getMetaDataFileURL(String resourcePath) throws IOException; - /** Get additional metadata files attached to the deployment **/ List<UnifiedVirtualFile> getMetadataFiles(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -24,7 +24,6 @@ import java.util.List; import javax.management.ObjectName; -import javax.naming.Context; import org.jboss.ws.api.monitoring.Record; import org.jboss.ws.api.monitoring.RecordProcessor; @@ -120,9 +119,6 @@ /** Ask configured processors for processing of the given record **/ void processRecord(Record record); - /** Returns associated JNDI context with this endpoint. */ - Context getJNDIContext(); - /** Get endpoint address */ String getAddress(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -24,8 +24,6 @@ import java.lang.reflect.UndeclaredThrowableException; import javax.management.MBeanException; -import javax.naming.Context; -import javax.naming.NamingException; import org.jboss.wsf.spi.deployment.Endpoint; @@ -47,9 +45,6 @@ /** Initilize the invocation handler */ public abstract void init(Endpoint ep); - /** Returns JNDI context associated with endpoint */ - public abstract Context getJNDIContext(Endpoint ep) throws NamingException; - protected void handleInvocationException(Throwable th) throws Exception { if (th instanceof MBeanException) Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/invocation/WebServiceContextFactory.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -31,14 +31,5 @@ */ public abstract class WebServiceContextFactory implements SPIView { - /** - * Use {@link #newWebServiceContext(MessageContext) instead} - */ - @Deprecated - public ExtensibleWebServiceContext newWebServiceContext(InvocationType type, MessageContext messageContext) - { - return newWebServiceContext(messageContext); - } - public abstract ExtensibleWebServiceContext newWebServiceContext(MessageContext messageContext); } Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentMD.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -1,107 +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.metadata.j2ee; - -import java.lang.annotation.Annotation; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@Deprecated -public class PortComponentMD implements PortComponentSpec -{ - private static final long serialVersionUID = 1; - - private String portComponentName; - private String portComponentURI; - private String authMethod; - private String transportGuarantee; - private boolean secureWSDLAccess; - - public PortComponentMD() - { - } - - public String portComponentName() - { - return portComponentName; - } - - public void setPortComponentName(String portComponentName) - { - this.portComponentName = portComponentName; - } - - public String portComponentURI() - { - return portComponentURI; - } - - public void setPortComponentURI(String portComponentURI) - { - this.portComponentURI = portComponentURI; - } - - public String urlPattern() - { - String pattern = "/*"; - if (portComponentURI != null) - pattern = portComponentURI; - - return pattern; - } - - public String authMethod() - { - return authMethod; - } - - public void setAuthMethod(String authMethod) - { - this.authMethod = authMethod; - } - - public String transportGuarantee() - { - return transportGuarantee; - } - - public void setTransportGuarantee(String transportGuarantee) - { - this.transportGuarantee = transportGuarantee; - } - - public boolean secureWSDLAccess() - { - return secureWSDLAccess; - } - - public void setSecureWSDLAccess(boolean secureWSDLAccess) - { - this.secureWSDLAccess = secureWSDLAccess; - } - - public Class<? extends Annotation> annotationType() - { - return PortComponentSpec.class; - } -} Deleted: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/PortComponentSpec.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -1,41 +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.metadata.j2ee; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com&gt; - */ -@Deprecated -public @interface PortComponentSpec -{ - String portComponentName(); - - String portComponentURI(); - - String urlPattern(); - - String authMethod(); - - String transportGuarantee(); - - boolean secureWSDLAccess(); -} Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2011-12-16 10:27:17 UTC (rev 15404) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/jms/JMSEndpointsMetaData.java 2011-12-16 14:22:47 UTC (rev 15405) @@ -21,44 +21,24 @@ */ package org.jboss.wsf.spi.metadata.jms; -import java.net.URL; -import java.util.ArrayList; +import java.util.LinkedList; import java.util.List; /** - * <p>Meta data class from jbossws-cxf.xml</p> * @author <a href=&quot;ema(a)redhat.com&quot;&gt;Jim Ma</a> */ - -public class JMSEndpointsMetaData +public final class JMSEndpointsMetaData { - //The endpoints list - private List<JMSEndpointMetaData> endpointsMetaData = new ArrayList<JMSEndpointMetaData>(); - private URL descriptorURL; + private List<JMSEndpointMetaData> jmsEndpointsMD = new LinkedList<JMSEndpointMetaData>(); - public JMSEndpointsMetaData() - { - } - - @Deprecated - public JMSEndpointsMetaData(URL descriptorURL) - { - this.descriptorURL = descriptorURL; - } - - @Deprecated - public URL getDescriptorURL() - { - return descriptorURL; - } - public void addEndpointMetaData(JMSEndpointMetaData endpointMetaData) { - endpointsMetaData.add(endpointMetaData); + jmsEndpointsMD.add(endpointMetaData); } public List<JMSEndpointMetaData> getEndpointsMetaData() { - return this.endpointsMetaData; + return jmsEndpointsMD; } + }