axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ros...@apache.org
Subject cvs commit: ws-axis/c/src/xml StartElement.h StartElement.cpp SimpleAttribute.h SimpleAttribute.cpp QName.h QName.cpp Event.h Event.cpp Element.h Element.cpp
Date Thu, 08 Apr 2004 10:38:52 GMT
roshan      2004/04/08 03:38:52

  Modified:    c/src/xml StartElement.h StartElement.cpp SimpleAttribute.h
                        SimpleAttribute.cpp QName.h QName.cpp Event.h
                        Event.cpp Element.h Element.cpp
  Log:
  Applied Coding Conventions
  
  Revision  Changes    Path
  1.4       +25 -67    ws-axis/c/src/xml/StartElement.h
  
  Index: StartElement.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/StartElement.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StartElement.h	26 Mar 2004 13:07:58 -0000	1.3
  +++ StartElement.h	8 Apr 2004 10:38:52 -0000	1.4
  @@ -1,70 +1,27 @@
  -/* -*- C++ -*- */
  -
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "SOAP" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  + *   Copyright 2003-2004 The Apache Software Foundation.
    *
  + *   Licensed under the Apache License, Version 2.0 (the "License");
  + *   you may not use this file except in compliance with the License.
  + *   You may obtain a copy of the License at
  + *
  + *       http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *   Unless required by applicable law or agreed to in writing, software
  + *   distributed under the License is distributed on an "AS IS" BASIS,
  + *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *   See the License for the specific language governing permissions and
  + *   limitations under the License.
    */
   
  -/**
  -    @class 
  -    @brief 
  -    @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  -*/
  +/*
  + *   @class 
  + *   @brief 
  + *   @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  + */
   
  -#if !defined(AFX_STARTELEMENT_H__932C3C70_0E61_48FD_A83D_37399F6DB023__INCLUDED_)
  -#define AFX_STARTELEMENT_H__932C3C70_0E61_48FD_A83D_37399F6DB023__INCLUDED_
  +#if !defined(AXIS_STARTELEMENT_H__INCLUDED_)
  +#define AXIS_STARTELEMENT_H__INCLUDED_
   
   #include <list>
   using namespace std;
  @@ -75,12 +32,13 @@
   class StartElement : public Element  
   {
   public:
  -	StartElement();
  -	virtual ~StartElement();
  -	list<SimpleAttribute*> m_Attributes;
  +    StartElement();
  +    virtual ~StartElement();
  +    list<SimpleAttribute*> m_Attributes;
   public:
  -	virtual XML_NODE_TYPE GetType() { return START_ELEMENT;};
  +    virtual XML_NODE_TYPE GetType() { return START_ELEMENT;};
   };
   
   
  -#endif // !defined(AFX_STARTELEMENT_H__932C3C70_0E61_48FD_A83D_37399F6DB023__INCLUDED_)
  +#endif 
  +
  
  
  
  1.6       +6 -13     ws-axis/c/src/xml/StartElement.cpp
  
  Index: StartElement.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/StartElement.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StartElement.cpp	26 Mar 2004 13:07:58 -0000	1.5
  +++ StartElement.cpp	8 Apr 2004 10:38:52 -0000	1.6
  @@ -1,4 +1,3 @@
  -/* -*- C++ -*- */
   /*
    *   Copyright 2003-2004 The Apache Software Foundation.
    *
  @@ -16,17 +15,9 @@
    */
   
   
  -//////////////////////////////////////////////////////////////////////
  -// StartElement.cpp: implementation of the StartElement class.
  -//
  -//////////////////////////////////////////////////////////////////////
   
   #include "StartElement.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
  -
   
   StartElement::StartElement()
   {
  @@ -35,10 +26,12 @@
   
   StartElement::~StartElement()
   {
  -	for (list<SimpleAttribute*>::iterator it = m_Attributes.begin(); it != m_Attributes.end();
it++)
  -	{
  -		delete *it;
  -	}
  +    for (list<SimpleAttribute*>::iterator it = m_Attributes.begin(); it != 
  +        m_Attributes.end(); it++)
  +    {
  +        delete *it;
  +    }
   }
  +
   
   
  
  
  
  1.3       +26 -68    ws-axis/c/src/xml/SimpleAttribute.h
  
  Index: SimpleAttribute.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/SimpleAttribute.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleAttribute.h	26 Mar 2004 13:07:58 -0000	1.2
  +++ SimpleAttribute.h	8 Apr 2004 10:38:52 -0000	1.3
  @@ -1,81 +1,39 @@
  -/* -*- C++ -*- */
  -
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "SOAP" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  + *   Copyright 2003-2004 The Apache Software Foundation.
    *
  + *   Licensed under the Apache License, Version 2.0 (the "License");
  + *   you may not use this file except in compliance with the License.
  + *   You may obtain a copy of the License at
  + *
  + *       http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *   Unless required by applicable law or agreed to in writing, software
  + *   distributed under the License is distributed on an "AS IS" BASIS,
  + *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *   See the License for the specific language governing permissions and
  + *   limitations under the License.
    */
   
  -/**
  -    @class Attribute
  -    @brief Class used to store any XML attribute
  -    @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  -*/
  +/*
  + *   @class Attribute
  + *   @brief Class used to store any XML attribute
  + *   @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  + */
   
  -#if !defined(AFX_ATTRIBUTE_H__93C9B708_3BA1_4933_BE5F_BEABABD92E0C__INCLUDED_)
  -#define AFX_ATTRIBUTE_H__93C9B708_3BA1_4933_BE5F_BEABABD92E0C__INCLUDED_
  +#if !defined(AXIS_ATTRIBUTE_H__INCLUDED_)
  +#define AXIS_ATTRIBUTE_H__INCLUDED_
   #include <string>
   using namespace std;
   
   class SimpleAttribute  
   {
   public:
  -	SimpleAttribute();
  -	virtual ~SimpleAttribute();
  -	string m_Namespace;
  -	string m_Name;
  -	string m_Value;
  +    SimpleAttribute();
  +    virtual ~SimpleAttribute();
  +    string m_Namespace;
  +    string m_Name;
  +    string m_Value;
   };
   
  -#endif // !defined(AFX_ATTRIBUTE_H__93C9B708_3BA1_4933_BE5F_BEABABD92E0C__INCLUDED_)
  +#endif 
  +
  
  
  
  1.3       +2 -8      ws-axis/c/src/xml/SimpleAttribute.cpp
  
  Index: SimpleAttribute.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/SimpleAttribute.cpp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SimpleAttribute.cpp	26 Mar 2004 13:07:58 -0000	1.2
  +++ SimpleAttribute.cpp	8 Apr 2004 10:38:52 -0000	1.3
  @@ -1,4 +1,3 @@
  -/* -*- C++ -*- */
   /*
    *   Copyright 2003-2004 The Apache Software Foundation.
    *
  @@ -15,16 +14,9 @@
    *   limitations under the License.
    */
   
  -//////////////////////////////////////////////////////////////////////
  -// SimpleAttribute.cpp: implementation of the SimpleAttribute class.
  -//
  -//////////////////////////////////////////////////////////////////////
   
   #include "SimpleAttribute.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
   
   SimpleAttribute::SimpleAttribute()
   {
  @@ -35,6 +27,8 @@
   {
   
   }
  +
  +
   
   
   
  
  
  
  1.7       +44 -85    ws-axis/c/src/xml/QName.h
  
  Index: QName.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/QName.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- QName.h	29 Mar 2004 11:29:56 -0000	1.6
  +++ QName.h	8 Apr 2004 10:38:52 -0000	1.7
  @@ -1,108 +1,67 @@
  -/* -*- C++ -*- */
  -
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "SOAP" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  + *   Copyright 2003-2004 The Apache Software Foundation.
    *
  + *   Licensed under the Apache License, Version 2.0 (the "License");
  + *   you may not use this file except in compliance with the License.
  + *   You may obtain a copy of the License at
  + *
  + *       http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *   Unless required by applicable law or agreed to in writing, software
  + *   distributed under the License is distributed on an "AS IS" BASIS,
  + *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *   See the License for the specific language governing permissions and
  + *   limitations under the License.
    *
    *
    * @author Roshan Weerasuriya (roshan@jkcs.slt.lk)
    *
    */
   
  -// QName.h: interface for the QName class.
  -//
  -//////////////////////////////////////////////////////////////////////
   
  -#if !defined(AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_)
  -#define AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_
  +#if !defined(AXIS_QNAME_H__INCLUDED_)
  +#define AXIS_QNAME_H__INCLUDED_
   
   #include <axis/server/GDefine.h>
   
  -/**
  - *	Qualified name according to "Namespaces in XML" specification.
  - *	
  - *	QName	  ::=  (Prefix ':')? LocalPart										<br>
  - *	Prefix	  ::=  NCName														<br>
  - *	LocalPart ::=  NCName														<br>
  - *	NCName	  ::=  (Letter | '_') (NCNameChar)*  ;  An XML Name, minus the ":"	<br>
  - *	NCNameChar ::=  Letter | Digit | '.' | '-' | '_' etc.						<br>
  - *
  - *	The Prefix provides the namespace prefix part of the qualified name, and must 
  - *	be associated with a namespace URI reference in a namespace declaration. 
  - *	The LocalPart provides the local part of the qualified name. 
  - *	Note that the prefix functions only as a placeholder for a namespace name. 
  - *	Applications should use the namespace name, not the prefix, in constructing 
  - *	names whose scope extends beyond the containing document.
  +/*
  + *    Qualified name according to "Namespaces in XML" specification.
  + *    
  + *    QName      ::=  (Prefix ':')? LocalPart          <br>
  + *    Prefix      ::=  NCName                          <br>
  + *    LocalPart ::=  NCName                            <br>
  + *    NCName      ::=  (Letter | '_') (NCNameChar)*  ;  
  + *    An XML Name, minus the ":"                       <br>
  + *    NCNameChar ::=  Letter | Digit | '.' | '-' | '_' etc.   <br>
  + *    The Prefix provides the namespace prefix part of the qualified name,
  + *    and must 
  + *    be associated with a namespace URI reference in a namespace declaration. 
  + *    The LocalPart provides the local part of the qualified name. 
  + *    Note that the prefix functions only as a placeholder 
  + *    for a namespace name. 
  + *    Applications should use the namespace name, not the prefix, 
  + *    in constructing 
  + *    names whose scope extends beyond the containing document.
    *
  - *	
  - *	@brief	Qualified name according to "Namespaces in XML" specification
  + *    
  + *    @brief    Qualified name according to "Namespaces in XML" specification
    */
   
  -#define NAMESPACESEPARATOR 0x03 /*Heart*/
  +#define NAMESPACESEPARATOR 0x03 /* Heart */
   
   class QName  
   {
   public:
  -	const XML_Ch* uri;
  -	const XML_Ch* localname;
  +    const XML_Ch* uri;
  +    const XML_Ch* localname;
   
   public:
  -	QName();
  -	virtual ~QName();
  -	void SplitQNameString(const XML_Ch* qname, XML_Ch sep);
  -	void MergeQNameString(XML_Ch sep);
  +    QName();
  +    virtual ~QName();
  +    void SplitQNameString(const XML_Ch* qname, XML_Ch sep);
  +    void MergeQNameString(XML_Ch sep);
   };
   
  -#endif // !defined(AFX_QNAME_H__7E4E7E7B_F051_4989_89A6_F0248109C410__INCLUDED_)
  +#endif 
  +
  +
  
  
  
  1.7       +24 -29    ws-axis/c/src/xml/QName.cpp
  
  Index: QName.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/QName.cpp,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- QName.cpp	29 Mar 2004 11:29:56 -0000	1.6
  +++ QName.cpp	8 Apr 2004 10:38:52 -0000	1.7
  @@ -1,4 +1,3 @@
  -/* -*- C++ -*- */
   /*
    *   Copyright 2003-2004 The Apache Software Foundation.
    *
  @@ -14,24 +13,20 @@
    *   See the License for the specific language governing permissions and
    *   limitations under the License.
    *
  + *
    * @author Roshan Weerasuriya (roshan@jkcs.slt.lk)
    *
    */
   
  -// QName.cpp: implementation of the QName class.
  -//
  -//////////////////////////////////////////////////////////////////////
  +
   
   #include "QName.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
   
   QName::QName()
   {
  -	uri = 0;
  -	localname = 0;
  +    uri = 0;
  +    localname = 0;
   }
   
   QName::~QName()
  @@ -41,28 +36,28 @@
   
   void QName::SplitQNameString(const XML_Ch* qname, XML_Ch sep)
   {
  -	XML_Ch *p = const_cast<XML_Ch*>(qname);
  -	while (*p)
  -	{
  -		if (*p == sep)
  -		{
  -			*p = '\0'; //put null to separate local name from namespace
  -			localname = ++p; //now p points to localpart
  -			uri = qname; //qname points to uri
  -			return; 
  -		}
  -		p++;
  -	}
  -	//if there is no separator that means there is no uri
  -	localname = qname;
  -	uri = 0; //no uri
  +    XML_Ch *p = const_cast<XML_Ch*>(qname);
  +    while (*p)
  +    {
  +        if (*p == sep)
  +        {
  +            *p = '\0'; /* put null to separate local name from namespace */
  +            localname = ++p; /* now p points to localpart */
  +            uri = qname; /* qname points to uri */
  +            return; 
  +        }
  +        p++;
  +    }
  +    /* if there is no separator that means there is no uri */
  +    localname = qname;
  +    uri = 0; /* no uri */
   }
   
   void QName::MergeQNameString(XML_Ch sep)
   {
  -	if (uri)
  -	{
  -		XML_Ch* p = const_cast<XML_Ch*>(localname);
  -		*(--p) = sep;
  -	}
  +    if (uri)
  +    {
  +        XML_Ch* p = const_cast<XML_Ch*>(localname);
  +        *(--p) = sep;
  +    }
   }
  
  
  
  1.4       +26 -67    ws-axis/c/src/xml/Event.h
  
  Index: Event.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Event.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- Event.h	26 Mar 2004 13:07:58 -0000	1.3
  +++ Event.h	8 Apr 2004 10:38:52 -0000	1.4
  @@ -1,70 +1,27 @@
  -/* -*- C++ -*- */
  -
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "SOAP" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  + *   Copyright 2003-2004 The Apache Software Foundation.
    *
  + *   Licensed under the Apache License, Version 2.0 (the "License");
  + *   you may not use this file except in compliance with the License.
  + *   You may obtain a copy of the License at
  + *
  + *       http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *   Unless required by applicable law or agreed to in writing, software
  + *   distributed under the License is distributed on an "AS IS" BASIS,
  + *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *   See the License for the specific language governing permissions and
  + *   limitations under the License.
    */
   
  -/**
  -    @class 
  -    @brief 
  -    @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  -*/
  +/*
  + *   @class 
  + *   @brief 
  + *   @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  + */
   
  -#if !defined(AFX_Event_H__165AA74B_3F51_4B2E_8081_86CD8DCD86FA__INCLUDED_)
  -#define AFX_Event_H__165AA74B_3F51_4B2E_8081_86CD8DCD86FA__INCLUDED_
  +#if !defined(AXIS_Event_H__INCLUDED_)
  +#define AXIS_Event_H__INCLUDED_
   
   #include <axis/server/AnyElement.h>
   
  @@ -74,13 +31,15 @@
   class Event  
   {
   public:
  -	Event();
  -	virtual ~Event();
  -	string m_NameOrValue; /* character data or element name */
  +    Event();
  +    virtual ~Event();
  +    string m_NameOrValue; /* character data or element name */
   public:
  -	virtual XML_NODE_TYPE GetType(){ return CHARACTER_ELEMENT;};
  +    virtual XML_NODE_TYPE GetType(){ return CHARACTER_ELEMENT;};
   };
   
   typedef Event CharElement;
   
  -#endif // !defined(AFX_Event_H__165AA74B_3F51_4B2E_8081_86CD8DCD86FA__INCLUDED_)
  +#endif 
  +
  +
  
  
  
  1.6       +2 -9      ws-axis/c/src/xml/Event.cpp
  
  Index: Event.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Event.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Event.cpp	26 Mar 2004 13:07:58 -0000	1.5
  +++ Event.cpp	8 Apr 2004 10:38:52 -0000	1.6
  @@ -1,4 +1,3 @@
  -/* -*- C++ -*- */
   /*
    *   Copyright 2003-2004 The Apache Software Foundation.
    *
  @@ -15,25 +14,19 @@
    *   limitations under the License.
    */
   
  -//////////////////////////////////////////////////////////////////////
  -// Event.cpp: implementation of the Event class.
  -//
  -//////////////////////////////////////////////////////////////////////
   
   #include "Event.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
   
   Event::Event()
   {
  -
  +    
   }
   
   Event::~Event()
   {
   
   }
  +
   
   
  
  
  
  1.3       +27 -69    ws-axis/c/src/xml/Element.h
  
  Index: Element.h
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Element.h,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Element.h	26 Mar 2004 13:07:58 -0000	1.2
  +++ Element.h	8 Apr 2004 10:38:52 -0000	1.3
  @@ -1,94 +1,52 @@
  -/* -*- C++ -*- */
  -
   /*
  - * The Apache Software License, Version 1.1
  - *
  - *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  - * reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions
  - * are met:
  - *
  - * 1. Redistributions of source code must retain the above copyright
  - *    notice, this list of conditions and the following disclaimer.
  - *
  - * 2. Redistributions in binary form must reproduce the above copyright
  - *    notice, this list of conditions and the following disclaimer in
  - *    the documentation and/or other materials provided with the
  - *    distribution.
  - *
  - * 3. The end-user documentation included with the redistribution,
  - *    if any, must include the following acknowledgment:
  - *       "This product includes software developed by the
  - *        Apache Software Foundation (http://www.apache.org/)."
  - *    Alternately, this acknowledgment may appear in the software itself,
  - *    if and wherever such third-party acknowledgments normally appear.
  - *
  - * 4. The names "SOAP" and "Apache Software Foundation" must
  - *    not be used to endorse or promote products derived from this
  - *    software without prior written permission. For written
  - *    permission, please contact apache@apache.org.
  - *
  - * 5. Products derived from this software may not be called "Apache",
  - *    nor may "Apache" appear in their name, without prior written
  - *    permission of the Apache Software Foundation.
  - *
  - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  - * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
  - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  - * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  - * SUCH DAMAGE.
  - * ====================================================================
  - *
  - * This software consists of voluntary contributions made by many
  - * individuals on behalf of the Apache Software Foundation.  For more
  - * information on the Apache Software Foundation, please see
  - * <http://www.apache.org/>.
  - *
  + *   Copyright 2003-2004 The Apache Software Foundation.
    *
  + *   Licensed under the Apache License, Version 2.0 (the "License");
  + *   you may not use this file except in compliance with the License.
  + *   You may obtain a copy of the License at
  + *
  + *       http://www.apache.org/licenses/LICENSE-2.0
  + *
  + *   Unless required by applicable law or agreed to in writing, software
  + *   distributed under the License is distributed on an "AS IS" BASIS,
  + *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  + *   See the License for the specific language governing permissions and
  + *   limitations under the License.
    */
   
  -/**
  -    @class Element
  -    @brief 
  -    @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  -*/
  +/*
  + *   @class Element
  + *   @brief 
  + *   @author Susantha Kumara (susantha@opensource.lk, skumara@virtusa.com)
  + */
   
  -#if !defined(AFX_ELEMENT_H__93E0989D_3148_4E7B_AA81_9D1DF43975B0__INCLUDED_)
  -#define AFX_ELEMENT_H__93E0989D_3148_4E7B_AA81_9D1DF43975B0__INCLUDED_
  +#if !defined(AXIS_ELEMENT_H__INCLUDED_)
  +#define AXIS_ELEMENT_H__INCLUDED_
   
   #include "Event.h"
   
   class Element : public Event  
   {
   public:
  -	Element();
  -	virtual ~Element();
  -	string m_Namespace;
  +    Element();
  +    virtual ~Element();
  +    string m_Namespace;
   public:
  -	virtual XML_NODE_TYPE GetType() { return END_ELEMENT;};
  +    virtual XML_NODE_TYPE GetType() { return END_ELEMENT;};
   };
   
   class StartPrefix : public Element
   {
  -	virtual XML_NODE_TYPE GetType() { return START_PREFIX;};		
  +    virtual XML_NODE_TYPE GetType() { return START_PREFIX;};        
   };
   
   class EndPrefix : public Element
   {
  -	virtual XML_NODE_TYPE GetType() { return END_PREFIX;};		
  +    virtual XML_NODE_TYPE GetType() { return END_PREFIX;};        
   };
   
   typedef Element EndElement;
   
   
  -#endif // !defined(AFX_ELEMENT_H__93E0989D_3148_4E7B_AA81_9D1DF43975B0__INCLUDED_)
  +#endif 
  +
  
  
  
  1.6       +3 -8      ws-axis/c/src/xml/Element.cpp
  
  Index: Element.cpp
  ===================================================================
  RCS file: /home/cvs/ws-axis/c/src/xml/Element.cpp,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- Element.cpp	26 Mar 2004 13:07:58 -0000	1.5
  +++ Element.cpp	8 Apr 2004 10:38:52 -0000	1.6
  @@ -1,4 +1,3 @@
  -/* -*- C++ -*- */
   /*
    *   Copyright 2003-2004 The Apache Software Foundation.
    *
  @@ -15,16 +14,11 @@
    *   limitations under the License.
    */
   
  -//////////////////////////////////////////////////////////////////////
  -// Element.cpp: implementation of the Element class.
  -//
  -//////////////////////////////////////////////////////////////////////
  +
  +
   
   #include "Element.h"
   
  -//////////////////////////////////////////////////////////////////////
  -// Construction/Destruction
  -//////////////////////////////////////////////////////////////////////
   
   Element::Element()
   {
  @@ -35,5 +29,6 @@
   {
   
   }
  +
   
   
  
  
  

Mime
View raw message