pegasus/src/Pegasus/Common/XmlWriter.cpp - diff

Return to XmlWriter.cpp CVS log

Up to [Pegasus] / pegasus / src / Pegasus / Common

Diff for /pegasus/src/Pegasus/Common/XmlWriter.cpp between version 1.88 and 1.91

version 1.88, 2003/04/30 18:26:55

version 1.91, 2003/08/06 14:53:21

Line 108

return out;

}

// l10n

Array<Sint8>& operator<<(Array<Sint8>& out, const AcceptLanguages& al)

{

XmlWriter::append(out, al.toString ());

return out;

}

// l10n

Array<Sint8>& operator<<(Array<Sint8>& out, const ContentLanguages& cl)

{

XmlWriter::append(out, cl.toString ());

return out;

}

PEGASUS_STD(ostream)& operator<<(PEGASUS_STD(ostream)& os, const CIMDateTime& x)

{

return os << x.toString();

Line 380

Line 396

out << "<LOCALNAMESPACEPATH>\n";

char* nameSpaceCopy = strdup(nameSpace.getString().getCString());

#ifdef PEGASUS_PLATFORM_SOLARIS_SPARC_CC

char *last;

for (const char* p = strtok_r(nameSpaceCopy, "/", &last); p;

p = strtok_r(NULL, "/", &last))

#else

for (const char* p = strtok(nameSpaceCopy, "/"); p; p = strtok(NULL, "/"))

#endif

{

out << "<NAMESPACE NAME=\"" << p << "\"/>\n";

}

Line 1460

Line 1482

}

// l10n - added content language and accept language support to

// the header methods below

//------------------------------------------------------------------------------

// appendMethodCallHeader()

Line 1475

Line 1500

const String& cimObject,

const String& authenticationHeader,

HttpMethod httpMethod,

const AcceptLanguages & acceptLanguages,

const ContentLanguages & contentLanguages,

Uint32 contentLength)

{

char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };

Line 1485

Line 1512

// do that in client today. Permanent change is to retry until spec

// updated. This change is temp to finish tests or until the retry

// installed. Required because of change to wbemservices cimom

#ifdef PEGASUS_SNIA_INTEROP_TEST

#if defined PEGASUS_SNIA_INTEROP_TEST || defined PEGASUS_FORCE_POST_METHOD

out << "POST /cimom HTTP/1.1\r\n";

#else

if (httpMethod == HTTP_METHOD_M_POST)

Line 1500

Line 1527

out << "HOST: " << host << "\r\n";

out << "Content-Type: application/xml; charset=\"utf-8\"\r\n";

out << "Content-Length: " << contentLength << "\r\n";

if (acceptLanguages.size() > 0)

{

out << "Accept-Language: " << acceptLanguages << "\r\n";

}

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

}

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Man: http://www.dmtf.org/cim/mapping/http/v1.0; ns=";

Line 1524

Line 1559

out << "\r\n";

}

//------------------------------------------------------------------------------

// appendMethodResponseHeader()

Line 1535

Line 1571

void XmlWriter::appendMethodResponseHeader(

Array<Sint8>& out,

HttpMethod httpMethod,

const ContentLanguages & contentLanguages,

Uint32 contentLength)

{

char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };

Line 1543

Line 1580

STAT_SERVERTIME

out << "Content-Type: application/xml; charset=\"utf-8\"\r\n";

out << "Content-Length: " << contentLength << "\r\n";

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

}

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Ext:\r\n";

Line 1630

Line 1671

// out << "</BODY></HTML>\r\n";

}

#ifdef PEGASUS_KERBEROS_AUTHENTICATION

//------------------------------------------------------------------------------

// appendOKResponseHeader()

// Build HTTP authentication response header for unauthorized requests.

// Returns OK message in the following format:

// HTTP/1.1 200 OK

// WWW-Authenticate: Negotiate "token"

// <HTML><HEAD>

// <TITLE>200 OK</TITLE>

// </HEAD><BODY BGCOLOR="#99cc99">

// <H2>TEST200 OK</H2>

// <HR>

// </BODY></HTML>

//------------------------------------------------------------------------------

void XmlWriter::appendOKResponseHeader(

Array<Sint8>& out,

const String& content)

{

out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n";

out << content << "\r\n";

out << "\r\n";

//ATTN: We may need to include the following line, so that the browsers

// can display the error message.

// out << "<HTML><HEAD>\r\n";

// out << "<TITLE>" << "200 OK" << "</TITLE>\r\n";

// out << "</HEAD><BODY BGCOLOR=\"#99cc99\">\r\n";

// out << "<H2>TEST" << "200 OK" << "</H2>\r\n";

// out << "<HR>\r\n";

// out << "</BODY></HTML>\r\n";

}

#endif

//------------------------------------------------------------------------------

// _appendMessageElementBegin()

Line 2160

Line 2240

return out;

}

// l10n - add content language support to the format methods below

//------------------------------------------------------------------------------

// XmlWriter::formatSimpleMethodReqMessage()

Line 2175

Line 2257

const Array<CIMParamValue>& parameters,

const String& messageId,

HttpMethod httpMethod,

