geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1292669 - /geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
Date Thu, 23 Feb 2012 07:00:50 GMT
Author: xuhaihong
Date: Thu Feb 23 07:00:49 2012
New Revision: 1292669

URL: http://svn.apache.org/viewvc?rev=1292669&view=rev
Log:
GERONIMO-6283 Ignore JAX-WS webservices handlering in Axis module

Modified:
    geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
  (contents, props changed)

Modified: geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java?rev=1292669&r1=1292668&r2=1292669&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
(original)
+++ geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
Thu Feb 23 07:00:49 2012
@@ -27,8 +27,10 @@ import java.util.Collections;
 import java.util.Properties;
 import java.util.jar.JarFile;
 
+import javax.jws.WebService;
 import javax.security.jacc.WebResourcePermission;
 import javax.security.jacc.WebUserDataPermission;
+import javax.xml.ws.WebServiceProvider;
 
 import org.apache.geronimo.axis.server.EjbWebServiceGBean;
 import org.apache.geronimo.common.DeploymentException;
@@ -131,6 +133,11 @@ public class AxisModuleBuilderExtension 
 
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
 
+            //JAX-WS will be handled in JAXWSEJBModuleBuilderExtension
+            if (isJAXWSWebService(bean, bundle)) {
+                continue;
+            }
+
             String j2eeType = null;
             if (bean.type == EnterpriseBeanInfo.STATELESS) {
                 j2eeType = NameFactory.STATELESS_SESSION_BEAN;
@@ -194,6 +201,11 @@ public class AxisModuleBuilderExtension 
 
         for (EnterpriseBeanInfo bean : ejbModule.getEjbJarInfo().enterpriseBeans) {
 
+            //JAX-WS will be handled in JAXWSEJBModuleBuilderExtension
+            if (isJAXWSWebService(bean, bundle)) {
+                continue;
+            }
+
             String j2eeType = null;
             if (bean.type == EnterpriseBeanInfo.STATELESS) {
                 j2eeType = NameFactory.STATELESS_SESSION_BEAN;
@@ -292,6 +304,15 @@ public class AxisModuleBuilderExtension 
         return wsBindingMap;
     }
 
+    private boolean isJAXWSWebService(EnterpriseBeanInfo bean, Bundle bundle) throws DeploymentException
{
+        try {
+            Class<?> clazz = bundle.loadClass(bean.ejbClass);
+            return (clazz.isAnnotationPresent(WebService.class) || clazz.isAnnotationPresent(WebServiceProvider.class));
+        } catch (ClassNotFoundException ex) {
+            throw new DeploymentException("Unable to load EJB Bean class : " + bean.ejbClass,
ex);
+        }
+    }
+
     private static class WebServiceBinding {
 
         private String address;

Propchange: geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: geronimo/server/branches/3.0-beta/plugins/axis/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message