Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (asf.osuosl.org: local policy)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r463898 - in
 /webservices/axis2/branches/java/1_1/modules:
 kernel/src/org/apache/axis2/deployment/util/Utils.java
 spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
Date: Sat, 14 Oct 2006 08:02:34 -0000
To: axis2-cvs@ws.apache.org
From: saminda@apache.org
Message-Id: <20061014080234.7829C1A981A@eris.apache.org>

Author: saminda
Date: Sat Oct 14 01:02:33 2006
New Revision: 463898

URL: http://svn.apache.org/viewvc?view=rev&rev=463898
Log:
Improved the way the ServiceObjectSupplier work in deployment time. If 
the serive object couldn't find in the deployment time, still it can 
populate the OperationDescription with standard Axis2 ways. 


Modified:
    webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
    webservices/axis2/branches/java/1_1/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java

Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?view=diff&rev=463898&r1=463897&r2=463898
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sat Oct 14 01:02:33 2006
@@ -19,6 +19,8 @@
 import org.apache.ws.java2wsdl.Java2WSDLConstants;
 import org.apache.ws.java2wsdl.SchemaGenerator;
 import org.apache.ws.java2wsdl.utils.TypeTable;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.codehaus.jam.JMethod;
 
 import javax.xml.namespace.QName;
@@ -49,6 +51,9 @@
 */
 
 public class Utils {
+
+    private static Log log = LogFactory.getLog(Utils.class);
+
     public static void addFlowHandlers(Flow flow, ClassLoader clsLoader) throws AxisFault {
         int count = flow.getHandlerCount();
 
@@ -243,7 +248,8 @@
                     obj = method.invoke(serviceObjectMaker.newInstance(), new Object[]{axisService});
                 }
                 if (obj == null) {
-                    throw new Exception("ServiceObjectSupplier implmentation Object could not be found");
+                    log.warn("ServiceObjectSupplier implmentation Object could not be found");
+                    return;
                 }
                 serviceClass = obj.getClass().getName();
             } else {

Modified: webservices/axis2/branches/java/1_1/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java?view=diff&rev=463898&r1=463897&r2=463898
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java (original)
+++ webservices/axis2/branches/java/1_1/modules/spring/src/org/apache/axis2/extensions/spring/receivers/SpringServletContextObjectSupplier.java Sat Oct 14 01:02:33 2006
@@ -22,6 +22,8 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.http.HTTPConstants;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
@@ -29,6 +31,9 @@
 import javax.servlet.ServletContext;
 
 public class SpringServletContextObjectSupplier implements ServiceObjectSupplier {
+
+    private static Log log = LogFactory.getLog(SpringServletContextObjectSupplier.class);
+
     public static final String SERVICE_SPRING_BEANNAME = "SpringBeanName";
 
     /**
@@ -64,7 +69,8 @@
                 ApplicationContext aCtx =
                         WebApplicationContextUtils.getWebApplicationContext(servletContext);
                 if (aCtx == null) {
-                    throw new Exception("Axis2 Can't find Spring's ApplicationContext");
+                    log.warn("Axis2 Can't find Spring's ApplicationContext");
+                    return null;
                 } else if (aCtx.getBean(beanName) == null) {
                     throw new Exception("Axis2 Can't find Spring Bean: " + beanName);
                 }


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