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 gd...@apache.org on 2001/08/21 23:35:13 UTC

cvs commit: xml-axis/java/src/org/apache/axis/providers/java JavaProvider.java MsgProvider.java RPCProvider.java

gdaniels    01/08/21 14:35:13

  Modified:    java/src/org/apache/axis/providers/java JavaProvider.java
                        MsgProvider.java RPCProvider.java
  Log:
  serviceUrn -> serviceName, remove unused code
  
  Revision  Changes    Path
  1.9       +5 -5      xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java
  
  Index: JavaProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/JavaProvider.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- JavaProvider.java	2001/08/21 21:26:01	1.8
  +++ JavaProvider.java	2001/08/21 21:35:13	1.9
  @@ -161,7 +161,7 @@
        * @param obj the service object itself
        */
       public abstract void processMessage (MessageContext msgContext,
  -                                         String serviceUrn,
  +                                         String serviceName,
                                            String allowedMethods,
                                            SOAPEnvelope reqEnv,
                                            SOAPEnvelope resEnv,
  @@ -180,7 +180,7 @@
   
           /* Find the service we're invoking so we can grab it's options */
           /***************************************************************/
  -        String serviceUrn = msgContext.getTargetService();
  +        String serviceName = msgContext.getTargetService();
           Handler service = msgContext.getServiceHandler();
   
           /* Now get the service (RPC) specific info  */
  @@ -193,7 +193,7 @@
                   "No '" +
                   getServiceClassNameOptionName() +
                   "' option was configured for the service '" +
  -                serviceUrn + "'",
  +                serviceName + "'",
                   null, null);
   
           /** ??? Should we enforce setting allowedMethods?  As it was,
  @@ -207,7 +207,7 @@
                   "No '" +
                   getServiceAllowedMethodsOptionName() +
                   "' option was configured for the service '" +
  -                serviceUrn + "'",
  +                serviceName + "'",
                   null, null);
   
           if (allowedMethods.equals("*"))
  @@ -235,7 +235,7 @@
                   allowedMethods = ((AxisServiceConfig)obj).getMethods();
               }
   
  -            processMessage(msgContext, serviceUrn, allowedMethods, reqEnv,
  +            processMessage(msgContext, serviceName, allowedMethods, reqEnv,
                              resEnv, jc, obj);
   
               // get the response message again! It may have been explicitly set!
  
  
  
  1.7       +1 -13     xml-axis/java/src/org/apache/axis/providers/java/MsgProvider.java
  
  Index: MsgProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/MsgProvider.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- MsgProvider.java	2001/08/21 21:26:01	1.6
  +++ MsgProvider.java	2001/08/21 21:35:13	1.7
  @@ -82,7 +82,7 @@
        * take the Request xml file and call the Admin processing.
        */
       public void processMessage (MessageContext msgContext,
  -                                String serviceUrn,
  +                                String serviceName,
                                   String methodName,
                                   SOAPEnvelope reqEnv,
                                   SOAPEnvelope resEnv,
  @@ -106,18 +106,6 @@
           
           Class[]         argClasses;
           Object[]        argObjects;
  -        
  -        /** !!! KLUDGE WARNING
  -         * We need some way of associating ServiceDescriptions with actual
  -         * services... and then at the point when we figure out which service
  -         * we'll be calling (which might be right away (static dispatch), after
  -         * looking at the URL (transport-level dispatch), or even after looking
  -         * into the SOAP message itself...)
  -         */
  -        if (serviceUrn.equals("org.apache.axis.utils.Admin")) {
  -            ServiceDescription sd = new ServiceDescription("Admin", false);
  -            msgContext.setServiceDescription(sd);
  -        }
           
           // the document which is the contents of the first body element
           // (generated only if we are not an envelope service)
  
  
  
  1.14      +1 -1      xml-axis/java/src/org/apache/axis/providers/java/RPCProvider.java
  
  Index: RPCProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/providers/java/RPCProvider.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- RPCProvider.java	2001/08/21 21:26:01	1.13
  +++ RPCProvider.java	2001/08/21 21:35:13	1.14
  @@ -72,7 +72,7 @@
       private static final boolean DEBUG_LOG = false;
       
       public void processMessage (MessageContext msgContext,
  -                                String serviceUrn,
  +                                String serviceName,
                                   String allowedMethods,
                                   SOAPEnvelope reqEnv,
                                   SOAPEnvelope resEnv,