Author: richard.opalka(a)jboss.com Date: 2010-05-26 05:08:23 -0400 (Wed, 26 May 2010) New Revision: 12325 Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java Log: [JBPAPP-4384] fixing EJB integration - to be lazy Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java =================================================================== --- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-05-26 08:40:02 UTC (rev 12324) +++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/Endpoint.java 2010-05-26 09:08:23 UTC (rev 12325) @@ -24,6 +24,8 @@ import java.util.List; import javax.management.ObjectName; +import javax.naming.Context; +import javax.naming.NamingException; import org.jboss.wsf.spi.invocation.InvocationHandler; import org.jboss.wsf.spi.invocation.RequestHandler; @@ -127,4 +129,7 @@ /** Ask configured processors for processing of the given record **/ void processRecord(Record record); + + /** Returns associated JNDI context with this endpoint. */ + Context getJNDIContext(); } Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java =================================================================== --- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2010-05-26 08:40:02 UTC (rev 12324) +++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/deployment/integration/WebServiceDeclaration.java 2010-05-26 09:08:23 UTC (rev 12325) @@ -51,12 +51,6 @@ String getComponentClassName(); /** - * Returns JNDI context associated with EJB container. - * @return - */ - Context getContext(); - - /** * Get a unified meta data view represented by an annotation. * * @param t Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java =================================================================== --- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2010-05-26 08:40:02 UTC (rev 12324) +++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/invocation/InvocationHandler.java 2010-05-26 09:08:23 UTC (rev 12325) @@ -24,6 +24,8 @@ import java.lang.reflect.UndeclaredThrowableException; import javax.management.MBeanException; +import javax.naming.Context; +import javax.naming.NamingException; import org.jboss.wsf.spi.deployment.Endpoint; @@ -36,14 +38,17 @@ */ public abstract class InvocationHandler { - /** Create a container specific invocation **/ + /** Create a container specific invocation */ public abstract Invocation createInvocation(); /** Invoke the the service endpoint */ public abstract void invoke(Endpoint ep, Invocation inv) throws Exception; - /** Initilize the invocation handler **/ + /** 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 { Modified: spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java =================================================================== --- spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java 2010-05-26 08:40:02 UTC (rev 12324) +++ spi/branches/jbossws-spi-1.1.2/src/main/java/org/jboss/wsf/spi/metadata/injection/InjectionsMetaData.java 2010-05-26 09:08:23 UTC (rev 12325) @@ -27,8 +27,6 @@ import java.util.LinkedList; import java.util.Map; -import javax.naming.Context; - /** * Injections metadata container. * @@ -55,40 +53,25 @@ private final Map<Class<? extends Annotation>, ReferenceResolver> referenceResolvers; /** - * JNDI context. - */ - private final Context ctx; - - /** * Constructor. * * @param injections injection definitions list - * @param ctx JNDI context + * @param resolvers reference resolvers */ - public InjectionsMetaData(Collection<InjectionMetaData> injections, Map<Class<? extends Annotation>, ReferenceResolver> referenceResolvers, Context ctx) + public InjectionsMetaData(Collection<InjectionMetaData> injections, Map<Class<? extends Annotation>, ReferenceResolver> resolvers) { super(); if (injections == null) throw new IllegalArgumentException("injections metadata list cannot be null"); - if ((referenceResolvers == null) || (referenceResolvers.size() == 0)) + if ((resolvers == null) || (resolvers.size() == 0)) throw new IllegalArgumentException("reference resolvers list cannot be null or empty collection"); this.injections = injections; - this.referenceResolvers = referenceResolvers; - this.ctx = ctx; + this.referenceResolvers = resolvers; } /** - * Returns associated JNDI context. - * @return associated JNDI context - */ - public Context getContext() - { - return this.ctx; - } - - /** * Returns all descriptor driven injections metadata for particular class. * * @param clazz class to return injection definitions for