You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/05/08 17:34:29 UTC

svn commit: r654555 - /geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Author: gawor
Date: Thu May  8 08:34:29 2008
New Revision: 654555

URL: http://svn.apache.org/viewvc?rev=654555&view=rev
Log:
Make deployment of EJB-based JAX-WS web service with WebServiceContext injection work (GERONIMO-4006)

Modified:
    geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Modified: geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=654555&r1=654554&r2=654555&view=diff
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original)
+++ geronimo/server/branches/2.0/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Thu May  8 08:34:29 2008
@@ -37,6 +37,7 @@
 import javax.ejb.MessageDrivenContext;
 import javax.ejb.SessionContext;
 import javax.xml.namespace.QName;
+import javax.xml.ws.WebServiceContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -377,6 +378,8 @@
                     iterator.remove();
                 } else if (ref.getType().equals(MessageDrivenContext.class.getName())) {
                     iterator.remove();
+                } else if (ref.getType().equals(WebServiceContext.class.getName())) {
+                    iterator.remove();
                 } else {
                     ref.setMappedName(null);
                 }