(file) Return to XmlWriter.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlWriter.cpp between version 1.124.2.2 and 1.137

version 1.124.2.2, 2005/09/30 20:35:55 version 1.137, 2006/05/02 20:26:59
Line 1 
Line 1 
 //%2005////////////////////////////////////////////////////////////////////////  //%2006////////////////////////////////////////////////////////////////////////
 // //
 // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development // Copyright (c) 2000, 2001, 2002 BMC Software; Hewlett-Packard Development
 // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems. // Company, L.P.; IBM Corp.; The Open Group; Tivoli Systems.
Line 8 
Line 8 
 // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group. // IBM Corp.; EMC Corporation; VERITAS Software Corporation; The Open Group.
 // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.; // Copyright (c) 2005 Hewlett-Packard Development Company, L.P.; IBM Corp.;
 // EMC Corporation; VERITAS Software Corporation; The Open Group. // EMC Corporation; VERITAS Software Corporation; The Open Group.
   // Copyright (c) 2006 Hewlett-Packard Development Company, L.P.; IBM Corp.;
   // EMC Corporation; Symantec Corporation; The Open Group.
 // //
 // Permission is hereby granted, free of charge, to any person obtaining a copy // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to // of this software and associated documentation files (the "Software"), to
Line 39 
Line 41 
 //                               Willis White (whiwill@us.ibm.com) PEP 127 and 128 //                               Willis White (whiwill@us.ibm.com) PEP 127 and 128
 //         Brian G. Campbell, EMC (campbell_brian@emc.com) - PEP140/phase2 //         Brian G. Campbell, EMC (campbell_brian@emc.com) - PEP140/phase2
 //              Dave Sudlik, IBM (dsudlik@us.ibm.com) //              Dave Sudlik, IBM (dsudlik@us.ibm.com)
 //              David Dillard, VERITAS Software Corp.  //              David Dillard, Symantec Corp. (david_dillard@symantec.com)
 //                  (david.dillard@veritas.com)  
 //              Vijay Eli, vijayeli@in.ibm.com, fix for #2571 //              Vijay Eli, vijayeli@in.ibm.com, fix for #2571
 // //
 //%///////////////////////////////////////////////////////////////////////////// //%/////////////////////////////////////////////////////////////////////////////
Line 71 
Line 72 
 #include "Tracer.h" #include "Tracer.h"
 #include <Pegasus/Common/StatisticalData.h> #include <Pegasus/Common/StatisticalData.h>
 #include "CommonUTF.h" #include "CommonUTF.h"
   #include "Buffer.h"
   #include "StrLit.h"
   #include "LanguageParser.h"
  
 PEGASUS_NAMESPACE_BEGIN PEGASUS_NAMESPACE_BEGIN
  
