axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsi...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis AxisProperties.java AxisFault.java
Date Mon, 12 Aug 2002 22:23:54 GMT
rsitze      2002/08/12 15:23:54

  Modified:    java/src/org/apache/axis/deployment/wsdd
                        WSDDDeployableItem.java
               java/src/org/apache/axis/utils DOM2Writer.java CLUtil.java
                        JavaUtils.java
               java/src/org/apache/axis AxisProperties.java AxisFault.java
  Log:
  Correcting misdirected constants.  I let this one get by when I was
  rearranging code for System properties earlier, just putting them
  back where they belong.
  
  Revision  Changes    Path
  1.45      +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
  
  Index: WSDDDeployableItem.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- WSDDDeployableItem.java	2 Aug 2002 17:27:42 -0000	1.44
  +++ WSDDDeployableItem.java	12 Aug 2002 22:23:53 -0000	1.45
  @@ -350,11 +350,11 @@
                   try{
                     h.init();
                   }catch(Exception e){
  -                    String msg=e + AxisProperties.LS + JavaUtils.stackToString(e);
  +                    String msg=e + JavaUtils.LS + JavaUtils.stackToString(e);
                       log.debug(msg);
                       throw new ConfigurationException(e);
                   }catch(Error e){
  -                    String msg=e + AxisProperties.LS + JavaUtils.stackToString(e);
  +                    String msg=e + JavaUtils.LS + JavaUtils.stackToString(e);
                       log.debug(msg);
                       throw new ConfigurationException(msg);
                   }
  
  
  
  1.11      +10 -10    xml-axis/java/src/org/apache/axis/utils/DOM2Writer.java
  
  Index: DOM2Writer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/DOM2Writer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DOM2Writer.java	2 Aug 2002 17:27:40 -0000	1.10
  +++ DOM2Writer.java	12 Aug 2002 22:23:54 -0000	1.11
  @@ -242,7 +242,7 @@
                       {
                           out.print('>');
                           if (pretty)
  -                            out.print(AxisProperties.LS);
  +                            out.print(JavaUtils.LS);
                       }
   
                       for (int i = 0; i < numChildren; i++)
  @@ -260,7 +260,7 @@
                   {
                       out.print("/>");
                       if (pretty)
  -                        out.print(AxisProperties.LS);
  +                        out.print(JavaUtils.LS);
                   }
                   break;
               }
  @@ -293,7 +293,7 @@
                   out.print(node.getNodeValue());
                   out.print("-->");
                   if (pretty)
  -                    out.print(AxisProperties.LS);
  +                    out.print(JavaUtils.LS);
                   break;
               }
   
  @@ -312,7 +312,7 @@
   
                   out.println("?>");
                   if (pretty)
  -                    out.print(AxisProperties.LS);
  +                    out.print(JavaUtils.LS);
                   break;
               }
           }
  @@ -327,7 +327,7 @@
               out.print(node.getNodeName());
               out.print('>');
               if (pretty)
  -                out.print(AxisProperties.LS);
  +                out.print(JavaUtils.LS);
               hasChildren = false;
           }
       }
  @@ -408,24 +408,24 @@
                       str.append("&quot;");
                       break;
                   }
  -            case AxisProperties.NL :
  +            case JavaUtils.NL :
                   {
                       if (i > 0)
                       {
                           char lastChar = str.charAt(str.length() - 1);
   
  -                        if (lastChar != AxisProperties.CR)
  +                        if (lastChar != JavaUtils.CR)
                           {
  -                            str.append(AxisProperties.LS);
  +                            str.append(JavaUtils.LS);
                           }
                           else
                           {
  -                            str.append(AxisProperties.NL);
  +                            str.append(JavaUtils.NL);
                           }
                       }
                       else
                       {
  -                        str.append(AxisProperties.LS);
  +                        str.append(JavaUtils.LS);
                       }
                       break;
                   }
  
  
  
  1.4       +3 -3      xml-axis/java/src/org/apache/axis/utils/CLUtil.java
  
  Index: CLUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/CLUtil.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CLUtil.java	2 Aug 2002 17:27:41 -0000	1.3
  +++ CLUtil.java	12 Aug 2002 22:23:54 -0000	1.4
  @@ -74,7 +74,7 @@
                   {
                       sb.append("=<value>");
                   }
  -                sb.append( AxisProperties.LS );
  +                sb.append( JavaUtils.LS );
               }
   
               if( null != description )
  @@ -87,12 +87,12 @@
                           description.substring( MAX_DESCRIPTION_COLUMN_LENGTH );
                       sb.append( "\t\t" );
                       sb.append( descriptionPart );
  -                    sb.append( AxisProperties.LS );
  +                    sb.append( JavaUtils.LS );
                   }
   
                   sb.append( "\t\t" );
                   sb.append( description );
  -                sb.append( AxisProperties.LS );
  +                sb.append( JavaUtils.LS );
               }
           }
           return sb;
  
  
  
  1.67      +15 -0     xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
  
  Index: JavaUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- JavaUtils.java	9 Aug 2002 13:56:24 -0000	1.66
  +++ JavaUtils.java	12 Aug 2002 22:23:54 -0000	1.67
  @@ -60,6 +60,7 @@
   import org.apache.axis.types.HexBinary;
   
   import org.apache.axis.components.logger.LogFactory;
  +import org.apache.commons.discovery.ManagedProperties;
   import org.apache.commons.logging.Log;
   
   import java.io.IOException;
  @@ -70,8 +71,11 @@
   import java.util.Arrays;
   import java.util.Calendar;
   import java.util.Date;
  +import java.util.Enumeration;
   import java.util.Locale;
  +import java.util.Map;
   import java.util.MissingResourceException;
  +import java.util.Properties;
   import java.util.ResourceBundle;
   import java.util.Collection;
   import java.util.Iterator;
  @@ -97,6 +101,17 @@
       protected static Log log =
           LogFactory.getLog(JavaUtils.class.getName());
       
  +    public static final char NL = '\n';
  +
  +    public static final char CR = '\r';
  +
  +    /**
  +     * The prefered line separator
  +     */
  +    public static final String LS = System.getProperty("line.separator",
  +                                                       (new Character(NL)).toString());
  +
  +
       public static Class getWrapperClass(Class primitive)
       {
           if (primitive == int.class)
  
  
  
  1.7       +2 -9      xml-axis/java/src/org/apache/axis/AxisProperties.java
  
  Index: AxisProperties.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisProperties.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AxisProperties.java	9 Aug 2002 19:14:36 -0000	1.6
  +++ AxisProperties.java	12 Aug 2002 22:23:54 -0000	1.7
  @@ -60,6 +60,8 @@
   import java.util.HashMap;
   import java.util.Hashtable;
   import java.util.Properties;
  +
  +import org.apache.axis.utils.JavaUtils;
   import org.apache.commons.discovery.ManagedProperties;
   
   
  @@ -94,15 +96,6 @@
    * @author Richard A. Sitze
    */
   public class AxisProperties {
  -
  -    public static final char NL = '\n';
  -    public static final char CR = '\r';
  -
  -    /**
  -     * The prefered line separator
  -     */
  -    public static final String LS = System.getProperty("line.separator",
  -                                                       (new Character(NL)).toString());
   
       private static String commonsGroupContext = null;
       
  
  
  
  1.57      +6 -6      xml-axis/java/src/org/apache/axis/AxisFault.java
  
  Index: AxisFault.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisFault.java,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- AxisFault.java	2 Aug 2002 17:27:41 -0000	1.56
  +++ AxisFault.java	12 Aug 2002 22:23:54 -0000	1.57
  @@ -225,17 +225,17 @@
           if (faultDetails != null) {
               for (int i=0; i < faultDetails.size(); i++) {
                   Element e = (Element) faultDetails.get(i);
  -                details += AxisProperties.LS
  +                details += JavaUtils.LS
                             + "\t" +  e.getLocalName() + ": "
                             + XMLUtils.getInnerXMLString(e);
               }
           }
           
  -        return "AxisFault" + AxisProperties.LS
  -            + " faultCode: " + faultCode + AxisProperties.LS
  -            + " faultString: " + faultString + AxisProperties.LS
  -            + " faultActor: " + faultActor + AxisProperties.LS
  -            + " faultDetail: " + details + AxisProperties.LS
  +        return "AxisFault" + JavaUtils.LS
  +            + " faultCode: " + faultCode + JavaUtils.LS
  +            + " faultString: " + faultString + JavaUtils.LS
  +            + " faultActor: " + faultActor + JavaUtils.LS
  +            + " faultDetail: " + details + JavaUtils.LS
               ;
       }
   
  
  
  

Mime
View raw message