axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/utils resources.properties
Date Wed, 05 Dec 2001 20:30:57 GMT
rubys       01/12/05 12:30:57

  Modified:    java/src/org/apache/axis/configuration Tag: alpha-3
                        FileProvider.java
               java/src/org/apache/axis/deployment/wsdd Tag: alpha-3
                        WSDDHandler.java
               java/src/org/apache/axis/utils Tag: alpha-3
                        resources.properties
  Log:
  Backport more changes to alpha3:
  
  Don't risk screwing up the persistent config in case of errors - save to
  a String first then write it out from there.
  
  New message for missing type attribute on deployed Handlers
  
  Doesn't make sense to deploy Handlers without types.
  
  Submitted by:	Glen Daniels
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +10 -1     xml-axis/java/src/org/apache/axis/configuration/FileProvider.java
  
  Index: FileProvider.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/FileProvider.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -r1.11 -r1.11.2.1
  --- FileProvider.java	2001/11/14 21:22:54	1.11
  +++ FileProvider.java	2001/12/05 20:30:56	1.11.2.1
  @@ -66,6 +66,7 @@
   import java.io.FileInputStream;
   import java.io.FileOutputStream;
   import java.io.InputStream;
  +import java.io.StringWriter;
   import java.util.Properties;
   
   /**
  @@ -131,11 +132,19 @@
           myInputStream = null;
       }
   
  +    /**
  +     * Save the engine configuration.  In case there's a problem, we
  +     * write it to a string before saving it out to the actual file so
  +     * we don't screw up the file.
  +     */ 
       public void writeEngineConfig(AxisEngine engine) throws Exception
       {
           Document doc = Admin.listConfig(engine);
  +        StringWriter writer = new StringWriter();
  +        XMLUtils.DocumentToWriter(doc, writer);
  +        writer.close();
           FileOutputStream fos = new FileOutputStream(basepath + sep + filename);
  -        XMLUtils.DocumentToStream(doc, fos);
  +        fos.write(writer.getBuffer().toString().getBytes());
           fos.close();
       }
   }
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.1  +3 -3      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java
  
  Index: WSDDHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDHandler.java,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- WSDDHandler.java	2001/11/25 23:49:33	1.13
  +++ WSDDHandler.java	2001/12/05 20:30:57	1.13.2.1
  @@ -57,6 +57,7 @@
   import org.apache.axis.Handler;
   import org.apache.axis.encoding.SerializationContext;
   import org.apache.axis.utils.XMLUtils;
  +import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.deployment.DeploymentRegistry;
   import org.apache.axis.deployment.DeploymentException;
   import org.w3c.dom.Document;
  @@ -90,11 +91,9 @@
           throws WSDDException
       {
           super(e);
  -        /*
           if (type == null && (this.getClass() == WSDDHandler.class)) {
  -            throw new WSDDException("Must include type attribute for Handlers");
  +            throw new WSDDException(JavaUtils.getMessage("noTypeAttr00"));
           }
  -        */
       }
   
       protected QName getElementName()
  @@ -111,6 +110,7 @@
               attrs.addAttribute("", "name", "name",
                                  "CDATA", context.qName2String(name));
           }
  +        
           attrs.addAttribute("", "type", "type",
                              "CDATA", context.qName2String(getType()));
           context.startElement(new QName(WSDDConstants.WSDD_NS, "handler"),
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.20.2.1  +2 -0      xml-axis/java/src/org/apache/axis/utils/resources.properties
  
  Index: resources.properties
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/resources.properties,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- resources.properties	2001/12/04 19:43:29	1.20
  +++ resources.properties	2001/12/05 20:30:57	1.20.2.1
  @@ -360,6 +360,8 @@
   # NOTE:  in noType01, do not translate "vector"
   noType01=No type attribute for vector!
   
  +noTypeAttr00=Must include type attribute for Handler deployment!
  +
   noTypeQName00=No type QName for mapping!
   
   notAuth00=User ''{0}'' not authorized to ''{1}''
  
  
  

Mime
View raw message