Line 84 
Line 88 
 #define OUTPUT_CONTENTLENGTH                                            \ #define OUTPUT_CONTENTLENGTH                                            \
 {                                                                       \ {                                                                       \
     char contentLengthP[11];                                            \     char contentLengthP[11];                                            \
     sprintf(contentLengthP,"%.10u", contentLength);                     \      int n = sprintf(contentLengthP,"%.10u", contentLength);                \
     out << LIT("content-length: ") << contentLengthP << LIT("\r\n");    \      out << STRLIT("content-length: ");                                     \
 }      out.append(contentLengthP, n);                                         \
       out << STRLIT("\r\n");                                                 \
 Buffer& operator<<(Buffer& out, const char* x)  }
 {  
     XmlWriter::append(out, x);  ////////////////////////////////////////////////////////////////////////////////
     return out;  //
 }  // SpecialChar and table.
   //
   ////////////////////////////////////////////////////////////////////////////////
   
   // Note: we cannot use StrLit here since it has a constructur (forbits
   // structure initialization).
   
   struct SpecialChar
   {
       const char* str;
       size_t size;
   };
   
   // Defines encodings of special characters. Just use a 7-bit ASCII character
   // as an index into this array to retrieve its string encoding and encoding
   // length in bytes.
   static const SpecialChar _specialChars[] =
   {
       {STRLIT_ARGS("&#0;")},
       {STRLIT_ARGS("&#1;")},
       {STRLIT_ARGS("&#2;")},
       {STRLIT_ARGS("&#3;")},
       {STRLIT_ARGS("&#4;")},
       {STRLIT_ARGS("&#5;")},
       {STRLIT_ARGS("&#6;")},
       {STRLIT_ARGS("&#7;")},
       {STRLIT_ARGS("&#8;")},
       {STRLIT_ARGS("&#9;")},
       {STRLIT_ARGS("&#10;")},
       {STRLIT_ARGS("&#11;")},
       {STRLIT_ARGS("&#12;")},
       {STRLIT_ARGS("&#13;")},
       {STRLIT_ARGS("&#14;")},
       {STRLIT_ARGS("&#15;")},
       {STRLIT_ARGS("&#16;")},
       {STRLIT_ARGS("&#17;")},
       {STRLIT_ARGS("&#18;")},
       {STRLIT_ARGS("&#19;")},
       {STRLIT_ARGS("&#20;")},
       {STRLIT_ARGS("&#21;")},
       {STRLIT_ARGS("&#22;")},
       {STRLIT_ARGS("&#23;")},
       {STRLIT_ARGS("&#24;")},
       {STRLIT_ARGS("&#25;")},
       {STRLIT_ARGS("&#26;")},
       {STRLIT_ARGS("&#27;")},
       {STRLIT_ARGS("&#28;")},
       {STRLIT_ARGS("&#29;")},
       {STRLIT_ARGS("&#30;")},
       {STRLIT_ARGS("&#31;")},
       {STRLIT_ARGS(" ")},
       {STRLIT_ARGS("!")},
       {STRLIT_ARGS("&quot;")},
       {STRLIT_ARGS("#")},
       {STRLIT_ARGS("$")},
       {STRLIT_ARGS("%")},
       {STRLIT_ARGS("&amp;")},
       {STRLIT_ARGS("&apos;")},
       {STRLIT_ARGS("(")},
       {STRLIT_ARGS(")")},
       {STRLIT_ARGS("*")},
       {STRLIT_ARGS("+")},
       {STRLIT_ARGS(",")},
       {STRLIT_ARGS("-")},
       {STRLIT_ARGS(".")},
       {STRLIT_ARGS("/")},
       {STRLIT_ARGS("0")},
       {STRLIT_ARGS("1")},
       {STRLIT_ARGS("2")},
       {STRLIT_ARGS("3")},
       {STRLIT_ARGS("4")},
       {STRLIT_ARGS("5")},
       {STRLIT_ARGS("6")},
       {STRLIT_ARGS("7")},
       {STRLIT_ARGS("8")},
       {STRLIT_ARGS("9")},
       {STRLIT_ARGS(":")},
       {STRLIT_ARGS(";")},
       {STRLIT_ARGS("&lt;")},
       {STRLIT_ARGS("=")},
       {STRLIT_ARGS("&gt;")},
       {STRLIT_ARGS("?")},
       {STRLIT_ARGS("@")},
       {STRLIT_ARGS("A")},
       {STRLIT_ARGS("B")},
       {STRLIT_ARGS("C")},
       {STRLIT_ARGS("D")},
       {STRLIT_ARGS("E")},
       {STRLIT_ARGS("F")},
       {STRLIT_ARGS("G")},
       {STRLIT_ARGS("H")},
       {STRLIT_ARGS("I")},
       {STRLIT_ARGS("J")},
       {STRLIT_ARGS("K")},
       {STRLIT_ARGS("L")},
       {STRLIT_ARGS("M")},
       {STRLIT_ARGS("N")},
       {STRLIT_ARGS("O")},
       {STRLIT_ARGS("P")},
       {STRLIT_ARGS("Q")},
       {STRLIT_ARGS("R")},
       {STRLIT_ARGS("S")},
       {STRLIT_ARGS("T")},
       {STRLIT_ARGS("U")},
       {STRLIT_ARGS("V")},
       {STRLIT_ARGS("W")},
       {STRLIT_ARGS("X")},
       {STRLIT_ARGS("Y")},
       {STRLIT_ARGS("Z")},
       {STRLIT_ARGS("[")},
       {STRLIT_ARGS("\\")},
       {STRLIT_ARGS("]")},
       {STRLIT_ARGS("^")},
       {STRLIT_ARGS("_")},
       {STRLIT_ARGS("`")},
       {STRLIT_ARGS("a")},
       {STRLIT_ARGS("b")},
       {STRLIT_ARGS("c")},
       {STRLIT_ARGS("d")},
       {STRLIT_ARGS("e")},
       {STRLIT_ARGS("f")},
       {STRLIT_ARGS("g")},
       {STRLIT_ARGS("h")},
       {STRLIT_ARGS("i")},
       {STRLIT_ARGS("j")},
       {STRLIT_ARGS("k")},
       {STRLIT_ARGS("l")},
       {STRLIT_ARGS("m")},
       {STRLIT_ARGS("n")},
       {STRLIT_ARGS("o")},
       {STRLIT_ARGS("p")},
       {STRLIT_ARGS("q")},
       {STRLIT_ARGS("r")},
       {STRLIT_ARGS("s")},
       {STRLIT_ARGS("t")},
       {STRLIT_ARGS("u")},
       {STRLIT_ARGS("v")},
       {STRLIT_ARGS("w")},
       {STRLIT_ARGS("x")},
       {STRLIT_ARGS("y")},
       {STRLIT_ARGS("z")},
       {STRLIT_ARGS("{")},
       {STRLIT_ARGS("|")},
       {STRLIT_ARGS("}")},
       {STRLIT_ARGS("~")},
       {STRLIT_ARGS("&#127;")},
   };
   
   // If _isSpecialChar7[ch] is true, then ch is a special character, which must
   // have a special encoding in XML. But only use 7-bit ASCII characters to
   // index this array.
   static const int _isSpecialChar7[] =
   {
       1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0,1,0,0,
       0,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,
       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,
   };
  
 Buffer& operator<<(Buffer& out, char x)  ////////////////////////////////////////////////////////////////////////////////
 {  
     XmlWriter::append(out, x);  
     return out;  
 }  
  
 Buffer& operator<<(Buffer& out, const Char16& x) Buffer& operator<<(Buffer& out, const Char16& x)
 { {
Line 138 
Line 295 
  
  
 // l10n // l10n
 Buffer& operator<<(Buffer& out, const AcceptLanguages& al)  Buffer& operator<<(Buffer& out, const AcceptLanguageList& al)
 { {
     XmlWriter::append(out, al.toString ());      XmlWriter::append(out, LanguageParser::buildAcceptLanguageHeader(al));
     return out;     return out;
 } }
  
 // l10n // l10n
 Buffer& operator<<(Buffer& out, const ContentLanguages& cl)  Buffer& operator<<(Buffer& out, const ContentLanguageList& cl)
 { {
     XmlWriter::append(out, cl.toString ());      XmlWriter::append(out, LanguageParser::buildContentLanguageHeader(cl));
     return out;     return out;
 } }
  
Line 170 
Line 327 
     return os;     return os;
 } }
  
 inline void _xmlWritter_appendChar(Buffer& out, const Char16& c)  static void _xmlWritter_appendChar(Buffer& out, const Char16& c)
 { {
     // We need to convert the Char16 to UTF8 then append the UTF8     // We need to convert the Char16 to UTF8 then append the UTF8
     // character into the array.     // character into the array.
Line 195 
Line 352 
     out.append(str, UTF_8_COUNT_TRAIL_BYTES(str[0]) + 1);     out.append(str, UTF_8_COUNT_TRAIL_BYTES(str[0]) + 1);
 } }
  
 inline void _xmlWritter_appendSpecialChar(Buffer& out, const Char16& c)  inline void _appendSpecialChar7(Buffer& out, char c)
 {  
     if ( ((c < Char16(0x20)) && (c >= Char16(0x00))) || (c == Char16(0x7f)) )  
     {     {
         char charref[7];      if (_isSpecialChar7[int(c)])
         sprintf(charref, "&#%u;", (Uint16)c);          out.append(_specialChars[int(c)].str, _specialChars[int(c)].size);
         out.append(charref, static_cast<Uint32>(strlen(charref)));  
     }  
     else     else
     {          out.append(c);
         switch (c)  
         {  
             case '&':  
                 out.append("&amp;", 5);  
                 break;  
   
             case '<':  
                 out.append("&lt;", 4);  
                 break;  
   
             case '>':  
                 out.append("&gt;", 4);  
                 break;  
   
             case '"':  
                 out.append("&quot;", 6);  
                 break;  
   
             case '\'':  
                 out.append("&apos;", 6);  
                 break;  
   
             default:  
                 {  
                     // We need to convert the Char16 to UTF8 then append the UTF8  
                     // character into the array.  
                     // NOTE: The UTF8 character could be several bytes long.  
                     // WARNING: This function will put in replacement character for  
                     // all characters that have surogate pairs.  
             char str[6];  
                     memset(str,0x00,sizeof(str));  
                     const char* charIN = reinterpret_cast<const char *>(&c);  
   
                     const Uint16 *strsrc = (const Uint16 *)charIN;  
                     const Uint16 *endsrc = (const Uint16 *)&charIN[1];  
   
                     Uint8 *strtgt = (Uint8 *)str;  
                     Uint8 *endtgt = (Uint8 *)&str[5];  
   
                     UTF16toUTF8(&strsrc,  
                                 endsrc,  
                                 &strtgt,  
                                 endtgt);  
   
                     Uint32 number1 = UTF_8_COUNT_TRAIL_BYTES(str[0]) + 1;  
   
                     out.append(str,number1);  
                 }  
         }  
     }  
 } }
  
 inline void _xmlWritter_appendSpecialChar(Buffer& out, char c)  inline void _xmlWritter_appendSpecialChar(Buffer& out, const Char16& c)
 {  
         if ( ((c < 0x20) && (c >= 0)) || (c == 0x7f) )  
     {     {
         char charref[7];      if (c < 128)
         sprintf(charref, "&#%u;", (Uint8)c);          _appendSpecialChar7(out, char(c));
         out.append(charref, static_cast<Uint32>(strlen(charref)));  
     }  
     else     else
     {          _xmlWritter_appendChar(out, c);
         switch (c)  
         {  
             case '&':  
                 out.append("&amp;", 5);  
                 break;  
   
             case '<':  
                 out.append("&lt;", 4);  
                 break;  
   
             case '>':  
                 out.append("&gt;", 4);  
                 break;  
   
             case '"':  
                 out.append("&quot;", 6);  
                 break;  
   
             case '\'':  
                 out.append("&apos;", 6);  
                 break;  
   
             default:  
                 out.append(static_cast<Sint8>(c));  
         }  
     }     }
 }  
   
  
 inline void _xmlWritter_appendSpecialChar(PEGASUS_STD(ostream)& os, char c)  static void _xmlWritter_appendSpecialChar(PEGASUS_STD(ostream)& os, char c)
 { {
     if ( ((c < 0x20) && (c >= 0)) || (c == 0x7f) )     if ( ((c < 0x20) && (c >= 0)) || (c == 0x7f) )
     {     {
Line 422 
Line 494 
  
 void XmlWriter::append(Buffer& out, const char* str) void XmlWriter::append(Buffer& out, const char* str)
 { {
     while (*str)      size_t n = strlen(str);
       XmlWriter::append(out, *str++);      out.append(str, n);
 } }
  
 void XmlWriter::append(Buffer& out, const String& str) void XmlWriter::append(Buffer& out, const String& str)
 { {
     for (Uint32 i = 0; i < str.size(); i++)      const Uint16* p = (const Uint16*)str.getChar16Data();
       size_t n = str.size();
   
       // Handle leading ASCII 7 characers in these next two loops (use unrolling).
   
       while (n >= 8 && ((p[0]|p[1]|p[2]|p[3]|p[4]|p[5]|p[6]|p[7]) & 0xFF80) == 0)
       {
           out.append(p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
           p += 8;
           n -= 8;
       }
   
       while (n >= 4 && ((p[0]|p[1]|p[2]|p[3]) & 0xFF80) == 0)
       {
           out.append(p[0], p[1], p[2], p[3]);
           p += 4;
           n -= 4;
       }
   
       while (n--)
       {
           Uint16 c = *p++;
   
           // Special processing for UTF8 case:
   
           if (c < 128)
     {     {
         Uint16 c = str[i];              out.append(c);
               continue;
           }
   
           // Hanlde UTF8 case (if reached).
   
         if(((c >= FIRST_HIGH_SURROGATE) && (c <= LAST_HIGH_SURROGATE)) ||         if(((c >= FIRST_HIGH_SURROGATE) && (c <= LAST_HIGH_SURROGATE)) ||
            ((c >= FIRST_LOW_SURROGATE) && (c <= LAST_LOW_SURROGATE)))            ((c >= FIRST_LOW_SURROGATE) && (c <= LAST_LOW_SURROGATE)))
         {         {
             Char16 highSurrogate = str[i];              Char16 highSurrogate = p[-1];
             Char16 lowSurrogate = str[++i];              Char16 lowSurrogate = p[0];
               p++;
               n--;
  
             _xmlWritter_appendSurrogatePair(out, Uint16(highSurrogate),Uint16(lowSurrogate));              _xmlWritter_appendSurrogatePair(
                   out, Uint16(highSurrogate),Uint16(lowSurrogate));
         }         }
         else         else
         {         {
             _xmlWritter_appendChar(out, str[i]);              _xmlWritter_appendChar(out, c);
         }         }
     }     }
 } }
Line 459 
Line 564 
  
 void XmlWriter::appendSpecial(Buffer& out, char x) void XmlWriter::appendSpecial(Buffer& out, char x)
 { {
     _xmlWritter_appendSpecialChar(out, x);      _appendSpecialChar7(out, x);
 } }
  
 void XmlWriter::appendSpecial(Buffer& out, const char* str) void XmlWriter::appendSpecial(Buffer& out, const char* str)
 { {
     while (*str)     while (*str)
         _xmlWritter_appendSpecialChar(out, *str++);          _appendSpecialChar7(out, *str++);
 } }
  
 void XmlWriter::appendSpecial(Buffer& out, const String& str) void XmlWriter::appendSpecial(Buffer& out, const String& str)
 { {
     for (Uint32 i = 0; i < str.size(); i++)      const Uint16* p = (const Uint16*)str.getChar16Data();
       // prevCharIsSpace is true when the last character written to the Buffer
       // is a space character (not a character reference).
       Boolean prevCharIsSpace = false;
   
       // If the first character is a space, use a character reference to avoid
       // space compression.
       if (*p == ' ')
     {     {
         Uint16 c = str[i];          out.append(STRLIT_ARGS("&#32;"));
           p++;
       }
  
         if(((c >= FIRST_HIGH_SURROGATE) && (c <= LAST_HIGH_SURROGATE)) ||      Uint16 c;
            ((c >= FIRST_LOW_SURROGATE) && (c <= LAST_LOW_SURROGATE)))      while ((c = *p++) != 0)
       {
           if (c < 128)
           {
               if (_isSpecialChar7[c])
               {
                   // Write the character reference for the special character
                   out.append(
                       _specialChars[int(c)].str, _specialChars[int(c)].size);
                   prevCharIsSpace = false;
               }
               else if (prevCharIsSpace && (c == ' '))
               {
                   // Write the character reference for the space character, to
                   // avoid compression
                   out.append(STRLIT_ARGS("&#32;"));
                   prevCharIsSpace = false;
               }
               else
               {
                   out.append(c);
                   prevCharIsSpace = (c == ' ');
               }
           }
           else
         {         {
             Char16 highSurrogate = str[i];              // Handle UTF8 case
             Char16 lowSurrogate = str[++i];  
  
             _xmlWritter_appendSurrogatePair(out, Uint16(highSurrogate),Uint16(lowSurrogate));              if ((((c >= FIRST_HIGH_SURROGATE) && (c <= LAST_HIGH_SURROGATE)) ||
                    ((c >= FIRST_LOW_SURROGATE) && (c <= LAST_LOW_SURROGATE))) &&
                   *p)
               {
                   _xmlWritter_appendSurrogatePair(out, c, *p++);
         }         }
         else         else
         {         {
             _xmlWritter_appendSpecialChar(out, str[i]);                  _xmlWritter_appendChar(out, c);
         }         }
   
               prevCharIsSpace = false;
           }
       }
   
       // If the last character is a space, use a character reference to avoid
       // space compression.
       if (prevCharIsSpace)
       {
           out.remove(out.size() - 1);
           out.append(STRLIT_ARGS("&#32;"));
     }     }
 } }
  
Line 498 
Line 650 
 //   Unwise = '{' '}' '|' '\\' '^' '[' ']' '`' //   Unwise = '{' '}' '|' '\\' '^' '[' ']' '`'
 // //
  
 inline void _xmlWritter_encodeURIChar(String& outString, Sint8 char8)  static const char _is_uri[128] =
   {
       1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,
       1,1,0,0,0,0,1,1,0,0,1,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,0,0,0,0,0,0,0,0,0,
       0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
       0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,0,1,
   };
   
   // Perform the necessary URI encoding of characters in HTTP header values.
   // This is required by the HTTP/1.1 specification and the CIM/HTTP
   // Specification (section 3.3.2).
   static void _xmlWritter_encodeURIChar(String& outString, Sint8 char8)
 { {
     Uint8 c = (Uint8)char8;     Uint8 c = (Uint8)char8;
  
 #ifndef PEGASUS_DO_NOT_IMPLEMENT_URI_ENCODING #ifndef PEGASUS_DO_NOT_IMPLEMENT_URI_ENCODING
     if ( (c <= 0x20) ||                     // Control characters + space char      if (c > 127 || _is_uri[int(c)])
          ( (c >= 0x22) && (c <= 0x26) ) ||  // '"' '#' '$' '%' '&'  
          (c == 0x2b) ||                     // '+'  
          (c == 0x2c) ||                     // ','  
          (c == 0x2f) ||                     // '/'  
          ( (c >= 0x3a) && (c <= 0x40) ) ||  // ':' ';' '<' '=' '>' '?' '@'  
          ( (c >= 0x5b) && (c <= 0x5e) ) ||  // '[' '\\' ']' '^'  
          (c == 0x60) ||                     // '`'  
          ( (c >= 0x7b) && (c <= 0x7d) ) ||  // '{' '|' '}'  
          (c >= 0x7f) )                      // Control character or non US-ASCII (UTF-8)  
     {     {
         char hexencoding[4];         char hexencoding[4];
           int n = sprintf(hexencoding, "%%%X%X", c/16, c%16);
         sprintf(hexencoding, "%%%X%X", c/16, c%16);  #ifdef PEGASUS_USE_STRING_EXTENSIONS
           outString.append(hexencoding, n);
   #else /* PEGASUS_USE_STRING_EXTENSIONS */
         outString.append(hexencoding);         outString.append(hexencoding);
   #endif /* PEGASUS_USE_STRING_EXTENSIONS */
     }     }
     else     else
 #endif #endif
Line 593 
Line 750 
     Buffer& out,     Buffer& out,
     const CIMNamespaceName& nameSpace)     const CIMNamespaceName& nameSpace)
 { {
     out << LIT("<LOCALNAMESPACEPATH>\n");      out << STRLIT("<LOCALNAMESPACEPATH>\n");
  
     char* nameSpaceCopy = strdup(nameSpace.getString().getCString());     char* nameSpaceCopy = strdup(nameSpace.getString().getCString());
  
 #if defined(PEGASUS_PLATFORM_SOLARIS_SPARC_CC) || \  #if !defined(PEGASUS_COMPILER_MSVC)
     defined(PEGASUS_OS_HPUX) || \  
     defined(PEGASUS_OS_LINUX)  
     char *last;     char *last;
     for (const char* p = strtok_r(nameSpaceCopy, "/", &last); p;     for (const char* p = strtok_r(nameSpaceCopy, "/", &last); p;
          p = strtok_r(NULL, "/", &last))          p = strtok_r(NULL, "/", &last))
Line 607 
Line 762 
     for (const char* p = strtok(nameSpaceCopy, "/"); p; p = strtok(NULL, "/"))     for (const char* p = strtok(nameSpaceCopy, "/"); p; p = strtok(NULL, "/"))
 #endif #endif
     {     {
         out << LIT("<NAMESPACE NAME=\"") << p << LIT("\"/>\n");          out << STRLIT("<NAMESPACE NAME=\"") << p << STRLIT("\"/>\n");
     }     }
     free(nameSpaceCopy);     free(nameSpaceCopy);
  
     out << LIT("</LOCALNAMESPACEPATH>\n");      out << STRLIT("</LOCALNAMESPACEPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 627 
Line 782 
     const String& host,     const String& host,
     const CIMNamespaceName& nameSpace)     const CIMNamespaceName& nameSpace)
 { {
     out << LIT("<NAMESPACEPATH>\n");      out << STRLIT("<NAMESPACEPATH>\n");
     out << LIT("<HOST>") << host << LIT("</HOST>\n");      out << STRLIT("<HOST>") << host << STRLIT("</HOST>\n");
     appendLocalNameSpacePathElement(out, nameSpace);     appendLocalNameSpacePathElement(out, nameSpace);
     out << LIT("</NAMESPACEPATH>\n");      out << STRLIT("</NAMESPACEPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 647 
Line 802 
     Buffer& out,     Buffer& out,
     const CIMName& className)     const CIMName& className)
 { {
     out << LIT("<CLASSNAME NAME=\"") << className << LIT("\"/>\n");      out << STRLIT("<CLASSNAME NAME=\"") << className << STRLIT("\"/>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 664 
Line 819 
     Buffer& out,     Buffer& out,
     const CIMObjectPath& instanceName)     const CIMObjectPath& instanceName)
 { {
     out << LIT("<INSTANCENAME CLASSNAME=\"");      out << STRLIT("<INSTANCENAME CLASSNAME=\"");
     out << instanceName.getClassName() << LIT("\">\n");      out << instanceName.getClassName() << STRLIT("\">\n");
  
     Array<CIMKeyBinding> keyBindings = instanceName.getKeyBindings();      const Array<CIMKeyBinding>& keyBindings = instanceName.getKeyBindings();
     for (Uint32 i = 0, n = keyBindings.size(); i < n; i++)     for (Uint32 i = 0, n = keyBindings.size(); i < n; i++)
     {     {
         out << LIT("<KEYBINDING NAME=\"");          out << STRLIT("<KEYBINDING NAME=\"");
         out << keyBindings[i].getName() << LIT("\">\n");          out << keyBindings[i].getName() << STRLIT("\">\n");
  
         if (keyBindings[i].getType() == CIMKeyBinding::REFERENCE)         if (keyBindings[i].getType() == CIMKeyBinding::REFERENCE)
         {         {
Line 679 
Line 834 
             appendValueReferenceElement(out, ref, true);             appendValueReferenceElement(out, ref, true);
         }         }
         else {         else {
             out << LIT("<KEYVALUE VALUETYPE=\"");              out << STRLIT("<KEYVALUE VALUETYPE=\"");
             out << keyBindingTypeToString(keyBindings[i].getType());             out << keyBindingTypeToString(keyBindings[i].getType());
             out << LIT("\">");              out << STRLIT("\">");
  
             // fixed the special character problem - Markus             // fixed the special character problem - Markus
  
             appendSpecial(out, keyBindings[i].getValue());             appendSpecial(out, keyBindings[i].getValue());
             out << LIT("</KEYVALUE>\n");              out << STRLIT("</KEYVALUE>\n");
         }         }
         out << LIT("</KEYBINDING>\n");          out << STRLIT("</KEYBINDING>\n");
     }     }
     out << LIT("</INSTANCENAME>\n");      out << STRLIT("</INSTANCENAME>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 705 
Line 860 
     Buffer& out,     Buffer& out,
     const CIMObjectPath& classPath)     const CIMObjectPath& classPath)
 { {
     out << LIT("<CLASSPATH>\n");      out << STRLIT("<CLASSPATH>\n");
     appendNameSpacePathElement(out,     appendNameSpacePathElement(out,
                                classPath.getHost(),                                classPath.getHost(),
                                classPath.getNameSpace());                                classPath.getNameSpace());
     appendClassNameElement(out, classPath.getClassName());     appendClassNameElement(out, classPath.getClassName());
     out << LIT("</CLASSPATH>\n");      out << STRLIT("</CLASSPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 725 
Line 880 
     Buffer& out,     Buffer& out,
     const CIMObjectPath& instancePath)     const CIMObjectPath& instancePath)
 { {
     out << LIT("<INSTANCEPATH>\n");      out << STRLIT("<INSTANCEPATH>\n");
     appendNameSpacePathElement(out,     appendNameSpacePathElement(out,
                                instancePath.getHost(),                                instancePath.getHost(),
                                instancePath.getNameSpace());                                instancePath.getNameSpace());
     appendInstanceNameElement(out, instancePath);     appendInstanceNameElement(out, instancePath);
     out << LIT("</INSTANCEPATH>\n");      out << STRLIT("</INSTANCEPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 745 
Line 900 
     Buffer& out,     Buffer& out,
     const CIMObjectPath& classPath)     const CIMObjectPath& classPath)
 { {
     out << LIT("<LOCALCLASSPATH>\n");      out << STRLIT("<LOCALCLASSPATH>\n");
     appendLocalNameSpacePathElement(out, classPath.getNameSpace());     appendLocalNameSpacePathElement(out, classPath.getNameSpace());
     appendClassNameElement(out, classPath.getClassName());     appendClassNameElement(out, classPath.getClassName());
     out << LIT("</LOCALCLASSPATH>\n");      out << STRLIT("</LOCALCLASSPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 763 
Line 918 
     Buffer& out,     Buffer& out,
     const CIMObjectPath& instancePath)     const CIMObjectPath& instancePath)
 { {
     out << LIT("<LOCALINSTANCEPATH>\n");      out << STRLIT("<LOCALINSTANCEPATH>\n");
     appendLocalNameSpacePathElement(out, instancePath.getNameSpace());     appendLocalNameSpacePathElement(out, instancePath.getNameSpace());
     appendInstanceNameElement(out, instancePath);     appendInstanceNameElement(out, instancePath);
     out << LIT("</LOCALINSTANCEPATH>\n");      out << STRLIT("</LOCALINSTANCEPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 871 
Line 1026 
  
 inline void _xmlWritter_appendValue(Buffer& out, const CIMDateTime& x) inline void _xmlWritter_appendValue(Buffer& out, const CIMDateTime& x)
 { {
     out << x.toString();  //ATTN: append() method?      // It is not necessary to use XmlWriter::appendSpecial(), because
       // CIMDateTime values do not contain special characters.
       out << x.toString();
 } }
  
 inline void _xmlWritter_appendValue(Buffer& out, const CIMObjectPath& x) inline void _xmlWritter_appendValue(Buffer& out, const CIMObjectPath& x)
Line 885 
Line 1042 
     _xmlWritter_appendValue(out, myStr);     _xmlWritter_appendValue(out, myStr);
 } }
  
 void _xmlWritter_appendValueArray(Buffer& out, const CIMObjectPath* p, Uint32 size)  void _xmlWritter_appendValueArray(
       Buffer& out, const CIMObjectPath* p, Uint32 size)
 { {
     out << LIT("<VALUE.REFARRAY>\n");      out << STRLIT("<VALUE.REFARRAY>\n");
     while (size--)     while (size--)
     {     {
         _xmlWritter_appendValue(out, *p++);         _xmlWritter_appendValue(out, *p++);
     }     }
     out << LIT("</VALUE.REFARRAY>\n");      out << STRLIT("</VALUE.REFARRAY>\n");
 } }
  
 template<class T> template<class T>
 void _xmlWritter_appendValueArray(Buffer& out, const T* p, Uint32 size) void _xmlWritter_appendValueArray(Buffer& out, const T* p, Uint32 size)
 { {
     out << LIT("<VALUE.ARRAY>\n");      out << STRLIT("<VALUE.ARRAY>\n");
  
     while (size--)     while (size--)
     {     {
         out << LIT("<VALUE>");          out << STRLIT("<VALUE>");
         _xmlWritter_appendValue(out, *p++);         _xmlWritter_appendValue(out, *p++);
         out << LIT("</VALUE>\n");          out << STRLIT("</VALUE>\n");
     }     }
  
     out << LIT("</VALUE.ARRAY>\n");      out << STRLIT("</VALUE.ARRAY>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 1033 
Line 1191 
  
             case CIMTYPE_STRING:             case CIMTYPE_STRING:
             {             {
                 Array<String> a;                  const String* data;
                 value.get(a);                  Uint32 size;
                 _xmlWritter_appendValueArray(out, a.getData(), a.size());                  value._get(data, size);
                   _xmlWritter_appendValueArray(out, data, size);
                 break;                 break;
             }             }
  
Line 1062 
Line 1221 
                 _xmlWritter_appendValueArray(out, a.getData(), a.size());                 _xmlWritter_appendValueArray(out, a.getData(), a.size());
                 break;                 break;
             }             }
   #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
               case CIMTYPE_INSTANCE:
               {
                   Array<CIMInstance> a;
                   value.get(a);
                   _xmlWritter_appendValueArray(out, a.getData(), a.size());
                   break;
               }
   #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
             default:             default:
                 PEGASUS_ASSERT(false);                 PEGASUS_ASSERT(false);
         }         }
Line 1076 
Line 1243 
     }     }
     else     else
     {     {
         out << LIT("<VALUE>");          out << STRLIT("<VALUE>");
  
         switch (value.getType())         switch (value.getType())
         {         {
Line 1199 
Line 1366 
                 _xmlWritter_appendValue(out, v);                 _xmlWritter_appendValue(out, v);
                 break;                 break;
             }             }
   #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
               case CIMTYPE_INSTANCE:
               {
                   CIMInstance v;
                   value.get(v);
                   _xmlWritter_appendValue(out, v);
                   break;
               }
   #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
             default:             default:
                 PEGASUS_ASSERT(false);                 PEGASUS_ASSERT(false);
         }         }
  
         out << LIT("</VALUE>\n");          out << STRLIT("</VALUE>\n");
     }     }
 } }
  
Line 1231 
Line 1406 
     Buffer& out,     Buffer& out,
     const CIMObject& objectWithPath)     const CIMObject& objectWithPath)
 { {
     out << LIT("<VALUE.OBJECTWITHPATH>\n");      out << STRLIT("<VALUE.OBJECTWITHPATH>\n");
  
     appendValueReferenceElement(out, objectWithPath.getPath (), false);     appendValueReferenceElement(out, objectWithPath.getPath (), false);
     appendObjectElement(out, objectWithPath);     appendObjectElement(out, objectWithPath);
  
     out << LIT("</VALUE.OBJECTWITHPATH>\n");      out << STRLIT("</VALUE.OBJECTWITHPATH>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 1255 
Line 1430 
     Boolean putValueWrapper)     Boolean putValueWrapper)
 { {
     if (putValueWrapper)     if (putValueWrapper)
         out << LIT("<VALUE.REFERENCE>\n");          out << STRLIT("<VALUE.REFERENCE>\n");
  
     // See if it is a class or instance reference (instance references have     // See if it is a class or instance reference (instance references have
     // key-bindings; class references do not).     // key-bindings; class references do not).
Line 1266 
Line 1441 
     //  key bindings     //  key bindings
     //     //
  
     Array<CIMKeyBinding> kbs = reference.getKeyBindings();      const Array<CIMKeyBinding>& kbs = reference.getKeyBindings();
  
     if (kbs.size())     if (kbs.size())
     {     {
Line 1300 
Line 1475 
     }     }
  
     if (putValueWrapper)     if (putValueWrapper)
         out << LIT("</VALUE.REFERENCE>\n");          out << STRLIT("</VALUE.REFERENCE>\n");
 } }
  
 void XmlWriter::printValueReferenceElement( void XmlWriter::printValueReferenceElement(
Line 1325 
Line 1500 
     Buffer& out,     Buffer& out,
     const CIMInstance& namedInstance)     const CIMInstance& namedInstance)
 { {
     out << LIT("<VALUE.NAMEDINSTANCE>\n");      out << STRLIT("<VALUE.NAMEDINSTANCE>\n");
  
     appendInstanceNameElement(out, namedInstance.getPath ());     appendInstanceNameElement(out, namedInstance.getPath ());
     appendInstanceElement(out, namedInstance);     appendInstanceElement(out, namedInstance);
  
     out << LIT("</VALUE.NAMEDINSTANCE>\n");      out << STRLIT("</VALUE.NAMEDINSTANCE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 1648 
Line 1823 
     const CIMFlavor & flavor)     const CIMFlavor & flavor)
 { {
     if (!(flavor.hasFlavor (CIMFlavor::OVERRIDABLE)))     if (!(flavor.hasFlavor (CIMFlavor::OVERRIDABLE)))
         out << LIT(" OVERRIDABLE=\"false\"");          out << STRLIT(" OVERRIDABLE=\"false\"");
  
     if (!(flavor.hasFlavor (CIMFlavor::TOSUBCLASS)))     if (!(flavor.hasFlavor (CIMFlavor::TOSUBCLASS)))
         out << LIT(" TOSUBCLASS=\"false\"");          out << STRLIT(" TOSUBCLASS=\"false\"");
  
     if (flavor.hasFlavor (CIMFlavor::TOINSTANCE))     if (flavor.hasFlavor (CIMFlavor::TOINSTANCE))
         out << LIT(" TOINSTANCE=\"true\"");          out << STRLIT(" TOINSTANCE=\"true\"");
  
     if (flavor.hasFlavor (CIMFlavor::TRANSLATABLE))     if (flavor.hasFlavor (CIMFlavor::TRANSLATABLE))
         out << LIT(" TRANSLATABLE=\"true\"");          out << STRLIT(" TRANSLATABLE=\"true\"");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 1682 
Line 1857 
 { {
     if (!(scope.equal (CIMScope ())))     if (!(scope.equal (CIMScope ())))
     {     {
         out << LIT("<SCOPE");          out << STRLIT("<SCOPE");
  
         if (scope.hasScope (CIMScope::CLASS))         if (scope.hasScope (CIMScope::CLASS))
             out << LIT(" CLASS=\"true\"");              out << STRLIT(" CLASS=\"true\"");
  
         if (scope.hasScope (CIMScope::ASSOCIATION))         if (scope.hasScope (CIMScope::ASSOCIATION))
             out << LIT(" ASSOCIATION=\"true\"");              out << STRLIT(" ASSOCIATION=\"true\"");
  
         if (scope.hasScope (CIMScope::REFERENCE))         if (scope.hasScope (CIMScope::REFERENCE))
             out << LIT(" REFERENCE=\"true\"");              out << STRLIT(" REFERENCE=\"true\"");
  
         if (scope.hasScope (CIMScope::PROPERTY))         if (scope.hasScope (CIMScope::PROPERTY))
             out << LIT(" PROPERTY=\"true\"");              out << STRLIT(" PROPERTY=\"true\"");
  
         if (scope.hasScope (CIMScope::METHOD))         if (scope.hasScope (CIMScope::METHOD))
             out << LIT(" METHOD=\"true\"");              out << STRLIT(" METHOD=\"true\"");
  
         if (scope.hasScope (CIMScope::PARAMETER))         if (scope.hasScope (CIMScope::PARAMETER))
             out << LIT(" PARAMETER=\"true\"");              out << STRLIT(" PARAMETER=\"true\"");
  
         if (scope.hasScope (CIMScope::INDICATION))         if (scope.hasScope (CIMScope::INDICATION))
             out << LIT(" INDICATION=\"true\"");              out << STRLIT(" INDICATION=\"true\"");
  
         out << LIT("/>");          out << STRLIT("/>");
     }     }
 } }
  
Line 1727 
Line 1902 
     const String& cimObject,     const String& cimObject,
     const String& authenticationHeader,     const String& authenticationHeader,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const AcceptLanguages & acceptLanguages,      const AcceptLanguageList& acceptLanguages,
     const ContentLanguages & contentLanguages,      const ContentLanguageList& contentLanguages,
     Uint32 contentLength)     Uint32 contentLength)
 { {
     char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };     char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };
Line 1741 
Line 1916 
     // installed.  Required because of change to wbemservices cimom     // installed.  Required because of change to wbemservices cimom
     if (httpMethod == HTTP_METHOD_M_POST)     if (httpMethod == HTTP_METHOD_M_POST)
     {     {
         out << LIT("M-POST /cimom HTTP/1.1\r\n");          out << STRLIT("M-POST /cimom HTTP/1.1\r\n");
     }     }
     else     else
     {     {
         out << LIT("POST /cimom HTTP/1.1\r\n");          out << STRLIT("POST /cimom HTTP/1.1\r\n");
     }     }
     out << LIT("HOST: ") << host << LIT("\r\n");      out << STRLIT("HOST: ") << host << STRLIT("\r\n");
     out << LIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");      out << STRLIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");
     OUTPUT_CONTENTLENGTH;     OUTPUT_CONTENTLENGTH;
     if (acceptLanguages.size() > 0)     if (acceptLanguages.size() > 0)
     {     {
         out << LIT("Accept-Language: ") << acceptLanguages << LIT("\r\n");          out << STRLIT("Accept-Language: ") << acceptLanguages << STRLIT("\r\n");
     }     }
     if (contentLanguages.size() > 0)     if (contentLanguages.size() > 0)
     {     {
         out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");          out << STRLIT("Content-Language: ") << contentLanguages << STRLIT("\r\n");
     }     }
  
 #ifdef PEGASUS_DEBUG #ifdef PEGASUS_DEBUG
Line 1770 
Line 1945 
                 if (!clientTransferEncodingOff || *clientTransferEncodingOff != '0')                 if (!clientTransferEncodingOff || *clientTransferEncodingOff != '0')
 #endif #endif
  
                         out << LIT("TE: chunked, trailers\r\n");                          out << STRLIT("TE: chunked, trailers\r\n");
  
     if (httpMethod == HTTP_METHOD_M_POST)     if (httpMethod == HTTP_METHOD_M_POST)
     {     {
         out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");          out << STRLIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");
         out << nn << LIT("\r\n");          out << nn << STRLIT("\r\n");
         out << nn << LIT("-CIMOperation: MethodCall\r\n");          out << nn << STRLIT("-CIMOperation: MethodCall\r\n");
         out << nn << LIT("-CIMMethod: ")          out << nn << STRLIT("-CIMMethod: ")
             << encodeURICharacters(cimMethod.getString()) << LIT("\r\n");              << encodeURICharacters(cimMethod.getString()) << STRLIT("\r\n");
         out << nn << LIT("-CIMObject: ") << encodeURICharacters(cimObject)          out << nn << STRLIT("-CIMObject: ") << encodeURICharacters(cimObject)
             << LIT("\r\n");              << STRLIT("\r\n");
     }     }
     else     else
     {     {
         out << LIT("CIMOperation: MethodCall\r\n");          out << STRLIT("CIMOperation: MethodCall\r\n");
         out << LIT("CIMMethod: ") << encodeURICharacters(cimMethod.getString())          out << STRLIT("CIMMethod: ") << encodeURICharacters(cimMethod.getString())
             << LIT("\r\n");              << STRLIT("\r\n");
         out << LIT("CIMObject: ") << encodeURICharacters(cimObject)          out << STRLIT("CIMObject: ") << encodeURICharacters(cimObject)
             << LIT("\r\n");              << STRLIT("\r\n");
     }     }
  
     if (authenticationHeader.size())     if (authenticationHeader.size())
     {     {
         out << authenticationHeader << LIT("\r\n");          out << authenticationHeader << STRLIT("\r\n");
     }     }
  
     out << LIT("\r\n");      out << STRLIT("\r\n");
 } }
  
  
 void XmlWriter::appendMethodResponseHeader( void XmlWriter::appendMethodResponseHeader(
      Buffer& out,      Buffer& out,
      HttpMethod httpMethod,      HttpMethod httpMethod,
      const ContentLanguages & contentLanguages,       const ContentLanguageList& contentLanguages,
      Uint32 contentLength,      Uint32 contentLength,
      Uint32 serverResponseTime)       Uint64 serverResponseTime)
 { {
      char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };      char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };
      out << LIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");       out << STRLIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");
      STAT_SERVERTIME      STAT_SERVERTIME
      out << LIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");       out << STRLIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");
      OUTPUT_CONTENTLENGTH;      OUTPUT_CONTENTLENGTH;
  
      if (contentLanguages.size() > 0)      if (contentLanguages.size() > 0)
      {      {
          out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");           out << STRLIT("Content-Language: ") << contentLanguages << STRLIT("\r\n");
      }      }
      if (httpMethod == HTTP_METHOD_M_POST)      if (httpMethod == HTTP_METHOD_M_POST)
      {      {
          out << LIT("Ext:\r\n");           out << STRLIT("Ext:\r\n");
          out << LIT("Cache-Control: no-cache\r\n");           out << STRLIT("Cache-Control: no-cache\r\n");
          out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");           out << STRLIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");
          out << nn << LIT("\r\n");           out << nn << STRLIT("\r\n");
          out << nn << LIT("-CIMOperation: MethodResponse\r\n\r\n");           out << nn << STRLIT("-CIMOperation: MethodResponse\r\n\r\n");
      }      }
      else      else
      {      {
          out << LIT("CIMOperation: MethodResponse\r\n\r\n");           out << STRLIT("CIMOperation: MethodResponse\r\n\r\n");
      }      }
 } }
  
