You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2008/02/22 04:25:56 UTC

svn commit: r630079 - in /webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws: framework/JAXWSDeployer.java registry/FactoryRegistry.java

Author: dims
Date: Thu Feb 21 19:25:53 2008
New Revision: 630079

URL: http://svn.apache.org/viewvc?rev=630079&view=rev
Log:
log an error if some jars go awol! check for isInterface() is enough, no need to check whether endpointInterface is empty

Modified:
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
    webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java?rev=630079&r1=630078&r2=630079&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/framework/JAXWSDeployer.java Thu Feb 21 19:25:53 2008
@@ -181,11 +181,10 @@
                 wspAnnotation = (WebServiceProvider) pojoClass.getAnnotation(WebServiceProvider.class);
             }
 
-            //If this contains a WebService annotation, make sure that we are not
-            //processing the pure SEI. We should only create the AxisService based on the 
-            //implementation class. Also skip any interfaces.
-            if (((wsAnnotation != null && !isEmpty(wsAnnotation.endpointInterface())) 
-                    || wspAnnotation != null) 
+            // Create an Axis Service only if the class is not an interface and it has either 
+            // @WebService annotation or @WebServiceProvider annotation.
+            if ((wsAnnotation != null
+                    || wspAnnotation != null)
                     && !pojoClass.isInterface()) {
                 log.info("Deploying JAXWS class : " + className);
                 AxisService axisService;

Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java?rev=630079&r1=630078&r2=630079&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/registry/FactoryRegistry.java Thu Feb 21 19:25:53 2008
@@ -55,6 +55,8 @@
 import org.apache.axis2.jaxws.server.endpoint.lifecycle.factory.impl.EndpointLifecycleManagerFactoryImpl;
 import org.apache.axis2.jaxws.utility.ExecutorFactory;
 import org.apache.axis2.jaxws.utility.JAXWSExecutorFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -77,9 +79,14 @@
 
     private static volatile Map<Class, Object> table;
     private static Object lockbox = new Object();
+    private static final Log log = LogFactory.getLog(FactoryRegistry.class);
     
     static {
-        init();
+        try {
+            init();
+        } catch (Throwable t){
+            log.error(t.getMessage(), t);
+        }
     }
     
     private static final void init() {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org