axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r392268 - in /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2: deployment/DeploymentEngine.java deployment/ServiceBuilder.java engine/ListenerManager.java transport/http/AxisServlet.java
Date Fri, 07 Apr 2006 12:58:04 GMT
Author: deepal
Date: Fri Apr  7 05:58:03 2006
New Revision: 392268

URL: http://svn.apache.org/viewcvs?rev=392268&view=rev
Log:
-fixing 552
- catch Throwable
- Keep static reference to configurations context , so if some one set that 
- then the client run inside the server can use the same configcontext

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=392268&r1=392267&r2=392268&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
Fri Apr  7 05:58:03 2006
@@ -635,6 +635,19 @@
                                 PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
                                 e.printStackTrace(error_ptintWriter);
                                 serviceStatus = "Error:\n" + errorWriter.toString();
+                            } catch(Throwable t) {
+                                 if (log.isInfoEnabled()) {
+                                    StringWriter sw = new StringWriter();
+                                    PrintWriter pw = new PrintWriter(sw);
+                                    t.printStackTrace(pw);
+                                    log.info(Messages.getMessage(
+                                            DeploymentErrorMsgs.INVALID_SERVICE,
+                                            currentArchiveFile.getName(),
+                                            sw.getBuffer().toString()));
+                                }
+                                PrintWriter error_ptintWriter = new PrintWriter(errorWriter);
+                                t.printStackTrace(error_ptintWriter);
+                                serviceStatus = "Error:\n" + errorWriter.toString();
                             } finally {
                                 if (serviceStatus.startsWith("Error:")) {
                                     axisConfig.getFaultyServices().put(currentArchiveFile.getFile().getAbsolutePath(),

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=392268&r1=392267&r2=392268&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
Fri Apr  7 05:58:03 2006
@@ -101,7 +101,7 @@
             //Setting schema namespece if any
             OMElement scheamElement = service_element.getFirstChildWithName(new QName(SCHEMA));
             if (scheamElement != null) {
-                OMAttribute schemaNameSpace = service_element.
+                OMAttribute schemaNameSpace = scheamElement.
                         getAttribute(new QName(SCHEMA_NAME_SPACE));
                 if (schemaNameSpace != null) {
                     String nameSpeceVale = schemaNameSpace.getAttributeValue();

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java?rev=392268&r1=392267&r2=392268&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/ListenerManager.java
Fri Apr  7 05:58:03 2006
@@ -35,6 +35,8 @@
 
     private Log log = LogFactory.getLog(getClass());
 
+    public static ConfigurationContext defaultConfigurationContext;
+    
     private ConfigurationContext configctx;
     private HashMap startedTranports = new HashMap();
     private boolean stopped = true;

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java?rev=392268&r1=392267&r2=392268&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/AxisServlet.java
Fri Apr  7 05:58:03 2006
@@ -219,6 +219,7 @@
                     new QName(Constants.TRANSPORT_HTTP));
             transportInDescription.setReceiver(this);
             listenerManager.addListener(transportInDescription, true);
+            ListenerManager.defaultConfigurationContext = configContext;
         } catch (Exception e) {
             throw new ServletException(e);
         }



Mime
View raw message