Line 1852 
Line 2027 
     const String& cimError,     const String& cimError,
     const String& errorDetail)     const String& errorDetail)
 { {
     out << LIT("HTTP/1.1 ") << status << LIT("\r\n");      out << STRLIT("HTTP/1.1 ") << status << STRLIT("\r\n");
     if (cimError != String::EMPTY)     if (cimError != String::EMPTY)
     {     {
         out << LIT("CIMError: ") << cimError << LIT("\r\n");          out << STRLIT("CIMError: ") << cimError << STRLIT("\r\n");
     }     }
     if (errorDetail != String::EMPTY)     if (errorDetail != String::EMPTY)
     {     {
         // ATTN-RK-P3-20020404: It is critical that this text not contain '\n'          out << STRLIT(PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": ")
         // ATTN-RK-P3-20020404: Need to encode this value properly.  (See              << encodeURICharacters(errorDetail) << STRLIT("\r\n");
         // CIM/HTTP Specification section 3.3.2  
         out << LIT(PEGASUS_HTTPHEADERTAG_ERRORDETAIL ": ")  
             << encodeURICharacters(errorDetail) << LIT("\r\n");  
     }     }
     out << LIT("\r\n");      out << STRLIT("\r\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 1891 
Line 2063 
     Buffer& out,     Buffer& out,
     const String& content)     const String& content)
 { {
     out << LIT("HTTP/1.1 " HTTP_STATUS_UNAUTHORIZED "\r\n");      out << STRLIT("HTTP/1.1 " HTTP_STATUS_UNAUTHORIZED "\r\n");
     out << content << LIT("\r\n");      out << content << STRLIT("\r\n");
     out << LIT("\r\n");      out << STRLIT("\r\n");
  
 //ATTN: We may need to include the following line, so that the browsers //ATTN: We may need to include the following line, so that the browsers
 //      can display the error message. //      can display the error message.
Line 1930 
Line 2102 
     Buffer& out,     Buffer& out,
     const String& content)     const String& content)
 { {
     out << LIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");      out << STRLIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");
     // Content-Length header needs to be added because 200 OK record     // Content-Length header needs to be added because 200 OK record
     // is usually intended to have content.  But, for Kerberos this     // is usually intended to have content.  But, for Kerberos this
     // may not always be the case so we need to indicate that there     // may not always be the case so we need to indicate that there
     // is no content     // is no content
                 Uint32 contentLength = 0;                 Uint32 contentLength = 0;
                 OUTPUT_CONTENTLENGTH;                 OUTPUT_CONTENTLENGTH;
     out << content << LIT("\r\n");      out << content << STRLIT("\r\n");
     out << LIT("\r\n");      out << STRLIT("\r\n");
  
 //ATTN: We may need to include the following line, so that the browsers //ATTN: We may need to include the following line, so that the browsers
 //      can display the error message. //      can display the error message.
Line 1967 
Line 2139 
     Buffer& out,     Buffer& out,
     const String& messageId)     const String& messageId)
 { {
     out << LIT("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n");      out << STRLIT("<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n");
     out << LIT("<CIM CIMVERSION=\"2.0\" DTDVERSION=\"2.0\">\n");      out << STRLIT("<CIM CIMVERSION=\"2.0\" DTDVERSION=\"2.0\">\n");
     out << LIT("<MESSAGE ID=\"") << messageId;      out << STRLIT("<MESSAGE ID=\"") << messageId;
     out << LIT("\" PROTOCOLVERSION=\"1.0\">\n");      out << STRLIT("\" PROTOCOLVERSION=\"1.0\">\n");
 } }
  
 void XmlWriter::_appendMessageElementEnd( void XmlWriter::_appendMessageElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</MESSAGE>\n");      out << STRLIT("</MESSAGE>\n");
     out << LIT("</CIM>\n");      out << STRLIT("</CIM>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 1992 
Line 2164 
 void XmlWriter::_appendSimpleReqElementBegin( void XmlWriter::_appendSimpleReqElementBegin(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("<SIMPLEREQ>\n");      out << STRLIT("<SIMPLEREQ>\n");
 } }
  
 void XmlWriter::_appendSimpleReqElementEnd( void XmlWriter::_appendSimpleReqElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</SIMPLEREQ>\n");      out << STRLIT("</SIMPLEREQ>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2015 
Line 2187 
     Buffer& out,     Buffer& out,
     const CIMName& name)     const CIMName& name)
 { {
     out << LIT("<METHODCALL NAME=\"") << name << LIT("\">\n");      out << STRLIT("<METHODCALL NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendMethodCallElementEnd( void XmlWriter::_appendMethodCallElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</METHODCALL>\n");      out << STRLIT("</METHODCALL>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2038 
Line 2210 
     Buffer& out,     Buffer& out,
     const CIMName& name)     const CIMName& name)
 { {
     out << LIT("<IMETHODCALL NAME=\"") << name << LIT("\">\n");      out << STRLIT("<IMETHODCALL NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendIMethodCallElementEnd( void XmlWriter::_appendIMethodCallElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</IMETHODCALL>\n");      out << STRLIT("</IMETHODCALL>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2063 
Line 2235 
     Buffer& out,     Buffer& out,
     const char* name)     const char* name)
 { {
     out << LIT("<IPARAMVALUE NAME=\"") << name << LIT("\">\n");      out << STRLIT("<IPARAMVALUE NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendIParamValueElementEnd( void XmlWriter::_appendIParamValueElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</IPARAMVALUE>\n");      out << STRLIT("</IPARAMVALUE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2084 
Line 2256 
 void XmlWriter::_appendSimpleRspElementBegin( void XmlWriter::_appendSimpleRspElementBegin(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("<SIMPLERSP>\n");      out << STRLIT("<SIMPLERSP>\n");
 } }
  
 void XmlWriter::_appendSimpleRspElementEnd( void XmlWriter::_appendSimpleRspElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</SIMPLERSP>\n");      out << STRLIT("</SIMPLERSP>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2107 
Line 2279 
     Buffer& out,     Buffer& out,
     const CIMName& name)     const CIMName& name)
 { {
     out << LIT("<METHODRESPONSE NAME=\"") << name << LIT("\">\n");      out << STRLIT("<METHODRESPONSE NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendMethodResponseElementEnd( void XmlWriter::_appendMethodResponseElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</METHODRESPONSE>\n");      out << STRLIT("</METHODRESPONSE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2130 
Line 2302 
     Buffer& out,     Buffer& out,
     const CIMName& name)     const CIMName& name)
 { {
     out << LIT("<IMETHODRESPONSE NAME=\"") << name << LIT("\">\n");      out << STRLIT("<IMETHODRESPONSE NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendIMethodResponseElementEnd( void XmlWriter::_appendIMethodResponseElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</IMETHODRESPONSE>\n");      out << STRLIT("</IMETHODRESPONSE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2151 
Line 2323 
 { {
     Tracer::traceCIMException(TRC_XML_WRITER, Tracer::LEVEL2, cimException);     Tracer::traceCIMException(TRC_XML_WRITER, Tracer::LEVEL2, cimException);
  
     out << LIT("<ERROR");      out << STRLIT("<ERROR");
     out << LIT(" CODE=\"") << Uint32(cimException.getCode());      out << STRLIT(" CODE=\"") << Uint32(cimException.getCode());
     out.append('"');     out.append('"');
     String description = TraceableCIMException(cimException).getDescription();     String description = TraceableCIMException(cimException).getDescription();
     if (description != String::EMPTY)     if (description != String::EMPTY)
     {     {
         out << LIT(" DESCRIPTION=\"");          out << STRLIT(" DESCRIPTION=\"");
         appendSpecial(out, description);         appendSpecial(out, description);
         out.append('"');         out.append('"');
     }     }
     out << LIT("/>");      out << STRLIT("/>");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2179 
Line 2351 
     Buffer& out,     Buffer& out,
     const CIMValue& value)     const CIMValue& value)
 { {
     out << LIT("<RETURNVALUE");      out << STRLIT("<RETURNVALUE");
  
     CIMType type = value.getType();     CIMType type = value.getType();
     // If the property type is CIMObject, then     // If the property type is CIMObject, then
Line 2189 
Line 2361 
     //   output the real type     //   output the real type
     if (type == CIMTYPE_OBJECT)     if (type == CIMTYPE_OBJECT)
     {     {
         out << LIT(" PARAMTYPE=\"string\"");          out << STRLIT(" PARAMTYPE=\"string\"");
         out << LIT(" EMBEDDEDOBJECT=\"object\"");          out << STRLIT(" EMBEDDEDOBJECT=\"object\"");
       }
   #ifdef PEGASUS_EMBEDDED_INSTANCE_SUPPORT
       else if (type == CIMTYPE_INSTANCE)
       {
           out << STRLIT(" PARAMTYPE=\"string\"");
           out << STRLIT(" EMBEDDEDOBJECT=\"instance\"");
     }     }
   #endif // PEGASUS_EMBEDDED_INSTANCE_SUPPORT
     else     else
     {     {
         out << LIT(" PARAMTYPE=\"") << cimTypeToString (type);          out << STRLIT(" PARAMTYPE=\"") << cimTypeToString (type);
         out.append('"');         out.append('"');
     }     }
  
     out << LIT(">\n");      out << STRLIT(">\n");
  
     // Add value.     // Add value.
     appendValueElement(out, value);     appendValueElement(out, value);
     out << LIT("</RETURNVALUE>\n");      out << STRLIT("</RETURNVALUE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2220 
Line 2399 
 void XmlWriter::_appendIReturnValueElementBegin( void XmlWriter::_appendIReturnValueElementBegin(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("<IRETURNVALUE>\n");      out << STRLIT("<IRETURNVALUE>\n");
 } }
  
 void XmlWriter::_appendIReturnValueElementEnd( void XmlWriter::_appendIReturnValueElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</IRETURNVALUE>\n");      out << STRLIT("</IRETURNVALUE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2241 
Line 2420 
     Boolean flag)     Boolean flag)
 { {
     _appendIParamValueElementBegin(out, name);     _appendIParamValueElementBegin(out, name);
     out << LIT("<VALUE>");      out << STRLIT("<VALUE>");
     append(out, flag);     append(out, flag);
     out << LIT("</VALUE>\n");      out << STRLIT("</VALUE>\n");
     _appendIParamValueElementEnd(out);     _appendIParamValueElementEnd(out);
 } }
  
Line 2259 
Line 2438 
     const String& str)     const String& str)
 { {
     _appendIParamValueElementBegin(out, name);     _appendIParamValueElementBegin(out, name);
     out << LIT("<VALUE>");      out << STRLIT("<VALUE>");
     appendSpecial(out, str);     appendSpecial(out, str);
     out << LIT("</VALUE>\n");      out << STRLIT("</VALUE>\n");
     _appendIParamValueElementEnd(out);  
 }  
   
 //------------------------------------------------------------------------------  
 //  
 // appendQualifierNameIParameter()  
 //  
 //------------------------------------------------------------------------------  
   
 void XmlWriter::appendQualifierNameIParameter(  
     Buffer& out,  
     const char* name,  
     const String& qualifierName)  
 {  
     // <!ELEMENT IPARAMVALUE (VALUE|VALUE.ARRAY|VALUE.REFERENCE  
     //     |INSTANCENAME|CLASSNAME|QUALIFIER.DECLARATION  
     //     |CLASS|INSTANCE|VALUE.NAMEDINSTANCE)?>  
     //  
     // ATTN: notice that there is really no way to pass a qualifier name  
     // as an IPARAMVALUE element according to the spec (look above). So we  
     // just pass it as a class name. An answer must be obtained later.  
   
     _appendIParamValueElementBegin(out, name);  
     appendClassNameElement(out, qualifierName);  
     _appendIParamValueElementEnd(out);     _appendIParamValueElementEnd(out);
 } }
  
Line 2415 
Line 2570 
     const CIMName& propertyName)     const CIMName& propertyName)
 { {
     _appendIParamValueElementBegin(out, "PropertyName");     _appendIParamValueElementBegin(out, "PropertyName");
     out << LIT("<VALUE>") << propertyName << LIT("</VALUE>\n");      out << STRLIT("<VALUE>") << propertyName << STRLIT("</VALUE>\n");
     _appendIParamValueElementEnd(out);     _appendIParamValueElementEnd(out);
 } }
  
Line 2453 
Line 2608 
     //     //
     if (!propertyList.isNull ())     if (!propertyList.isNull ())
     {     {
         out << LIT("<VALUE.ARRAY>\n");          out << STRLIT("<VALUE.ARRAY>\n");
         for (Uint32 i = 0; i < propertyList.size(); i++)         for (Uint32 i = 0; i < propertyList.size(); i++)
         {         {
             out << LIT("<VALUE>") << propertyList[i] << LIT("</VALUE>\n");              out << STRLIT("<VALUE>") << propertyList[i] << STRLIT("</VALUE>\n");
         }         }
         out << LIT("</VALUE.ARRAY>\n");          out << STRLIT("</VALUE.ARRAY>\n");
     }     }
  
     _appendIParamValueElementEnd(out);     _appendIParamValueElementEnd(out);
Line 2516 
Line 2671 
     const String& messageId,     const String& messageId,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const String& authenticationHeader,     const String& authenticationHeader,
     const AcceptLanguages& httpAcceptLanguages,      const AcceptLanguageList& httpAcceptLanguages,
     const ContentLanguages& httpContentLanguages)      const ContentLanguageList& httpContentLanguages)
 { {
     Buffer out;     Buffer out;
     Buffer tmp;     Buffer tmp;
Line 2557 
Line 2712 
     const CIMName& methodName,     const CIMName& methodName,
     const String& messageId,     const String& messageId,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const ContentLanguages & httpContentLanguages,      const ContentLanguageList& httpContentLanguages,
     const Buffer& body,     const Buffer& body,
                 Uint32 serverResponseTime,                  Uint64 serverResponseTime,
                 Boolean isFirst,                 Boolean isFirst,
                 Boolean isLast)                 Boolean isLast)
 { {
Line 2639 
Line 2794 
     const String& messageId,     const String& messageId,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const String& authenticationHeader,     const String& authenticationHeader,
     const AcceptLanguages& httpAcceptLanguages,      const AcceptLanguageList& httpAcceptLanguages,
     const ContentLanguages& httpContentLanguages,      const ContentLanguageList& httpContentLanguages,
     const Buffer& body)     const Buffer& body)
 { {
     Buffer out;     Buffer out;
Line 2680 
Line 2835 
     const CIMName& iMethodName,     const CIMName& iMethodName,
     const String& messageId,     const String& messageId,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const ContentLanguages & httpContentLanguages,      const ContentLanguageList& httpContentLanguages,
     const Buffer& body,     const Buffer& body,
     Uint32 serverResponseTime,      Uint64 serverResponseTime,
     Boolean isFirst,     Boolean isFirst,
     Boolean isLast)     Boolean isLast)
 { {
Line 2779 
Line 2934 
     const CIMName& cimMethod,     const CIMName& cimMethod,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const String& authenticationHeader,     const String& authenticationHeader,
     const AcceptLanguages& acceptLanguages,      const AcceptLanguageList& acceptLanguages,
     const ContentLanguages& contentLanguages,      const ContentLanguageList& contentLanguages,
     Uint32 contentLength)     Uint32 contentLength)
 { {
     char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };     char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };
  
     if (httpMethod == HTTP_METHOD_M_POST)     if (httpMethod == HTTP_METHOD_M_POST)
     {     {
       out << LIT("M-POST ") << requestUri << LIT(" HTTP/1.1\r\n");        out << STRLIT("M-POST ") << requestUri << STRLIT(" HTTP/1.1\r\n");
     }     }
     else     else
     {     {
       out << LIT("POST ") << requestUri << LIT(" HTTP/1.1\r\n");        out << STRLIT("POST ") << requestUri << STRLIT(" HTTP/1.1\r\n");
     }     }
     out << LIT("HOST: ") << host << LIT("\r\n");      out << STRLIT("HOST: ") << host << STRLIT("\r\n");
     out << LIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");      out << STRLIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");
     OUTPUT_CONTENTLENGTH;     OUTPUT_CONTENTLENGTH;
  
     if (acceptLanguages.size() > 0)     if (acceptLanguages.size() > 0)
     {     {
         out << LIT("Accept-Language: ") << acceptLanguages << LIT("\r\n");          out << STRLIT("Accept-Language: ") << acceptLanguages << STRLIT("\r\n");
     }     }
     if (contentLanguages.size() > 0)     if (contentLanguages.size() > 0)
     {     {
         out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");          out << STRLIT("Content-Language: ") << contentLanguages << STRLIT("\r\n");
     }     }
  
 #ifdef PEGASUS_DEBUG #ifdef PEGASUS_DEBUG
Line 2816 
Line 2971 
                         getenv("PEGASUS_HTTP_TRANSFER_ENCODING_REQUEST");                         getenv("PEGASUS_HTTP_TRANSFER_ENCODING_REQUEST");
                 if (!clientTransferEncodingOff || *clientTransferEncodingOff != '0')                 if (!clientTransferEncodingOff || *clientTransferEncodingOff != '0')
 #endif #endif
                         out << LIT("TE: chunked, trailers\r\n");                          out << STRLIT("TE: chunked, trailers\r\n");
  
     if (httpMethod == HTTP_METHOD_M_POST)     if (httpMethod == HTTP_METHOD_M_POST)
     {     {
         out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");          out << STRLIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");
         out << nn << LIT("\r\n");          out << nn << STRLIT("\r\n");
         out << nn << LIT("-CIMExport: MethodRequest\r\n");          out << nn << STRLIT("-CIMExport: MethodRequest\r\n");
         out << nn << LIT("-CIMExportMethod: ") << cimMethod << LIT("\r\n");          out << nn << STRLIT("-CIMExportMethod: ") << cimMethod << STRLIT("\r\n");
     }     }
     else     else
     {     {
         out << LIT("CIMExport: MethodRequest\r\n");          out << STRLIT("CIMExport: MethodRequest\r\n");
         out << LIT("CIMExportMethod: ") << cimMethod << LIT("\r\n");          out << STRLIT("CIMExportMethod: ") << cimMethod << STRLIT("\r\n");
     }     }
  
     if (authenticationHeader.size())     if (authenticationHeader.size())
     {     {
         out << authenticationHeader << LIT("\r\n");          out << authenticationHeader << STRLIT("\r\n");
     }     }
  
     out << LIT("\r\n");      out << STRLIT("\r\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2850 
Line 3005 
 void XmlWriter::appendEMethodResponseHeader( void XmlWriter::appendEMethodResponseHeader(
     Buffer& out,     Buffer& out,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const ContentLanguages& contentLanguages,      const ContentLanguageList& contentLanguages,
     Uint32 contentLength)     Uint32 contentLength)
 { {
     char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };     char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };
  
     out << LIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");      out << STRLIT("HTTP/1.1 " HTTP_STATUS_OK "\r\n");
     out << LIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");      out << STRLIT("Content-Type: application/xml; charset=\"utf-8\"\r\n");
     OUTPUT_CONTENTLENGTH;     OUTPUT_CONTENTLENGTH;
  
     if (contentLanguages.size() > 0)     if (contentLanguages.size() > 0)
     {     {
         out << LIT("Content-Language: ") << contentLanguages << LIT("\r\n");          out << STRLIT("Content-Language: ") << contentLanguages << STRLIT("\r\n");
     }     }
     if (httpMethod == HTTP_METHOD_M_POST)     if (httpMethod == HTTP_METHOD_M_POST)
     {     {
         out << LIT("Ext:\r\n");          out << STRLIT("Ext:\r\n");
         out << LIT("Cache-Control: no-cache\r\n");          out << STRLIT("Cache-Control: no-cache\r\n");
         out << LIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");          out << STRLIT("Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=");
         out << nn << LIT("\r\n");          out << nn << STRLIT("\r\n");
         out << nn << LIT("-CIMExport: MethodResponse\r\n\r\n");          out << nn << STRLIT("-CIMExport: MethodResponse\r\n\r\n");
     }     }
     else     else
     {     {
         out << LIT("CIMExport: MethodResponse\r\n\r\n");          out << STRLIT("CIMExport: MethodResponse\r\n\r\n");
     }     }
 } }
  
Line 2889 
Line 3044 
 void XmlWriter::_appendSimpleExportReqElementBegin( void XmlWriter::_appendSimpleExportReqElementBegin(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("<SIMPLEEXPREQ>\n");      out << STRLIT("<SIMPLEEXPREQ>\n");
 } }
  
 void XmlWriter::_appendSimpleExportReqElementEnd( void XmlWriter::_appendSimpleExportReqElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</SIMPLEEXPREQ>\n");      out << STRLIT("</SIMPLEEXPREQ>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2912 
Line 3067 
     Buffer& out,     Buffer& out,
     const CIMName& name)     const CIMName& name)
 { {
     out << LIT("<EXPMETHODCALL NAME=\"") << name << LIT("\">\n");      out << STRLIT("<EXPMETHODCALL NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendEMethodCallElementEnd( void XmlWriter::_appendEMethodCallElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</EXPMETHODCALL>\n");      out << STRLIT("</EXPMETHODCALL>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2936 
Line 3091 
     Buffer& out,     Buffer& out,
     const char* name)     const char* name)
 { {
     out << LIT("<EXPPARAMVALUE NAME=\"") << name << LIT("\">\n");      out << STRLIT("<EXPPARAMVALUE NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendEParamValueElementEnd( void XmlWriter::_appendEParamValueElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</EXPPARAMVALUE>\n");      out << STRLIT("</EXPPARAMVALUE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2973 
Line 3128 
 void XmlWriter::_appendSimpleExportRspElementBegin( void XmlWriter::_appendSimpleExportRspElementBegin(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("<SIMPLEEXPRSP>\n");      out << STRLIT("<SIMPLEEXPRSP>\n");
 } }
  
 void XmlWriter::_appendSimpleExportRspElementEnd( void XmlWriter::_appendSimpleExportRspElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</SIMPLEEXPRSP>\n");      out << STRLIT("</SIMPLEEXPRSP>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 2996 
Line 3151 
     Buffer& out,     Buffer& out,
     const CIMName& name)     const CIMName& name)
 { {
     out << LIT("<EXPMETHODRESPONSE NAME=\"") << name << LIT("\">\n");      out << STRLIT("<EXPMETHODRESPONSE NAME=\"") << name << STRLIT("\">\n");
 } }
  
 void XmlWriter::_appendEMethodResponseElementEnd( void XmlWriter::_appendEMethodResponseElementEnd(
     Buffer& out)     Buffer& out)
 { {
     out << LIT("</EXPMETHODRESPONSE>\n");      out << STRLIT("</EXPMETHODRESPONSE>\n");
 } }
  
 //------------------------------------------------------------------------------ //------------------------------------------------------------------------------
Line 3018 
Line 3173 
     const String& messageId,     const String& messageId,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const String& authenticationHeader,     const String& authenticationHeader,
     const AcceptLanguages& httpAcceptLanguages,      const AcceptLanguageList& httpAcceptLanguages,
     const ContentLanguages& httpContentLanguages,      const ContentLanguageList& httpContentLanguages,
     const Buffer& body)     const Buffer& body)
 { {
     Buffer out;     Buffer out;
Line 3058 
Line 3213 
     const CIMName& eMethodName,     const CIMName& eMethodName,
     const String& messageId,     const String& messageId,
     HttpMethod httpMethod,     HttpMethod httpMethod,
     const ContentLanguages& httpContentLanguages,      const ContentLanguageList& httpContentLanguages,
     const Buffer& body)     const Buffer& body)
 { {
     Buffer out;     Buffer out;
Line 3239 
Line 3394 
             case XmlEntry::CDATA:             case XmlEntry::CDATA:
             {             {
                 _xmlWritter_indent(os, stack.size(), indentChars);                 _xmlWritter_indent(os, stack.size(), indentChars);
                 os << "<![CDATA[...]]>";                  os << "<![CDATA[" << entry.text << "]]>";
                 break;                 break;
             }             }
  
Line 3304 
Line 3459 
 } }
  
 PEGASUS_NAMESPACE_END PEGASUS_NAMESPACE_END
   
   

Legend:
Removed from v.1.124.2.2  
changed lines
  Added in v.1.137
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2