Author: richard.opalka(a)jboss.com Date: 2010-10-14 08:42:46 -0400 (Thu, 14 Oct 2010) New Revision: 13120 Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java Log: removing obsolete code Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2010-10-14 11:38:50 UTC (rev 13119) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedPortComponentRefMetaData.java 2010-10-14 12:42:46 UTC (rev 13120) @@ -69,21 +69,6 @@ this.serviceRefMetaData = serviceRefMetaData; } - public void merge(UnifiedPortComponentRefMetaData pcref) - { - portQName = pcref.portQName; - configName = pcref.configName; - configFile = pcref.configFile; - callProperties = pcref.callProperties; - stubProperties = pcref.stubProperties; - addressingEnabled = pcref.addressingEnabled; - addressingRequired = pcref.addressingRequired; - addressingResponses = pcref.addressingResponses; - mtomEnabled = pcref.mtomEnabled; - mtomThreshold = pcref.mtomThreshold; - respectBindingEnabled = pcref.respectBindingEnabled; - } - public UnifiedServiceRefMetaData getServiceRefMetaData() { return serviceRefMetaData; 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 2010-10-14 11:38:50 UTC (rev 13119) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/metadata/j2ee/serviceref/UnifiedServiceRefMetaData.java 2010-10-14 12:42:46 UTC (rev 13120) @@ -34,7 +34,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; -import java.util.LinkedList; import java.util.List; import javax.xml.namespace.QName; @@ -47,7 +46,7 @@ import org.jboss.wsf.spi.util.URLLoaderAdapter; /** - * The metdata data from service-ref element in web.xml, ejb-jar.xml, and + * The metadata from service-ref element in web.xml, ejb-jar.xml, and * application-client.xml. * * @author Thomas.Diesler(a)jboss.org @@ -55,7 +54,7 @@ */ public class UnifiedServiceRefMetaData extends ServiceRefMetaData { - private static final long serialVersionUID = -926464174132493954L; + private static final long serialVersionUID = -926464174132493955L; // provide logging private static Logger log = Logger.getLogger(UnifiedServiceRefMetaData.class); @@ -112,9 +111,6 @@ // A flag that should be set when this service-ref has been bound. private transient boolean processed; - // Maps 'injection-target-class' to 'injection-target-name' - private List<String[]> injectionTargets = new LinkedList<String[]>(); - public UnifiedServiceRefMetaData(UnifiedVirtualFile vfRoot) { this.vfsRoot = vfRoot; @@ -177,46 +173,6 @@ return this.respectBindingEnabled; } - public void merge(ServiceRefMetaData sref) - { - UnifiedServiceRefMetaData sourceRef = (UnifiedServiceRefMetaData)sref; - serviceImplClass = sourceRef.serviceImplClass; - configName = sourceRef.configName; - configFile = sourceRef.configFile; - wsdlOverride = sourceRef.wsdlOverride; - handlerChain = sourceRef.handlerChain; - callProperties = sourceRef.callProperties; - addressingEnabled = sourceRef.addressingEnabled; - addressingRequired = sourceRef.addressingRequired; - addressingResponses = sourceRef.addressingResponses; - mtomEnabled = sourceRef.mtomEnabled; - mtomThreshold = sourceRef.mtomThreshold; - respectBindingEnabled = sourceRef.respectBindingEnabled; - - if (serviceQName == null && sourceRef.serviceQName != null) - serviceQName = sourceRef.serviceQName; - - for (UnifiedPortComponentRefMetaData pcref : sourceRef.getPortComponentRefs()) - { - String seiName = pcref.getServiceEndpointInterface(); - QName portQName = pcref.getPortQName(); - UnifiedPortComponentRefMetaData targetPCRef = getPortComponentRef(seiName, portQName); - - if (targetPCRef == null) - { - log.warn("Cannot find port component ref: [sei=" + seiName + ",port=" + portQName + "]"); - if (seiName != null) - addPortComponentRef(pcref); - else - log.warn("Ingore port component ref without SEI declaration: " + pcref); - - targetPCRef = pcref; - } - - targetPCRef.merge(pcref); - } - } - public UnifiedVirtualFile getVfsRoot() { return vfsRoot; @@ -473,22 +429,6 @@ this.anElement = anElement; } - public void registerInjectionTarget(String classname) - { - this.injectionTargets.add( new String[]{classname, null} ); - } - - public void finalizeInjectionTarget(String propName) - { - int index = this.injectionTargets.isEmpty() ? 0 : this.injectionTargets.size() - 1; - this.injectionTargets.get(index)[1] = propName; - } - - public List<String[]> getInjectionTargets() - { - return this.injectionTargets; - } - private void writeObject(ObjectOutputStream out) throws IOException { out.defaultWriteObject(); Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 11:38:50 UTC (rev 13119) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefBinder.java 2010-10-14 12:42:46 UTC (rev 13120) @@ -36,9 +36,5 @@ */ public interface ServiceRefBinder { - final static String BEAN_NAME_JAXRPC = "WSServiceRefBinderJAXRPC"; - - final static String BEAN_NAME_JAXWS = "WSServiceRefBinderJAXWS"; - void setupServiceRef(Context encCtx, String encName, AnnotatedElement anElement, UnifiedServiceRefMetaData serviceRef, ClassLoader loader) throws NamingException; } Modified: spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java =================================================================== --- spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-10-14 11:38:50 UTC (rev 13119) +++ spi/trunk/src/main/java/org/jboss/wsf/spi/serviceref/ServiceRefMetaData.java 2010-10-14 12:42:46 UTC (rev 13120) @@ -21,16 +21,13 @@ */ package org.jboss.wsf.spi.serviceref; -import java.io.Serializable; -import java.util.List; - /** * An abstract service-ref meta data object. * * @author Thomas.Diesler(a)jboss.org * @since 08-Mar-2007 */ -public abstract class ServiceRefMetaData extends ServiceRefElement implements Serializable +public abstract class ServiceRefMetaData extends ServiceRefElement { public abstract String getServiceRefName(); @@ -43,8 +40,4 @@ public abstract boolean isProcessed(); public abstract void setProcessed(boolean flag); - - public abstract List<String[]> getInjectionTargets(); - - public abstract void merge(ServiceRefMetaData targetRef); }