You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/01/19 09:32:28 UTC
svn commit: r497740 - in /incubator/tuscany/cpp/das:
VSExpress/tuscany_das/Build/ VSExpress/tuscany_das/das_runtime/
runtime/core/src/
Author: lresende
Date: Fri Jan 19 00:32:27 2007
New Revision: 497740
URL: http://svn.apache.org/viewvc?view=rev&rev=497740
Log:
Latest patch from Adriano Creatani for DAS C++
Modified:
incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj
incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj
incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.cpp
incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.h
incubator/tuscany/cpp/das/runtime/core/src/CollisionParameter.cpp
incubator/tuscany/cpp/das/runtime/core/src/Column.h
incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.cpp
incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.h
incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.cpp
incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.h
incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.cpp
incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.h
incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.cpp
incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.h
incubator/tuscany/cpp/das/runtime/core/src/ConfigImpl.h
incubator/tuscany/cpp/das/runtime/core/src/DASObject.h
incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.cpp
incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.h
incubator/tuscany/cpp/das/runtime/core/src/ParameterImpl.h
incubator/tuscany/cpp/das/runtime/core/src/Parameters.cpp
incubator/tuscany/cpp/das/runtime/core/src/Parameters.h
incubator/tuscany/cpp/das/runtime/core/src/Relationship.h
Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/Build/Build.vcproj Fri Jan 19 00:32:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="Build"
ProjectGUID="{9540B934-24BA-45F0-965B-8231E256DF03}"
Keyword="MakeFileProj"
Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj Fri Jan 19 00:32:27 2007
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="8,00"
Name="das_runtime"
ProjectGUID="{964F3F93-8D1C-46BE-9724-2313CE7380AA}"
RootNamespace="das_runtime"
@@ -280,6 +280,14 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\ConnectionInfoImpl.cpp"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\runtime\core\src\CreateImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\CreateOperation.cpp"
>
</File>
@@ -292,6 +300,28 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\DASObject.cpp"
+ >
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ ObjectFile="$(IntDir)\$(InputName)1.obj"
+ XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
+ />
+ </FileConfiguration>
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\DatabaseObject.cpp"
>
</File>
@@ -312,6 +342,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\DeleteImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\DeleteList.cpp"
>
</File>
@@ -340,6 +374,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\KeyPairImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\ManagedParameterImpl.cpp"
>
</File>
@@ -380,10 +418,18 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\RelationshipImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\RelationshipWrapper.cpp"
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\ResultDescriptorImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\ResultMetadata.cpp"
>
</File>
@@ -404,6 +450,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\TableImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\TableWrapper.cpp"
>
</File>
@@ -416,6 +466,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\UpdateImpl.cpp"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\UpdateList.cpp"
>
</File>
@@ -513,6 +567,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\ConnectionInfoImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\Converter.h"
>
</File>
@@ -521,6 +579,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\CreateImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\CreateOperation.h"
>
</File>
@@ -545,6 +607,14 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\DASPointer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\runtime\core\src\DASValues.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\DatabaseObject.h"
>
</File>
@@ -569,6 +639,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\DeleteImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\DeleteList.h"
>
</File>
@@ -601,6 +675,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\KeyPairImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\ManagedParameterImpl.h"
>
</File>
@@ -653,6 +731,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\RelationshipImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\RelationshipWrapper.h"
>
</File>
@@ -661,6 +743,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\ResultDescriptorImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\ResultMetadata.h"
>
</File>
@@ -697,6 +783,10 @@
>
</File>
<File
+ RelativePath="..\..\..\runtime\core\src\TableImpl.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\runtime\core\src\TableWrapper.h"
>
</File>
@@ -710,6 +800,10 @@
</File>
<File
RelativePath="..\..\..\runtime\core\src\UpdateGenerator.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\runtime\core\src\UpdateImpl.h"
>
</File>
<File
Modified: incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.cpp Fri Jan 19 00:32:27 2007
@@ -25,7 +25,7 @@
ChangeSummarizer::~ChangeSummarizer(void) {}
Changes* ChangeSummarizer::loadChanges(DataObject* root) {
- ChangeSummary* changeSummary = root->getDataGraph()->getChangeSummary();
+ ChangeSummaryPtr changeSummary = root->getChangeSummary();
/*if (changeSummary.isLogging()) {
((ChangeSummaryImpl) changeSummary).summarize();
@@ -40,11 +40,11 @@
changes.setInsertOrder(mapping->getInsertOrder());
changes.setDeleteOrder(mapping->getDeleteOrder());
- list<DataObject*>::iterator i;
- for (i = changedObjects.begin() ; i != changedObjects.end() ; i++) {
+ int i;
+ for (i = 0 ; i < changedObjects.size() ; i++) {
- if (*i != root) {
- createChange(changeSummary, *i);
+ if (changedObjects[i] != (const DataObjectPtr) root) {
+ createChange(changeSummary, (DataObject*) changedObjects[i]);
}
}
@@ -63,7 +63,7 @@
if (!changeSummary->isDeleted(changedObject)) {
ChangeFactory* factory = getRegistry()->getFactory(changedObject->getType());
- string propagatedID = ((map<string, string>::iterator) generatedKeys.find(changedObject->getType().getName())->second;
+ string propagatedID = ((map<string, string>::iterator) generatedKeys.find(changedObject->getType().getName()))->second;
changes.addInsert(factory->createInsertOperation(changedObject, propagatedID));
}
@@ -97,26 +97,26 @@
changes.addUpdate(factory->createUpdateOperation(changedObject, propagatedID));
} else {
- SettingList* values = changeSummary.getOldValues(changedObject);
- int valuesSize = values->size();
+ SettingList& values = changeSummary->getOldValues((DataObjectPtr) changedObject);
+ int valuesSize = values.size();
int i;
for (i = 0; i < valuesSize ; i++) {
- ChangeSummary.Setting* setting = values.get(i);
+ Setting* setting = values.get(i);
- if (!setting->getProperty()->getType()->isDataType()) {
+ if (!setting->getProperty().getType().isDataType()) {
/*if (this.logger.isDebugEnabled()) {
this.logger.debug("Reference change for " + changedObject.getType().getName());
}*/
- Property* ref = setting->getProperty();
+ const Property& ref = setting->getProperty();
/*if (this.logger.isDebugEnabled()) {
this.logger.debug(ref.getName());
}*/
- if (hasState(ref, changedObject)) {
+ if (hasState(&ref, changedObject)) {
ChangeFactory* factory = getRegistry()->getFactory(changedObject->getType());
changes.addUpdate(factory->createUpdateOperation(changedObject));
@@ -168,8 +168,8 @@
}
list<Table*>* tables = mapping->getConfig()->getTable();
- list<Table*>::iterator i = tables->iterator();
- for (; i != tables->end() ; i++) {
+ list<Table*>::iterator i;
+ for (i = tables->begin() ; i != tables->end() ; i++) {
list<Column*>* columns = (*i)->getColumn();
list<Column*>::iterator j = columns->begin();
@@ -195,7 +195,7 @@
return connection;
}
-bool ChangeSummarizer::hasState(Property* ref, DataObject* changedObject) {
+bool ChangeSummarizer::hasState(const Property* ref, DataObject* changedObject) const {
if (ref->getOpposite()->isMany()) {
return true;
@@ -204,7 +204,7 @@
MappingWrapper& mw = *mapping;
if (mw.getConfig() == NULL) {
- mw = &(registry->getFactory(changedObject->getType())->getConfig());
+ mw = *(registry->getFactory(changedObject->getType())->getConfig());
}
if (mw.getConfig() == NULL) {
@@ -220,7 +220,7 @@
}
// This is a one-one relationship
- Table* t = mapping.getTableByTypeName(changedObject->getType().getName());
+ Table* t = mapping->getTableByTypeName(changedObject->getType().getName());
TableWrapper tw(t);
RelationshipWrapper rw(rel);
@@ -232,8 +232,8 @@
keys.sort();
keys.unique();
- if ((rel.getForeignKeyTable() == t.getTableName())
- && (keys.size() == primaryKeyProperties.size() + foreignKeys.size())) {
+ if ((rel->getForeignKeyTable() == t->getTableName())
+ && (keys.size() == primaryKeyProperties->size() + foreignKeys->size())) {
return true;
}
@@ -244,7 +244,7 @@
}
-bool ChangeSummarizer::hasAttributeChange(SettingList* theChanges) {
+bool ChangeSummarizer::hasAttributeChange(SettingList* theChanges) const {
int i;
for (i = 0 ; i < theChanges->size() ; i++) {
@@ -266,4 +266,4 @@
return registry;
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ChangeSummarizer.h Fri Jan 19 00:32:27 2007
@@ -40,6 +40,7 @@
#include "commonj/sdo/Type.h"
#include "commonj/sdo/ChangeSummary.h"
#include "commonj/sdo/SettingList.h"
+#include "commonj/sdo/Setting.h"
using namespace commonj::sdo;
using namespace std;
@@ -53,8 +54,8 @@
ConnectionImpl* connection;
map<string, string> generatedKeys;
- bool hasState(Property* ref, DataObject* changedObject);
- bool hasAttributeChange(SettingList* theChanges);
+ bool hasState(const Property* ref, DataObject* changedObject) const;
+ bool hasAttributeChange(SettingList* theChanges) const;
FactoryRegistry* getRegistry(void);
public:
@@ -72,4 +73,4 @@
};
-#endif //CHANGE_SUMMARIZER_H
\ No newline at end of file
+#endif //CHANGE_SUMMARIZER_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/CollisionParameter.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/CollisionParameter.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/CollisionParameter.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/CollisionParameter.cpp Fri Jan 19 00:32:27 2007
@@ -18,7 +18,7 @@
*/
#include "CollisionParameter.h"
-CollisionParameter::void setValue(DASObject* aValue) {
+void CollisionParameter::setValue(DASObject* aValue) {
if (!isSet) {
value = aValue;
@@ -26,4 +26,4 @@
}
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/cpp/das/runtime/core/src/Column.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/Column.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/Column.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/Column.h Fri Jan 19 00:32:27 2007
@@ -24,6 +24,8 @@
using namespace std;
virtual class Column {
+
+public:
/**
* Returns the value of the '<em><b>Column Name</b></em>' attribute.
* <!-- begin-user-doc -->
@@ -196,4 +198,4 @@
}; // Column
-#endif //COLUMN_H
\ No newline at end of file
+#endif //COLUMN_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.cpp Fri Jan 19 00:32:27 2007
@@ -18,6 +18,14 @@
*/
#include "ColumnImpl.h"
+string ColumnImpl::columnName = COLUMN_NAME_DEFAULT_;
+string ColumnImpl::propertyName = PROPERTY_NAME_DEFAULT_;
+string ColumnImpl::converterClassName = CONVERTER_CLASS_NAME_DEFAULT_;
+bool ColumnImpl::primaryKey = PRIMARY_KEY_DEFAULT_;
+bool ColumnImpl::generated = GENERATED_DEFAULT_;
+bool ColumnImpl::collision = COLLISION_DEFAULT_;
+bool ColumnImpl::managed = MANAGED_DEFAULT_;
+
ColumnImpl::ColumnImpl(void) {}
ColumnImpl::~ColumnImpl(void) {
@@ -35,7 +43,7 @@
}
Type& ColumnImpl::getType(void) {
- return ((ConfigFactoryImpl) ConfigFactory.INSTANCE).getColumn();
+ return ((ConfigFactoryImpl) ConfigFactory::INSTANCE).getColumn();
}
string ColumnImpl::getColumnName(void) {
@@ -94,7 +102,7 @@
managed = newManaged;
}
-DASObject& ColumnImpl::get(int propertyIndex, bool resolve) {
+DASValuePtr ColumnImpl::get(int propertyIndex, bool resolve) {
switch (propertyIndex) {
case COLUMN_NAME:
Modified: incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ColumnImpl.h Fri Jan 19 00:32:27 2007
@@ -19,26 +19,29 @@
#ifndef COLUMN_IMPL_H
#define COLUMN_IMPL_H
-class ColumnImpl : public DataObjectBase, public Column {
+#include <string>
+
+#include "Column.h"
+#include "DASObject.h"
+#include "ConfigFactory.h"
+#include "ConfigFactoryImpl.h"
+
+#include "commonj/sdo/Type.h"
+
+using namespace std;
+using namespace commonj::sdo;
+
+class ColumnImpl : /*public DataObjectBase,*/ public Column {
protected:
- const static string COLUMN_NAME_DEFAULT_ = NULL;
- const static string PROPERTY_NAME_DEFAULT_ = NULL;
- const static string CONVERTER_CLASS_NAME_DEFAULT_ = NULL;
+ const static string COLUMN_NAME_DEFAULT_;
+ const static string PROPERTY_NAME_DEFAULT_;
+ const static string CONVERTER_CLASS_NAME_DEFAULT_;
const static bool PRIMARY_KEY_DEFAULT_ = false;
const static bool GENERATED_DEFAULT_ = false;
const static bool COLLISION_DEFAULT_ = false;
const static bool MANAGED_DEFAULT_ = true;
-
- string columnName = COLUMN_NAME_DEFAULT_;
- string propertyName = PROPERTY_NAME_DEFAULT_;
- string converterClassName = CONVERTER_CLASS_NAME_DEFAULT_;
- bool primaryKey = PRIMARY_KEY_DEFAULT_;
- bool generated = GENERATED_DEFAULT_;
- bool collision = COLLISION_DEFAULT_;
- bool managed = MANAGED_DEFAULT_;
-
- ColumnImpl(void);
+
void initializeVariables(void);
public:
@@ -51,6 +54,7 @@
const static int MANAGED = 6;
const static int SDO_PROPERTY_COUNT = 7;
+ ColumnImpl(void);
virtual ~ColumnImpl(void);
Type* getType(void);
string getColumnName(void);
@@ -76,4 +80,4 @@
};
-#endif //COLUMN_IMPL_H
\ No newline at end of file
+#endif //COLUMN_IMPL_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.cpp Fri Jan 19 00:32:27 2007
@@ -16,18 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
+#include "CommandImpl.h"
+
CommandImpl::CommandImpl(string sqlString) {
- statement = Statement(sqlString);
+ statement = new Statement(sqlString);
//try {
- URL url = getClass().getResource("/xml/sdoJava.xsd");
+ /*URL url = getClass().getResource("/xml/sdoJava.xsd");
if (url == null) {
//throw new RuntimeException("Could not find resource: xml/sdoJava.xsd");
}
InputStream inputStream = url.openStream();
XSDHelper.INSTANCE.define(inputStream, url.toString());
- inputStream.close();
+ inputStream.close();*/
//} catch (IOException ex) {
// throw new RuntimeException(ex);
//}
@@ -37,7 +39,7 @@
CommandImpl::~CommandImpl() {
}
-void CommandImpl::setParameter(int index, Object* value) {
+void CommandImpl::setParameter(int index, DASObject* value) {
parameters.setParameter(index, value);
}
@@ -45,7 +47,7 @@
parameters.add(param);
}
-list* CommandImpl::getParameters(void) {
+vector<ParameterImpl*>* CommandImpl::getParameters(void) {
return parameters.parameterList();
}
@@ -53,7 +55,7 @@
return parameters.parameterWithIndex(index)->getValue();
}
-void CommandImpl::setConnection(ConnectionImpl connection) {
+void CommandImpl::setConnection(ConnectionImpl* connection) {
statement->setConnection(connection);
}
Modified: incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/CommandImpl.h Fri Jan 19 00:32:27 2007
@@ -19,7 +19,7 @@
#ifndef COMMAND_IMPL_H
#define COMMAND_IMPL_H
-#include <list>
+#include <vector>
#include "Command.h"
#include "Statement.h"
@@ -52,7 +52,7 @@
virtual DataObject* executeQuery(void);
void setParameter(int index, DASObject* value);
void addParameter(ParameterImpl* param);
- list<ParameterImpl*>* getParameters(void);
+ vector<ParameterImpl*>* getParameters(void);
DASObject* getParameter(int index);
void setConnection(ConnectionImpl* connection);
void close(void);
@@ -60,4 +60,4 @@
};
-#endif //COMMAND_IMPL_H
\ No newline at end of file
+#endif //COMMAND_IMPL_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.cpp Fri Jan 19 00:32:27 2007
@@ -17,5 +17,6 @@
* under the License.
*/
#include "ConfigFactory.h"
+#include "ConfigFactoryImpl.h"
-ConfigFactory& ConfigFactory::INSTANCE = ConfigFactoryImpl.init();
\ No newline at end of file
+ConfigFactory* ConfigFactory::INSTANCE = (ConfigFactory*) ConfigFactoryImpl::init();
Modified: incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ConfigFactory.h Fri Jan 19 00:32:27 2007
@@ -31,7 +31,6 @@
#include "Relationship.h"
#include "Update.h"
#include "Table.h"
-#include "ConfigFactoryImpl.h"
class ConfigFactory {
@@ -43,7 +42,7 @@
* <!-- end-user-doc -->
* @generated
*/
- ConfigFactory* INSTANCE/* = ConfigFactoryImpl.init()*/;
+ static ConfigFactory* INSTANCE/* = ConfigFactoryImpl.init()*/;
/**
* Returns a new object of class '<em>Column</em>'.
@@ -156,4 +155,4 @@
}; //ConfigFactory
-#endif //CONFIG_FACTORY_H
\ No newline at end of file
+#endif //CONFIG_FACTORY_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.cpp Fri Jan 19 00:32:27 2007
@@ -6,28 +6,44 @@
* to you 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.
+ * under the License.
*/
-package meta-data objects
- theConfigFactoryImpl.createMetaData();
+
+#include "ConfigFactoryImpl.h"
+
+ConfigFactoryImpl* ConfigFactoryImpl::init(void) {
+
+ if (isInited) {
+ //return (ConfigFactoryImpl) FactoryBase.getStaticFactory(ConfigFactoryImpl.NAMESPACE_URI);
+ }
+
+ ConfigFactoryImpl* theConfigFactoryImpl = new ConfigFactoryImpl;
+ isInited = true;
+
+ // Initialize simple dependencies
+ //SDOUtil.registerStaticTypes(SDOFactory.class);
+ //SDOUtil.registerStaticTypes(ModelFactory.class);
+
+ // Create package meta-data objects
+ theConfigFactoryImpl->createMetaData();
// Initialize created meta-data
- theConfigFactoryImpl.initializeMetaData();
+ theConfigFactoryImpl->initializeMetaData();
// Mark meta-data to indicate it can't be changed
//theConfigFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
return theConfigFactoryImpl;
-}
+ }
void ConfigFactoryImpl::initializeVariables(void) {
isCreated = false;
@@ -47,14 +63,197 @@
}
+ConfigFactoryImpl::ConfigFactoryImpl(void) /*: FactoryBase(NAMESPACE_URI, NAMESPACE_PREFIX)*/ {}
+
+ConfigFactoryImpl::~ConfigFactoryImpl(void) {}
+
+//DataObject* ConfigFactoryImpl::create(int typeNumber) {}
+Column* ConfigFactoryImpl::createColumn(void) {
+ return new ColumnImpl;
+}
+
+Command* ConfigFactoryImpl::createCommand(void) {
+ return new CommandImpl("");
+}
+
+Config* ConfigFactoryImpl::createConfig(void) {
+ return new ConfigImpl;
+}
+
+ConnectionInfo* ConfigFactoryImpl::createConnectionInfo(void) {
+ return new ConnectionInfoImpl;
+}
+
+Create* ConfigFactoryImpl::createCreate(void) {
+ return new CreateImpl;
+}
+
+Delete* ConfigFactoryImpl::createDelete(void) {
+ return new DeleteImpl;
+}
+
+KeyPair* ConfigFactoryImpl::createKeyPair(void) {
+ return (KeyPair*) new KeyPairImpl;
+}
+
+Parameter* ConfigFactoryImpl::createParameter(void) {
+ return (Parameter*) new ParameterImpl;
+}
+
+Relationship* ConfigFactoryImpl::createRelationship(void) {
+ return (Relationship*) new RelationshipImpl;
+}
+
+ResultDescriptor* ConfigFactoryImpl::createResultDescriptor(void) {
+ return (ResultDescriptor*) new ResultDescriptorImpl;
+}
+
+Table* ConfigFactoryImpl::createTable(void) {
+ return new TableImpl;
+}
+
+Update* ConfigFactoryImpl::createUpdate(void) {
+ return new UpdateImpl;
+}
+
+Type* ConfigFactoryImpl::getColumn(void) {
+ return columnType;
+}
+
+Type* ConfigFactoryImpl::getCommand(void) {
+ return commandType;
+}
+
+Type* ConfigFactoryImpl::getConfig(void) {
+ return configType;
+}
+
+Type* ConfigFactoryImpl::getConnectionInfo(void) {
+ return connectionInfoType;
+}
+
+Type* ConfigFactoryImpl::getCreate(void) {
+ return createType;
+}
+
+Type* ConfigFactoryImpl::getDelete(void) {
+ return deleteType;
+}
+
+Type* ConfigFactoryImpl::getKeyPair(void) {
+ return keyPairType;
+}
+
+Type* ConfigFactoryImpl::getParameter(void) {
+ return parameterType;
+
+}
+
+Type* ConfigFactoryImpl::getRelationship(void) {
+ return relationshipType;
+}
+
+Type* ConfigFactoryImpl::getResultDescriptor(void) {
+ return keyPairType;
+}
+
+Type* ConfigFactoryImpl::getTable(void) {
+ return tableType;
+}
+
+Type* ConfigFactoryImpl::getUpdate(void) {
+ return updateType;
+}
+
+void ConfigFactoryImpl::createMetaData(void) {
+ if (isCreated) {
+ return;
+ }
+
+ isCreated = true;
+
+ /*columnType = createType(false, COLUMN);
+ createProperty(true, columnType, ColumnImpl::COLUMN_NAME);
+ createProperty(true, columnType, ColumnImpl::PROPERTY_NAME);
+ createProperty(true, columnType, ColumnImpl::CONVERTER_CLASS_NAME);
+ createProperty(true, columnType, ColumnImpl::PRIMARY_KEY);
+ createProperty(true, columnType, ColumnImpl::GENERATED);
+ createProperty(true, columnType, ColumnImpl::COLLISION);
+ createProperty(true, columnType, ColumnImpl::MANAGED);
+
+ commandType = createType(false, COMMAND);
+ createProperty(false, commandType, ColumnImpl::PARAMETER);
+ createProperty(false, commandType, ColumnImpl::RESULT_DESCRIPTOR);
+ createProperty(true, commandType, ColumnImpl::NAME);
+ createProperty(true, commandType, ColumnImpl::SQL);
+ createProperty(true, commandType, ColumnImpl::KIND);
+
+ configType = createType(false, CONFIG);
+ createProperty(false, configType, ColumnImpl::COMMAND);
+ createProperty(false, configType, ColumnImpl::TABLE);
+ createProperty(false, configType, ColumnImpl::RELATIONSHIP);
+ createProperty(false, configType, ColumnImpl::CONNECTION_INFO);
+ createProperty(true, configType, ColumnImpl::URI);
+ createProperty(true, configType, ColumnImpl::DATA_OBJECT_MODEL);
+
+ connectionInfoType = createType(false, CONNECTION_INFO);
+ createProperty(true, connectionInfoType, ConnectionInfoImpl::DATA_SOURCE);
+ createProperty(true, connectionInfoType, ConnectionInfoImpl::MANAGEDTX);
+
+ createType = createType(false, CREATE);
+ createProperty(true, createType, CreateImpl::SQL);
+ createProperty(true, createType, CreateImpl::PARAMETERS);
+
+ deleteType = createType(false, DELETE);
+ createProperty(true, deleteType, DeleteImpl::SQL);
+ createProperty(true, deleteType, DeleteImpl::PARAMETERS);
+
+
+ keyPairType = createType(false, KEY_PAIR);
+ createProperty(true, keyPairType, KeyPairImpl::PRIMARY_KEY_COLUMN);
+ createProperty(true, keyPairType, KeyPairImpl::FOREIGN_KEY_COLUMN);
+
+ parameterType = createType(false, PARAMETER);
+ createProperty(true, parameterType, ParameterImpl::COLUMN_TYPE);
+ createProperty(true, parameterType, ParameterImpl::DIRECTION);
+ createProperty(true, parameterType, ParameterImpl::INDEX);
+
+ relationshipType = createType(false, RELATIONSHIP);
+ createProperty(false, relationshipType, RelationshipImpl::KEY_PAIR);
+ createProperty(true, relationshipType, RelationshipImpl::NAME);
+ createProperty(true, relationshipType, RelationshipImpl::PRIMARY_KEY_TABLE);
+ createProperty(true, relationshipType, RelationshipImpl::FOREIGN_KEY_TABLE);
+ createProperty(true, relationshipType, RelationshipImpl::MANY);
+ createProperty(true, relationshipType, RelationshipImpl::KEY_RESTRICTED);
+
+ resultDescriptorType = createType(false, RESULT_DESCRIPTOR);
+ createProperty(true, resultDescriptorType, ResultDescriptorImpl::COLUMN_NAME);
+ createProperty(true, resultDescriptorType, ResultDescriptorImpl::TABLE_NAME);
+ createProperty(true, resultDescriptorType, ResultDescriptorImpl::COLUMN_TYPE);
+
+ tableType = createType(false, TABLE);
+ createProperty(false, tableType, TableImpl::COLUMN);
+ createProperty(false, tableType, TableImpl::CREATE);
+ createProperty(false, tableType, TableImpl::UPDATE);
+ createProperty(false, tableType, TableImpl::DELETE);
+ createProperty(true, tableType, TableImpl::TABLE_NAME);
+ createProperty(true, tableType, TableImpl::TYPE_NAME);
+
+ updateType = createType(false, UPDATE);
+ createProperty(true, updateType, UpdateImpl::SQL);
+ createProperty(true, updateType, UpdateImpl::PARAMETERS);*/
+
+}
+
+
//void ConfigFactoryImpl::createXSDMetaData(ModelFactoryImpl& theModelPackageImpl) {
// super.createXSDMetaData();
-//
+//
// Property& property = NULL;
-//
+//
// addXSDMapping
// (columnType,
-// new String[]
+// new String[]
// {
// "name", "Column",
// "kind", "empty"
@@ -118,7 +317,7 @@
//
// addXSDMapping
// (commandType,
-// new String[]
+// new String[]
// {
// "name", "Command",
// "kind", "elementOnly"
@@ -168,7 +367,7 @@
//
// addXSDMapping
// (configType,
-// new String[]
+// new String[]
// {
// "name", "Config",
// "kind", "elementOnly"
@@ -228,7 +427,7 @@
//
// addXSDMapping
// (connectionInfoType,
-// new String[]
+// new String[]
// {
// "name", "ConnectionInfo",
// "kind", "empty"
@@ -252,7 +451,7 @@
//
// addXSDMapping
// (createType,
-// new String[]
+// new String[]
// {
// "name", "Create",
// "kind", "empty"
@@ -276,7 +475,7 @@
//
// addXSDMapping
// (deleteType,
-// new String[]
+// new String[]
// {
// "name", "Delete",
// "kind", "empty"
@@ -307,10 +506,10 @@
// "name", "Config",
// "namespace", "##targetNamespace"
// });
-//
+//
// addXSDMapping
// (keyPairType,
-// new String[]
+// new String[]
// {
// "name", "KeyPair",
// "kind", "empty"
@@ -334,7 +533,7 @@
//
// addXSDMapping
// (parameterType,
-// new String[]
+// new String[]
// {
// "name", "Parameter",
// "kind", "empty"
@@ -366,7 +565,7 @@
//
// addXSDMapping
// (relationshipType,
-// new String[]
+// new String[]
// {
// "name", "Relationship",
// "kind", "elementOnly"
@@ -423,7 +622,7 @@
//
// addXSDMapping
// (resultDescriptorType,
-// new String[]
+// new String[]
// {
// "name", "ResultDescriptor",
// "kind", "empty"
@@ -455,7 +654,7 @@
//
// addXSDMapping
// (tableType,
-// new String[]
+// new String[]
// {
// "name", "Table",
// "kind", "elementOnly"
@@ -515,7 +714,7 @@
//
// addXSDMapping
// (updateType,
-// new String[]
+// new String[]
// {
// "name", "Update",
// "kind", "empty"
@@ -537,4 +736,4 @@
// "name", "parameters"
// });
//
-//}
\ No newline at end of file
+//}
Modified: incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ConfigFactoryImpl.h Fri Jan 19 00:32:27 2007
@@ -6,24 +6,54 @@
* to you 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.
+ * under the License.
*/
+
#ifndef CONFIG_FACTORY_IMPL_H
#define CONFIG_FACTORY_IMPL_H
#include <string>
#include "ConfigFactory.h"
+#include "Column.h"
+#include "Command.h"
+#include "Config.h"
+#include "ConnectionInfo.h"
+#include "Create.h"
+#include "Delete.h"
+#include "KeyPair.h"
+#include "Parameter.h"
+#include "Relationship.h"
+#include "ResultDescriptor.h"
+#include "Table.h"
+#include "Update.h"
+#include "ColumnImpl.h"
+#include "CommandImpl.h"
+#include "ConfigImpl.h"
+#include "ConnectionInfoImpl.h"
+#include "CreateImpl.h"
+#include "DeleteImpl.h"
+#include "KeyPairImpl.h"
+#include "ParameterImpl.h"
+#include "RelationshipImpl.h"
+#include "ResultDescriptorImpl.h"
+#include "TableImpl.h"
+#include "UpdateImpl.h"
+
+#include "commonj/sdo/Type.h"
+
+using namespace commonj::sdo;
+using namespace std;
-class ConfigFactoryImpl /*:*/ /*public FactoryBase,*/ /*public ConfigFactory*/ {
+class ConfigFactoryImpl : /*public FactoryBase,*/ public ConfigFactory {
private:
static bool isInited/* = false*/;
@@ -50,18 +80,18 @@
public:
const static string NAMESPACE_URI/* = "http:///org.apache.tuscany.das.rdb/config.xsd"*/;
- const static string NAMESPACE_PREFIX/* = "config"*/;
- const static int COLUMN = 1;
- const static int COMMAND = 2;
- const static int CONFIG = 3;
- const static int CONNECTION_INFO = 4;
- const static int CREATE = 5;
- const static int DELET = 6;
- const static int KEY_PAIR = 7;
- const static int PARAMETER = 8;
- const static int RELATIONSHIP = 9;
- const static int RESULT_DESCRIPTOR = 10;
- const static int TABLE = 11;
+ const static string NAMESPACE_PREFIX/* = "config"*/;
+ const static int COLUMN = 1;
+ const static int COMMAND = 2;
+ const static int CONFIG = 3;
+ const static int CONNECTION_INFO = 4;
+ const static int CREATE = 5;
+ const static int DELET = 6;
+ const static int KEY_PAIR = 7;
+ const static int PARAMETER = 8;
+ const static int RELATIONSHIP = 9;
+ const static int RESULT_DESCRIPTOR = 10;
+ const static int TABLE = 11;
const static int UPDATE = 12;
static ConfigFactoryImpl* init(void);
@@ -69,18 +99,18 @@
ConfigFactoryImpl(void);
virtual ~ConfigFactoryImpl(void);
//DataObject* create(int typeNumber);
- virtual Column* createColumn(void);
- virtual Command* createCommand(void);
- virtual Config* createConfig(void);
- virtual ConnectionInfo* createConnectionInfo(void);
- virtual Create* createCreate(void);
- virtual Delete* createDelete(void);
- virtual KeyPair* createKeyPair(void);
- virtual Parameter* createParameter(void);
- virtual Relationship* createRelationship(void);
- virtual ResultDescriptor* createResultDescriptor(void);
- virtual Table* createTable(void);
- virtual Update* createUpdate(void);
+ Column* createColumn(void);
+ Command* createCommand(void);
+ Config* createConfig(void);
+ ConnectionInfo* createConnectionInfo(void);
+ Create* createCreate(void);
+ Delete* createDelete(void);
+ KeyPair* createKeyPair(void);
+ Parameter* createParameter(void);
+ Relationship* createRelationship(void);
+ ResultDescriptor* createResultDescriptor(void);
+ Table* createTable(void);
+ Update* createUpdate(void);
Type* getColumn(void);
Type* getCommand(void);
Type* getConfig(void);
@@ -98,4 +128,4 @@
};
-#endif //CONFIG_FACTORY_IMPL_H
\ No newline at end of file
+#endif //CONFIG_FACTORY_IMPL_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/ConfigImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ConfigImpl.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ConfigImpl.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ConfigImpl.h Fri Jan 19 00:32:27 2007
@@ -19,20 +19,34 @@
#ifndef CONFIG_IMPL_H
#define CONFIG_IMPL_H
-class ConfigImpl : public DataObjectBase, public Config {
+#include <string>
+#include <list>
+
+#include "Config.h"
+#include "Command.h"
+#include "Table.h"
+#include "Relationship.h"
+#include "ConnectionInfo.h"
+#include "DASObject.h"
+
+#include "commonj/sdo/Type.h"
+
+using namespace commonj::sdo;
+using namespace std;
+
+class ConfigImpl : /*public DataObjectBase,*/ public Config {
protected:
- const static string URI_DEFAULT_ = NULL;
- const static string DATA_OBJECT_MODEL_DEFAULT_ = NULL;
+ const static string URI_DEFAULT_;
+ const static string DATA_OBJECT_MODEL_DEFAULT_;
- list<Command*>* command = NULL;
- list<Table*>* table = NULL;
- list<Relationship*>* relationship = NULL;
- ConnectionInfo* connectionInfo = NULL;
- string uri = URI_DEFAULT_;
- string dataObjectModel = DATA_OBJECT_MODEL_DEFAULT_;
+ list<Command*>* command;
+ list<Table*>* table;
+ list<Relationship*>* relationship;
+ ConnectionInfo* connectionInfo;
+ string uri;
+ string dataObjectModel;
- ConfigImpl(void);
void initializeaVariables(void);
public:
@@ -44,19 +58,20 @@
const static int DATA_OBJECT_MODEL = 5;
const static int SDO_PROPERTY_COUNT = 6;
- virtual ~ConfigImple(void);
+ ConfigImpl(void);
+ virtual ~ConfigImpl(void);
Type* getType(void);
list<Command*>* getCommand(void);
list<Table*>* getTable(void);
list<Relationship*>* getRelationship(void);
ConnectionInfo* getConnectionInfo(void);
- ChangeContext* basicSetConnectionInfo(ConnectionInfo* newConnectionInfo, ChangeContext* changeContext);
+ //ChangeContext* basicSetConnectionInfo(ConnectionInfo* newConnectionInfo, ChangeContext* changeContext);
void setConnectionInfo(ConnectionInfo* newConnectionInfo);
string getUri(void);
void setUri(string newUri);
string getDataObjectModel(void);
void setDataObjectModel(string newDataObjectModel);
- ChangeContext* inverseRemove(DASObject* otherEnd, int propertyIndex, ChangeContext* changeContext);
+ //ChangeContext* inverseRemove(DASObject* otherEnd, int propertyIndex, ChangeContext* changeContext);
DASObject* get(int propertyIndex, bool resolve);
void set(int propertyIndex, DASObject* newValue);
void unset(int propertyIndex);
@@ -66,4 +81,4 @@
};
-#endif //CONFIG_IMPL_H
\ No newline at end of file
+#endif //CONFIG_IMPL_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/DASObject.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/DASObject.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/DASObject.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/DASObject.h Fri Jan 19 00:32:27 2007
@@ -6,20 +6,36 @@
* to you 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.
+ * under the License.
*/
-#ifndef D_A_S_OBJECT_H
-#define D_A_S_OBJECT_H
+
+#ifndef DAS_VALUE_H
+#define DAS_VALUE_H
+
+#include "DASPointer.h"
class DASObject {
+
+ private:
+ DASPointer dasPointer;
+ short dasValueType;
+
+ public:
+ DASObject(void);
+ DASObject(DASPointer pointer, short value);
+ virtual ~DASObject(void);
+ void setDASObject(DASPointer pointer, short value);
+ DASPointer getDASPointer(void) const;
+ short getDASObject(void) const;
+
};
-#endif //D_A_S_OBJECT_H
\ No newline at end of file
+#endif //DAS_VALUE_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.cpp Fri Jan 19 00:32:27 2007
@@ -468,7 +468,7 @@
}
-Relationship* MappingWrapper::getRelationshipByReference(Property* ref) {
+Relationship* MappingWrapper::getRelationshipByReference(const Property* ref) {
list<Relationship*>* relationshipList = config->getRelationship();
list<Relationship*>::iterator i;
Modified: incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/MappingWrapper.h Fri Jan 19 00:32:27 2007
@@ -67,7 +67,7 @@
void addConverter(string name, string converter);
string getConverter(string tableName, string columnName);
map<string, string>* getConverters(Table* table);
- Relationship* getRelationshipByReference(Property* ref);
+ Relationship* getRelationshipByReference(const Property* ref);
Relationship* getRelationshipByName(string name);
void addUpdateStatement(Table* table, string statement, string parameters);
void addDeleteStatement(Table* table, string statement, string parameters);
@@ -78,4 +78,4 @@
};
-#endif //MAPPING_WRAPPER_H
\ No newline at end of file
+#endif //MAPPING_WRAPPER_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/ParameterImpl.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/ParameterImpl.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/ParameterImpl.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/ParameterImpl.h Fri Jan 19 00:32:27 2007
@@ -19,12 +19,15 @@
#ifndef PARAMETER_IMPL_H
#define PARAMETER_IMPL_H
+#include <string>
+
#include "Converter.h"
#include "DASObject.h"
#include "commonj/sdo/Type.h"
using namespace commonj::sdo;
+using namespace std;
class ParameterImpl {
@@ -36,7 +39,7 @@
Converter* converter;
protected:
- DASObject* value;
+ DASValue* value;
public:
static const int PARAMETER_OUT = 1;
@@ -61,4 +64,4 @@
};
-#endif //PARAMETER_IMPL_H
\ No newline at end of file
+#endif //PARAMETER_IMPL_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/Parameters.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/Parameters.cpp?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/Parameters.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/Parameters.cpp Fri Jan 19 00:32:27 2007
@@ -71,7 +71,7 @@
return findOrCreateParameterWithIndex(index, ParameterImpl.IN, NULL);
}
-void Parameters::setParameter(int index, DASObject* value) {
+void Parameters::setParameter(int index, DASValue* value) {
ParameterImpl* param = findOrCreateParameterWithIndex(index);
param->setValue(value);
@@ -101,4 +101,4 @@
parameters.insert(param);
-}
\ No newline at end of file
+}
Modified: incubator/tuscany/cpp/das/runtime/core/src/Parameters.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/Parameters.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/Parameters.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/Parameters.h Fri Jan 19 00:32:27 2007
@@ -22,6 +22,7 @@
#include <vector>
#include "ParameterImpl.h"
+#include "DASObject.h"
#include "commonj/sdo/Type.h"
@@ -52,4 +53,4 @@
};
-#endif //PARAMETERS_H
\ No newline at end of file
+#endif //PARAMETERS_H
Modified: incubator/tuscany/cpp/das/runtime/core/src/Relationship.h
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/Relationship.h?view=diff&rev=497740&r1=497739&r2=497740
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/Relationship.h (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/Relationship.h Fri Jan 19 00:32:27 2007
@@ -26,6 +26,8 @@
using namespace std;
virtual class Relationship {
+
+public:
/**
* Returns the value of the '<em><b>Key Pair</b></em>' containment reference list.
* The list contents are of type {@link org.apache.tuscany.das.rdb.config.KeyPair}.
@@ -163,4 +165,4 @@
}; // Relationship
-#endif //RELATIONSHIP_H
\ No newline at end of file
+#endif //RELATIONSHIP_H
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org