axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r356029 - in /webservices/axis2/trunk/java/modules/core: src/org/apache/axis2/client/ src/org/apache/axis2/description/ test/org/apache/axis2/engine/
Date Sun, 11 Dec 2005 21:32:25 GMT
Author: chinthaka
Date: Sun Dec 11 13:32:19 2005
New Revision: 356029

URL: http://svn.apache.org/viewcvs?rev=356029&view=rev
Log:
Fixing more stuff in AxisService and fixing some tests too.

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java?rev=356029&r1=356028&r2=356029&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/client/MessageSender.java
Sun Dec 11 13:32:19 2005
@@ -85,7 +85,7 @@
         }
 
         AxisOperation axisOp = serviceContext.getAxisService()
-                .getOperation(opName);
+                .getOperation(new QName(opName));
         if (axisOp == null) {
             //todo I just assumed mep is alwas in-out , this has to improve : Deepal
             axisOp = new OutOnlyAxisOperation(new QName(opName));

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java?rev=356029&r1=356028&r2=356029&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/AxisService.java
Sun Dec 11 13:32:19 2005
@@ -71,6 +71,8 @@
 
     private HashMap wsaaction_operationmap = null;
 
+    private HashMap operations = new HashMap();
+
     // to store module ref at deploy time parsing
     private ArrayList moduleRefs = new ArrayList();
 
@@ -220,10 +222,7 @@
      * @return AxisOperation
      */
     public AxisOperation getOperation(QName operationName) {
-        String opStr = operationName.getLocalPart();
-
-        HashMap allOperations = this.getServiceInterface().getAllOperations();
-        return (AxisOperation) allOperations.get(opStr);
+        return (AxisOperation) operations.get(operationName);
     }
 
     /**
@@ -266,7 +265,7 @@
                         + module.getName().getLocalPart());
             }
         }
-        this.getServiceInterface().setOperation(axisOperation);
+        operations.put(axisOperation.getName(), axisOperation);
     }
 
     /*
@@ -564,11 +563,6 @@
             }
         }
         return operationList;
-    }
-
-    public AxisOperation getOperation(String ncName) {
-        return (AxisOperation) this.getServiceInterface().getOperations().get(
-                ncName);
     }
 
     /**

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java?rev=356029&r1=356028&r2=356029&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
(original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EnginePausingTest.java
Sun Dec 11 13:32:19 2005
@@ -66,6 +66,7 @@
             }
         });
         service.addOperation(axisOp);
+        service.mapActionToOperation(operationName.getLocalPart(), axisOp);
 
         mc = new MessageContext(engineContext, transportIn, transportOut);
 

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java?rev=356029&r1=356028&r2=356029&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
(original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/ModuleConfigTest.java
Sun Dec 11 13:32:19 2005
@@ -77,7 +77,7 @@
             Parameter para = moduleConfiguration.getParameter("Servie_module_para");
             assertNotNull(para);
 
-            AxisOperation op = service.getOperation("echoString");
+            AxisOperation op = service.getOperation(new QName("echoString"));
             assertNotNull(op);
 
             moduleConfiguration = op.getModuleConfig(new QName("Op_Module"));



Mime
View raw message