axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dee...@apache.org
Subject svn commit: r165392 - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis/deployment/ core/src/org/apache/axis/engine/ core/src/org/apache/axis/handlers/addressing/ core/src/org/apache/axis/transport/http/ samples/test/org/apache/axis/integration/
Date Sat, 30 Apr 2005 07:49:29 GMT
Author: deepal
Date: Sat Apr 30 00:49:28 2005
New Revision: 165392

URL: http://svn.apache.org/viewcvs?rev=165392&view=rev
Log:
refactoring and bug fixing in AddressingInHandler

Removed:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/EngineRegistryFactoryImpl.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineRegistryFactory.java
Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfigurationImpl.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingInHandler.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java?rev=165392&r1=165391&r2=165392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/AxisEngine.java Sat
Apr 30 00:49:28 2005
@@ -97,6 +97,7 @@
             chain.addPhase(addressingPhase);
 
             // Receiving is always a matter of running the transport handlers first
+
             AxisTransportIn transport = context.getTransportIn();
             chain.addPhases(transport.getPhases(EngineConfiguration.OUTFLOW));
 

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfigurationImpl.java?rev=165392&r1=165391&r2=165392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfigurationImpl.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/EngineConfigurationImpl.java
Sat Apr 30 00:49:28 2005
@@ -136,6 +136,15 @@
     }
 
     /**
+     * 
+     * @return
+     */
+    public HashMap getModules(){
+        return  modules;
+    }
+
+
+    /**
      * Method getService
      *
      * @param name

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingInHandler.java?rev=165392&r1=165391&r2=165392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingInHandler.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/handlers/addressing/AddressingInHandler.java
Sat Apr 30 00:49:28 2005
@@ -45,6 +45,9 @@
     public void invoke(MessageContext msgContext) throws AxisFault {
         logger.debug("Starting Addressing IN Handler .........");
         SOAPHeader header = msgContext.getEnvelope().getHeader();
+        if(header == null){
+            return;
+        }
         ArrayList addressingHeaders = header.getHeaderBolcksWithNSURI(AddressingConstants.WSA_NAMESPACE);
         if (addressingHeaders != null) {
             extractAddressingInformationFromHeaders(header, msgContext.getMessageInformationHeaders(),addressingHeaders);

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java?rev=165392&r1=165391&r2=165392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/AxisServlet.java
Sat Apr 30 00:49:28 2005
@@ -42,7 +42,7 @@
 import org.apache.axis.context.SimpleSessionContext;
 import org.apache.axis.engine.AxisEngine;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistryFactory;
+import org.apache.axis.engine.EngineContextFactory;
 import org.apache.axis.om.OMFactory;
 import org.apache.axis.om.SOAPEnvelope;
 import org.apache.axis.om.OMAbstractFactory;
@@ -93,9 +93,9 @@
             String repoDir = context.getRealPath("/WEB-INF");
             Class erClass = Class.forName(
                     "org.apache.axis.deployment.EngineRegistryFactoryImpl");
-            EngineRegistryFactory erfac =
-                    (EngineRegistryFactory) erClass.newInstance();
-            engineContext = erfac.createEngineRegistry(repoDir);
+            EngineContextFactory erfac =
+                    (EngineContextFactory) erClass.newInstance();
+            engineContext = erfac.createContextBuilder(repoDir);
         } catch (Exception e) {
             throw new ServletException(e);
         }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java?rev=165392&r1=165391&r2=165392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
(original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/transport/http/SimpleHTTPServer.java
Sat Apr 30 00:49:28 2005
@@ -31,7 +31,7 @@
 import org.apache.axis.context.MessageContext;
 import org.apache.axis.description.AxisTransportOut;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistryFactory;
+import org.apache.axis.engine.EngineContextFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -90,9 +90,9 @@
     public SimpleHTTPServer(String dir, ServerSocket serverSoc) throws AxisFault {
         try {
             this.serverSocket = serverSoc;
-            Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
-            EngineRegistryFactory erfac = (EngineRegistryFactory) erClass.newInstance();
-            this.engineReg = erfac.createEngineRegistry(dir);
+            Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
+            EngineContextFactory erfac = (EngineContextFactory) erClass.newInstance();
+            this.engineReg = erfac.createContextBuilder(dir);
             Thread.sleep(2000);
         } catch (Exception e1) {
             throw new AxisFault("Thread interuptted", e1);

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=165392&r1=165391&r2=165392&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
(original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
Sat Apr 30 00:49:28 2005
@@ -24,7 +24,7 @@
 import org.apache.axis.context.EngineContext;
 import org.apache.axis.context.ServiceContext;
 import org.apache.axis.engine.AxisFault;
-import org.apache.axis.engine.EngineRegistryFactory;
+import org.apache.axis.engine.EngineContextFactory;
 import org.apache.axis.transport.http.SimpleHTTPServer;
 
 public class UtilServer {
@@ -48,12 +48,12 @@
 
     public static synchronized void start() throws Exception {
         if (count == 0) {
-            Class erClass = Class.forName("org.apache.axis.deployment.EngineRegistryFactoryImpl");
-            EngineRegistryFactory erfac = (EngineRegistryFactory)erClass.newInstance();
+            Class erClass = Class.forName("org.apache.axis.deployment.EngineContextFactoryImpl");
+            EngineContextFactory erfac = (EngineContextFactory)erClass.newInstance();
             
             File file = new File("target/test-resources/samples");
             System.out.println(new File(file,"server.xml").exists());
-            EngineContext er = erfac.createEngineRegistry(file.getAbsolutePath());
+            EngineContext er = erfac.createContextBuilder(file.getAbsolutePath());
             try {
                 Thread.sleep(2000);
             } catch (InterruptedException e1) {



Mime
View raw message