axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: ws-axis/java/src/org/apache/axis/wsdl WSDL2Java.java
Date Thu, 08 Apr 2004 13:09:07 GMT
dims        2004/04/08 06:09:07

  Modified:    java/src/org/apache/axis/client AdminClient.java Stub.java
               java/src/org/apache/axis/attachments AttachmentPart.java
                        AttachmentsImpl.java OctetStreamDataSource.java
               java/src/org/apache/axis/encoding/ser
                        BaseDeserializerFactory.java
                        BaseSerializerFactory.java
                        OctetStreamDataHandlerDeserializer.java
                        OctetStreamDataHandlerSerializer.java
               java/src/org/apache/axis Constants.java
               java/src/org/apache/axis/utils DOM2Writer.java
                        JavaUtils.java
               java/src/org/apache/axis/providers/java EJBProvider.java
               java/src/org/apache/axis/wsdl/toJava Emitter.java
                        JavaBuildFileWriter.java JavaGeneratorFactory.java
                        JavaStubWriter.java JavaWriter.java Utils.java
               java/src/org/apache/axis/transport/http HTTPSender.java
               java/src/org/apache/axis/description JavaServiceDesc.java
                        OperationDesc.java ParameterDesc.java
                        ServiceDesc.java
               java/src/org/apache/axis/handlers JWSHandler.java
               java/src/org/apache/axis/utils/cache MethodCache.java
               java/src/org/apache/axis/message NodeListImpl.java
               java/src/org/apache/axis/wsdl/symbolTable SymbolTable.java
               java/src/org/apache/axis/wsdl/fromJava Types.java
               java/src/org/apache/axis/types URI.java
               java/src/org/apache/axis/deployment/wsdd WSDDOperation.java
                        WSDDService.java
               java/src/org/apache/axis/wsdl WSDL2Java.java
  Log:
  - Replace tabs with 4 spaces
  - First round of Fix for AXIS-1289 Processing of 'octet-stream' content type for MIME SOAP attachments
  
  Notes:
  - Need to replace hard-coded strings with constants as defined in Constants.java
  
  Revision  Changes    Path
  1.83      +1 -1      ws-axis/java/src/org/apache/axis/client/AdminClient.java
  
  Index: AdminClient.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/client/AdminClient.java,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- AdminClient.java	25 Feb 2004 14:02:30 -0000	1.82
  +++ AdminClient.java	8 Apr 2004 13:09:05 -0000	1.83
  @@ -343,7 +343,7 @@
               } else {
                   System.exit(1);
               }
  -	} catch (AxisFault ae) {
  +    } catch (AxisFault ae) {
               System.err.println(Messages.getMessage("exception00") + " " + ae.dumpToString());
               System.exit(1);
           } catch (Exception e) {
  
  
  
  1.35      +1 -1      ws-axis/java/src/org/apache/axis/client/Stub.java
  
  Index: Stub.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/client/Stub.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Stub.java	7 Apr 2004 20:36:14 -0000	1.34
  +++ Stub.java	8 Apr 2004 13:09:05 -0000	1.35
  @@ -390,7 +390,7 @@
           attachments.clear();
       }
   
  -    protected void setRequestHeaders(org.apache.axis.client.Call call) throws AxisFault {		
  +    protected void setRequestHeaders(org.apache.axis.client.Call call) throws AxisFault {        
           SOAPHeaderElement[] headers = getHeaders();
           for(int i=0;i<headers.length;i++){
               call.addHeader(headers[i]);
  
  
  
  1.45      +4 -4      ws-axis/java/src/org/apache/axis/attachments/AttachmentPart.java
  
  Index: AttachmentPart.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/attachments/AttachmentPart.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- AttachmentPart.java	5 Apr 2004 12:21:44 -0000	1.44
  +++ AttachmentPart.java	8 Apr 2004 13:09:05 -0000	1.45
  @@ -80,11 +80,11 @@
           datahandler = dh;
           if(dh != null) {
               setMimeHeader(HTTPConstants.HEADER_CONTENT_TYPE, dh.getContentType());
  -	    javax.activation.DataSource ds = dh.getDataSource();
  -	    if (ds instanceof ManagedMemoryDataSource) {
  -		extractFilename((ManagedMemoryDataSource)ds); //and get the filename if appropriate
  +        javax.activation.DataSource ds = dh.getDataSource();
  +        if (ds instanceof ManagedMemoryDataSource) {
  +    	extractFilename((ManagedMemoryDataSource)ds); //and get the filename if appropriate
   
  -	    }
  +        }
           }
       }
   
  
  
  
  1.46      +10 -10    ws-axis/java/src/org/apache/axis/attachments/AttachmentsImpl.java
  
  Index: AttachmentsImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/attachments/AttachmentsImpl.java,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- AttachmentsImpl.java	25 Mar 2004 20:32:05 -0000	1.45
  +++ AttachmentsImpl.java	8 Apr 2004 13:09:05 -0000	1.46
  @@ -64,9 +64,9 @@
        */
       protected String contentLocation = null;
   
  -	/**
  -	 * The HashMap for DataHandler Managements.
  -	 */
  +    /**
  +     * The HashMap for DataHandler Managements.
  +     */
   	private HashMap stackDataHandler = new HashMap();
   
       /**
  @@ -230,11 +230,11 @@
       public Part createAttachmentPart(Object datahandler)
               throws org.apache.axis.AxisFault {
   
  -		// Searching for the same attachements
  -		Integer key = new Integer(datahandler.hashCode());
  -		if (stackDataHandler.containsKey(key)) {
  -			return (Part)stackDataHandler.get(key);
  -		}
  +        // Searching for the same attachements
  +    	Integer key = new Integer(datahandler.hashCode());
  +    	if (stackDataHandler.containsKey(key)) {
  +        	return (Part)stackDataHandler.get(key);
  +        }
   
           multipart = null;
   
  @@ -254,8 +254,8 @@
   
           addAttachmentPart(ret);
   
  -		// Store the current DataHandler with its key
  -		stackDataHandler.put(key, ret);
  +        // Store the current DataHandler with its key
  +    	stackDataHandler.put(key, ret);
   
           return ret;
       }
  
  
  
  1.4       +1 -1      ws-axis/java/src/org/apache/axis/attachments/OctetStreamDataSource.java
  
  Index: OctetStreamDataSource.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/attachments/OctetStreamDataSource.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OctetStreamDataSource.java	25 Feb 2004 14:02:30 -0000	1.3
  +++ OctetStreamDataSource.java	8 Apr 2004 13:09:05 -0000	1.4
  @@ -23,7 +23,7 @@
   import java.io.OutputStream;
   
   public class OctetStreamDataSource implements DataSource {
  -    public static final String CONTENT_TYPE = "application/octetstream";
  +    public static final String CONTENT_TYPE = "application/octet-stream";
   
       private final String name;
       private byte[] data;
  
  
  
  1.21      +17 -17    ws-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
  
  Index: BaseDeserializerFactory.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/BaseDeserializerFactory.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- BaseDeserializerFactory.java	23 Mar 2004 12:29:55 -0000	1.20
  +++ BaseDeserializerFactory.java	8 Apr 2004 13:09:05 -0000	1.21
  @@ -253,26 +253,26 @@
           }
           return df;
       }
  -	/**
  -	 * Returns the deserClassConstructor.
  -	 * @return Constructor
  -	 */
  +    /**
  +     * Returns the deserClassConstructor.
  +     * @return Constructor
  +     */
   	protected Constructor getDeserClassConstructor() {
  -		if (deserClassConstructor == null) { 
  -		    deserClassConstructor = getConstructor(deserClass);
  -		} 
  -		return deserClassConstructor;
  -	}
  +    	if (deserClassConstructor == null) { 
  +            deserClassConstructor = getConstructor(deserClass);
  +        } 
  +    	return deserClassConstructor;
  +    }
   
  -	/**
  -	 * Returns the getDeserializer.
  -	 * @return Method
  -	 */
  +    /**
  +     * Returns the getDeserializer.
  +     * @return Method
  +     */
   	protected Method getGetDeserializer() {
  -		if (getDeserializer == null) {
  +    	if (getDeserializer == null) {
               getDeserializer = getMethod(javaType,"getDeserializer");    
  -		}
  -		return getDeserializer;
  -	}
  +        }
  +    	return getDeserializer;
  +    }
   
   }
  
  
  
  1.29      +17 -17    ws-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java
  
  Index: BaseSerializerFactory.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/BaseSerializerFactory.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- BaseSerializerFactory.java	23 Mar 2004 12:29:55 -0000	1.28
  +++ BaseSerializerFactory.java	8 Apr 2004 13:09:05 -0000	1.29
  @@ -284,26 +284,26 @@
           }
           return sf;
       }
  -	/**
  -	 * Returns the getSerializer.
  -	 * @return Method
  -	 */
  +    /**
  +     * Returns the getSerializer.
  +     * @return Method
  +     */
   	protected Method getGetSerializer() {
  -		if (getSerializer == null) {
  +    	if (getSerializer == null) {
               getSerializer = getMethod(javaType, "getSerializer");
  -		}
  -		return getSerializer;
  -	}
  +        }
  +    	return getSerializer;
  +    }
   
  -	/**
  -	 * Returns the serClassConstructor.
  -	 * @return Constructor
  -	 */
  +    /**
  +     * Returns the serClassConstructor.
  +     * @return Constructor
  +     */
   	protected Constructor getSerClassConstructor() {
  -		if (serClassConstructor == null) {
  -		    serClassConstructor = getConstructor(serClass);
  -		}
  -		return serClassConstructor;
  -	}
  +    	if (serClassConstructor == null) {
  +            serClassConstructor = getConstructor(serClass);
  +        }
  +    	return serClassConstructor;
  +    }
   
   }
  
  
  
  1.5       +1 -1      ws-axis/java/src/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
  
  Index: OctetStreamDataHandlerDeserializer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OctetStreamDataHandlerDeserializer.java	25 Feb 2004 14:02:37 -0000	1.4
  +++ OctetStreamDataHandlerDeserializer.java	8 Apr 2004 13:09:05 -0000	1.5
  @@ -29,7 +29,7 @@
   import java.io.ByteArrayOutputStream;
   
   /**
  - * application/octetstream DataHandler Deserializer
  + * application/octet-stream DataHandler Deserializer
    * Modified by Davanum Srinivas <dims@yahoo.com>
    */
   public class OctetStreamDataHandlerDeserializer extends JAFDataHandlerDeserializer {
  
  
  
  1.4       +1 -1      ws-axis/java/src/org/apache/axis/encoding/ser/OctetStreamDataHandlerSerializer.java
  
  Index: OctetStreamDataHandlerSerializer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/encoding/ser/OctetStreamDataHandlerSerializer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- OctetStreamDataHandlerSerializer.java	25 Feb 2004 14:02:37 -0000	1.3
  +++ OctetStreamDataHandlerSerializer.java	8 Apr 2004 13:09:05 -0000	1.4
  @@ -28,7 +28,7 @@
   import java.io.IOException;
   
   /**
  - * application/octetstream DataHandler Serializer
  + * application/octet-stream DataHandler Serializer
    * @author Davanum Srinivas (dims@yahoo.com)
    */
   public class OctetStreamDataHandlerSerializer extends JAFDataHandlerSerializer {
  
  
  
  1.132     +13 -1     ws-axis/java/src/org/apache/axis/Constants.java
  
  Index: Constants.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/Constants.java,v
  retrieving revision 1.131
  retrieving revision 1.132
  diff -u -r1.131 -r1.132
  --- Constants.java	25 Feb 2004 14:02:28 -0000	1.131
  +++ Constants.java	8 Apr 2004 13:09:05 -0000	1.132
  @@ -613,7 +613,7 @@
       public static final QName MIME_PLAINTEXT = new QName(NS_URI_XMLSOAP, "PlainText");
       public static final QName MIME_MULTIPART = new QName(NS_URI_XMLSOAP, "Multipart");
       public static final QName MIME_SOURCE = new QName(NS_URI_XMLSOAP, "Source");
  -    public static final QName MIME_OCTETSTREAM = new QName(NS_URI_XMLSOAP, "octetstream");
  +    public static final QName MIME_OCTETSTREAM = new QName(NS_URI_XMLSOAP, "octet-stream");
       public static final QName MIME_DATA_HANDLER = new QName(NS_URI_XMLSOAP, "DataHandler");
   
   
  @@ -694,4 +694,16 @@
        */
       public static final int DEFAULT_MESSAGE_TIMEOUT=60*1000*10;
   
  +    /**
  +     * MIME Content Types
  +     * 
  +     * @since Axis1.2
  +     */
  +    public static final String MIME_CT_APPLICATION_OCTETSTREAM     = "application/octet-stream";
  +    public static final String MIME_CT_TEXT_PLAIN         = "text/plain";
  +    public static final String MIME_CT_IMAGE_JPEG        = "image/jpeg";
  +    public static final String MIME_CT_IMAGE_GIF        = "image/gif";
  +    public static final String MIME_CT_TEXT_XML            = "text/xml";
  +    public static final String MIME_CT_APPLICATION_XML        = "application/xml";
  +    public static final String MIME_CT_MULTIPART_PREFIX        = "multipart/";
   }
  
  
  
  1.21      +2 -2      ws-axis/java/src/org/apache/axis/utils/DOM2Writer.java
  
  Index: DOM2Writer.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/utils/DOM2Writer.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- DOM2Writer.java	25 Feb 2004 14:02:48 -0000	1.20
  +++ DOM2Writer.java	8 Apr 2004 13:09:05 -0000	1.21
  @@ -79,7 +79,7 @@
       }
   
       private static void print(Node node, NSStack namespaceStack,
  -    						  Node startnode,
  +                              Node startnode,
                                 PrintWriter out, boolean pretty,
                                 int indent)
       {
  @@ -294,7 +294,7 @@
   
       private static void printNamespaceDecl(Node node,
                                              NSStack namespaceStack,
  -										   Node startnode,
  +                                           Node startnode,
                                              PrintWriter out)
       {
           switch (node.getNodeType())
  
  
  
  1.108     +2 -1      ws-axis/java/src/org/apache/axis/utils/JavaUtils.java
  
  Index: JavaUtils.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
  retrieving revision 1.107
  retrieving revision 1.108
  diff -u -r1.107 -r1.108
  --- JavaUtils.java	22 Mar 2004 14:52:58 -0000	1.107
  +++ JavaUtils.java	8 Apr 2004 13:09:05 -0000	1.108
  @@ -1144,7 +1144,8 @@
           else if ("text/xml".equals(mime) || "application/xml".equals(mime)) {
               return "javax.xml.transform.Source";
           }
  -        else if ("application/octetstream".equals(mime)) {
  +        else if ("application/octet-stream".equals(mime)||
  +                 "application/octetstream".equals(mime)) {
               return "org.apache.axis.attachments.OctetStream";
           }
           else if (mime != null && mime.startsWith("multipart/")) {
  
  
  
  1.43      +1 -1      ws-axis/java/src/org/apache/axis/providers/java/EJBProvider.java
  
  Index: EJBProvider.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/providers/java/EJBProvider.java,v
  retrieving revision 1.42
  retrieving revision 1.43
  diff -u -r1.42 -r1.43
  --- EJBProvider.java	25 Feb 2004 14:02:44 -0000	1.42
  +++ EJBProvider.java	8 Apr 2004 13:09:05 -0000	1.43
  @@ -453,7 +453,7 @@
   //        ServiceDesc serviceDescription = service.getServiceDescription();
   //        ArrayList stopClasses = serviceDescription.getStopClasses();
   //        if (stopClasses == null)
  -//            stopClasses = new ArrayList();              	
  +//            stopClasses = new ArrayList();                  
   //        stopClasses.add("javax.ejb.EJBObject");
   //        stopClasses.add("javax.ejb.EJBLocalObject");
   //        serviceDescription.setStopClasses(stopClasses);
  
  
  
  1.67      +16 -16    ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java
  
  Index: Emitter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/Emitter.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- Emitter.java	30 Mar 2004 11:36:02 -0000	1.66
  +++ Emitter.java	8 Apr 2004 13:09:06 -0000	1.67
  @@ -87,7 +87,7 @@
       /** Field bHelperGeneration */
       private boolean bHelperGeneration = false;
       
  -	private boolean bBuildFileGeneration = false;
  +    private boolean bBuildFileGeneration = false;
   
       /** Field packageName */
       private String packageName = null;
  @@ -207,21 +207,21 @@
           return bEmitTestCase;
       }    // isTestCaseWanted
   
  -	/**
  -	 * get the build file genaeration state
  -	 * @return
  -	 */
  -	public boolean isBuildFileWanted(){
  -		return bBuildFileGeneration;
  -	}
  -	
  -	/**
  -	 * turn the build file genaration ON
  -	 * @param value
  -	 */
  -	public void setBuildFileWanted(boolean value){
  -		bBuildFileGeneration = value;
  -	}
  +    /**
  +     * get the build file genaeration state
  +     * @return
  +     */
  +    public boolean isBuildFileWanted(){
  +        return bBuildFileGeneration;
  +    }
  +    
  +    /**
  +     * turn the build file genaration ON
  +     * @param value
  +     */
  +    public void setBuildFileWanted(boolean value){
  +        bBuildFileGeneration = value;
  +    }
   
       /**
        * By default, code is generated only for referenced elements.
  
  
  
  1.6       +24 -24    ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java
  
  Index: JavaBuildFileWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaBuildFileWriter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- JavaBuildFileWriter.java	30 Mar 2004 11:36:02 -0000	1.5
  +++ JavaBuildFileWriter.java	8 Apr 2004 13:09:06 -0000	1.6
  @@ -71,42 +71,42 @@
           out.write("<?xml version=\"1.0\"?>\n");
   
           out.write("<project basedir=\".\" default=\"jar\">\n");
  -        out.write("	<property name=\"src\" location=\".\"/>\n");
  -        out.write("	<property name=\"build.classes\" location=\"classes\"/>\n");
  +        out.write("    <property name=\"src\" location=\".\"/>\n");
  +        out.write("    <property name=\"build.classes\" location=\"classes\"/>\n");
   
  -        out.write("	<path id=\"classpath\">\n");
  +        out.write("    <path id=\"classpath\">\n");
           StringTokenizer tok = getClasspathComponets();
           while (tok.hasMoreTokens()) {
  -            out.write("		<pathelement location=\"" + tok.nextToken() + "\"/>\n");
  +            out.write("        <pathelement location=\"" + tok.nextToken() + "\"/>\n");
           }
  -        out.write("	</path>\n");
  +        out.write("    </path>\n");
   
  -        out.write("	<target name=\"compile\">\n");
  -        out.write("	   <mkdir dir=\"${build.classes}\"/>\n");
  -        out.write("		<javac destdir=\"${build.classes}\" debug=\"on\">\n");
  -        out.write("			<classpath refid=\"classpath\" />\n");
  -        out.write("			<src path=\"${src}\"/>\n");
  -        out.write("		</javac>\n");
  -        out.write("	</target>\n");
  +        out.write("    <target name=\"compile\">\n");
  +        out.write("       <mkdir dir=\"${build.classes}\"/>\n");
  +        out.write("        <javac destdir=\"${build.classes}\" debug=\"on\">\n");
  +        out.write("            <classpath refid=\"classpath\" />\n");
  +        out.write("            <src path=\"${src}\"/>\n");
  +        out.write("        </javac>\n");
  +        out.write("    </target>\n");
   
  -        out.write("	<target name=\"jar\" depends=\"compile\">\n");
  +        out.write("    <target name=\"jar\" depends=\"compile\">\n");
           out.write("        <copy todir=\"${build.classes}\">\n");
           out.write("            <fileset dir=\".\" casesensitive=\"yes\" >\n");
           out.write("                <include name=\"**/*.wsdd\"/>\n");
           out.write("            </fileset>\n");
           out.write("        </copy>\n");
   
  -        out.write("		<jar jarfile=\"" + getJarFileName(symbolTable.getWSDLURI()) + ".jar\" basedir=\"${build.classes}\" >\n");
  -        out.write("		<include name=\"**\" />\n");
  -        out.write("		<manifest>\n");
  -        out.write("			<section name=\"org/apache/ws4j2ee\">\n");
  -        out.write("			<attribute name=\"Implementation-Title\" value=\"Apache Axis\"/>\n");
  -        out.write("			<attribute name=\"Implementation-Vendor\" value=\"Apache Web Services\"/>\n");
  -        out.write("			</section>\n");
  -        out.write("		</manifest>\n");
  -        out.write("		</jar>\n");
  -        out.write("		<delete dir=\"${build.classes}\"/>\n");
  -        out.write("	</target>\n");
  +        out.write("        <jar jarfile=\"" + getJarFileName(symbolTable.getWSDLURI()) + ".jar\" basedir=\"${build.classes}\" >\n");
  +        out.write("        <include name=\"**\" />\n");
  +        out.write("        <manifest>\n");
  +        out.write("            <section name=\"org/apache/ws4j2ee\">\n");
  +        out.write("            <attribute name=\"Implementation-Title\" value=\"Apache Axis\"/>\n");
  +        out.write("            <attribute name=\"Implementation-Vendor\" value=\"Apache Web Services\"/>\n");
  +        out.write("            </section>\n");
  +        out.write("        </manifest>\n");
  +        out.write("        </jar>\n");
  +        out.write("        <delete dir=\"${build.classes}\"/>\n");
  +        out.write("    </target>\n");
           out.write("</project>\n");
           out.close();
       }
  
  
  
  1.49      +2 -2      ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
  
  Index: JavaGeneratorFactory.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- JavaGeneratorFactory.java	30 Mar 2004 11:36:02 -0000	1.48
  +++ JavaGeneratorFactory.java	8 Apr 2004 13:09:06 -0000	1.49
  @@ -171,8 +171,8 @@
                   JavaDeployWriter.class);      // for deploy.wsdd
           addGenerator(Definition.class,
                   JavaUndeployWriter.class);    // for undeploy.wsdd
  -		addGenerator(Definition.class,
  -				JavaBuildFileWriter.class); //add a build file writer
  +        addGenerator(Definition.class,
  +                JavaBuildFileWriter.class); //add a build file writer
   
       }                                              // addDefinitionGenerators
   
  
  
  
  1.131     +15 -15    ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java
  
  Index: JavaStubWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaStubWriter.java,v
  retrieving revision 1.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- JavaStubWriter.java	30 Mar 2004 11:36:02 -0000	1.130
  +++ JavaStubWriter.java	8 Apr 2004 13:09:06 -0000	1.131
  @@ -728,21 +728,21 @@
               }
           }
   
  - 		if(emitter.isAllWanted()) {
  - 			HashMap rawSymbolTable = symbolTable.getHashMap();
  - 			for(Iterator j = rawSymbolTable.values().iterator(); j.hasNext(); ) {
  - 				Vector typeVector = (Vector)j.next();
  - 				for(Iterator k = typeVector.iterator(); k.hasNext(); ) {
  - 					Object symbol = k.next();
  - 					if(symbol instanceof DefinedType) {
  - 						TypeEntry type = (TypeEntry)symbol;
  - 						if(!types.contains(type)) {
  - 							types.add(type);
  - 						}
  - 					}
  - 				}
  - 			}
  - 		}        
  +         if(emitter.isAllWanted()) {
  +             HashMap rawSymbolTable = symbolTable.getHashMap();
  +             for(Iterator j = rawSymbolTable.values().iterator(); j.hasNext(); ) {
  +                 Vector typeVector = (Vector)j.next();
  +                 for(Iterator k = typeVector.iterator(); k.hasNext(); ) {
  +                     Object symbol = k.next();
  +                     if(symbol instanceof DefinedType) {
  +                         TypeEntry type = (TypeEntry)symbol;
  +                         if(!types.contains(type)) {
  +                             types.add(type);
  +                         }
  +                     }
  +                 }
  +             }
  +         }        
           return types;
       }    // getTypesInPortType
   
  
  
  
  1.30      +2 -2      ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java
  
  Index: JavaWriter.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/JavaWriter.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JavaWriter.java	23 Mar 2004 14:10:30 -0000	1.29
  +++ JavaWriter.java	8 Apr 2004 13:09:06 -0000	1.30
  @@ -257,7 +257,7 @@
           if (st.hasMoreTokens()) {
               String token = st.nextToken();
               boolean startLine = Character.isWhitespace(token.charAt(token.length() - 1))
  -            	&& (token.charAt(token.length() - 1) != '\n');
  +                && (token.charAt(token.length() - 1) != '\n');
               newComments = new StringBuffer(token);
               
               while (st.hasMoreTokens()) {
  @@ -268,7 +268,7 @@
                   }
                   newComments.append('@');
                   startLine = Character.isWhitespace(token.charAt(token.length() - 1))
  -		    & (token.charAt(token.length() - 1) != '\n');
  +            & (token.charAt(token.length() - 1) != '\n');
   
                   newComments.append(token);
               }
  
  
  
  1.86      +4 -2      ws-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java
  
  Index: Utils.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/toJava/Utils.java,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -r1.85 -r1.86
  --- Utils.java	1 Apr 2004 20:47:51 -0000	1.85
  +++ Utils.java	8 Apr 2004 13:09:06 -0000	1.86
  @@ -1030,7 +1030,8 @@
           } else if ("text/xml".equals(mimeName)
                   || "applications/xml".equals(mimeName)) {
               return Constants.MIME_SOURCE;
  -        } else if ("application/octetstream".equals(mimeName)) {
  +        } else if ("application/octet-stream".equals(mimeName) ||
  +                   "application/octetstream".equals(mimeName)) {
               return Constants.MIME_OCTETSTREAM;
           } else if ((mimeName != null) && mimeName.startsWith("multipart/")) {
               return Constants.MIME_MULTIPART;
  @@ -1205,7 +1206,8 @@
                   } else {
                       return "new javax.xml.transform.stream.StreamSource[0]";
                   }
  -            } else if (mimeType.equals("application/octetstream")) {
  +            } else if (mimeType.equals("application/octet-stream")||
  +                       mimeType.equals("application/octetstream")) {
                   if (mimeDimensions.length() <= 0) {
                       return "new org.apache.axis.attachments.OctetStream()";
                   } else {
  
  
  
  1.114     +36 -36    ws-axis/java/src/org/apache/axis/transport/http/HTTPSender.java
  
  Index: HTTPSender.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/transport/http/HTTPSender.java,v
  retrieving revision 1.113
  retrieving revision 1.114
  diff -u -r1.113 -r1.114
  --- HTTPSender.java	25 Mar 2004 16:50:18 -0000	1.113
  +++ HTTPSender.java	8 Apr 2004 13:09:06 -0000	1.114
  @@ -591,45 +591,45 @@
               // No return code?? Should have one by now.
           }
   
  -		/* All HTTP headers have been read. */
  -		String contentType =
  -				(String) headers
  -				.get(HTTPConstants.HEADER_CONTENT_TYPE.toLowerCase());
  -						
  -		contentType = (null == contentType)
  -				? null
  -				: contentType.trim();
  +        /* All HTTP headers have been read. */
  +    	String contentType =
  +                (String) headers
  +                .get(HTTPConstants.HEADER_CONTENT_TYPE.toLowerCase());
  +                        
  +    	contentType = (null == contentType)
  +                ? null
  +                : contentType.trim();
                   
  -		String location =
  -				(String) headers
  -				.get(HTTPConstants.HEADER_LOCATION.toLowerCase());
  +    	String location =
  +                (String) headers
  +                .get(HTTPConstants.HEADER_LOCATION.toLowerCase());
   
  -		location = (null == location)
  -				? null
  -				: location.trim();
  +    	location = (null == location)
  +                ? null
  +                : location.trim();
                   
  -		if ((returnCode > 199) && (returnCode < 300)) {
  -			if (returnCode == 202)
  -				return inp;
  -			// SOAP return is OK - so fall through
  -		} else if (msgContext.getSOAPConstants() ==
  -				SOAPConstants.SOAP12_CONSTANTS) {
  -			// For now, if we're SOAP 1.2, fall through, since the range of
  -			// valid result codes is much greater
  -		} else if ((contentType != null) && !contentType.startsWith("text/html")
  -				&& ((returnCode > 499) && (returnCode < 600))) {
  -			// SOAP Fault should be in here - so fall through
  -		} else if ((location != null) && (returnCode == 307)) {
  -			// Temporary Redirect (HTTP: 307)			
  -			// close old connection
  -			inp.close();
  -			socketHolder.getSocket().close();	
  -			// remove former result and set new target url
  -			msgContext.removeProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
  -			msgContext.setProperty(MessageContext.TRANS_URL, location);
  -			// next try
  -			invoke(msgContext);			
  -			return inp;
  +    	if ((returnCode > 199) && (returnCode < 300)) {
  +        	if (returnCode == 202)
  +            	return inp;
  +            // SOAP return is OK - so fall through
  +        } else if (msgContext.getSOAPConstants() ==
  +            	SOAPConstants.SOAP12_CONSTANTS) {
  +            // For now, if we're SOAP 1.2, fall through, since the range of
  +            // valid result codes is much greater
  +        } else if ((contentType != null) && !contentType.startsWith("text/html")
  +                && ((returnCode > 499) && (returnCode < 600))) {
  +            // SOAP Fault should be in here - so fall through
  +        } else if ((location != null) && (returnCode == 307)) {
  +            // Temporary Redirect (HTTP: 307)            
  +            // close old connection
  +        	inp.close();
  +        	socketHolder.getSocket().close();    
  +            // remove former result and set new target url
  +        	msgContext.removeProperty(HTTPConstants.MC_HTTP_STATUS_CODE);
  +        	msgContext.setProperty(MessageContext.TRANS_URL, location);
  +            // next try
  +        	invoke(msgContext);            
  +        	return inp;
           } else {
               // Unknown return code - so wrap up the content into a
               // SOAP Fault.
  
  
  
  1.10      +11 -11    ws-axis/java/src/org/apache/axis/description/JavaServiceDesc.java
  
  Index: JavaServiceDesc.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/description/JavaServiceDesc.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JavaServiceDesc.java	25 Feb 2004 14:02:35 -0000	1.9
  +++ JavaServiceDesc.java	8 Apr 2004 13:09:06 -0000	1.10
  @@ -67,7 +67,7 @@
       /** The name of this service */
       private String name = null;
   
  -	/** The documentation of this service */
  +    /** The documentation of this service */
   	private String documentation = null;
   
       /** Style/Use */
  @@ -314,19 +314,19 @@
           this.name = name;
       }
   
  -	/**
  -	 * get the documentation for the service
  -	 */
  +    /**
  +     * get the documentation for the service
  +     */
   	public String getDocumentation() {
  -		return documentation; 
  -	}
  +    	return documentation; 
  +    }
   
  -	/**
  -	 * set the documentation for the service
  -	 */
  +    /**
  +     * set the documentation for the service
  +     */
   	public void setDocumentation(String documentation) {
  -		this.documentation = documentation;
  -	}
  +    	this.documentation = documentation;
  +    }
   
       public ArrayList getStopClasses() {
           return stopClasses;
  
  
  
  1.38      +11 -11    ws-axis/java/src/org/apache/axis/description/OperationDesc.java
  
  Index: OperationDesc.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/description/OperationDesc.java,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- OperationDesc.java	25 Feb 2004 14:02:35 -0000	1.37
  +++ OperationDesc.java	8 Apr 2004 13:09:06 -0000	1.38
  @@ -86,7 +86,7 @@
       /** If we're a message-style operation, what's our signature? */
       private int messageOperationStyle = -1;
   
  -	/** The documentation for the operation */
  +    /** The documentation for the operation */
   	private String documentation = null;
   
       /**
  @@ -124,19 +124,19 @@
           this.name = name;
       }
   
  -	/**
  -	 * get the documentation for the operation
  -	 */
  +    /**
  +     * get the documentation for the operation
  +     */
   	public String getDocumentation() {
  -		return documentation; 
  -	}
  +    	return documentation; 
  +    }
   
  -	/**
  -	 * set the documentation for the operation
  -	 */
  +    /**
  +     * set the documentation for the operation
  +     */
   	public void setDocumentation(String documentation) {
  -		this.documentation = documentation;
  -	}
  +    	this.documentation = documentation;
  +    }
   
       public QName getReturnQName() {
           return returnDesc.getQName();
  
  
  
  1.31      +11 -11    ws-axis/java/src/org/apache/axis/description/ParameterDesc.java
  
  Index: ParameterDesc.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/description/ParameterDesc.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- ParameterDesc.java	25 Feb 2004 14:02:35 -0000	1.30
  +++ ParameterDesc.java	8 Apr 2004 13:09:06 -0000	1.31
  @@ -60,7 +60,7 @@
       private boolean inHeader = false;
       private boolean outHeader = false; 
   
  -	/** The documentation for the parameter */
  +    /** The documentation for the parameter */
   	private String documentation = null;
   
   
  @@ -282,19 +282,19 @@
           isReturn = value;
       }
   
  -	/**
  -	 * get the documentation for the parameter
  -	 */
  +    /**
  +     * get the documentation for the parameter
  +     */
   	public String getDocumentation() {
  -		return documentation; 
  -	}
  +    	return documentation; 
  +    }
   
  -	/**
  -	 * set the documentation for the parameter
  -	 */
  +    /**
  +     * set the documentation for the parameter
  +     */
   	public void setDocumentation(String documentation) {
  -		this.documentation = documentation;
  -	}
  +    	this.documentation = documentation;
  +    }
   
       private void writeObject(ObjectOutputStream out)
           throws IOException {
  
  
  
  1.84      +4 -4      ws-axis/java/src/org/apache/axis/description/ServiceDesc.java
  
  Index: ServiceDesc.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/description/ServiceDesc.java,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- ServiceDesc.java	25 Feb 2004 14:02:35 -0000	1.83
  +++ ServiceDesc.java	8 Apr 2004 13:09:06 -0000	1.84
  @@ -76,13 +76,13 @@
       void setName(String name);
   
       /**
  -	 * get the documentation for the service
  -	 */
  +     * get the documentation for the service
  +     */
       String getDocumentation();
   
       /**
  -	 * set the documentation for the service
  -	 */
  +     * set the documentation for the service
  +     */
       void setDocumentation(String documentation);
   
       void addOperationDesc(OperationDesc operation);
  
  
  
  1.41      +3 -3      ws-axis/java/src/org/apache/axis/handlers/JWSHandler.java
  
  Index: JWSHandler.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/handlers/JWSHandler.java,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- JWSHandler.java	25 Feb 2004 14:02:40 -0000	1.40
  +++ JWSHandler.java	8 Apr 2004 13:09:06 -0000	1.41
  @@ -444,10 +444,10 @@
        * directories.
        *
        * @param dirPaths The string containing the directory path or list of
  -     * 		directory paths.
  +     *     	directory paths.
        * @return The file paths of the jar files in the directories. This is an
  -     *		empty string if no files were found, and is terminated by an
  -     *		additional pathSeparator in all other cases.
  +     *    	empty string if no files were found, and is terminated by an
  +     *    	additional pathSeparator in all other cases.
        */
       private String expandDirs(String dirPaths) {
           StringTokenizer st = new StringTokenizer(dirPaths, File.pathSeparator);
  
  
  
  1.6       +33 -33    ws-axis/java/src/org/apache/axis/utils/cache/MethodCache.java
  
  Index: MethodCache.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/utils/cache/MethodCache.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- MethodCache.java	25 Feb 2004 14:02:50 -0000	1.5
  +++ MethodCache.java	8 Apr 2004 13:09:06 -0000	1.6
  @@ -32,10 +32,10 @@
    * @author Sebastian Dietrich <sebastian.dietrich@anecon.com>
    */
   public class MethodCache {
  -	/**
  -	 * The only instance of this class
  -	 */
  -	transient private static MethodCache instance;
  +    /**
  +     * The only instance of this class
  +     */
  +    transient private static MethodCache instance;
   
       /**
        * Cache for Methods
  @@ -43,24 +43,24 @@
        */
       transient private static ThreadLocal cache;
   
  -	/**
  -	 * The <i>private</i> constructor for this class.
  -	 * Use getInstance to get an instance (the only one).
  -	 */
  -	private MethodCache() {
  -		cache = new ThreadLocal();
  -	}
  -
  -	/**
  -	 * Gets the only instance of this class
  -	 * @return the only instance of this class
  -	 */
  -	public static MethodCache getInstance() {
  -		if (instance == null) {
  -			instance = new MethodCache();
  -		}
  -		return instance;
  -	}
  +    /**
  +     * The <i>private</i> constructor for this class.
  +     * Use getInstance to get an instance (the only one).
  +     */
  +    private MethodCache() {
  +        cache = new ThreadLocal();
  +    }
  +
  +    /**
  +     * Gets the only instance of this class
  +     * @return the only instance of this class
  +     */
  +    public static MethodCache getInstance() {
  +        if (instance == null) {
  +            instance = new MethodCache();
  +        }
  +        return instance;
  +    }
   
       /**
        * Returns the per thread hashmap (for method caching)
  @@ -69,7 +69,7 @@
           Map map = (Map) cache.get();
           if (map == null) {
               map = new HashMap();
  -			cache.set(map);
  +            cache.set(map);
           }
           return map;
       }
  @@ -114,16 +114,16 @@
       /** used to track methods we've sought but not found in the past */
       private static final Object NULL_OBJECT = new Object();
   
  -	/**
  -	 * Returns the specified method - if any.
  -	 *
  -	 * @param clazz the class to get the method from
  -	 * @param methodName the name of the method
  -	 * @param parameterTypes the parameters of the method
  -	 * @return the found method
  -	 *
  -	 * @throws NoSuchMethodException if the method can't be found
  -	 */
  +    /**
  +     * Returns the specified method - if any.
  +     *
  +     * @param clazz the class to get the method from
  +     * @param methodName the name of the method
  +     * @param parameterTypes the parameters of the method
  +     * @return the found method
  +     *
  +     * @throws NoSuchMethodException if the method can't be found
  +     */
       public Method getMethod(Class clazz,
                               String methodName,
                               Class[] parameterTypes)
  
  
  
  1.3       +8 -8      ws-axis/java/src/org/apache/axis/message/NodeListImpl.java
  
  Index: NodeListImpl.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/message/NodeListImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NodeListImpl.java	25 Feb 2004 14:02:42 -0000	1.2
  +++ NodeListImpl.java	8 Apr 2004 13:09:06 -0000	1.3
  @@ -31,9 +31,9 @@
       Vector mNodes;
   
       /**
  -	 * Constructor and Setter is intensionally made package access only.
  -	 *  
  -	 */
  +     * Constructor and Setter is intensionally made package access only.
  +     *  
  +     */
       NodeListImpl() {
           mNodes = new Vector();
       }
  @@ -53,11 +53,11 @@
       }
   
       /**
  -	 * Interface Implemented
  -	 * 
  -	 * @param index
  -	 * @return
  -	 */
  +     * Interface Implemented
  +     * 
  +     * @param index
  +     * @return
  +     */
       public Node item(int index) {
           if (mNodes != null && mNodes.size() > index) {
               return (Node) mNodes.get(index);
  
  
  
  1.95      +1 -1      ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java
  
  Index: SymbolTable.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/symbolTable/SymbolTable.java,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- SymbolTable.java	30 Mar 2004 11:36:02 -0000	1.94
  +++ SymbolTable.java	8 Apr 2004 13:09:07 -0000	1.95
  @@ -2318,7 +2318,7 @@
                   } else if (Constants.MIME_SOURCE.equals(mimeQName)) {
                       mimeInfo = new MimeInfo("text/xml", "");
                   } else if (Constants.MIME_OCTETSTREAM.equals(mimeQName)) {
  -                    mimeInfo = new MimeInfo("application/octetstream", "");
  +                    mimeInfo = new MimeInfo("application/octet-stream", "");
                   }
               }
           }
  
  
  
  1.93      +1 -1      ws-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java
  
  Index: Types.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/fromJava/Types.java,v
  retrieving revision 1.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- Types.java	29 Mar 2004 13:15:14 -0000	1.92
  +++ Types.java	8 Apr 2004 13:09:07 -0000	1.93
  @@ -438,7 +438,7 @@
               }
           } //if (mappedTyped != null) {
           
  -        return qNameRet;	
  +        return qNameRet;    
       }
       
       /**
  
  
  
  1.7       +55 -55    ws-axis/java/src/org/apache/axis/types/URI.java
  
  Index: URI.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/types/URI.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- URI.java	3 Apr 2004 09:43:19 -0000	1.6
  +++ URI.java	8 Apr 2004 13:09:07 -0000	1.7
  @@ -436,10 +436,10 @@
     */
     private void initialize(URI p_base, String p_uriSpec)
                            throws MalformedURIException {
  -	  
  +      
       String uriSpec = p_uriSpec;
       int uriSpecLen = (uriSpec != null) ? uriSpec.length() : 0;
  -	
  +    
       if (p_base == null && uriSpecLen == 0) {
         throw new MalformedURIException(
                     "Cannot initialize URI with empty parameters.");
  @@ -477,7 +477,7 @@
               
               // Neither 'scheme:' or 'scheme:#fragment' are valid URIs.
               if (colonIdx == uriSpecLen - 1 || uriSpec.charAt(colonIdx+1) == '#') {
  -            	throw new MalformedURIException("Scheme specific part cannot be empty.");	
  +                throw new MalformedURIException("Scheme specific part cannot be empty.");    
               }
           }
       }
  @@ -595,7 +595,7 @@
           }
         }
         else if (m_path.length() > 0) {
  -      	path = "/";
  +          path = "/";
         }
   
         // 6b - append the relative URI path
  @@ -717,20 +717,20 @@
       boolean hasPort = false;
       if (index < end) {
         if (p_uriSpec.charAt(start) == '[') {
  -      	int bracketIndex = p_uriSpec.indexOf(']', start);
  -      	index = (bracketIndex != -1) ? bracketIndex : end;
  -      	if (index+1 < end && p_uriSpec.charAt(index+1) == ':') {
  -      	  ++index;
  -      	  hasPort = true;
  -      	}
  -      	else {
  -      	  index = end;
  -      	}
  +          int bracketIndex = p_uriSpec.indexOf(']', start);
  +          index = (bracketIndex != -1) ? bracketIndex : end;
  +          if (index+1 < end && p_uriSpec.charAt(index+1) == ':') {
  +            ++index;
  +            hasPort = true;
  +          }
  +          else {
  +            index = end;
  +          }
         }
         else {
  -      	int colonIndex = p_uriSpec.lastIndexOf(':', end);
  -      	index = (colonIndex > start) ? colonIndex : end;
  -      	hasPort = (index != end);
  +          int colonIndex = p_uriSpec.lastIndexOf(':', end);
  +          index = (colonIndex > start) ? colonIndex : end;
  +          hasPort = (index != end);
         }
       }
       host = p_uriSpec.substring(start, index);
  @@ -846,7 +846,7 @@
       int index = 0;
       int end = authority.length();
       char testChar;
  -  	
  +      
       while (index < end) {
         testChar = authority.charAt(index);
         
  @@ -868,7 +868,7 @@
       }
       return true;
     }
  -  	
  +      
    /**
     * Initialize the path for this URI from a URI string spec.
     *
  @@ -891,9 +891,9 @@
   
       // path - everything up to query string or fragment
       if (start < end) {
  -    	// RFC 2732 only allows '[' and ']' to appear in the opaque part.
  -    	if (getScheme() == null || p_uriSpec.charAt(start) == '/') {
  -    	
  +        // RFC 2732 only allows '[' and ']' to appear in the opaque part.
  +        if (getScheme() == null || p_uriSpec.charAt(start) == '/') {
  +        
               // Scan path.
               // abs_path = "/"  path_segments
               // rel_path = rel_segment [ abs_path ]
  @@ -913,9 +913,9 @@
                   // Path segments cannot contain '[' or ']' since pchar
                   // production was not changed by RFC 2732.
                   else if (!isPathCharacter(testChar)) {
  -      	            if (testChar == '?' || testChar == '#') {
  -      	                break;
  -      	            }
  +                      if (testChar == '?' || testChar == '#') {
  +                          break;
  +                      }
                       throw new MalformedURIException(
                           "Path contains invalid character: " + testChar);
                   }
  @@ -931,7 +931,7 @@
               
                   if (testChar == '?' || testChar == '#') {
                       break;
  -      	        }
  +                  }
                   
                   // check for valid escape sequence
                   if (testChar == '%') {
  @@ -1049,7 +1049,7 @@
         }
         // Registry based authority.
         else {
  -      	schemespec.append(m_regAuthority);
  +          schemespec.append(m_regAuthority);
         }
       }
   
  @@ -1301,21 +1301,21 @@
     public void setRegBasedAuthority(String authority) 
       throws MalformedURIException {
   
  -  	if (authority == null) {
  -  	  m_regAuthority = null;
  -  	  return;
  -  	}
  -	// reg_name = 1*( unreserved | escaped | "$" | "," | 
  -	//            ";" | ":" | "@" | "&" | "=" | "+" )
  -  	else if (authority.length() < 1 ||
  -  	  !isValidRegistryBasedAuthority(authority) ||
  -  	  authority.indexOf('/') != -1) {
  -      throw new MalformedURIException("Registry based authority is not well formed.");       	
  -  	}
  -  	m_regAuthority = authority;
  -  	m_host = null;
  -  	m_userinfo = null;
  -  	m_port = -1;
  +      if (authority == null) {
  +        m_regAuthority = null;
  +        return;
  +      }
  +    // reg_name = 1*( unreserved | escaped | "$" | "," | 
  +    //            ";" | ":" | "@" | "&" | "=" | "+" )
  +      else if (authority.length() < 1 ||
  +        !isValidRegistryBasedAuthority(authority) ||
  +        authority.indexOf('/') != -1) {
  +      throw new MalformedURIException("Registry based authority is not well formed.");           
  +      }
  +      m_regAuthority = authority;
  +      m_host = null;
  +      m_userinfo = null;
  +      m_port = -1;
     }
   
    /**
  @@ -1615,7 +1615,7 @@
         // RFC 1034 (Section 3) and RFC 1123 (Section 2.1). According
         // to RFC 1034, hostnames are limited to 255 characters.
         if (addrLength > 255) {
  -      	return false;
  +          return false;
         }
         
         // domain labels can contain alphanumerics and '-"
  @@ -1801,7 +1801,7 @@
      * string cannot match a valid IPv6 address
      */
     private static int scanHexSequence (String address, int index, int end, int [] counter) {
  -  	
  +      
         char testChar;
         int numDigits = 0;
         int start = index;
  @@ -1810,17 +1810,17 @@
         // hexseq = hex4 *( ":" hex4)
         // hex4   = 1*4HEXDIG
         for (; index < end; ++index) {
  -      	testChar = address.charAt(index);
  -      	if (testChar == ':') {
  -      	    // IPv6 addresses are 128-bit, so there can be at most eight sections.
  -      	    if (numDigits > 0 && ++counter[0] > 8) {
  -      	        return -1;
  -      	    }
  -      	    // This could be '::'.
  -      	    if (numDigits == 0 || ((index+1 < end) && address.charAt(index+1) == ':')) {
  -      	        return index;
  -      	    }
  -      	    numDigits = 0;
  +          testChar = address.charAt(index);
  +          if (testChar == ':') {
  +              // IPv6 addresses are 128-bit, so there can be at most eight sections.
  +              if (numDigits > 0 && ++counter[0] > 8) {
  +                  return -1;
  +              }
  +              // This could be '::'.
  +              if (numDigits == 0 || ((index+1 < end) && address.charAt(index+1) == ':')) {
  +                  return index;
  +              }
  +              numDigits = 0;
           }
           // This might be invalid or an IPv4address. If it's potentially an IPv4address,
           // backup to just after the last valid character that matches hexseq.
  
  
  
  1.29      +1 -1      ws-axis/java/src/org/apache/axis/deployment/wsdd/WSDDOperation.java
  
  Index: WSDDOperation.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/deployment/wsdd/WSDDOperation.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- WSDDOperation.java	1 Apr 2004 20:47:51 -0000	1.28
  +++ WSDDOperation.java	8 Apr 2004 13:09:07 -0000	1.29
  @@ -152,7 +152,7 @@
               WSDDDocumentation documentation = new WSDDDocumentation(desc.getDocumentation());
               documentation.writeToContext(context);
           }
  -		
  +        
           ArrayList params = desc.getParameters();
           for (Iterator i = params.iterator(); i.hasNext();) {
               ParameterDesc parameterDesc = (ParameterDesc) i.next();
  
  
  
  1.104     +7 -7      ws-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java
  
  Index: WSDDService.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/deployment/wsdd/WSDDService.java,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- WSDDService.java	3 Apr 2004 09:45:36 -0000	1.103
  +++ WSDDService.java	8 Apr 2004 13:09:07 -0000	1.104
  @@ -205,7 +205,7 @@
               }
           }
   
  -	// 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) {
               _wsddHIchain = new WSDDJAXRPCHandlerInfoChain(hcEl);
  @@ -449,12 +449,12 @@
               service.setOption(AxisEngine.PROP_SEND_XSI, Boolean.FALSE);
           }
   
  -	// Set handlerInfoChain
  +    // Set handlerInfoChain
   	if (_wsddHIchain != null) {
               HandlerInfoChainFactory hiChainFactory = _wsddHIchain.getHandlerChainFactory();
   
  -	    service.setOption(Constants.ATTR_HANDLERINFOCHAIN, hiChainFactory);
  -	}
  +        service.setOption(Constants.ATTR_HANDLERINFOCHAIN, hiChainFactory);
  +    }
   
           AxisEngine.normaliseOptions(service);
           tmr.delegate(registry.getTypeMappingRegistry());
  @@ -607,10 +607,10 @@
               context.endElement();
           }
   
  -		if (_wsddHIchain != null) {
  -			_wsddHIchain.writeToContext(context);
  +    	if (_wsddHIchain != null) {
  +        	_wsddHIchain.writeToContext(context);
   
  -		}
  +        }
   
           context.endElement();
   
  
  
  
  1.48      +8 -8      ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java
  
  Index: WSDL2Java.java
  ===================================================================
  RCS file: /home/cvs/ws-axis/java/src/org/apache/axis/wsdl/WSDL2Java.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- WSDL2Java.java	30 Mar 2004 11:36:01 -0000	1.47
  +++ WSDL2Java.java	8 Apr 2004 13:09:07 -0000	1.48
  @@ -53,8 +53,8 @@
   
       /** Field TEST_OPT */
       protected static final int TEST_OPT = 't';
  -	/** Field BUILDFILE_OPT */
  -	protected static final int BUILDFILE_OPT = 'B';
  +    /** Field BUILDFILE_OPT */
  +    protected static final int BUILDFILE_OPT = 'B';
       /** Field PACKAGE_OPT */
       protected static final int PACKAGE_OPT = 'p';
   
  @@ -143,9 +143,9 @@
                           CLOptionDescriptor.ARGUMENT_DISALLOWED,
                           HELPER_CLASS_OPT,
                           Messages.getMessage("optionHelper00")),
  -				new CLOptionDescriptor("buildFile", CLOptionDescriptor.ARGUMENT_DISALLOWED,
  -						BUILDFILE_OPT,
  -						Messages.getMessage("optionBuildFile00")),        
  +                new CLOptionDescriptor("buildFile", CLOptionDescriptor.ARGUMENT_DISALLOWED,
  +                        BUILDFILE_OPT,
  +                        Messages.getMessage("optionBuildFile00")),        
                   new CLOptionDescriptor("user", CLOptionDescriptor.ARGUMENT_REQUIRED,
                           USERNAME_OPT,
                           Messages.getMessage("optionUsername")),
  @@ -254,9 +254,9 @@
               case TEST_OPT:
                   emitter.setTestCaseWanted(true);
                   break;
  -			case BUILDFILE_OPT:
  -				emitter.setBuildFileWanted(true);
  -				break;
  +            case BUILDFILE_OPT:
  +                emitter.setBuildFileWanted(true);
  +                break;
               case ALL_OPT:
                   emitter.setAllWanted(true);
                   break;
  
  
  

Mime
View raw message