You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2005/12/02 20:35:07 UTC

svn commit: r351810 - in /webservices/axis2/trunk/java/modules: common/src/org/apache/axis2/i18n/ core/src/org/apache/axis2/deployment/ core/test/org/apache/axis2/engine/ core/webapp/

Author: dims
Date: Fri Dec  2 11:34:57 2005
New Revision: 351810

URL: http://svn.apache.org/viewcvs?rev=351810&view=rev
Log:
just a few more of those...


Modified:
    webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java
    webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
    webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp
    webservices/axis2/trunk/java/modules/core/webapp/listGroupService.jsp
    webservices/axis2/trunk/java/modules/core/webapp/listService.jsp
    webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp

Modified: webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties (original)
+++ webservices/axis2/trunk/java/modules/common/src/org/apache/axis2/i18n/resource.properties Fri Dec  2 11:34:57 2005
@@ -101,7 +101,7 @@
 thisshouldbeimplment=This should be implemented {0}
 opnotfoundinwsdl={0} Operation Name not found in WSDL
 badopattribute=bad attribute in operation  {0}
-unknownelementinop=Unknown element in opeartion {0}
+unknownelementinop=Unknown element in operation {0}
 modulecannothavrbothnameandref=Module canot have both name and ref   {0}
 invalideleinmodule={0} elment is not allowed in module.xml
 invalidphase01=Invalid Phase : {0} for the handler {1} does not exit in axis2.xml or refering to phase in diffrent flow

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Fri Dec  2 11:34:57 2005
@@ -137,10 +137,10 @@
 
 
 
