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 st...@apache.org on 2002/08/29 21:20:20 UTC

cvs commit: xml-axis/java/src/org/apache/axis/deployment/wsdd WSDDService.java WSDDJAXRPCHandlerInfoChain.java WSDDJAXRPCHandlerInfo.java

stevel      2002/08/29 12:20:20

  Modified:    java/src/org/apache/axis/deployment/wsdd WSDDService.java
                        WSDDJAXRPCHandlerInfoChain.java
                        WSDDJAXRPCHandlerInfo.java
  Log:
  because tabs!=spaces. BTW, those GLT - fix this up comments - should they become TODO comments?
  
  Revision  Changes    Path
  1.84      +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
  
  Index: WSDDService.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- WSDDService.java	28 Aug 2002 14:51:50 -0000	1.83
  +++ WSDDService.java	29 Aug 2002 19:20:20 -0000	1.84
  @@ -221,10 +221,10 @@
               }
           }
   
  -	// Add in JAX-RPC support for HandlerInfo chains
  +        // Add in JAX-RPC support for HandlerInfo chains
           Element hcEl = getChildElement(e, ELEM_WSDD_JAXRPC_CHAIN);
           if (hcEl != null) {
  -	    WSDDJAXRPCHandlerInfoChain wsddHIChain = new WSDDJAXRPCHandlerInfoChain(hcEl);
  +        WSDDJAXRPCHandlerInfoChain wsddHIChain = new WSDDJAXRPCHandlerInfoChain(hcEl);
               _hiChainFactory = wsddHIChain.getHandlerChainFactory();
           }
   
  
  
  
  1.2       +72 -72    xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDJAXRPCHandlerInfoChain.java
  
  Index: WSDDJAXRPCHandlerInfoChain.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDJAXRPCHandlerInfoChain.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSDDJAXRPCHandlerInfoChain.java	28 Aug 2002 14:51:50 -0000	1.1
  +++ WSDDJAXRPCHandlerInfoChain.java	29 Aug 2002 19:20:20 -0000	1.2
  @@ -2,7 +2,7 @@
    * The Apache Software License, Version 1.1
    *
    *
  - * Copyright (c) 2001 The Apache Software Foundation.  All rights
  + * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -67,75 +67,75 @@
    *
    */
   public class WSDDJAXRPCHandlerInfoChain extends WSDDHandler {
  -	
  -	private HandlerInfoChainFactory _hiChainFactory;
  -	private String[] _roles;
  -
  -	/**
  -	 * Default constructor
  -	 */
  -	public WSDDJAXRPCHandlerInfoChain() {
  -	}
  -
  -	/**
  -	 *
  -	 * @param e (Element) XXX
  -	 * @throws WSDDException XXX
  -	 */
  -	public WSDDJAXRPCHandlerInfoChain(Element e) throws WSDDException {
  -		super(e);
  -
  -		ArrayList infoList = new ArrayList();
  -		Element[] elements = getChildElements(e, ELEM_WSDD_JAXRPC_HANDLERINFO);
  -		if (elements.length != 0) {
  -			for (int i = 0; i < elements.length; i++) {
  -				WSDDJAXRPCHandlerInfo handlerInfo =
  -					new WSDDJAXRPCHandlerInfo(elements[i]);
  -
  -				String handlerClassName = handlerInfo.getHandlerClassName();
  -				Class handlerClass = null;
  -				try {
  -					handlerClass = ClassUtils.forName(handlerClassName);
  -				} catch (ClassNotFoundException cnf) { 
  -					// GLT - do something here
  -				}
  -
  -				Map handlerMap = handlerInfo.getHandlerMap();
  -				QName[] headers = handlerInfo.getHeaders();
  -				
  -				if (handlerClass != null) {
  -					HandlerInfo hi =
  -						new HandlerInfo(handlerClass, handlerMap, headers);
  -					infoList.add(hi);
  -				}
  -			}
  -		}
  -		_hiChainFactory = new HandlerInfoChainFactory(infoList);
  -		
  -		elements = getChildElements(e,  ELEM_WSDD_JAXRPC_ROLE);
  -		if (elements.length != 0) {
  -			ArrayList roleList = new ArrayList();
  -			for (int i = 0; i < elements.length; i++) {
  -				String role = elements[i].getAttribute( ATTR_SOAPACTORNAME);
  -				roleList.add(role);
  -			}
  -			String [] roles =new String[roleList.size()]; 
  -			roles = (String[]) roleList.toArray(roles);
  -			_hiChainFactory.setRoles(roles);
  -		}
  -		
  -	}
  -
  -	public HandlerInfoChainFactory getHandlerChainFactory() {
  -		return _hiChainFactory;
  -	}
  -
  -	public void setHandlerChainFactory(HandlerInfoChainFactory handlerInfoChainFactory) {
  -		_hiChainFactory = handlerInfoChainFactory;
  -	}
  -
  -	protected QName getElementName() {
  -		return WSDDConstants.QNAME_JAXRPC_HANDLERINFOCHAIN;
  -	}
  -	
  +    
  +    private HandlerInfoChainFactory _hiChainFactory;
  +    private String[] _roles;
  +
  +    /**
  +     * Default constructor
  +     */
  +    public WSDDJAXRPCHandlerInfoChain() {
  +    }
  +
  +    /**
  +     *
  +     * @param e (Element) XXX
  +     * @throws WSDDException XXX
  +     */
  +    public WSDDJAXRPCHandlerInfoChain(Element e) throws WSDDException {
  +        super(e);
  +
  +        ArrayList infoList = new ArrayList();
  +        Element[] elements = getChildElements(e, ELEM_WSDD_JAXRPC_HANDLERINFO);
  +        if (elements.length != 0) {
  +            for (int i = 0; i < elements.length; i++) {
  +                WSDDJAXRPCHandlerInfo handlerInfo =
  +                    new WSDDJAXRPCHandlerInfo(elements[i]);
  +
  +                String handlerClassName = handlerInfo.getHandlerClassName();
  +                Class handlerClass = null;
  +                try {
  +                    handlerClass = ClassUtils.forName(handlerClassName);
  +                } catch (ClassNotFoundException cnf) { 
  +                    // GLT - do something here
  +                }
  +
  +                Map handlerMap = handlerInfo.getHandlerMap();
  +                QName[] headers = handlerInfo.getHeaders();
  +                
  +                if (handlerClass != null) {
  +                    HandlerInfo hi =
  +                        new HandlerInfo(handlerClass, handlerMap, headers);
  +                    infoList.add(hi);
  +                }
  +            }
  +        }
  +        _hiChainFactory = new HandlerInfoChainFactory(infoList);
  +        
  +        elements = getChildElements(e,  ELEM_WSDD_JAXRPC_ROLE);
  +        if (elements.length != 0) {
  +            ArrayList roleList = new ArrayList();
  +            for (int i = 0; i < elements.length; i++) {
  +                String role = elements[i].getAttribute( ATTR_SOAPACTORNAME);
  +                roleList.add(role);
  +            }
  +            String [] roles =new String[roleList.size()]; 
  +            roles = (String[]) roleList.toArray(roles);
  +            _hiChainFactory.setRoles(roles);
  +        }
  +        
  +    }
  +
  +    public HandlerInfoChainFactory getHandlerChainFactory() {
  +        return _hiChainFactory;
  +    }
  +
  +    public void setHandlerChainFactory(HandlerInfoChainFactory handlerInfoChainFactory) {
  +        _hiChainFactory = handlerInfoChainFactory;
  +    }
  +
  +    protected QName getElementName() {
  +        return WSDDConstants.QNAME_JAXRPC_HANDLERINFOCHAIN;
  +    }
  +    
   }
  
  
  
  1.2       +55 -55    xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDJAXRPCHandlerInfo.java
  
  Index: WSDDJAXRPCHandlerInfo.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDJAXRPCHandlerInfo.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WSDDJAXRPCHandlerInfo.java	28 Aug 2002 14:51:50 -0000	1.1
  +++ WSDDJAXRPCHandlerInfo.java	29 Aug 2002 19:20:20 -0000	1.2
  @@ -72,10 +72,10 @@
   public class WSDDJAXRPCHandlerInfo
       extends WSDDDeployableItem
   {
  -	private String _classname;
  -	private QName[] _headers;
  -	private Map _map;
  -	
  +    private String _classname;
  +    private QName[] _headers;
  +    private Map _map;
  +    
       /**
        * Default constructor
        */
  @@ -93,7 +93,7 @@
       {
           super(e);
           
  -		String classnameStr = e.getAttribute(ATTR_CLASSNAME);
  +        String classnameStr = e.getAttribute(ATTR_CLASSNAME);
           if (classnameStr != null && !classnameStr.equals("")) {
               _classname = classnameStr;
           }
  @@ -101,33 +101,33 @@
               throw new WSDDException(JavaUtils.getMessage("noClassNameAttr00"));
           
           Element[] elements = getChildElements(e, ELEM_WSDD_PARAM);
  -		if (elements.length != 0) {
  -			_map = new HashMap();
  +        if (elements.length != 0) {
  +            _map = new HashMap();
         
  -	        // Load up the map
  -	        for (int i = 0; i < elements.length; i++) {
  -    	        Element param = elements[i];
  -        	    String pname = param.getAttribute(ATTR_NAME);
  -            	String value = param.getAttribute(ATTR_VALUE);
  -            	parameters.put(pname, value); 
  -        	}			
  -		}
  -		
  -		elements = getChildElements(e, ELEM_WSDD_JAXRPC_HEADER);
  -		if (elements.length != 0) {
  -        	java.util.ArrayList headerList = new java.util.ArrayList();
  -        	for (int i = 0; i < elements.length; i++) {
  -        		Element qElem = elements[i];
  -				String headerStr = qElem.getAttribute(ATTR_QNAME);
  -		        if (headerStr == null ||  headerStr.equals("")) 
  -		            throw new WSDDException(JavaUtils.getMessage("noValidHeader"));		
  +            // Load up the map
  +            for (int i = 0; i < elements.length; i++) {
  +                Element param = elements[i];
  +                String pname = param.getAttribute(ATTR_NAME);
  +                String value = param.getAttribute(ATTR_VALUE);
  +                parameters.put(pname, value); 
  +            }           
  +        }
  +        
  +        elements = getChildElements(e, ELEM_WSDD_JAXRPC_HEADER);
  +        if (elements.length != 0) {
  +            java.util.ArrayList headerList = new java.util.ArrayList();
  +            for (int i = 0; i < elements.length; i++) {
  +                Element qElem = elements[i];
  +                String headerStr = qElem.getAttribute(ATTR_QNAME);
  +                if (headerStr == null ||  headerStr.equals("")) 
  +                    throw new WSDDException(JavaUtils.getMessage("noValidHeader"));     
   
  -				QName headerQName = XMLUtils.getQNameFromString(headerStr, e);
  -				headerList.add(headerQName); 
  -  			}
  -  			QName[] headers = new QName[headerList.size()];
  -  			_headers = (QName[]) headerList.toArray(headers);
  -		}		
  +                QName headerQName = XMLUtils.getQNameFromString(headerStr, e);
  +                headerList.add(headerQName); 
  +            }
  +            QName[] headers = new QName[headerList.size()];
  +            _headers = (QName[]) headerList.toArray(headers);
  +        }       
       }
   
       protected QName getElementName()
  @@ -135,34 +135,34 @@
           return QNAME_JAXRPC_HANDLERINFO;
       }
   
  -	public String getHandlerClassName() {
  -		return _classname;
  -	}
  -	
  -	public void setHandlerClassName(String classname) {
  -		_classname = classname;
  -	}
  -	
  -	public Map getHandlerMap() {
  -		return _map;
  -	}
  -	
  -	public void setHandlerMap(Map map) {
  -		_map = map;
  -	}
  -	
  -	public QName[] getHeaders() {
  -		return _headers;
  -	}
  -	
  -	public void setHeaders(QName[] headers) {
  -		_headers = headers;
  -	}
  -	
  +    public String getHandlerClassName() {
  +        return _classname;
  +    }
  +    
  +    public void setHandlerClassName(String classname) {
  +        _classname = classname;
  +    }
  +    
  +    public Map getHandlerMap() {
  +        return _map;
  +    }
  +    
  +    public void setHandlerMap(Map map) {
  +        _map = map;
  +    }
  +    
  +    public QName[] getHeaders() {
  +        return _headers;
  +    }
  +    
  +    public void setHeaders(QName[] headers) {
  +        _headers = headers;
  +    }
  +    
       public void writeToContext(SerializationContext context)
           throws IOException
       {
  -    	// GLT - FIX THIS UP
  +        // GLT - FIX THIS UP
           AttributesImpl attrs = new AttributesImpl();
           QName name = getQName();
           if (name != null) {