You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by de...@apache.org on 2006/10/10 07:20:49 UTC

svn commit: r454621 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java

Author: deepal
Date: Mon Oct  9 22:20:48 2006
New Revision: 454621

URL: http://svn.apache.org/viewvc?view=rev&rev=454621
Log:
fixing AXIS2-1326

Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=454621&r1=454620&r2=454621
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Oct  9 22:20:48 2006
@@ -255,6 +255,13 @@
                     try {
                         if (generateWsdl(service)) {
                             Utils.fillAxisService(service, axisConfig, excludeops);
+                        } else {
+                            ArrayList nonRpcOperations = getNonPRCMethods(service);
+                            for (int i = 0; i < excludeops.size(); i++) {
+                                String opName = (String) excludeops.get(i);
+                                nonRpcOperations.add(opName);
+                                Utils.fillAxisService(service, axisConfig, nonRpcOperations);
+                            }
                         }
                     } catch (Exception e) {
                         /**
@@ -310,13 +317,44 @@
                 if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
                         .equals(messageReceiverClass)
                         || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
-                        .equals(messageReceiverClass) || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
+                        .equals(messageReceiverClass)
+                        || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
                         .equals(messageReceiverClass))) {
                     return false;
                 }
             }
         }
         return true;
+    }
+
+    /**
+     * To get the methods which dose not use RPC* Message Recievers
+     *
+     * @return
+     */
+    private ArrayList getNonPRCMethods(AxisService axisService) {
+        ArrayList excludeOperations = new ArrayList();
+        Iterator operatins = axisService.getOperations();
+        if (operatins.hasNext()) {
+            while (operatins.hasNext()) {
+                AxisOperation axisOperation = (AxisOperation) operatins
+                        .next();
+                if (axisOperation.getMessageReceiver() == null) {
+                    continue;
+                }
+                String messageReceiverClass = axisOperation
+                        .getMessageReceiver().getClass().getName();
+                if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
+                        .equals(messageReceiverClass)
+                        || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
+                        .equals(messageReceiverClass)
+                        || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
+                        .equals(messageReceiverClass))) {
+                    excludeOperations.add(axisOperation.getName().getLocalPart());
+                }
+            }
+        }
+        return excludeOperations;
     }
 
     /**



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


Re: svn commit: r454621 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java

Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
Did u mean to commit to the branch (or both)? :)

Sanjiva.

On Tue, 2006-10-10 at 05:20 +0000, deepal@apache.org wrote:
> Author: deepal
> Date: Mon Oct  9 22:20:48 2006
> New Revision: 454621
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=454621
> Log:
> fixing AXIS2-1326
> 
> Modified:
>     webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
> 
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=454621&r1=454620&r2=454621
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Oct  9 22:20:48 2006
> @@ -255,6 +255,13 @@
>                      try {
>                          if (generateWsdl(service)) {
>                              Utils.fillAxisService(service, axisConfig, excludeops);
> +                        } else {
> +                            ArrayList nonRpcOperations = getNonPRCMethods(service);
> +                            for (int i = 0; i < excludeops.size(); i++) {
> +                                String opName = (String) excludeops.get(i);
> +                                nonRpcOperations.add(opName);
> +                                Utils.fillAxisService(service, axisConfig, nonRpcOperations);
> +                            }
>                          }
>                      } catch (Exception e) {
>                          /**
> @@ -310,13 +317,44 @@
>                  if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
>                          .equals(messageReceiverClass)
>                          || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
> -                        .equals(messageReceiverClass) || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
> +                        .equals(messageReceiverClass)
> +                        || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
>                          .equals(messageReceiverClass))) {
>                      return false;
>                  }
>              }
>          }
>          return true;
> +    }
> +
> +    /**
> +     * To get the methods which dose not use RPC* Message Recievers
> +     *
> +     * @return
> +     */
> +    private ArrayList getNonPRCMethods(AxisService axisService) {
> +        ArrayList excludeOperations = new ArrayList();
> +        Iterator operatins = axisService.getOperations();
> +        if (operatins.hasNext()) {
> +            while (operatins.hasNext()) {
> +                AxisOperation axisOperation = (AxisOperation) operatins
> +                        .next();
> +                if (axisOperation.getMessageReceiver() == null) {
> +                    continue;
> +                }
> +                String messageReceiverClass = axisOperation
> +                        .getMessageReceiver().getClass().getName();
> +                if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
> +                        .equals(messageReceiverClass)
> +                        || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
> +                        .equals(messageReceiverClass)
> +                        || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
> +                        .equals(messageReceiverClass))) {
> +                    excludeOperations.add(axisOperation.getName().getLocalPart());
> +                }
> +            }
> +        }
> +        return excludeOperations;
>      }
>  
>      /**
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
> 


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


Re: svn commit: r454621 - /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java

Posted by Sanjiva Weerawarana <sa...@opensource.lk>.
Did u mean to commit to the branch (or both)? :)

Sanjiva.

On Tue, 2006-10-10 at 05:20 +0000, deepal@apache.org wrote:
> Author: deepal
> Date: Mon Oct  9 22:20:48 2006
> New Revision: 454621
> 
> URL: http://svn.apache.org/viewvc?view=rev&rev=454621
> Log:
> fixing AXIS2-1326
> 
> Modified:
>     webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
> 
> Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java
> URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java?view=diff&rev=454621&r1=454620&r2=454621
> ==============================================================================
> --- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
> +++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/deployment/ServiceBuilder.java Mon Oct  9 22:20:48 2006
> @@ -255,6 +255,13 @@
>                      try {
>                          if (generateWsdl(service)) {
>                              Utils.fillAxisService(service, axisConfig, excludeops);
> +                        } else {
> +                            ArrayList nonRpcOperations = getNonPRCMethods(service);
> +                            for (int i = 0; i < excludeops.size(); i++) {
> +                                String opName = (String) excludeops.get(i);
> +                                nonRpcOperations.add(opName);
> +                                Utils.fillAxisService(service, axisConfig, nonRpcOperations);
> +                            }
>                          }
>                      } catch (Exception e) {
>                          /**
> @@ -310,13 +317,44 @@
>                  if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
>                          .equals(messageReceiverClass)
>                          || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
> -                        .equals(messageReceiverClass) || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
> +                        .equals(messageReceiverClass)
> +                        || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
>                          .equals(messageReceiverClass))) {
>                      return false;
>                  }
>              }
>          }
>          return true;
> +    }
> +
> +    /**
> +     * To get the methods which dose not use RPC* Message Recievers
> +     *
> +     * @return
> +     */
> +    private ArrayList getNonPRCMethods(AxisService axisService) {
> +        ArrayList excludeOperations = new ArrayList();
> +        Iterator operatins = axisService.getOperations();
> +        if (operatins.hasNext()) {
> +            while (operatins.hasNext()) {
> +                AxisOperation axisOperation = (AxisOperation) operatins
> +                        .next();
> +                if (axisOperation.getMessageReceiver() == null) {
> +                    continue;
> +                }
> +                String messageReceiverClass = axisOperation
> +                        .getMessageReceiver().getClass().getName();
> +                if (!("org.apache.axis2.rpc.receivers.RPCMessageReceiver"
> +                        .equals(messageReceiverClass)
> +                        || "org.apache.axis2.rpc.receivers.RPCInOnlyMessageReceiver"
> +                        .equals(messageReceiverClass)
> +                        || "org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"
> +                        .equals(messageReceiverClass))) {
> +                    excludeOperations.add(axisOperation.getName().getLocalPart());
> +                }
> +            }
> +        }
> +        return excludeOperations;
>      }
>  
>      /**
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
> For additional commands, e-mail: axis-cvs-help@ws.apache.org
> 


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