-    private ArrayList processOperations(Iterator opeartinsItr) throws DeploymentException {
+    private ArrayList processOperations(Iterator operationsIterator) throws DeploymentException {
         ArrayList operations = new ArrayList();
-        while (opeartinsItr.hasNext()) {
-            OMElement operation = (OMElement) opeartinsItr.next();
+        while (operationsIterator.hasNext()) {
+            OMElement operation = (OMElement) operationsIterator.next();
 
             // /getting operation name
             OMAttribute op_name_att = operation.getAttribute(

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=351810&r1=351809&r2=351810&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 Dec  2 11:34:57 2005
@@ -121,9 +121,9 @@
             }
 
             //processing operations
-            Iterator opeartinsItr = service_element.getChildrenWithName(
+            Iterator operationsIterator = service_element.getChildrenWithName(
                     new QName(OPRATIONST));
-            ArrayList ops = processOperations(opeartinsItr);
+            ArrayList ops = processOperations(operationsIterator);
             for (int i = 0; i < ops.size(); i++) {
                 AxisOperation operationDesc = (AxisOperation) ops.get(i);
                 ArrayList wsamappings = operationDesc.getWsamappingList();
@@ -147,10 +147,10 @@
         return service;
     }
 
-    private ArrayList processOperations(Iterator opeartinsItr) throws AxisFault {
+    private ArrayList processOperations(Iterator operationsIterator) throws AxisFault {
         ArrayList operations = new ArrayList();
-        while (opeartinsItr.hasNext()) {
-            OMElement operation = (OMElement) opeartinsItr.next();
+        while (operationsIterator.hasNext()) {
+            OMElement operation = (OMElement) operationsIterator.next();
 
             // /getting operation name
             OMAttribute op_name_att = operation.getAttribute(

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/AbstractEngineTest.java Fri Dec  2 11:34:57 2005
@@ -22,12 +22,6 @@
 import org.apache.axis2.receivers.AbstractInOutSyncMessageReceiver;
 
 public class AbstractEngineTest extends TestCase {
-//    protected ArrayList executedHandlers = new ArrayList();
-//    protected AxisConfiguration engineRegistry;
-//    protected QName serviceName = new QName("axis/services/NullService");
-//    protected QName opearationName = new QName("NullOperation");
-//    protected AxisService service;
-
     public AbstractEngineTest() {
     }
 

Modified: webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java (original)
+++ webservices/axis2/trunk/java/modules/core/test/org/apache/axis2/engine/EngineWithoutPhaseResolvingTest.java Fri Dec  2 11:34:57 2005
@@ -39,7 +39,7 @@
     private ArrayList executedHandlers = new ArrayList();
     private AxisConfiguration engineRegistry;
     private QName serviceName = new QName("axis/services/NullService");
-    private QName opearationName = new QName("NullOperation");
+    private QName operationName = new QName("NullOperation");
     private AxisService service;
     private ConfigurationContext engineContext;
     private AxisOperation axisOp;
@@ -62,7 +62,7 @@
 
         TransportInDescription transportIn = new TransportInDescription(
                 new QName("null"));
-        axisOp = new InOutAxisOperation(opearationName);
+        axisOp = new InOutAxisOperation(operationName);
 
         service = new AxisService(serviceName);
         axisOp.setMessageReceiver(new MessageReceiver() {
@@ -94,8 +94,8 @@
         mc.setEnvelope(omFac.getDefaultEnvelope());
 
 
-        mc.setWSAAction(opearationName.getLocalPart());
-        mc.setSoapAction(opearationName.getLocalPart());
+        mc.setWSAAction(operationName.getLocalPart());
+        mc.setSoapAction(operationName.getLocalPart());
         System.out.flush();
     }
 

Modified: webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/ServiceParaEdit.jsp Fri Dec  2 11:34:57 2005
@@ -56,24 +56,24 @@
 
                  ArrayList op_paras ;
                  for (Iterator iterator = ops.iterator(); iterator.hasNext();) {
-                     AxisOperation axisOperationon = (AxisOperation) iterator.next();
-                     String opeartionName = axisOperationon.getName().getLocalPart();
+                     AxisOperation axisOperation = (AxisOperation) iterator.next();
+                     String operationName = axisOperation.getName().getLocalPart();
                      %>
                      <tr>
                        <td colspan="2" > &nbsp;&nbsp;&nbsp;&nbsp;</td>
                      </tr>
                      <tr>
-                       <td colspan="2" ><b>Operation : <%=opeartionName%></b></td>
+                       <td colspan="2" ><b>Operation : <%=operationName%></b></td>
                      </tr>
                     <%
-                     op_paras = axisOperationon.getParameters();
+                     op_paras = axisOperation.getParameters();
                      for (int i = 0; i < op_paras.size(); i++) {
                      Parameter parameter = (Parameter) op_paras.get(i);
                      %>
                      <tr>
                      <td><%=parameter.getName()%></td>
                      <td><input type="text" value="<%=parameter.getValue()%>"
-                           name="<%=(opeartionName + "_" + parameter.getName())%>" size="50">
+                           name="<%=(operationName + "_" + parameter.getName())%>" size="50">
                            </td>
                      </tr>
                      <%

Modified: webservices/axis2/trunk/java/modules/core/webapp/listGroupService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/listGroupService.jsp?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/listGroupService.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/listGroupService.jsp Fri Dec  2 11:34:57 2005
@@ -45,20 +45,20 @@
         if (operationsList.size() > 0) {
     %><br><i>Available operations</i><%
 } else {
-%><i> There are no any opeartions specified</i><%
+%><i> There are no operations specified</i><%
     }
 %><ul><%
     for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
         AxisOperation axisOperation = (AxisOperation) iterator1.next();
 %><li><%=axisOperation.getName().getLocalPart()%></li>
-    <%--                 <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
+    <%--                 <br>Operation EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
     <%
         engagdeModules = null;
         engagdeModules = axisOperation.getEngagedModules();
         moduleName = "";
         if(engagdeModules.size() >0){
     %>
-    <br><i>Engaged Modules for the opeartion</i><ul>
+    <br><i>Engaged Modules for the Operation</i><ul>
     <%
         for (Iterator iterator2 = engagdeModules.iterator(); iterator2.hasNext();) {
             ModuleDescription moduleDecription = (ModuleDescription) iterator2.next();

Modified: webservices/axis2/trunk/java/modules/core/webapp/listService.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/listService.jsp?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/listService.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/listService.jsp Fri Dec  2 11:34:57 2005
@@ -85,20 +85,20 @@
                  if (operationsList.size() > 0) {
                 %><br><i>Available operations</i><%
                  } else {
-                %><i> There are no any opeartions specified</i><%
+                %><i> There are no Operations specified</i><%
                  }
                 %><ul><%
                  for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
                      AxisOperation axisOperation = (AxisOperation) iterator1.next();
                 %><li><%=axisOperation.getName().getLocalPart()%></li>
-<%--                 <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
+<%--                 <br>Operation EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
                  <%
                      engagdeModules = null;
                      engagdeModules = axisOperation.getEngagedModules();
                      moduleName = "";
                      if(engagdeModules.size() >0){
                 %>
-                <br><i>Engaged Modules for the opeartion</i><ul>
+                <br><i>Engaged Modules for the Operation</i><ul>
                 <%
                          for (Iterator iterator2 = engagdeModules.iterator(); iterator2.hasNext();) {
                              ModuleDescription moduleDecription = (ModuleDescription) iterator2.next();

Modified: webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp?rev=351810&r1=351809&r2=351810&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/listServices.jsp Fri Dec  2 11:34:57 2005
@@ -58,13 +58,13 @@
             if (operationsList.size() > 0) {
                 %><i>Available operations</i><%
             } else {
-                %><i> There are no any opeartions specified</i><%
+                %><i> There are no Operations specified</i><%
             }
            %><ul><%
             for (Iterator iterator1 = operationsList.iterator(); iterator1.hasNext();) {
                 AxisOperation axisOperation = (AxisOperation) iterator1.next();
                 %><li><%=axisOperation.getName().getLocalPart()%></li>
-<%--                <br>Opeartion EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
+<%--                <br>Operation EPR : <%=prifix + axisService.getName().getLocalPart() + "/"+ axisOperation.getName().getLocalPart()%>--%>
                 <%
             }
            %></ul>