const String& authenticationHeader)

const String& authenticationHeader,

const AcceptLanguages& httpAcceptLanguages,

const ContentLanguages& httpContentLanguages)

{

Array<Sint8> out;

Array<Sint8> tmp;

Line 2202

Line 2286

localObjectPath.toString(),

authenticationHeader,

httpMethod,

httpAcceptLanguages,

httpContentLanguages,

out.size());

tmp << out;

Line 2212

Line 2298

const CIMName& methodName,

const String& messageId,

HttpMethod httpMethod,

const ContentLanguages & httpContentLanguages,

const Array<Sint8>& body)

{

Array<Sint8> out;

Line 2225

Line 2312

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

appendMethodResponseHeader(tmp, httpMethod, out.size());

appendMethodResponseHeader(tmp,

httpMethod,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

Line 2254

Line 2344

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

appendMethodResponseHeader(tmp, httpMethod, out.size());

// l10n

appendMethodResponseHeader(tmp,

httpMethod,

cimException.getContentLanguages(),

out.size());

tmp << out;

return tmp;

Line 2273

Line 2367

const String& messageId,

HttpMethod httpMethod,

const String& authenticationHeader,

const AcceptLanguages& httpAcceptLanguages,

const ContentLanguages& httpContentLanguages,

const Array<Sint8>& body)

{

Array<Sint8> out;

Line 2294

Line 2390

nameSpace.getString(),

authenticationHeader,

httpMethod,

httpAcceptLanguages,

httpContentLanguages,

out.size());

tmp << out;

Line 2310

Line 2408

const CIMName& iMethodName,

const String& messageId,

HttpMethod httpMethod,

const ContentLanguages & httpContentLanguages,

const Array<Sint8>& body)

{

Array<Sint8> out;

Line 2328

Line 2427

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

appendMethodResponseHeader(tmp, httpMethod, out.size());

appendMethodResponseHeader(tmp,

httpMethod,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

Line 2357

Line 2459

_appendSimpleRspElementEnd(out);

_appendMessageElementEnd(out);

appendMethodResponseHeader(tmp, httpMethod, out.size());

// l10n

appendMethodResponseHeader(tmp,

httpMethod,

cimException.getContentLanguages(),

out.size());

tmp << out;

return tmp;

Line 2384

Line 2490

const CIMName& cimMethod,

HttpMethod httpMethod,

const String& authenticationHeader,

const AcceptLanguages& acceptLanguages,

const ContentLanguages& contentLanguages,

Uint32 contentLength)

{

char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };

Line 2399

Line 2507

out << "HOST: " << host << "\r\n";

out << "Content-Type: application/xml; charset=\"utf-8\"\r\n";

out << "Content-Length: " << contentLength << "\r\n";

if (acceptLanguages.size() > 0)

{

out << "Accept-Language: " << acceptLanguages << "\r\n";

}

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

}

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Man: http://www.hp.com; ns=";

Line 2430

Line 2546

void XmlWriter::appendEMethodResponseHeader(

Array<Sint8>& out,

HttpMethod httpMethod,

const ContentLanguages& contentLanguages,

Uint32 contentLength)

{

char nn[] = { '0' + (rand() % 10), '0' + (rand() % 10), '\0' };

Line 2437

Line 2554

out << "HTTP/1.1 " HTTP_STATUS_OK "\r\n";

out << "Content-Type: application/xml; charset=\"utf-8\"\r\n";

out << "Content-Length: " << contentLength << "\r\n";

if (contentLanguages.size() > 0)

{

out << "Content-Language: " << contentLanguages << "\r\n";

}

if (httpMethod == HTTP_METHOD_M_POST)

{

out << "Ext:\r\n";

Line 2592

Line 2713

const String& messageId,

HttpMethod httpMethod,

const String& authenticationHeader,

const AcceptLanguages& httpAcceptLanguages,

const ContentLanguages& httpContentLanguages,

const Array<Sint8>& body)

{

Array<Sint8> out;

Line 2612

Line 2735

eMethodName,

httpMethod,

authenticationHeader,

httpAcceptLanguages,

httpContentLanguages,

out.size());

tmp << out;

Line 2628

Line 2753

const CIMName& eMethodName,

const String& messageId,

HttpMethod httpMethod,

const ContentLanguages& httpContentLanguages,

const Array<Sint8>& body)

{

Array<Sint8> out;

Line 2641

Line 2767

_appendSimpleExportRspElementEnd(out);

_appendMessageElementEnd(out);

appendEMethodResponseHeader(tmp, httpMethod, out.size());

appendEMethodResponseHeader(tmp,

httpMethod,

httpContentLanguages,

out.size());

tmp << out;

return tmp;

Line 2670

Line 2799

_appendSimpleExportRspElementEnd(out);

_appendMessageElementEnd(out);

appendEMethodResponseHeader(tmp, httpMethod, out.size());

// l10n

appendEMethodResponseHeader(tmp,

httpMethod,

cimException.getContentLanguages(),

out.size());

tmp << out;

return tmp;

Legend:

Removed from v.1.88
changed lines
	Added in v.1.91

No CVS admin address has been configured