tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gw...@apache.org
Subject svn commit: r499770 - in /incubator/tuscany/cpp/sdo/runtime/core: src/commonj/sdo/DataObjectImpl.cpp test/sdotest.cpp test/testopen.txt test/testutils.txt
Date Thu, 25 Jan 2007 12:51:58 GMT
Author: gwinn
Date: Thu Jan 25 04:51:57 2007
New Revision: 499770

URL: http://svn.apache.org/viewvc?view=rev&rev=499770
Log:
TUSCANY-1077

Modified:
    incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp
    incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
    incubator/tuscany/cpp/sdo/runtime/core/test/testopen.txt
    incubator/tuscany/cpp/sdo/runtime/core/test/testutils.txt

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=499770&r1=499769&r2=499770
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/src/commonj/sdo/DataObjectImpl.cpp Thu Jan 25 04:51:57
2007
@@ -1064,7 +1064,7 @@
     
     const PropertyImpl* DataObjectImpl::defineCString(const SDOString& propname)
     {
-        const Type& t = factory->getType(Type::SDOTypeNamespaceURI, "Bytes");
+        const Type& t = factory->getType(Type::SDOTypeNamespaceURI, "String");
         return defineProperty(propname,t);
     }
     
@@ -1247,7 +1247,7 @@
                const PropertyImpl* p = d->getPropertyImpl(prop);
                if (p == 0 && d->getType().isOpenType())
                {
-                  p = d->defineBytes(prop);
+                  p = d->defineString(prop);
                }
                if (p != 0)
                {

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp?view=diff&rev=499770&r1=499769&r2=499770
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/sdotest.cpp Thu Jan 25 04:51:57 2007
@@ -5683,7 +5683,7 @@
         
 
         // so, we now expect that the openboolean and openstring props will
-        // be of type boolean and Bytes, and the openlist will be a list of integers.
+        // be of type boolean and String, and the openlist will be a list of integers.
         // The dataobjectlist an dataobject will be of the correct OpenType
 
         // we need a test for data objects, and that we are writing out xsi:type
@@ -5708,9 +5708,9 @@
         }
 
         if (strcmp(emp->getProperty("openstring").getType().getName(),
-            "Bytes"))
+            "String"))
         {
-            if (!silent)cout << "OpenLoad failure - bytes property not bytes" <<
endl;
+            if (!silent)cout << "OpenLoad failure - bytes property not String" <<
endl;
             return 0;
 
         }
@@ -5883,7 +5883,7 @@
         
 
         // so, we now expect that the openboolean and openstring props will
-        // be of type boolean and Bytes, and the openlist will be a list of integers.
+        // be of type boolean and String, and the openlist will be a list of integers.
         // The dataobjectlist an dataobject will be of the correct OpenType
 
         // we need a test for data objects, and that we are writing out xsi:type
@@ -5895,9 +5895,9 @@
         DataObjectPtr emp2 = dl22[0];
 
         if (strcmp(emp2->getProperty("openboolean").getType().getName(),
-            "Bytes"))
+            "String"))
         {
-            if (!silent)cout << "OpenLoadNS2 failure - bool property not bytes" <<
endl;
+            if (!silent)cout << "OpenLoadNS2 failure - bool property not String" <<
endl;
             return 0;
 
         }
@@ -5908,9 +5908,9 @@
         }
 
         if (strcmp(emp2->getProperty("openstring").getType().getName(),
-            "Bytes"))
+            "String"))
         {
-            if (!silent)cout << "OpenLoadNS2 failure - bytes property not bytes" <<
endl;
+            if (!silent)cout << "OpenLoadNS2 failure - bytes property not String" <<
endl;
             return 0;
 
         }

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/testopen.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/testopen.txt?view=diff&rev=499770&r1=499769&r2=499770
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/testopen.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/testopen.txt Thu Jan 25 04:51:57 2007
@@ -7,7 +7,7 @@
 EMP1 inst property: name (many? 0) of type String
 EMP1 inst property: SN (many? 0) of type String
 EMP1 inst property: manager (many? 0) of type Boolean
-EMP1 inst property: openstring (many? 0) of type Bytes
+EMP1 inst property: openstring (many? 0) of type String
 EMP1 inst property: openboolean (many? 0) of type Boolean
 EMP1 inst property: opentypelist (many? 1) of type Short
 EMP1 inst property: name (many? 0) of type String

Modified: incubator/tuscany/cpp/sdo/runtime/core/test/testutils.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sdo/runtime/core/test/testutils.txt?view=diff&rev=499770&r1=499769&r2=499770
==============================================================================
--- incubator/tuscany/cpp/sdo/runtime/core/test/testutils.txt (original)
+++ incubator/tuscany/cpp/sdo/runtime/core/test/testutils.txt Thu Jan 25 04:51:57 2007
@@ -35,7 +35,7 @@
               Property Type: commonj.sdo#Boolean
               Property Value: not set
               Property: openstring
-              Property Type: commonj.sdo#Bytes
+              Property Type: commonj.sdo#String
               Property Value: Value Of Open String
               Property: openboolean
               Property Type: commonj.sdo#Boolean



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message