axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/utils Admin.java
Date Mon, 22 Oct 2001 14:00:11 GMT
dug         01/10/22 07:00:11

  Modified:    java/samples/encoding TestSer.java
               java/src/org/apache/axis MessageContext.java
               java/src/org/apache/axis/handlers/soap SOAPService.java
               java/src/org/apache/axis/message RPCElement.java
                        RPCHandler.java
               java/src/org/apache/axis/transport/http
                        SimpleAxisServer.java
               java/src/org/apache/axis/utils Admin.java
  Log:
  Remove unused code.
  
  Revision  Changes    Path
  1.17      +0 -5      xml-axis/java/samples/encoding/TestSer.java
  
  Index: TestSer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/samples/encoding/TestSer.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- TestSer.java	2001/10/19 15:51:19	1.16
  +++ TestSer.java	2001/10/22 14:00:10	1.17
  @@ -3,7 +3,6 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.ServiceDescription;
   import org.apache.axis.encoding.TypeMappingRegistry;
   import org.apache.axis.message.RPCElement;
   import org.apache.axis.message.RPCParam;
  @@ -30,9 +29,6 @@
           RPCParam arg1 = new RPCParam("urn:myNamespace", "testParam", "this is a string");
           QName dataQName = new QName("typeNS", "Data");
   
  -        ServiceDescription service = new ServiceDescription("testService", true);
  -        service.addInputParam("struct", dataQName);
  -        
           Data data = new Data();
           Data data2 = new Data();
           data.stringMember = "String member";
  @@ -72,7 +68,6 @@
                   reader = new FileReader(args[0]);
               }
               
  -            msgContext.setProperty( MessageContext.SERVICE_DESCRIPTION,service);
               TypeMappingRegistry reg = msgContext.getTypeMappingRegistry();
               reg.addDeserializerFactory(dataQName, Data.class, DataSer.getFactory());
               
  
  
  
  1.59      +0 -3      xml-axis/java/src/org/apache/axis/MessageContext.java
  
  Index: MessageContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- MessageContext.java	2001/10/19 14:58:12	1.58
  +++ MessageContext.java	2001/10/22 14:00:10	1.59
  @@ -423,9 +423,6 @@
       /** Is this message an RPC message (instead of just a blob of xml) */
       public static String ISRPC               ="is_rpc" ;
   
  -    /** Temporary */
  -    public static String SERVICE_DESCRIPTION = "service_description" ;
  -
       /** Just a util so we don't have to cast the result
        */
       public String getStrProp(String propName) {
  
  
  
  1.28      +0 -15     xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java
  
  Index: SOAPService.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/soap/SOAPService.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- SOAPService.java	2001/10/18 18:02:13	1.27
  +++ SOAPService.java	2001/10/22 14:00:11	1.28
  @@ -64,7 +64,6 @@
   import org.apache.axis.encoding.DeserializerFactory;
   import org.apache.axis.encoding.SOAPTypeMappingRegistry;
   import org.apache.axis.encoding.Serializer;
  -import org.apache.axis.encoding.ServiceDescription;
   import org.apache.axis.encoding.TypeMappingRegistry;
   import org.apache.axis.message.SOAPEnvelope;
   import org.apache.axis.message.SOAPHeader;
  @@ -100,10 +99,6 @@
        */
       private TypeMappingRegistry typeMap;
       
  -    /** Our service description
  -     */
  -    private ServiceDescription serviceDescription;
  -    
       /** Standard, no-arg constructor.
        */
       public SOAPService()
  @@ -120,16 +115,6 @@
       public void setTypeMappingRegistry(TypeMappingRegistry map)
       {
           typeMap = map;
  -    }
  -    
  -    public ServiceDescription getServiceDescription()
  -    {
  -      return serviceDescription;
  -    }
  -    
  -    public void setServiceDescription(ServiceDescription sd)
  -    {
  -      serviceDescription = sd;
       }
       
       /** Convenience constructor for wrapping SOAP semantics around
  
  
  
  1.22      +1 -11     xml-axis/java/src/org/apache/axis/message/RPCElement.java
  
  Index: RPCElement.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCElement.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- RPCElement.java	2001/10/18 18:02:14	1.21
  +++ RPCElement.java	2001/10/22 14:00:11	1.22
  @@ -2,7 +2,6 @@
   
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.SerializationContext;
  -import org.apache.axis.encoding.ServiceDescription;
   import javax.xml.rpc.namespace.QName;
   import org.xml.sax.Attributes;
   
  @@ -22,8 +21,7 @@
           needDeser = true;
       }
       
  -    public RPCElement(String namespace, String methodName,
  -                      Object [] args, ServiceDescription serviceDesc)
  +    public RPCElement(String namespace, String methodName, Object [] args)
       {
           this.setNamespaceURI(namespace);
           this.name = methodName;
  @@ -33,18 +31,10 @@
                   addParam((RPCParam)args[i]);
               } else {
                   String name = null;
  -                if (serviceDesc != null)
  -                    name = serviceDesc.getInputParamNameByPos(i);
                   if (name == null) name = "arg" + i;
                   addParam(new RPCParam(name, args[i]));
               }
           }
  -    }
  -    
  -    public RPCElement(String namespace, String methodName,
  -                      Object [] args)
  -    {
  -        this(namespace, methodName, args, null);
       }
       
       public RPCElement(String methodName)
  
  
  
  1.13      +2 -18     xml-axis/java/src/org/apache/axis/message/RPCHandler.java
  
  Index: RPCHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/message/RPCHandler.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- RPCHandler.java	2001/10/18 18:02:14	1.12
  +++ RPCHandler.java	2001/10/22 14:00:11	1.13
  @@ -10,7 +10,6 @@
   import org.apache.axis.MessageContext;
   import org.apache.axis.encoding.DeserializationContext;
   import org.apache.axis.encoding.Deserializer;
  -import org.apache.axis.encoding.ServiceDescription;
   import org.apache.axis.encoding.TypeMappingRegistry;
   import org.apache.axis.utils.AxisClassLoader;
   import javax.xml.rpc.namespace.QName;
  @@ -87,18 +86,13 @@
            * - Cache typeMappingRegistry
            * - Cache service description
            */
  -        ServiceDescription serviceDesc = (ServiceDescription) 
  -                                                context.getMessageContext().
  -                                                getProperty(MessageContext.SERVICE_DESCRIPTION);
  -        
           if (category.isDebugEnabled()) {
               category.debug("In RPCHandler.onStartChild()");
           }
           
           Vector params = call.getParams();
  -        if (serviceDesc == null && params.isEmpty()) {
  +        if (params.isEmpty()) 
               determineDefaultParams(call.getMethodName(), context);
  -        }
           
           // This is a param.
           currentParam = new RPCParam(namespace, localName, null);
  @@ -113,17 +107,7 @@
           
           // xsi:type always overrides everything else
           if (type == null) {
  -            // but if we don't find one, see if the ServiceDescription
  -            // might shed some light...
  -            if (serviceDesc != null) {
  -                String msgType = context.getEnvelope().getMessageType();
  -                type = serviceDesc.getParamTypeByName(msgType, localName);
  -                if (category.isDebugEnabled()) {
  -                    category.debug("Type from service desc was " + type);
  -                }
  -            }
  -            
  -            // and if we still don't know, check the introspected types
  +            // check the introspected types
               //
               // NOTE : We don't check params.isEmpty() here because we
               //        must have added at least one above...
  
  
  
  1.33      +0 -1      xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java
  
  Index: SimpleAxisServer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/SimpleAxisServer.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- SimpleAxisServer.java	2001/10/17 23:37:22	1.32
  +++ SimpleAxisServer.java	2001/10/22 14:00:11	1.33
  @@ -203,7 +203,6 @@
               // resetting state between requests:
               //   msgContext = new MessageContext();
               //   requestMsg = new Message("", "String");
  -            msgContext.clearProperty( MessageContext.SERVICE_DESCRIPTION );
               msgContext.setTargetService(null);
               msgContext.setResponseMessage(null);
               msgContext.reset();
  
  
  
  1.73      +0 -6      xml-axis/java/src/org/apache/axis/utils/Admin.java
  
  Index: Admin.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/Admin.java,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- Admin.java	2001/10/18 18:02:15	1.72
  +++ Admin.java	2001/10/22 14:00:11	1.73
  @@ -67,7 +67,6 @@
   import org.apache.axis.encoding.BeanSerializer;
   import org.apache.axis.encoding.DeserializerFactory;
   import org.apache.axis.encoding.Serializer;
  -import org.apache.axis.encoding.ServiceDescription;
   import org.apache.axis.encoding.TypeMappingRegistry;
   import org.apache.axis.handlers.soap.SOAPService;
   import org.apache.axis.registries.HandlerRegistry;
  @@ -669,11 +668,6 @@
                       ": couldn't find pivot Handler '" + pivot + "'");
   
               service.setPivotHandler( tmpH );
  -
  -            if (pivot.equals("MsgDispatcher")) {
  -                ServiceDescription sd = new ServiceDescription("msgService", false);
  -                service.setServiceDescription(sd);
  -            }
           }
   
           if ( response != null && !"".equals(response) ) {
  
  
  

Mime
View raw message