You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/08/10 10:53:17 UTC
svn commit: r564515 [2/3] - in /incubator/tuscany/cpp:
sca/runtime/core/src/tuscany/sca/model/ sca/runtime/core/xsd/
sdo/runtime/core/src/commonj/sdo/ sdo/runtime/core/test/
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp Fri Aug 10 01:53:10 2007
@@ -752,7 +752,7 @@
if (d == 0) {
// There is no list yet, so we need to create an
// empty data object to hold the list
- d = new DataObjectImpl(factory, factory->getType(Type::SDOTypeNamespaceURI,"DataObject"));
+ d = new DataObjectImpl(factory, factory->getType(Type::SDOTypeNamespaceURI,"OpenDataObject"));
PropertyValues.push_back(rdo(propIndex, d));
d->setContainer(this);
@@ -2288,7 +2288,7 @@
if ( theDO == 0) { /* No value set yet */
unsigned int ind = getPropertyIndex(property);
RefCountingPointer<DataObject> listptr =
- factory->create(Type::SDOTypeNamespaceURI,"DataObject");
+ factory->create(Type::SDOTypeNamespaceURI,"OpenDataObject");
DataObject* doptr = getRawPointer(listptr);
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.cpp Fri Aug 10 01:53:10 2007
@@ -26,298 +26,300 @@
{
namespace sdo
{
-
- PropertyDefinition::PropertyDefinition()
+ namespace internal
{
- propertydefinition = new PropertyDefinitionImpl();
- }
+
+ PropertyDefinition::PropertyDefinition()
+ {
+ propertydefinition = new PropertyDefinitionImpl();
+ }
- PropertyDefinition::~PropertyDefinition()
- {
- if (propertydefinition) delete propertydefinition;
- }
+ PropertyDefinition::~PropertyDefinition()
+ {
+ if (propertydefinition) delete propertydefinition;
+ }
- void PropertyDefinition::copy (const PropertyDefinition& pd)
- {
- if (propertydefinition != 0) delete propertydefinition;
- propertydefinition = new PropertyDefinitionImpl(*(pd.propertydefinition));
- }
+ void PropertyDefinition::copy (const PropertyDefinition& pd)
+ {
+ if (propertydefinition != 0) delete propertydefinition;
+ propertydefinition = new PropertyDefinitionImpl(*(pd.propertydefinition));
+ }
- PropertyDefinition::PropertyDefinition(const PropertyDefinition& pd)
- {
- copy(pd);
- }
-
- PropertyDefinition& PropertyDefinition::operator=(const PropertyDefinition& pd)
- {
- if (this != &pd)
+ PropertyDefinition::PropertyDefinition(const PropertyDefinition& pd)
{
copy(pd);
}
- return *this;
- }
+
+ PropertyDefinition& PropertyDefinition::operator=(const PropertyDefinition& pd)
+ {
+ if (this != &pd)
+ {
+ copy(pd);
+ }
+ return *this;
+ }
- PropertyDefinitionImpl* PropertyDefinition::getPropertyDefinition()
- {
- return propertydefinition;
- }
+ PropertyDefinitionImpl* PropertyDefinition::getPropertyDefinition()
+ {
+ return propertydefinition;
+ }
- // where this property is to be substituted for another
- void PropertyDefinition::setSubstituteName(const char * name)
- {
- propertydefinition->substituteName = name;
- }
- void PropertyDefinition::setSubstituteName(const SDOString& name)
- {
- propertydefinition->substituteName = name.c_str();
- }
-
- const char* PropertyDefinition::getSubstituteName() const
- {
- return (const char *)propertydefinition->substituteName;
- }
-
-
- void PropertyDefinition::setSubstituteUri(const char* name)
- {
- propertydefinition->substituteUri = name;
- }
- void PropertyDefinition::setSubstituteUri(const SDOString& name)
- {
- propertydefinition->substituteUri = name.c_str();
- }
-
- const char* PropertyDefinition::getSubstituteUri() const
- {
- return (const char*)propertydefinition->substituteUri;
- }
-
- // where there are substitute names for this property.
- void PropertyDefinition::addSubstitute(const SDOString& name,
- const SDOString& localname)
- {
- propertydefinition->substituteNames.push_back(name.c_str());
- propertydefinition->substituteLocalNames.push_back(localname.c_str());
- }
-
- int PropertyDefinition::getSubstituteCount() const
- {
- return propertydefinition->substituteNames.size();
- }
-
- const char* PropertyDefinition::getSubstituteNames(unsigned int index) const
- {
- if (index >= 0 && index < propertydefinition->substituteNames.size())
- {
- return propertydefinition->substituteNames[index];;
- }
- return 0;
- }
-
- const char* PropertyDefinition::getSubstituteLocalNames(unsigned int index) const
- {
- if (index >= 0 && index < propertydefinition->substituteLocalNames.size())
+ // where this property is to be substituted for another
+ void PropertyDefinition::setSubstituteName(const char * name)
+ {
+ propertydefinition->substituteName = name;
+ }
+ void PropertyDefinition::setSubstituteName(const SDOString& name)
+ {
+ propertydefinition->substituteName = name.c_str();
+ }
+
+ const char* PropertyDefinition::getSubstituteName() const
+ {
+ return (const char *)propertydefinition->substituteName;
+ }
+
+ void PropertyDefinition::setSubstituteUri(const char* name)
+ {
+ propertydefinition->substituteUri = name;
+ }
+ void PropertyDefinition::setSubstituteUri(const SDOString& name)
+ {
+ propertydefinition->substituteUri = name.c_str();
+ }
+
+ const char* PropertyDefinition::getSubstituteUri() const
+ {
+ return (const char*)propertydefinition->substituteUri;
+ }
+
+ // where there are substitute names for this property.
+ void PropertyDefinition::addSubstitute(const SDOString& name,
+ const SDOString& localname)
+ {
+ propertydefinition->substituteNames.push_back(name.c_str());
+ propertydefinition->substituteLocalNames.push_back(localname.c_str());
+ }
+
+ int PropertyDefinition::getSubstituteCount() const
{
- return propertydefinition->substituteLocalNames[index];;
+ return propertydefinition->substituteNames.size();
+ }
+
+ const char* PropertyDefinition::getSubstituteNames(unsigned int index) const
+ {
+ if (index >= 0 && index < propertydefinition->substituteNames.size())
+ {
+ return propertydefinition->substituteNames[index];;
+ }
+ return 0;
+ }
+
+ const char* PropertyDefinition::getSubstituteLocalNames(unsigned int index) const
+ {
+ if (index >= 0 && index < propertydefinition->substituteLocalNames.size())
+ {
+ return propertydefinition->substituteLocalNames[index];;
+ }
+ return 0;
}
- return 0;
- }
- void PropertyDefinition::setAliases(const char* aliases)
- {
- propertydefinition->aliases = aliases;
- }
- void PropertyDefinition::setAliases(const SDOString& aliases)
- {
- propertydefinition->aliases = aliases.c_str();
- }
-
- const char* PropertyDefinition::getAliases() const
- {
- return (const char *)propertydefinition->aliases;
- }
-
- void PropertyDefinition::setName(const char* name)
- {
- propertydefinition->name = name;
- }
- void PropertyDefinition::setName(const SDOString& name)
- {
- propertydefinition->name = name.c_str();
- }
-
- const char* PropertyDefinition::getName() const
- {
- return (const char *)propertydefinition->name;
- }
+ void PropertyDefinition::setAliases(const char* aliases)
+ {
+ propertydefinition->aliases = aliases;
+ }
+ void PropertyDefinition::setAliases(const SDOString& aliases)
+ {
+ propertydefinition->aliases = aliases.c_str();
+ }
+
+ const char* PropertyDefinition::getAliases() const
+ {
+ return (const char *)propertydefinition->aliases;
+ }
+
+ void PropertyDefinition::setName(const char* name)
+ {
+ propertydefinition->name = name;
+ }
+ void PropertyDefinition::setName(const SDOString& name)
+ {
+ propertydefinition->name = name.c_str();
+ }
+
+ const char* PropertyDefinition::getName() const
+ {
+ return (const char *)propertydefinition->name;
+ }
- void PropertyDefinition::setLocalName(const char* name)
- {
- propertydefinition->localname = name;
- }
- void PropertyDefinition::setLocalName(const SDOString& name)
- {
- propertydefinition->localname = name.c_str();
- }
-
- const char* PropertyDefinition::getLocalName() const
- {
- return (const char*)propertydefinition->localname;
- }
+ void PropertyDefinition::setLocalName(const char* name)
+ {
+ propertydefinition->localname = name;
+ }
+ void PropertyDefinition::setLocalName(const SDOString& name)
+ {
+ propertydefinition->localname = name.c_str();
+ }
+
+ const char* PropertyDefinition::getLocalName() const
+ {
+ return (const char*)propertydefinition->localname;
+ }
- void PropertyDefinition::setType(const char* uri, const char* name)
- {
- propertydefinition->typeUri = uri;
- propertydefinition->typeName = name;
- propertydefinition->fullTypeName = uri;
- propertydefinition->fullTypeName += "#";
- propertydefinition->fullTypeName += name;
- }
- void PropertyDefinition::setType(const SDOString& uri, const SDOString& name)
- {
- propertydefinition->typeUri = uri.c_str();
- propertydefinition->typeName = name.c_str();
- propertydefinition->fullTypeName = uri.c_str();
- propertydefinition->fullTypeName += "#";
- propertydefinition->fullTypeName += name.c_str();
- }
-
- const char * PropertyDefinition::getTypeName() const
- {
- return propertydefinition->typeName;
- }
-
- const char * PropertyDefinition::getTypeUri() const
- {
- return propertydefinition->typeUri;
- }
-
- const char * PropertyDefinition::getTypeFullName() const
- {
- return propertydefinition->fullTypeName;
- }
-
- const char * PropertyDefinition::getTypeFullLocalName() const
- {
- return propertydefinition->fullLocalTypeName;
- }
-
- void PropertyDefinition::setTypeFullLocalName(const char* name)
- {
- propertydefinition->fullLocalTypeName = name;
- }
- void PropertyDefinition::setTypeFullLocalName(const SDOString& name)
- {
- propertydefinition->fullLocalTypeName = name.c_str();
- }
-
-
- void PropertyDefinition::setDefaultValue(const char* value)
- {
- propertydefinition->defaultValue = value;
- }
- void PropertyDefinition::setDefaultValue(const SDOString& value)
- {
- propertydefinition->defaultValue = value.c_str();
- }
-
- const char* PropertyDefinition::getDefaultValue() const
- {
- return propertydefinition->defaultValue;
- }
-
- bool PropertyDefinition::getIsMany() const
- {
- return propertydefinition->isMany;
- }
-
- bool PropertyDefinition::getIsContainment() const
- {
- return propertydefinition->isContainment;
- }
-
- bool PropertyDefinition::getIsReadOnly() const
- {
- return propertydefinition->isReadOnly;
- }
-
- bool PropertyDefinition::getIsID() const
- {
- return propertydefinition->isID;
- }
-
- bool PropertyDefinition::getIsIDREF() const
- {
- return propertydefinition->isIDREF;
- }
-
- bool PropertyDefinition::getIsReference() const
- {
- return propertydefinition->isReference;
- }
-
- bool PropertyDefinition::getIsElement() const
- {
- return propertydefinition->isElement;
- }
-
- bool PropertyDefinition::getIsQName() const
- {
- return propertydefinition->isQName;
- }
-
- bool PropertyDefinition::getIsSubstitute() const
- {
- return propertydefinition->isSubstitute;
- }
-
-
- void PropertyDefinition::setIsMany(bool value)
- {
- propertydefinition->isMany = value;
- }
-
- void PropertyDefinition::setIsContainment(bool value)
- {
- propertydefinition->isContainment = value;
- }
-
- void PropertyDefinition::setIsReadOnly(bool value)
- {
- propertydefinition->isReadOnly = value;
- }
-
- void PropertyDefinition::setIsID(bool value)
- {
- propertydefinition->isID = value;
- }
-
- void PropertyDefinition::setIsIDREF(bool value)
- {
- propertydefinition->isIDREF = value;
- }
-
- void PropertyDefinition::setIsReference(bool value)
- {
- propertydefinition->isReference = value;
- }
-
- void PropertyDefinition::setIsElement(bool value)
- {
- propertydefinition->isElement = value;
- }
-
- void PropertyDefinition::setIsQName(bool value)
- {
- propertydefinition->isQName = value;
- }
-
- void PropertyDefinition::setIsSubstitute(bool value)
- {
- propertydefinition->isSubstitute = value;
- }
+ void PropertyDefinition::setType(const char* uri, const char* name)
+ {
+ propertydefinition->typeUri = uri;
+ propertydefinition->typeName = name;
+ propertydefinition->fullTypeName = uri;
+ propertydefinition->fullTypeName += "#";
+ propertydefinition->fullTypeName += name;
+ }
+ void PropertyDefinition::setType(const SDOString& uri, const SDOString& name)
+ {
+ propertydefinition->typeUri = uri.c_str();
+ propertydefinition->typeName = name.c_str();
+ propertydefinition->fullTypeName = uri.c_str();
+ propertydefinition->fullTypeName += "#";
+ propertydefinition->fullTypeName += name.c_str();
+ }
+
+ const char * PropertyDefinition::getTypeName() const
+ {
+ return propertydefinition->typeName;
+ }
+
+ const char * PropertyDefinition::getTypeUri() const
+ {
+ return propertydefinition->typeUri;
+ }
+
+ const char * PropertyDefinition::getTypeFullName() const
+ {
+ return propertydefinition->fullTypeName;
+ }
+
+ const char * PropertyDefinition::getTypeFullLocalName() const
+ {
+ return propertydefinition->fullLocalTypeName;
+ }
+
+ void PropertyDefinition::setTypeFullLocalName(const char* name)
+ {
+ propertydefinition->fullLocalTypeName = name;
+ }
+ void PropertyDefinition::setTypeFullLocalName(const SDOString& name)
+ {
+ propertydefinition->fullLocalTypeName = name.c_str();
+ }
+
+
+ void PropertyDefinition::setDefaultValue(const char* value)
+ {
+ propertydefinition->defaultValue = value;
+ }
+ void PropertyDefinition::setDefaultValue(const SDOString& value)
+ {
+ propertydefinition->defaultValue = value.c_str();
+ }
+
+ const char* PropertyDefinition::getDefaultValue() const
+ {
+ return propertydefinition->defaultValue;
+ }
+
+ bool PropertyDefinition::getIsMany() const
+ {
+ return propertydefinition->isMany;
+ }
+
+ bool PropertyDefinition::getIsContainment() const
+ {
+ return propertydefinition->isContainment;
+ }
+
+ bool PropertyDefinition::getIsReadOnly() const
+ {
+ return propertydefinition->isReadOnly;
+ }
+
+ bool PropertyDefinition::getIsID() const
+ {
+ return propertydefinition->isID;
+ }
+
+ bool PropertyDefinition::getIsIDREF() const
+ {
+ return propertydefinition->isIDREF;
+ }
+
+ bool PropertyDefinition::getIsReference() const
+ {
+ return propertydefinition->isReference;
+ }
+
+ bool PropertyDefinition::getIsElement() const
+ {
+ return propertydefinition->isElement;
+ }
+
+ bool PropertyDefinition::getIsQName() const
+ {
+ return propertydefinition->isQName;
+ }
+
+ bool PropertyDefinition::getIsSubstitute() const
+ {
+ return propertydefinition->isSubstitute;
+ }
+
+
+ void PropertyDefinition::setIsMany(bool value)
+ {
+ propertydefinition->isMany = value;
+ }
+
+ void PropertyDefinition::setIsContainment(bool value)
+ {
+ propertydefinition->isContainment = value;
+ }
+
+ void PropertyDefinition::setIsReadOnly(bool value)
+ {
+ propertydefinition->isReadOnly = value;
+ }
+
+ void PropertyDefinition::setIsID(bool value)
+ {
+ propertydefinition->isID = value;
+ }
+
+ void PropertyDefinition::setIsIDREF(bool value)
+ {
+ propertydefinition->isIDREF = value;
+ }
+
+ void PropertyDefinition::setIsReference(bool value)
+ {
+ propertydefinition->isReference = value;
+ }
+
+ void PropertyDefinition::setIsElement(bool value)
+ {
+ propertydefinition->isElement = value;
+ }
+
+ void PropertyDefinition::setIsQName(bool value)
+ {
+ propertydefinition->isQName = value;
+ }
+
+ void PropertyDefinition::setIsSubstitute(bool value)
+ {
+ propertydefinition->isSubstitute = value;
+ }
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinition.h Fri Aug 10 01:53:10 2007
@@ -33,101 +33,105 @@
{
namespace sdo
{
-
- class PropertyDefinitionImpl;
+ namespace internal
+ {
+ class PropertyDefinitionImpl;
/**
+ * Internal Helper Class
* PropertyDefinitionImpl holds a property as defined by an XSD.
* The XSD holds more information than does the SDO Property.
* This class holds the extra information found as the XSD is
* parsed.
*/
- class SDO_API PropertyDefinition
- {
+ class SDO_API PropertyDefinition
+ {
- public:
+ public:
- /*SDO_API*/ PropertyDefinition();
- PropertyDefinition(const PropertyDefinition& pd);
- PropertyDefinition& operator=(const PropertyDefinition& pd);
+ PropertyDefinition();
+ PropertyDefinition(const PropertyDefinition& pd);
+ PropertyDefinition& operator=(const PropertyDefinition& pd);
+
+ virtual ~PropertyDefinition();
- /*SDO_API*/ virtual ~PropertyDefinition();
-
- PropertyDefinitionImpl* getPropertyDefinition();
+ PropertyDefinitionImpl* getPropertyDefinition();
- // where this property is to be substituted for another
- /*SDO_API*/ void setSubstituteName(const char * name);
- /*SDO_API*/ void setSubstituteName(const SDOString& name);
- /*SDO_API*/ const char* getSubstituteName() const;
-
- /*SDO_API*/ void setSubstituteUri(const char* name);
- /*SDO_API*/ void setSubstituteUri(const SDOString& name);
- /*SDO_API*/ const char* getSubstituteUri() const;
-
- // where there are substitute names for this property.
- /*SDO_API*/ void addSubstitute(const char* name,
- const char* localname);
- /*SDO_API*/ void addSubstitute(const SDOString& name,
- const SDOString& localname);
- /*SDO_API*/ int getSubstituteCount() const;
- /*SDO_API*/ const char* getSubstituteNames(unsigned int index) const;
- /*SDO_API*/ const char* getSubstituteLocalNames(unsigned int index) const;
+ // where this property is to be substituted for another
+ void setSubstituteName(const char * name);
+ void setSubstituteName(const SDOString& name);
+ const char* getSubstituteName() const;
+
+ void setSubstituteUri(const char* name);
+ void setSubstituteUri(const SDOString& name);
+ const char* getSubstituteUri() const;
+
+ // where there are substitute names for this property.
+ void addSubstitute(const char* name,
+ const char* localname);
+ void addSubstitute(const SDOString& name,
+ const SDOString& localname);
+ int getSubstituteCount() const;
+ const char* getSubstituteNames(unsigned int index) const;
+ const char* getSubstituteLocalNames(unsigned int index) const;
- /*SDO_API*/ void setAliases(const char* aliases);
- /*SDO_API*/ void setAliases(const SDOString& aliases);
- /*SDO_API*/ const char* getAliases() const;
-
- /*SDO_API*/ void setName(const char* name);
- /*SDO_API*/ void setName(const SDOString& name);
- /*SDO_API*/ const char* getName() const;
+ void setAliases(const char* aliases);
+ void setAliases(const SDOString& aliases);
+ const char* getAliases() const;
+
+ void setName(const char* name);
+ void setName(const SDOString& name);
+ const char* getName() const;
- /*SDO_API*/ void setLocalName(const char* name);
- /*SDO_API*/ void setLocalName(const SDOString& name);
- /*SDO_API*/ const char* getLocalName() const;
-
- /*SDO_API*/ void setType(const char* uri, const char* name);
- /*SDO_API*/ void setType(const SDOString& uri, const SDOString& name);
- /*SDO_API*/ const char * getTypeName() const;
- /*SDO_API*/ const char * getTypeUri() const;
- /*SDO_API*/ const char * getTypeFullName() const;
- /*SDO_API*/ const char * getTypeFullLocalName() const ;
+ void setLocalName(const char* name);
+ void setLocalName(const SDOString& name);
+ const char* getLocalName() const;
+
+ void setType(const char* uri, const char* name);
+ void setType(const SDOString& uri, const SDOString& name);
+ const char * getTypeName() const;
+ const char * getTypeUri() const;
+ const char * getTypeFullName() const;
+ const char * getTypeFullLocalName() const ;
- /*SDO_API*/ void setTypeFullLocalName(const char* name);
- /*SDO_API*/ void setTypeFullLocalName(const SDOString& name);
+ void setTypeFullLocalName(const char* name);
+ void setTypeFullLocalName(const SDOString& name);
+
+ void setDefaultValue(const char* value);
+ void setDefaultValue(const SDOString& value);
+ const char* getDefaultValue() const;
+
+ bool getIsMany() const;
+ bool getIsContainment() const;
+ bool getIsReadOnly() const;
+ bool getIsID() const;
+ bool getIsIDREF() const;
+ bool getIsReference() const;
+ bool getIsElement() const;
+ bool getIsQName() const;
+ bool getIsSubstitute() const;
+
+ void setIsMany(bool value);
+ void setIsContainment(bool value);
+ void setIsReadOnly(bool value);
+ void setIsID(bool value);
+ void setIsIDREF(bool value);
+ void setIsReference(bool value);
+ void setIsElement(bool value);
+ void setIsQName(bool value);
+ void setIsSubstitute(bool value);
+
+
+ private:
+ PropertyDefinitionImpl* propertydefinition;
+ void copy(const PropertyDefinition& pd);
+ };
- /*SDO_API*/ void setDefaultValue(const char* value);
- /*SDO_API*/ void setDefaultValue(const SDOString& value);
- /*SDO_API*/ const char* getDefaultValue() const;
-
- /*SDO_API*/ bool getIsMany() const;
- /*SDO_API*/ bool getIsContainment() const;
- /*SDO_API*/ bool getIsReadOnly() const;
- /*SDO_API*/ bool getIsID() const;
- /*SDO_API*/ bool getIsIDREF() const;
- /*SDO_API*/ bool getIsReference() const;
- /*SDO_API*/ bool getIsElement() const;
- /*SDO_API*/ bool getIsQName() const;
- /*SDO_API*/ bool getIsSubstitute() const;
-
- /*SDO_API*/ void setIsMany(bool value);
- /*SDO_API*/ void setIsContainment(bool value);
- /*SDO_API*/ void setIsReadOnly(bool value);
- /*SDO_API*/ void setIsID(bool value);
- /*SDO_API*/ void setIsIDREF(bool value);
- /*SDO_API*/ void setIsReference(bool value);
- /*SDO_API*/ void setIsElement(bool value);
- /*SDO_API*/ void setIsQName(bool value);
- /*SDO_API*/ void setIsSubstitute(bool value);
-
-
- private:
- PropertyDefinitionImpl* propertydefinition;
- void copy(const PropertyDefinition& pd);
- };
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.cpp Fri Aug 10 01:53:10 2007
@@ -24,23 +24,26 @@
{
namespace sdo
{
- PropertyDefinitionImpl::PropertyDefinitionImpl()
- : isMany(false),
- isContainment(true),
- isReadOnly(false),
- isElement(false),
- isReference(false),
- isQName(false),
- isID(false),
- isIDREF(false),
- isSubstitute(false)
-
+ namespace internal
{
- }
+ PropertyDefinitionImpl::PropertyDefinitionImpl()
+ : isMany(false),
+ isContainment(true),
+ isReadOnly(false),
+ isElement(false),
+ isReference(false),
+ isQName(false),
+ isID(false),
+ isIDREF(false),
+ isSubstitute(false)
+
+ {
+ }
- PropertyDefinitionImpl::~PropertyDefinitionImpl()
- {
- }
+ PropertyDefinitionImpl::~PropertyDefinitionImpl()
+ {
+ }
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/PropertyDefinitionImpl.h Fri Aug 10 01:53:10 2007
@@ -33,56 +33,59 @@
{
namespace sdo
{
-
+ namespace internal
+ {
/**
+ * Internal Helper Class
* PropertyDefinitionImpl holds a property as defined by an XSD.
* The XSD holds more information than does the SDO Property.
* This class holds the extra information found as the XSD is
* parsed.
*/
- class PropertyDefinitionImpl
- {
+ class PropertyDefinitionImpl
+ {
- public:
- PropertyDefinitionImpl();
- virtual ~PropertyDefinitionImpl();
+ public:
+ PropertyDefinitionImpl();
+ virtual ~PropertyDefinitionImpl();
- // where this property is to be substituted for another
- SDOXMLString substituteName;
- SDOXMLString substituteUri;
-
- // where there are substitute names for this property.
- std::vector<SDOXMLString> substituteNames;
- std::vector<SDOXMLString> substituteLocalNames;
-
- SDOXMLString aliases;
-
- SDOXMLString name;
- SDOXMLString localname;
- SDOXMLString namespaceURI;
+ // where this property is to be substituted for another
+ SDOXMLString substituteName;
+ SDOXMLString substituteUri;
+
+ // where there are substitute names for this property.
+ std::vector<SDOXMLString> substituteNames;
+ std::vector<SDOXMLString> substituteLocalNames;
+
+ SDOXMLString aliases;
+
+ SDOXMLString name;
+ SDOXMLString localname;
+ SDOXMLString namespaceURI;
- SDOXMLString typeUri;
- SDOXMLString typeName;
- SDOXMLString fullTypeName;
-
- SDOXMLString fullLocalTypeName;
-
- SDOXMLString defaultValue;
-
- bool isMany;
- bool isContainment;
- bool isReadOnly;
-
- bool isID;
- bool isIDREF;
- bool isReference;
- bool isElement;
+ SDOXMLString typeUri;
+ SDOXMLString typeName;
+ SDOXMLString fullTypeName;
+
+ SDOXMLString fullLocalTypeName;
+
+ SDOXMLString defaultValue;
+
+ bool isMany;
+ bool isContainment;
+ bool isReadOnly;
+
+ bool isID;
+ bool isIDREF;
+ bool isReference;
+ bool isElement;
- bool isQName;
+ bool isQName;
- bool isSubstitute;
- };
+ bool isSubstitute;
+ };
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/RefCountingPointer.h Fri Aug 10 01:53:10 2007
@@ -268,6 +268,8 @@
typedef RefCountingPointer<XMLDocument> XMLDocumentPtr;
class XSDHelper;
typedef RefCountingPointer<XSDHelper> XSDHelperPtr;
+class XSDHelperImpl;
+typedef RefCountingPointer<XSDHelperImpl> XSDHelperImplPtr;
class XMLHelper;
typedef RefCountingPointer<XMLHelper> XMLHelperPtr;
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDO.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDO.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDO.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDO.h Fri Aug 10 01:53:10 2007
@@ -52,9 +52,6 @@
#include "commonj/sdo/XMLDocument.h"
#include "commonj/sdo/DASValue.h"
#include "commonj/sdo/XpathHelper.h"
-#include "commonj/sdo/TypeDefinition.h"
-#include "commonj/sdo/TypeDefinitions.h"
-#include "commonj/sdo/PropertyDefinition.h"
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSAX2Parser.cpp Fri Aug 10 01:53:10 2007
@@ -40,7 +40,12 @@
{
namespace sdo
{
-
+
+ using internal::XSDPropertyInfo;
+ using internal::PropertyDefinitionImpl;
+ using internal::XSDTypeInfo;
+ using internal::TypeDefinitionImpl;
+
SDOSAX2Parser::SDOSAX2Parser(
DataFactoryPtr df,
const SDOXMLString& targetNamespace,
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.cpp Fri Aug 10 01:53:10 2007
@@ -38,6 +38,13 @@
{
namespace sdo
{
+
+ using internal::XSDTypeInfo;
+ using internal::TypeDefinitionsImpl;
+ using internal::TypeDefinitionImpl;
+ using internal::XSDPropertyInfo;
+ using internal::PropertyDefinitionImpl;
+ using internal::XMLDAS_TypeDefs;
SDOSchemaSAX2Parser::SDOSchemaSAX2Parser(SchemaInfo& schemaInf,
ParserErrorSetter* insetter,
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOSchemaSAX2Parser.h Fri Aug 10 01:53:10 2007
@@ -79,8 +79,6 @@
const SDOXMLString& getTargetNamespaceURI() const {return schemaInfo.getTargetNamespaceURI();}
- TypeDefinitionsImpl& getTypeDefinitions() {return typeDefinitions;}
-
friend std::istream& operator>>(std::istream& input, SDOSchemaSAX2Parser& parser);
friend std::istringstream& operator>>(std::istringstream& input, SDOSchemaSAX2Parser& parser);
@@ -89,6 +87,8 @@
private:
+ internal::TypeDefinitionsImpl& getTypeDefinitions() {return typeDefinitions;}
+
// group handling.
int inGroup;
@@ -196,37 +196,38 @@
);
void setType(
- PropertyDefinitionImpl& property,
+ internal::PropertyDefinitionImpl& property,
const SAX2Attributes& attributes,
const SAX2Namespaces& namespaces);
void setTypeName(
- TypeDefinitionImpl& type,
+ internal::TypeDefinitionImpl& type,
const SAX2Attributes& attributes,
const SAX2Namespaces& namespaces);
void setDefault(
- PropertyDefinitionImpl& thisProperty,
+ internal::PropertyDefinitionImpl& thisProperty,
const SAX2Attributes& attributes);
SchemaInfo& schemaInfo;
- PropertyDefinitionImpl currentProperty;
- std::stack<PropertyDefinitionImpl> propertyStack;
- void setCurrentProperty(const PropertyDefinitionImpl& property);
+ internal::PropertyDefinitionImpl currentProperty;
+ std::stack<internal::PropertyDefinitionImpl> propertyStack;
+ void setCurrentProperty(const internal::PropertyDefinitionImpl& property);
void defineProperty();
- TypeDefinitionImpl currentType;
- std::stack<TypeDefinitionImpl> typeStack;
- void setCurrentType(const TypeDefinitionImpl& type);
+ internal::TypeDefinitionImpl currentType;
+ std::stack<internal::TypeDefinitionImpl> typeStack;
+ void setCurrentType(const internal::TypeDefinitionImpl& type);
void defineType();
- TypeDefinitionsImpl typeDefinitions;
+ internal::TypeDefinitionsImpl typeDefinitions;
PARSED_LOCATIONS& parsedLocations;
DEFINED_NAMESPACES& definedNamespaces;
+ friend class XSDHelperImpl;
};
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOUtils.cpp Fri Aug 10 01:53:10 2007
@@ -51,7 +51,7 @@
SDOUtils::XsdToSdo["ID"] = "String";
SDOUtils::XsdToSdo["NCName"] = "String";
SDOUtils::XsdToSdo["string"] = "String";
- SDOUtils::XsdToSdo["anyType"] = "DataObject";
+ SDOUtils::XsdToSdo["anyType"] = "OpenDataObject";
SDOUtils::XsdToSdo["int"] = "Integer";
SDOUtils::XsdToSdo["integer"] = "Integer";
SDOUtils::XsdToSdo["negativeInteger"] = "Integer";
@@ -73,7 +73,7 @@
SDOUtils::XsdToSdo["QName"] = "URI";
SDOUtils::SdoToXsd["String"] = "string";
- SDOUtils::SdoToXsd["DataObject"] = "anyType";
+ SDOUtils::SdoToXsd["OpenDataObject"] = "anyType";
SDOUtils::SdoToXsd["Integer"] = "integer";
SDOUtils::SdoToXsd["Long"] = "unsignedLong";
SDOUtils::SdoToXsd["Double"] = "double";
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.cpp Fri Aug 10 01:53:10 2007
@@ -21,6 +21,7 @@
#include "commonj/sdo/SDOXMLString.h"
#include <iostream>
+#include <libxml/xmlstring.h>
#include "libxml/globals.h"
#include <ctype.h>
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLString.h Fri Aug 10 01:53:10 2007
@@ -25,20 +25,22 @@
#define _SDOXMLString_H_
#include "commonj/sdo/export.h"
-#include <libxml/xmlstring.h>
#include <iostream>
+typedef unsigned char xmlChar;
+
namespace commonj
{
namespace sdo
{
- /**
- * SDOXMLString - utility class for string handling.
- * Keeps the string handling local to one place, so we can
- * replace it with a more NLS friendly version later.
- * Many places within the core should use this too instead
- * of allocated char* buffers. (DataObject etc...)
- */
+
+ /**
+ * SDOXMLString - utility class for string handling.
+ * Keeps the string handling local to one place, so we can
+ * replace it with a more NLS friendly version later.
+ * Many places within the core should use this too instead
+ * of allocated char* buffers. (DataObject etc...)
+ */
class SDOXMLString
{
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.cpp Fri Aug 10 01:53:10 2007
@@ -39,7 +39,12 @@
{
namespace sdo
{
-
+
+ using internal::XSDPropertyInfo;
+ using internal::PropertyDefinitionImpl;
+ using internal::XSDTypeInfo;
+ using internal::TypeDefinitionImpl;
+
const SDOXMLString SDOXMLWriter::s_xsi("xsi");
const SDOXMLString SDOXMLWriter::s_type("type");
const SDOXMLString SDOXMLWriter::s_nil("nil");
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXMLWriter.h Fri Aug 10 01:53:10 2007
@@ -110,7 +110,7 @@
SchemaInfo* schemaInfo;
DataFactoryPtr dataFactory;
- XSDPropertyInfo* getPropertyInfo(const Property& property);
+ internal::XSDPropertyInfo* getPropertyInfo(const Property& property);
std::map<SDOXMLString,SDOXMLString> namespaceMap;
SDOXMLString tnsURI;
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/SDOXSDWriter.cpp Fri Aug 10 01:53:10 2007
@@ -32,6 +32,8 @@
namespace sdo
{
+ using internal::XSDPropertyInfo;
+ using internal::PropertyDefinitionImpl;
@@ -725,7 +727,7 @@
{
resolvedName += "string";
}
- else if (name.equalsIgnoreCase("DataObject"))
+ else if (name.equalsIgnoreCase("OpenDataObject"))
{
resolvedName += "anyType";
}
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.cpp Fri Aug 10 01:53:10 2007
@@ -26,231 +26,234 @@
{
namespace sdo
{
- TypeDefinition::TypeDefinition()
+ namespace internal
{
- typedefinition = new TypeDefinitionImpl();
- }
+ TypeDefinition::TypeDefinition()
+ {
+ typedefinition = new TypeDefinitionImpl();
+ }
- TypeDefinition::~TypeDefinition()
- {
- if (typedefinition != 0) delete typedefinition;
- }
+ TypeDefinition::~TypeDefinition()
+ {
+ if (typedefinition != 0) delete typedefinition;
+ }
- void TypeDefinition::copy (const TypeDefinition& td)
- {
- if (typedefinition != 0) delete typedefinition;
- typedefinition = new TypeDefinitionImpl(*(td.typedefinition));
- }
+ void TypeDefinition::copy (const TypeDefinition& td)
+ {
+ if (typedefinition != 0) delete typedefinition;
+ typedefinition = new TypeDefinitionImpl(*(td.typedefinition));
+ }
- TypeDefinition::TypeDefinition(const TypeDefinition& td)
- {
- copy(td);
- }
-
- TypeDefinition& TypeDefinition::operator=(const TypeDefinition& td)
- {
- if (this != &td)
+ TypeDefinition::TypeDefinition(const TypeDefinition& td)
{
copy(td);
}
- return *this;
- }
-
- TypeDefinitionImpl* TypeDefinition::getTypeDefinition()
- {
- return typedefinition;
- }
- void TypeDefinition::setUri(const char * inuri)
- {
- typedefinition->uri = inuri;
- }
- void TypeDefinition::setUri(const SDOString& inuri)
- {
- typedefinition->uri = inuri.c_str();
- }
-
- const char * TypeDefinition::getUri() const
- {
- return (const char *)typedefinition->uri;
- }
+ TypeDefinition& TypeDefinition::operator=(const TypeDefinition& td)
+ {
+ if (this != &td)
+ {
+ copy(td);
+ }
+ return *this;
+ }
+
+ TypeDefinitionImpl* TypeDefinition::getTypeDefinition()
+ {
+ return typedefinition;
+ }
+
+ void TypeDefinition::setUri(const char * inuri)
+ {
+ typedefinition->uri = inuri;
+ }
+ void TypeDefinition::setUri(const SDOString& inuri)
+ {
+ typedefinition->uri = inuri.c_str();
+ }
+ const char * TypeDefinition::getUri() const
+ {
+ return (const char *)typedefinition->uri;
+ }
- void TypeDefinition::setName(const char * inname)
- {
- typedefinition->name = inname;
- }
- void TypeDefinition::setName(const SDOString& inname)
- {
- typedefinition->name = inname.c_str();
- }
- const char * TypeDefinition::getName() const
- {
- return (const char *)typedefinition->name;
- }
+ void TypeDefinition::setName(const char * inname)
+ {
+ typedefinition->name = inname;
+ }
+ void TypeDefinition::setName(const SDOString& inname)
+ {
+ typedefinition->name = inname.c_str();
+ }
+
+ const char * TypeDefinition::getName() const
+ {
+ return (const char *)typedefinition->name;
+ }
- void TypeDefinition::setLocalName(const char * inname)
- {
- typedefinition->localname = inname;
- }
- void TypeDefinition::setLocalName(const SDOString& inname)
- {
- typedefinition->localname = inname.c_str();
- }
+ void TypeDefinition::setLocalName(const char * inname)
+ {
+ typedefinition->localname = inname;
+ }
+ void TypeDefinition::setLocalName(const SDOString& inname)
+ {
+ typedefinition->localname = inname.c_str();
+ }
- const char * TypeDefinition::getLocalName() const
- {
- return (const char *)typedefinition->localname;
- }
+ const char * TypeDefinition::getLocalName() const
+ {
+ return (const char *)typedefinition->localname;
+ }
- void TypeDefinition::setAliases(const char * inaliases)
- {
- typedefinition->aliases = inaliases;
- }
- void TypeDefinition::setAliases(const SDOString& inaliases)
- {
- typedefinition->aliases = inaliases.c_str();
- }
+ void TypeDefinition::setAliases(const char * inaliases)
+ {
+ typedefinition->aliases = inaliases;
+ }
+ void TypeDefinition::setAliases(const SDOString& inaliases)
+ {
+ typedefinition->aliases = inaliases.c_str();
+ }
- const char * TypeDefinition::getAliases() const
- {
- return (const char*)typedefinition->aliases;
- }
+ const char * TypeDefinition::getAliases() const
+ {
+ return (const char*)typedefinition->aliases;
+ }
- void TypeDefinition::setParentType(const char* uri, const char* name,
- bool isrestriction)
- {
- typedefinition->parentTypeUri = uri;
- typedefinition->parentTypeName = name;
- typedefinition->isRestriction = isrestriction;
- }
- void TypeDefinition::setParentType(const SDOString& uri,
- const SDOString& name,
- bool isrestriction)
- {
- typedefinition->parentTypeUri = uri.c_str();
- typedefinition->parentTypeName = name.c_str();
- typedefinition->isRestriction = isrestriction;
- }
+ void TypeDefinition::setParentType(const char* uri, const char* name,
+ bool isrestriction)
+ {
+ typedefinition->parentTypeUri = uri;
+ typedefinition->parentTypeName = name;
+ typedefinition->isRestriction = isrestriction;
+ }
+ void TypeDefinition::setParentType(const SDOString& uri,
+ const SDOString& name,
+ bool isrestriction)
+ {
+ typedefinition->parentTypeUri = uri.c_str();
+ typedefinition->parentTypeName = name.c_str();
+ typedefinition->isRestriction = isrestriction;
+ }
- const char * TypeDefinition::getParentTypeUri() const
- {
- return (const char *)typedefinition->parentTypeUri;
- }
+ const char * TypeDefinition::getParentTypeUri() const
+ {
+ return (const char *)typedefinition->parentTypeUri;
+ }
- const char * TypeDefinition::getParentTypeName() const
- {
- return (const char *)typedefinition->parentTypeName;
- }
+ const char * TypeDefinition::getParentTypeName() const
+ {
+ return (const char *)typedefinition->parentTypeName;
+ }
- void TypeDefinition::setIDPropertyName(const char * idpropname)
- {
- typedefinition->IDPropertyName = idpropname;
- }
- void TypeDefinition::setIDPropertyName(const SDOString& idpropname)
- {
- typedefinition->IDPropertyName = idpropname.c_str();
- }
+ void TypeDefinition::setIDPropertyName(const char * idpropname)
+ {
+ typedefinition->IDPropertyName = idpropname;
+ }
+ void TypeDefinition::setIDPropertyName(const SDOString& idpropname)
+ {
+ typedefinition->IDPropertyName = idpropname.c_str();
+ }
- const char * TypeDefinition::getIDPropertyName() const
- {
- return (const char *)typedefinition->IDPropertyName;
- }
-
- void TypeDefinition::addPropertyDefinition(PropertyDefinition& p)
- {
- typedefinition->properties.push_back((PropertyDefinitionImpl&)(*(p.getPropertyDefinition())));
- }
-
- bool TypeDefinition::getIsDataType() const
- {
- return typedefinition->dataType;
- }
-
- bool TypeDefinition::getIsOpen() const
- {
- return typedefinition->isOpen;
- }
-
- bool TypeDefinition::getIsSequenced() const
- {
- return typedefinition->isSequenced;
- }
-
- bool TypeDefinition::getIsAbstract() const
- {
- return typedefinition->isAbstract;
- }
-
- bool TypeDefinition::getIsExtendedPrimitive() const
- {
- return typedefinition->isExtendedPrimitive;
- }
-
- bool TypeDefinition::getIsFromList() const
- {
- return typedefinition->isFromList;
- }
-
- bool TypeDefinition::getIsQName() const
- {
- return typedefinition->isQName;
- }
-
- bool TypeDefinition::getIsMany() const
- {
- return typedefinition->isMany;
- }
-
- void TypeDefinition::setIsDataType(bool value)
- {
- typedefinition->dataType = value;
- }
-
- void TypeDefinition::setIsOpen(bool value)
- {
- typedefinition->isOpen = value;
- }
-
- void TypeDefinition::setIsSequenced(bool value)
- {
- typedefinition->isSequenced = value;
- }
-
- void TypeDefinition::setIsAbstract(bool value)
- {
- typedefinition->isAbstract = value;
- }
-
- void TypeDefinition::setIsExtendedPrimitive(bool value)
- {
- typedefinition->isExtendedPrimitive = value;
- }
+ const char * TypeDefinition::getIDPropertyName() const
+ {
+ return (const char *)typedefinition->IDPropertyName;
+ }
- void TypeDefinition::setIsFromList(bool value)
- {
- typedefinition->isFromList = value;
- }
+ void TypeDefinition::addPropertyDefinition(PropertyDefinition& p)
+ {
+ typedefinition->properties.push_back((PropertyDefinitionImpl&)(*(p.getPropertyDefinition())));
+ }
- void TypeDefinition::setIsQName(bool value)
- {
- typedefinition->isQName = value;
- }
+ bool TypeDefinition::getIsDataType() const
+ {
+ return typedefinition->dataType;
+ }
- void TypeDefinition::setIsMany(bool value)
- {
- typedefinition->isMany = value;
- }
+ bool TypeDefinition::getIsOpen() const
+ {
+ return typedefinition->isOpen;
+ }
+ bool TypeDefinition::getIsSequenced() const
+ {
+ return typedefinition->isSequenced;
+ }
- int TypeDefinition::getGroupElementCount() const
- {
- return typedefinition->groupElementCount;
- }
+ bool TypeDefinition::getIsAbstract() const
+ {
+ return typedefinition->isAbstract;
+ }
+ bool TypeDefinition::getIsExtendedPrimitive() const
+ {
+ return typedefinition->isExtendedPrimitive;
+ }
+
+ bool TypeDefinition::getIsFromList() const
+ {
+ return typedefinition->isFromList;
+ }
+
+ bool TypeDefinition::getIsQName() const
+ {
+ return typedefinition->isQName;
+ }
+
+ bool TypeDefinition::getIsMany() const
+ {
+ return typedefinition->isMany;
+ }
+
+ void TypeDefinition::setIsDataType(bool value)
+ {
+ typedefinition->dataType = value;
+ }
+
+ void TypeDefinition::setIsOpen(bool value)
+ {
+ typedefinition->isOpen = value;
+ }
+
+ void TypeDefinition::setIsSequenced(bool value)
+ {
+ typedefinition->isSequenced = value;
+ }
+
+ void TypeDefinition::setIsAbstract(bool value)
+ {
+ typedefinition->isAbstract = value;
+ }
+
+ void TypeDefinition::setIsExtendedPrimitive(bool value)
+ {
+ typedefinition->isExtendedPrimitive = value;
+ }
+
+ void TypeDefinition::setIsFromList(bool value)
+ {
+ typedefinition->isFromList = value;
+ }
+
+ void TypeDefinition::setIsQName(bool value)
+ {
+ typedefinition->isQName = value;
+ }
+
+ void TypeDefinition::setIsMany(bool value)
+ {
+ typedefinition->isMany = value;
+ }
+
+
+ int TypeDefinition::getGroupElementCount() const
+ {
+ return typedefinition->groupElementCount;
+ }
+
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinition.h Fri Aug 10 01:53:10 2007
@@ -34,86 +34,90 @@
{
namespace sdo
{
+ namespace internal
+ {
- class TypeDefinitionImpl;
+ class TypeDefinitionImpl;
/**
+ * Internal Helper Class
* TypeDefinitionImpl holds information gathered from parsing the
* XSD and used for creating Types
*/
- class SDO_API TypeDefinition
- {
+ class SDO_API TypeDefinition
+ {
- public:
+ public:
- /*SDO_API*/ TypeDefinition();
- TypeDefinition(const TypeDefinition& td);
- TypeDefinition& operator=(const TypeDefinition& td);
+ TypeDefinition();
+ TypeDefinition(const TypeDefinition& td);
+ TypeDefinition& operator=(const TypeDefinition& td);
- /*SDO_API*/ virtual ~TypeDefinition();
+ virtual ~TypeDefinition();
- TypeDefinitionImpl* getTypeDefinition();
+ TypeDefinitionImpl* getTypeDefinition();
- /*SDO_API*/ void setUri(const char * inuri) ;
- /*SDO_API*/ void setUri(const SDOString& inuri) ;
+ void setUri(const char * inuri) ;
+ void setUri(const SDOString& inuri) ;
- /*SDO_API*/ const char * getUri() const;
+ const char * getUri() const;
- /*SDO_API*/ void setName(const char * inname) ;
- /*SDO_API*/ void setName(const SDOString& inname) ;
- /*SDO_API*/ const char * getName() const;
-
- /*SDO_API*/ void setLocalName(const char * inname) ;
- /*SDO_API*/ void setLocalName(const SDOString& inname) ;
- /*SDO_API*/ const char * getLocalName() const;
-
- /*SDO_API*/ void setAliases(const char * inaliases) ;
- /*SDO_API*/ void setAliases(const SDOString& inaliases) ;
- /*SDO_API*/ const char * getAliases() const;
-
-
- /*SDO_API*/ void setParentType(const char* uri, const char* name,
- bool isrestriction);
- /*SDO_API*/ void setParentType(const SDOString& uri,
- const SDOString& name,
- bool isrestriction);
- /*SDO_API*/ const char * getParentTypeUri() const;
- /*SDO_API*/ const char * getParentTypeName() const;
-
- /*SDO_API*/ void setIDPropertyName(const char * idpropname) ;
- /*SDO_API*/ void setIDPropertyName(const SDOString& idpropname) ;
- /*SDO_API*/ const char * getIDPropertyName() const;
-
-
- /*SDO_API*/ void addPropertyDefinition(PropertyDefinition& p);
-
- /*SDO_API*/ bool getIsDataType() const;
- /*SDO_API*/ bool getIsOpen() const;
- /*SDO_API*/ bool getIsSequenced() const;
- /*SDO_API*/ bool getIsAbstract() const;
- /*SDO_API*/ bool getIsExtendedPrimitive() const;
- /*SDO_API*/ bool getIsFromList() const;
- /*SDO_API*/ bool getIsQName() const;
- /*SDO_API*/ bool getIsMany() const;
+ void setName(const char * inname) ;
+ void setName(const SDOString& inname) ;
+ const char * getName() const;
+
+ void setLocalName(const char * inname) ;
+ void setLocalName(const SDOString& inname) ;
+ const char * getLocalName() const;
+
+ void setAliases(const char * inaliases) ;
+ void setAliases(const SDOString& inaliases) ;
+ const char * getAliases() const;
+
+
+ void setParentType(const char* uri, const char* name,
+ bool isrestriction);
+ void setParentType(const SDOString& uri,
+ const SDOString& name,
+ bool isrestriction);
+ const char * getParentTypeUri() const;
+ const char * getParentTypeName() const;
+
+ void setIDPropertyName(const char * idpropname) ;
+ void setIDPropertyName(const SDOString& idpropname) ;
+ const char * getIDPropertyName() const;
+
+
+ void addPropertyDefinition(PropertyDefinition& p);
+
+ bool getIsDataType() const;
+ bool getIsOpen() const;
+ bool getIsSequenced() const;
+ bool getIsAbstract() const;
+ bool getIsExtendedPrimitive() const;
+ bool getIsFromList() const;
+ bool getIsQName() const;
+ bool getIsMany() const;
- /*SDO_API*/ void setIsDataType(bool value);
- /*SDO_API*/ void setIsOpen(bool value);
- /*SDO_API*/ void setIsSequenced(bool value);
- /*SDO_API*/ void setIsAbstract(bool value);
- /*SDO_API*/ void setIsExtendedPrimitive(bool value);
- /*SDO_API*/ void setIsFromList(bool value);
- /*SDO_API*/ void setIsQName(bool value);
- /*SDO_API*/ void setIsMany(bool value);
-
- /*SDO_API*/ int getGroupElementCount() const;
-
- private :
- TypeDefinitionImpl *typedefinition;
- void copy(const TypeDefinition& td);
- };
+ void setIsDataType(bool value);
+ void setIsOpen(bool value);
+ void setIsSequenced(bool value);
+ void setIsAbstract(bool value);
+ void setIsExtendedPrimitive(bool value);
+ void setIsFromList(bool value);
+ void setIsQName(bool value);
+ void setIsMany(bool value);
+
+ int getGroupElementCount() const;
+
+ private:
+ TypeDefinitionImpl *typedefinition;
+ void copy(const TypeDefinition& td);
+ };
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.cpp Fri Aug 10 01:53:10 2007
@@ -24,7 +24,9 @@
{
namespace sdo
{
- TypeDefinitionImpl::TypeDefinitionImpl()
+ namespace internal
+ {
+ TypeDefinitionImpl::TypeDefinitionImpl()
: dataType(false),
isOpen(false),
isSequenced(false),
@@ -34,12 +36,15 @@
groupElementCount(0),
isExtendedPrimitive(false),
isFromList(false)
- {
- }
+ {
+ }
- TypeDefinitionImpl::~TypeDefinitionImpl()
- {
- }
+ TypeDefinitionImpl::~TypeDefinitionImpl()
+ {
+ }
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
+
+
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionImpl.h Fri Aug 10 01:53:10 2007
@@ -32,50 +32,54 @@
{
namespace sdo
{
+ namespace internal
+ {
- typedef std::list<PropertyDefinitionImpl> XmlDasPropertyDefs;
+ typedef std::list<PropertyDefinitionImpl> XmlDasPropertyDefs;
/**
+ * Internal Helper Class
* TypeDefinitionImpl holds information gathered from parsing the
* XSD and used for creating Types
*/
- class TypeDefinitionImpl
- {
+ class TypeDefinitionImpl
+ {
- public:
- TypeDefinitionImpl();
- virtual ~TypeDefinitionImpl();
+ public:
+ TypeDefinitionImpl();
+ virtual ~TypeDefinitionImpl();
- SDOXMLString uri;
- SDOXMLString name;
- SDOXMLString localname;
+ SDOXMLString uri;
+ SDOXMLString name;
+ SDOXMLString localname;
- SDOXMLString aliases;
+ SDOXMLString aliases;
- SDOXMLString parentTypeUri;
- SDOXMLString parentTypeName;
- bool isRestriction;
+ SDOXMLString parentTypeUri;
+ SDOXMLString parentTypeName;
+ bool isRestriction;
- SDOXMLString IDPropertyName;
+ SDOXMLString IDPropertyName;
- bool dataType;
- XmlDasPropertyDefs properties;
+ bool dataType;
+ XmlDasPropertyDefs properties;
- bool isOpen;
- bool isSequenced;
- bool isAbstract;
+ bool isOpen;
+ bool isSequenced;
+ bool isAbstract;
- bool isExtendedPrimitive;
+ bool isExtendedPrimitive;
- bool isFromList;
+ bool isFromList;
- bool isMany;
- int groupElementCount;
+ bool isMany;
+ int groupElementCount;
- bool isQName;
- };
+ bool isQName;
+ };
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.cpp Fri Aug 10 01:53:10 2007
@@ -27,56 +27,63 @@
{
namespace sdo
{
- TypeDefinitions::TypeDefinitions()
+ namespace internal
{
- typedefinitions = new TypeDefinitionsImpl();
- }
+
+ TypeDefinitions::TypeDefinitions()
+ {
+ typedefinitions = new TypeDefinitionsImpl();
+ }
- TypeDefinitions::~TypeDefinitions()
- {
- if (typedefinitions != 0) delete typedefinitions;
- }
+ TypeDefinitions::~TypeDefinitions()
+ {
+ if (typedefinitions != 0) delete typedefinitions;
+ }
- void TypeDefinitions::copy (const TypeDefinitions& tds)
- {
- if (typedefinitions != 0) delete typedefinitions;
- typedefinitions = new TypeDefinitionsImpl(*(tds.typedefinitions));
- }
+ void TypeDefinitions::copy (const TypeDefinitions& tds)
+ {
+ if (typedefinitions != 0) delete typedefinitions;
+ typedefinitions = new TypeDefinitionsImpl(*(tds.typedefinitions));
+ }
- TypeDefinitions::TypeDefinitions(const TypeDefinitions& tds)
- {
- copy(tds);
- }
-
- TypeDefinitions::TypeDefinitions(const TypeDefinitionsImpl& tds)
- {
- typedefinitions = new TypeDefinitionsImpl(tds);
- }
+ TypeDefinitions::TypeDefinitions(const TypeDefinitions& tds)
+ {
+ copy(tds);
+ }
- void TypeDefinitions::addTypeDefinition(TypeDefinition& t)
- {
- if (typedefinitions == 0)
+ TypeDefinitions::TypeDefinitions(const TypeDefinitionsImpl& tds)
{
- typedefinitions = new TypeDefinitionsImpl();
+ typedefinitions = new TypeDefinitionsImpl(tds);
}
- typedefinitions->types[
- typedefinitions->getTypeQName(
+ void TypeDefinitions::addTypeDefinition(TypeDefinition& t)
+ {
+ if (typedefinitions == 0)
+ {
+ typedefinitions = new TypeDefinitionsImpl();
+ }
+
+ typedefinitions->types[
+ typedefinitions->getTypeQName(
t.getUri(),t.getName())] = (TypeDefinitionImpl&)(*t.getTypeDefinition());
- }
+ }
- TypeDefinitionsImpl& TypeDefinitions::getTypeDefinitions()
- {
- if (typedefinitions == 0)
+ TypeDefinitionsImpl& TypeDefinitions::getTypeDefinitions()
{
- typedefinitions = new TypeDefinitionsImpl();
+ if (typedefinitions == 0)
+ {
+ typedefinitions = new TypeDefinitionsImpl();
+ }
+ return *typedefinitions;
}
- return *typedefinitions;
- }
- unsigned int TypeDefinitions::size()
- {
- return typedefinitions->types.size();
- }
+ unsigned int TypeDefinitions::size()
+ {
+ return typedefinitions->types.size();
+ }
+
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
+
+
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitions.h Fri Aug 10 01:53:10 2007
@@ -29,38 +29,42 @@
{
namespace sdo
{
+ namespace internal
+ {
- class TypeDefinitionsImpl;
+ class TypeDefinitionsImpl;
/**
+ * Internal Helper Class
* TypeDefinitionsImpl holds a list information gathered from parsing the
* XSD and used for creating Types
*/
- class SDO_API TypeDefinitions
- {
+ class SDO_API TypeDefinitions
+ {
- public:
- TypeDefinitions();
- TypeDefinitions(const TypeDefinitions& tds);
- TypeDefinitions& operator=(const TypeDefinitions& tds);
+ public:
+ TypeDefinitions();
+ TypeDefinitions(const TypeDefinitions& tds);
+ TypeDefinitions& operator=(const TypeDefinitions& tds);
- TypeDefinitions(const TypeDefinitionsImpl& tds);
+ TypeDefinitions(const TypeDefinitionsImpl& tds);
- virtual ~TypeDefinitions();
+ virtual ~TypeDefinitions();
- void addTypeDefinition(TypeDefinition& t);
+ void addTypeDefinition(TypeDefinition& t);
- TypeDefinitionsImpl& getTypeDefinitions();
+ TypeDefinitionsImpl& getTypeDefinitions();
- unsigned int size();
+ unsigned int size();
- protected:
- TypeDefinitionsImpl* typedefinitions;
- void copy(const TypeDefinitions& tds);
+ protected:
+ TypeDefinitionsImpl* typedefinitions;
+ void copy(const TypeDefinitions& tds);
- friend class XSDHelperImpl;
+ friend class XSDHelperImpl;
- };
+ };
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.cpp Fri Aug 10 01:53:10 2007
@@ -24,28 +24,31 @@
{
namespace sdo
{
- TypeDefinitionsImpl::TypeDefinitionsImpl()
+ namespace internal
{
- }
+ TypeDefinitionsImpl::TypeDefinitionsImpl()
+ {
+ }
- TypeDefinitionsImpl::~TypeDefinitionsImpl()
- {
- }
-
- void TypeDefinitionsImpl::addTypeDefinitions(const TypeDefinitionsImpl& typedefs)
- {
- XMLDAS_TypeDefs::const_iterator iter;
- for (iter=typedefs.types.begin(); iter != typedefs.types.end(); iter++)
+ TypeDefinitionsImpl::~TypeDefinitionsImpl()
{
- types.insert(*iter);
}
- }
+ void TypeDefinitionsImpl::addTypeDefinitions(const TypeDefinitionsImpl& typedefs)
+ {
+ XMLDAS_TypeDefs::const_iterator iter;
+ for (iter=typedefs.types.begin(); iter != typedefs.types.end(); iter++)
+ {
+ types.insert(*iter);
+ }
- SDOXMLString TypeDefinitionsImpl::getTypeQName(const SDOXMLString& typeUri, const SDOXMLString& typeName)
- {
- return typeUri + "#" + typeName;
- }
+ }
+
+ SDOXMLString TypeDefinitionsImpl::getTypeQName(const SDOXMLString& typeUri, const SDOXMLString& typeName)
+ {
+ return typeUri + "#" + typeName;
+ }
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/TypeDefinitionsImpl.h Fri Aug 10 01:53:10 2007
@@ -31,25 +31,29 @@
{
namespace sdo
{
- typedef std::map<SDOXMLString, TypeDefinitionImpl> XMLDAS_TypeDefs;
+ namespace internal
+ {
+ typedef std::map<SDOXMLString, TypeDefinitionImpl> XMLDAS_TypeDefs;
/**
+ * Internal Helper Class
* TypeDefinitionsImpl holds a list information gathered from parsing the
* XSD and used for creating Types
*/
- class TypeDefinitionsImpl
- {
+ class TypeDefinitionsImpl
+ {
- public:
- TypeDefinitionsImpl();
- virtual ~TypeDefinitionsImpl();
- void addTypeDefinitions(const TypeDefinitionsImpl& types);
- static SDOXMLString getTypeQName(const SDOXMLString& typeUri, const SDOXMLString& typeName);
+ public:
+ TypeDefinitionsImpl();
+ virtual ~TypeDefinitionsImpl();
+ void addTypeDefinitions(const TypeDefinitionsImpl& types);
+ static SDOXMLString getTypeQName(const SDOXMLString& typeUri, const SDOXMLString& typeName);
- XMLDAS_TypeDefs types;
+ XMLDAS_TypeDefs types;
- };
+ };
+ } // End - namespace internal
} // End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelper.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelper.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelper.h Fri Aug 10 01:53:10 2007
@@ -132,19 +132,6 @@
virtual const char* getErrorMessage(unsigned int errnum) const = 0;
- /**
- *
- * used for defining types from type definitions
- */
-
- SDO_API virtual void defineTypes(TypeDefinitions& types) = 0;
-
- /**
- *
- * returns the types parsed from the schemas
- */
- SDO_API virtual TypeDefinitions& getDefinedTypes() = 0;
-
};
}//End - namespace sdo
} // End - namespace commonj
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.cpp Fri Aug 10 01:53:10 2007
@@ -45,6 +45,14 @@
{
namespace sdo
{
+ using internal::XSDPropertyInfo;
+ using internal::PropertyDefinitionImpl;
+ using internal::TypeDefinitionImpl;
+ using internal::XSDTypeInfo;
+ using internal::TypeDefinitions;
+ using internal::TypeDefinitionsImpl;
+ using internal::XmlDasPropertyDefs;
+ using internal::XMLDAS_TypeDefs;
/** XSDHelperImpl
*
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDHelperImpl.h Fri Aug 10 01:53:10 2007
@@ -26,7 +26,6 @@
#include "commonj/sdo/XSDHelper.h"
#include "commonj/sdo/export.h"
-#include "commonj/sdo/SDOXMLString.h"
#include "commonj/sdo/SAX2Namespaces.h"
#include "commonj/sdo/SchemaInfo.h"
#include "commonj/sdo/TypeDefinitionsImpl.h"
@@ -138,20 +137,21 @@
return schemaInfo.getTargetNamespaceURI();
}
- virtual void defineTypes(TypeDefinitions& types);
+ virtual void defineTypes(internal::TypeDefinitions& types);
- virtual TypeDefinitions& getDefinedTypes() {return definedTypes;}
+ virtual internal::TypeDefinitions& getDefinedTypes() {return definedTypes;}
private:
+
virtual void clearErrors();
void newSubstitute(const char* entryName,
- PropertyDefinitionImpl& prop);
+ internal::PropertyDefinitionImpl& prop);
- void addSubstitutes(PropertyDefinitionImpl& prop,
- TypeDefinitionImpl& ty);
+ void addSubstitutes(internal::PropertyDefinitionImpl& prop,
+ internal::TypeDefinitionImpl& ty);
- void defineTypes(TypeDefinitionsImpl& types);
+ void defineTypes(internal::TypeDefinitionsImpl& types);
int parse(const char* source);
// Instance variables
@@ -160,7 +160,7 @@
std::vector<char*> parseErrors;
- TypeDefinitions definedTypes;
+ internal::TypeDefinitions definedTypes;
SDOSchemaSAX2Parser::PARSED_LOCATIONS parsedLocations;
SDOSchemaSAX2Parser::DEFINED_NAMESPACES definedNamespaces;
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp?view=diff&rev=564515&r1=564514&r2=564515
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.cpp Fri Aug 10 01:53:10 2007
@@ -25,31 +25,32 @@
{
namespace sdo
{
-
- /**
- *
- * This holds a property definition during the parsing process
- * when all properties need to be read and stored prior to creation
- * within the data facttory.
- */
-
- XSDPropertyInfo::XSDPropertyInfo()
+ namespace internal
{
- }
- XSDPropertyInfo::XSDPropertyInfo(const PropertyDefinitionImpl& prop)
- : property(prop)
- {
- }
+ /**
+ * Internal Helper Class
+ * This holds a property definition during the parsing process
+ * when all properties need to be read and stored prior to creation
+ * within the data facttory.
+ */
+ XSDPropertyInfo::XSDPropertyInfo()
+ {
+ }
- XSDPropertyInfo::~XSDPropertyInfo()
- {
- }
+ XSDPropertyInfo::XSDPropertyInfo(const PropertyDefinitionImpl& prop)
+ : property(prop)
+ {
+ }
+
+ XSDPropertyInfo::~XSDPropertyInfo()
+ {
+ }
- }
-}
-// end - namespace sdo
+ } // end namespace internal
+ } // end namespace sdo
+} // end namespace commonj
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org