Author: objectiser Date: 2010-02-02 12:23:23 -0500 (Tue, 02 Feb 2010) New Revision: 487 Removed: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/EndpointReferenceResolver.java Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java Log: Remove unnecessary EndpointReferenceResolver interface, that was introduced when working on a solution for RIFTSAW-156. Deleted: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/EndpointReferenceResolver.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/EndpointReferenceResolver.java 2010-02-01 17:44:33 UTC (rev 486) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/EndpointReferenceResolver.java 2010-02-02 17:23:23 UTC (rev 487) @@ -1,17 +0,0 @@ -package org.jboss.soa.bpel.runtime.engine; - -import javax.xml.namespace.QName; - -public interface EndpointReferenceResolver { - - /** - * This method returns the endpoint reference associated with the supplied service - * name and port name. - * - * @param serviceName The service name - * @param portName The port name - * @return The endpoint reference, or null if not found - */ - public org.apache.ode.bpel.iapi.EndpointReference getEndpoint(QName serviceName, String portName); - -} Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-02-01 17:44:33 UTC (rev 486) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/BPELEngineImpl.java 2010-02-02 17:23:23 UTC (rev 487) @@ -39,7 +39,6 @@ import org.apache.ode.utils.GUID; import org.apache.ode.utils.Properties; import org.jboss.soa.bpel.runtime.engine.BPELEngine; -import org.jboss.soa.bpel.runtime.engine.EndpointReferenceResolver; import org.jboss.soa.bpel.runtime.engine.IntegrationLayer; import org.jboss.soa.bpel.runtime.engine.InvocationAdapter; import org.w3c.dom.Element; @@ -71,7 +70,6 @@ protected Database _db; protected ExecutorService _executorService; protected CronScheduler _cronScheduler; - private EndpointReferenceResolver _endpointRefResolver; private java.util.List<IntegrationLayer> m_integrationLayers=new java.util.Vector<IntegrationLayer>(); @@ -279,7 +277,6 @@ } private long resolveTimeout(InvocationAdapter invocationAdapter, MyRoleMessageExchange odeMex) { - //EndpointReference serviceRef=_endpointRefResolver.getEndpoint(invocationAdapter.getServiceName(), invocationAdapter.getPortName()); ProcessConf conf=odeMex.getProcessConf(); String timeout = conf.getEndpointProperties(invocationAdapter.getServiceName(), invocationAdapter.getPortName()).get(Properties.PROP_MEX_TIMEOUT); @@ -515,8 +512,7 @@ _bpelServer.setEndpointReferenceContext(eprContext); _bpelServer.setMessageExchangeContext(new MessageExchangeContextImpl(this)); - _endpointRefResolver = new JAXWSBindingContext(this); - _bpelServer.setBindingContext((JAXWSBindingContext)_endpointRefResolver); + _bpelServer.setBindingContext(new JAXWSBindingContext(this)); _bpelServer.setScheduler(_scheduler); if (_odeConfig.isDehydrationEnabled()) { Modified: trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java =================================================================== --- trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-02-01 17:44:33 UTC (rev 486) +++ trunk/runtime/engine/src/main/java/org/jboss/soa/bpel/runtime/engine/ode/JAXWSBindingContext.java 2010-02-02 17:23:23 UTC (rev 487) @@ -20,7 +20,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.iapi.*; -import org.jboss.soa.bpel.runtime.engine.EndpointReferenceResolver; import org.jboss.soa.bpel.runtime.engine.PartnerChannel; import org.jboss.soa.bpel.runtime.ws.*; import org.jboss.soa.bpel.runtime.*; @@ -41,7 +40,7 @@ * * @author Heiko.Braun */ -public class JAXWSBindingContext implements BindingContext, EndpointReferenceResolver +public class JAXWSBindingContext implements BindingContext { protected final Log log = LogFactory.getLog(getClass());