Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h?view=diff&rev=564515&r1=564514&r2=564515 ============================================================================== --- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h (original) +++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDPropertyInfo.h Fri Aug 10 01:53:10 2007 @@ -32,30 +32,35 @@ { namespace sdo { + namespace internal + { /** - * + * Internal Helper Class * This holds a property definition during the parsing process. * 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. */ - class XSDPropertyInfo : public DASValue - { - public: + class XSDPropertyInfo : public DASValue + { + public: - XSDPropertyInfo(); - XSDPropertyInfo(const PropertyDefinitionImpl& prop); + XSDPropertyInfo(); + XSDPropertyInfo(const PropertyDefinitionImpl& prop); - virtual ~XSDPropertyInfo(); + virtual ~XSDPropertyInfo(); - const PropertyDefinitionImpl& getPropertyDefinition() {return property;} + const PropertyDefinitionImpl& getPropertyDefinition() {return property;} - private: - PropertyDefinitionImpl property; - }; - } -} + private: + PropertyDefinitionImpl property; + }; + } // end namespace internal + } // end namespace sdo +} // end namespace commonj #endif //_XSDPropertyInfo_H_ + +
Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp?view=diff&rev=564515&r1=564514&r2=564515 ============================================================================== --- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp (original) +++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.cpp Fri Aug 10 01:53:10 2007 @@ -25,30 +25,31 @@ { namespace sdo { - - /** XSDTypeInfo - * - * This holds a type definition during the parsing process - * when all types need to be read and stored prior to creation - * within the data facttory. - */ - - XSDTypeInfo::XSDTypeInfo() - { - } - - XSDTypeInfo::XSDTypeInfo(const TypeDefinitionImpl& typeDef) - : typeDefinition(typeDef) - { - } - - - XSDTypeInfo::~XSDTypeInfo() + namespace internal { - } - } -} -// end - namespace sdo + /** XSDTypeInfo + * + * This holds a type definition during the parsing process + * when all types need to be read and stored prior to creation + * within the data facttory. + */ + + XSDTypeInfo::XSDTypeInfo() + { + } + + XSDTypeInfo::XSDTypeInfo(const internal::TypeDefinitionImpl& typeDef) + : typeDefinition(typeDef) + { + } + + + XSDTypeInfo::~XSDTypeInfo() + { + } + } // end namespace internal + } // end namespace sdo +} // end namespace commonj Modified: incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h?view=diff&rev=564515&r1=564514&r2=564515 ============================================================================== --- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h (original) +++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/XSDTypeInfo.h Fri Aug 10 01:53:10 2007 @@ -31,24 +31,29 @@ { namespace sdo { - /** - * - * This holds a type definition during the parsing process - * when all types need to be read and stored prior to creation - * within the data factory. - */ - - class XSDTypeInfo : public DASValue + namespace internal { - public: - XSDTypeInfo(); - XSDTypeInfo(const TypeDefinitionImpl& typeDef); - virtual ~XSDTypeInfo(); - const TypeDefinitionImpl& getTypeDefinition() {return typeDefinition;} + /** + * Internal Helper Class + * This holds a type definition during the parsing process + * when all types need to be read and stored prior to creation + * within the data factory. + */ + + class XSDTypeInfo : public DASValue + { + public: + XSDTypeInfo(); + XSDTypeInfo(const TypeDefinitionImpl& typeDef); + virtual ~XSDTypeInfo(); + const TypeDefinitionImpl& getTypeDefinition() {return typeDefinition;} - private: - TypeDefinitionImpl typeDefinition; - }; - } -} + private: + TypeDefinitionImpl typeDefinition; + }; + } // end namespace internal + } // end namespace sdo +} // end namespace commonj #endif //_XSDTypeInfo_H_ + + Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp?view=diff&rev=564515&r1=564514&r2=564515 ============================================================================== --- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp (original) +++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest2.cpp Fri Aug 10 01:53:10 2007 @@ -30,10 +30,11 @@ #include "sdotest.h" - +#include <commonj/sdo/XSDHelperImpl.h> using namespace commonj::sdo; +using namespace commonj::sdo::internal; DataObjectPtr sdotest::scopetest2() { @@ -1122,7 +1123,7 @@ DataFactoryPtr mdg = DataFactory::getDataFactory(); - XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg); + XSDHelperImplPtr xsh = staticCast<XSDHelperImplPtr>(HelperProvider::getXSDHelper(mdg)); TypeDefinitions* ts = new TypeDefinitions(); if (ts) delete ts; @@ -1732,11 +1733,11 @@ DataFactoryPtr mdg = DataFactory::getDataFactory(); - XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg); + XSDHelperImplPtr xsh = staticCast<XSDHelperImplPtr>(HelperProvider::getXSDHelper(mdg)); xsh->defineFile("company.xsd"); - XSDHelperPtr clonedHelper = HelperProvider::getXSDHelper(); + XSDHelperImplPtr clonedHelper = staticCast<XSDHelperImplPtr>(HelperProvider::getXSDHelper()); clonedHelper->defineTypes(xsh->getDefinedTypes()); xsh->generateFile(mdg->getTypes(),"typedefs.xsd", "companyNS", 0); @@ -1762,14 +1763,14 @@ DataFactoryPtr mdg = DataFactory::getDataFactory(); - XSDHelperPtr xsh = HelperProvider::getXSDHelper(mdg); + XSDHelperImplPtr xsh = staticCast<XSDHelperImplPtr>(HelperProvider::getXSDHelper(mdg)); cout << "parsing" <<endl; xsh->defineFile("eBaySvc.wsdl"); cout << "parsed" <<endl; cout<< "number of types = " << xsh->getDefinedTypes().size() <<endl; - XSDHelperPtr clonedHelper = HelperProvider::getXSDHelper(); + XSDHelperImplPtr clonedHelper = staticCast<XSDHelperImplPtr>(HelperProvider::getXSDHelper()); cout << "cloning" <<endl; clonedHelper->defineTypes(xsh->getDefinedTypes()); cout << "cloned" <<endl; @@ -1908,4 +1909,4 @@ cout << "Exception in jira1112" << e << endl; return 0; } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
