tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adrianocrest...@apache.org
Subject svn commit: r573001 - in /incubator/tuscany/cpp/das: ./ VSExpress/tuscany_das/ VSExpress/tuscany_das/das_runtime/ VSExpress/tuscany_das/das_test/ runtime/core/ runtime/core/src/apache/das/ runtime/test/rsc/ runtime/test/src/ samples/SimpleRead/VSExpres...
Date Wed, 05 Sep 2007 17:14:09 GMT
Author: adrianocrestani
Date: Wed Sep  5 10:14:08 2007
New Revision: 573001

URL: http://svn.apache.org/viewvc?rev=573001&view=rev
Log:
added ant build to Native DAS 

Added:
    incubator/tuscany/cpp/das/build.xml
    incubator/tuscany/cpp/das/runtime/core/build.xml
Modified:
    incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_runtime/das_runtime.vcproj
    incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj
    incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln
    incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo
    incubator/tuscany/cpp/das/runtime/core/src/apache/das/RefCountingObject.cpp
    incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb
    incubator/tuscany/cpp/das/runtime/test/src/main.cpp
    incubator/tuscany/cpp/das/samples/SimpleRead/VSExpress/SimpleRead.suo
    incubator/tuscany/cpp/das/samples/SimpleRead/rsc/SimpleRead.fdb
    incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp

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?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
--- 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 Wed Sep
 5 10:14:08 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"
@@ -50,7 +50,7 @@
 				Optimization="2"
 				InlineFunctionExpansion="1"
 				AdditionalIncludeDirectories="..\..\..\runtime\core\src,$(LIBXML2_HOME)\include,$(ICONV_HOME)\include,$(ZLIB_HOME)\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;SDO_EXPORTS;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -120,7 +120,7 @@
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
 			UseOfMFC="0"
 			ATLMinimizesCRunTimeLibraryUsage="false"
-			CharacterSet="0"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -147,8 +147,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\runtime\generator\src;..\..\..\runtime\core\include;&quot;$(TUSCANY_SDOCPP)\include&quot;;&quot;$(LIBXML2_HOME)\include&quot;;&quot;$(ICONV_HOME)\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;"
+				AdditionalIncludeDirectories="..\..\..\runtime\core\include;&quot;$(TUSCANY_SDOCPP)\include&quot;;&quot;$(LIBXML2_HOME)\include&quot;;&quot;$(ICONV_HOME)\include&quot;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"

Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/das_test/das_test.vcproj Wed Sep  5 10:14:08
2007
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="8.00"
 	Name="das_test"
 	ProjectGUID="{277D86C4-0113-49EE-A351-0D32FF2E1EF3}"
 	RootNamespace="das_test"
@@ -40,8 +40,8 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ICONV_HOME)\include&quot;;&quot;$(LIBXML2_HOME)\include&quot;;&quot;$(TUSCANY_SDOCPP)/include&quot;;../../../deploy/include"
-				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;"
+				AdditionalIncludeDirectories="&quot;$(ICONV_HOME)\include&quot;;&quot;$(LIBXML2_INCLUDE)&quot;;&quot;$(TUSCANY_SDOCPP)/include&quot;;../../../deploy/include"
+				PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="3"
@@ -66,7 +66,7 @@
 				AdditionalDependencies="tuscany_das.lib tuscany_sdo.lib odbc32.lib $(NOINHERIT)"
 				OutputFile=".\Debug/das_test.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="&quot;$(ICONV_HOME)\lib&quot;;&quot;$(LIBXML2_HOME)\lib&quot;;&quot;$(TUSCANY_SDOCPP)/lib&quot;;../../../deploy/lib"
+				AdditionalLibraryDirectories="&quot;$(ICONV_HOME)\lib&quot;;&quot;$(LIBXML2_LIB)&quot;;&quot;$(TUSCANY_SDOCPP)/lib&quot;;../../../deploy/lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile=""
 				SubSystem="1"
@@ -100,8 +100,10 @@
 		</Configuration>
 		<Configuration
 			Name="Release|Win32"
-			IntermediateDirectory="$(ConfigurationName)"
+			OutputDirectory=".\Release"
+			IntermediateDirectory=".\Release"
 			ConfigurationType="1"
+			CharacterSet="2"
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
@@ -120,6 +122,15 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				Optimization="4"
+				AdditionalIncludeDirectories="&quot;$(ICONV_HOME)\include&quot;;&quot;$(LIBXML2_INCLUDE)&quot;;&quot;$(TUSCANY_SDOCPP)/include&quot;;../../../deploy/include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE"
+				StringPooling="false"
+				RuntimeLibrary="2"
+				PrecompiledHeaderFile=".\Release/das_test.pch"
+				AssemblerListingLocation=".\Release/"
+				ObjectFile=".\Release/"
+				ProgramDataBaseFileName=".\Release/"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -132,6 +143,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="tuscany_das.lib tuscany_sdo.lib odbc32.lib $(NOINHERIT)"
+				OutputFile=".\Release/das_test.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="&quot;$(ICONV_HOME)\lib&quot;;&quot;$(LIBXML2_LIB)&quot;;&quot;$(TUSCANY_SDOCPP)/lib&quot;;../../../deploy/lib"
+				ProgramDatabaseFile=".\Release/das_test.pdb"
+				SubSystem="1"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
--- incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln (original)
+++ incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.sln Wed Sep  5 10:14:08 2007
@@ -4,14 +4,11 @@
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "das_runtime", "das_runtime\das_runtime.vcproj",
"{964F3F93-8D1C-46BE-9724-2313CE7380AA}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "das_test", "das_test\das_test.vcproj",
"{277D86C4-0113-49EE-A351-0D32FF2E1EF3}"
-	ProjectSection(ProjectDependencies) = postProject
-		{964F3F93-8D1C-46BE-9724-2313CE7380AA} = {964F3F93-8D1C-46BE-9724-2313CE7380AA}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Build", "Build\Build.vcproj", "{78511C3F-18E5-44FC-928D-BFAAA4A8BCBE}"
 	ProjectSection(ProjectDependencies) = postProject
-		{964F3F93-8D1C-46BE-9724-2313CE7380AA} = {964F3F93-8D1C-46BE-9724-2313CE7380AA}
 		{277D86C4-0113-49EE-A351-0D32FF2E1EF3} = {277D86C4-0113-49EE-A351-0D32FF2E1EF3}
+		{964F3F93-8D1C-46BE-9724-2313CE7380AA} = {964F3F93-8D1C-46BE-9724-2313CE7380AA}
 	EndProjectSection
 EndProject
 Global

Modified: incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/tuscany/cpp/das/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/build.xml?rev=573001&view=auto
==============================================================================
--- incubator/tuscany/cpp/das/build.xml (added)
+++ incubator/tuscany/cpp/das/build.xml Wed Sep  5 10:14:08 2007
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   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.
+-->
+
+<project name="TuscanyDASNative" default="all" basedir=".">
+
+  <!--
+    This is the root level ant build.xml file for TuscanyDAS Native
+    Nothing is actually performed here, it just delegates to subdirectory
+    build.xml files. Common scripts used by all ant build files can be
+    found in the ant subdirectory.
+  --> 
+    
+  <import file="antscripts/system.xml"/>
+
+  <property name="runtime.das.dir" value="runtime/core"/>
+ 	
+  <!--
+    Public targets
+  -->
+
+  <target name="all" description="build and install all TuscanyDASNative source code and
documentation">
+    <antcall target="build"/>
+  	<antcall target="install"/>
+  </target>
+
+  <target name="build" description="Build all TuscanyDASNative source code and documentation">
+    <antcall target="build.das"/>
+  	<!--antcall target="generate.docs"/-->
+  </target>
+
+  <target name="install" description="Install TuscanyDASNative libraries and headers">
+    <antcall target="install.das"/>
+    <!--antcall target="install.docs"/-->
+  </target>
+
+  <target name="clean" description="Clean all TuscanyDASNative compiled source code">
+    <antcall target="clean.das"/>
+    <!--antcall target="clean.docs"/-->
+  </target>
+	
+  <target name="test" description="Run DAS tests, not implemented yet">
+    <!-- TODO finish this -->
+  </target>
+
+
+  <!--
+    Internal targets
+    They can still be called, they're just not described, so wont show up in "ant -p"
+    Using antfile and inheritAll="false" to maintain the subdir build.xml basedir settings
+  -->
+
+  <target name="build.das">
+    <ant target="build" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/>
+  </target>
+
+  <target name="generate.docs">
+    <!--ant target="generate.docs" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/-->
+  </target>
+
+  <target name="install.das">
+    <ant target="install" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/>
+  </target>
+
+  <target name="install.docs">
+    <!--ant target="install.docs" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/-->
+  </target>
+
+  <target name="clean.das">
+    <ant target="clean" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/>
+  </target>
+
+  <target name="clean.docs">
+    <!--ant target="clean.docs" antfile="${runtime.das.dir}/build.xml" inheritAll="false"/-->
+  </target>
+
+</project>

Added: incubator/tuscany/cpp/das/runtime/core/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/build.xml?rev=573001&view=auto
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/build.xml (added)
+++ incubator/tuscany/cpp/das/runtime/core/build.xml Wed Sep  5 10:14:08 2007
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information
+   regarding copyright ownership.  The ASF licenses this file
+   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.
+-->
+<project name="TuscanyDASNative_core" default="all" basedir="../..">
+
+  <import file="${basedir}/antscripts/system.xml"/>
+  <import file="${basedir}/antscripts/compile-targets.xml"/>
+
+  <!--
+    Notice that the basedir for this project is set to the TuscanyDAS root dir
+    This makes path setting in system.xml much simpler, but we'll just have to
+    set a property here to this directory.
+  -->
+  <property name="this.dir"            location="${basedir}/runtime/core"/>
+  <property name="das.base.dir"        value="apache/das"/>
+
+  <property name="das.dir"             location="${this.dir}/src/${das.base.dir}"/>
+  <property name="das.lib.dir"         location="${das.dir}/.libs"/>
+
+<path id="all.src.path">
+        <pathelement location="${das.base.dir}"/>
+        <pathelement location="${das.base.dir}/rdb"/>
+    </path>
+    <property name="all.src.path" refid="all.src.path" />
+
+  
+  <property name="tuscany.das.lib"         value="tuscany_das"/>
+
+  <!--
+    Public targets
+  -->
+  <target name="all" description="compile, link, and install all TuscanyDASNative source
code">
+    <antcall target="build.das"/>
+    <antcall target="install.das"/>
+  </target>
+
+  <target name="build" description="compile and link all TuscanyDASNative source code">
+    <antcall target="build.das"/>
+  	<antcall target="install.das"/>
+  </target>
+
+  <target name="install" description="Install TuscanyDASNative libraries and headers">
+    <antcall target="install.das"/>
+  </target>
+
+  <target name="clean" description="Clean all TuscanyDASNative core compiled source code">
+    <antcall target="clean.das"/>
+  </target>
+
+  <!--
+    Internal targets
+    They can still be called, they're just not described, so wont show up in "ant -p"
+  -->
+
+    <!-- build -->
+
+  <target name="build.das" depends="check.sdo" if="enable_sdo">
+    <cpp-build
+        srcdir="${das.dir}"
+	  outdir="${das.lib.dir}"
+	  outtype="static"
+    	  outfile="${tuscany.das.lib}">
+      <custom-build-elements>
+
+        <includepath path="${tuscany.das.home.dir}/include"/>
+        <includepath path="${iconv.home.dir}/include"/>
+	  <includepath path="${tuscany.sdo.home.dir}/include"/>
+	  <includepath path="${libxml2.include.dir}"/>
+	  <includepath path="${this.dir}/include"/>
+
+        <libset dir="${libxml2.lib.dir}" libs="libxml2"/>
+	  <libset dir="${tuscany.sdo.home.dir}/lib" libs="tuscany_sdo"/>
+	  <libset libs="odbc32"/>
+
+      </custom-build-elements>
+    </cpp-build>
+  <cpp-build
+        srcdir="${das.dir}"
+	  outdir="${das.lib.dir}"
+	  outfile="${tuscany.das.lib}">
+      <custom-build-elements>
+
+        <includepath path="${tuscany.das.home.dir}/include"/>
+        <includepath path="${iconv.home.dir}/include"/>
+	  <includepath path="${tuscany.sdo.home.dir}/include"/>
+	  <includepath path="${libxml2.include.dir}"/>
+	  <includepath path="${this.dir}/include"/>
+
+        <libset dir="${libxml2.lib.dir}" libs="libxml2"/>
+	  <libset dir="${tuscany.sdo.home.dir}/lib" libs="tuscany_sdo"/>
+	  <libset libs="odbc32"/>
+
+      </custom-build-elements>
+    </cpp-build>
+     
+</target>
+
+    <!-- install -->
+
+  <target name="install.das" depends="check.sdo" if="enable_sdo">
+  	<cpp-install-lib
+  	   lib="${tuscany.das.lib}"
+  	   srcdir="${das.lib.dir}"
+         destrootdir="${tuscanyDAS.install.dir}"/>
+    <cpp-symlink
+        linkdir="${tuscanyDAS.install.dir}/lib"
+        link="${lib.prefix}${tuscany.das.lib}${lib.ext}"
+        resource="${lib.prefix}${tuscany.das.lib}${lib.ext}${tuscanyDAS.library.version}"/>
+    <cpp-install-files
+        srcdir="${this.dir}/include/${das.base.dir}"
+        files="**/*.h"
+        destdir="${tuscanyDAS.install.dir}/include/${das.base.dir}"/>
+  </target>
+
+  
+    <!-- clean -->
+
+  <target name="clean.das">
+    <cpp-clean-files
+        dir="${tuscanyDAS.install.dir}/include/${das.base.dir}"
+        rmdir="true"/>
+  	<cpp-clean-lib
+  	    lib="${tuscany.das.lib}"
+  	    librootdir="${tuscanyDAS.install.dir}"/>
+  	<cpp-clean-files
+  	    dir="${das.lib.dir}"
+  	    rmdir="true"/>
+  </target>
+
+
+</project>

Modified: incubator/tuscany/cpp/das/runtime/core/src/apache/das/RefCountingObject.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/core/src/apache/das/RefCountingObject.cpp?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
--- incubator/tuscany/cpp/das/runtime/core/src/apache/das/RefCountingObject.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/core/src/apache/das/RefCountingObject.cpp Wed Sep  5
10:14:08 2007
@@ -132,6 +132,8 @@
             /* 1) construct */
 			    
 			rdb::Connection conn("", "", "");
+			/*rdb::Connection* conn1 = new rdb::Connection("", "", "");
+			delete conn1;*/
             rdb::StatementObject* fptr = new rdb::StatementObject();
 			rdb::StatementObject statement;
 			rdb::Statement* s = new rdb::Statement(conn, 0);

Modified: incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/tuscany/cpp/das/runtime/test/src/main.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/test/src/main.cpp?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
--- incubator/tuscany/cpp/das/runtime/test/src/main.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/test/src/main.cpp Wed Sep  5 10:14:08 2007
@@ -30,6 +30,7 @@
 #include <apache/das/rdb/Table.h>
 #include <apache/das/DataGraphPrinter.h>
 #include <commonj/sdo/DataObject.h>
+#include <commonj/sdo/SDORuntimeException.h>
 #include <libxml/xmlreader.h>
 
 #define TEST_RESOURCE_PATH "../../../../runtime/test/rsc/"
@@ -190,7 +191,7 @@
 			root->getDataFactory()->getType(DAS_NAMESPACE, "department").getProperty("employee");
 			cout << "not ignored" << endl;
 
-		} catch (SDOPropertyNotFoundException ex) {
+		} catch (commonj::sdo::SDOPropertyNotFoundException& ex) {
 			cout << "OK" << endl;
 		}
 
@@ -211,7 +212,7 @@
 			root->getDataFactory()->getType(DAS_NAMESPACE, "department").getProperty("employee");
 			cout << "not ignored" << endl;
 
-		} catch (SDOPropertyNotFoundException ex) {
+		} catch (commonj::sdo::SDOPropertyNotFoundException& ex) {
 			cout << "OK" << endl;
 		}
 
@@ -248,7 +249,7 @@
 			cout << "not set" << endl;
 		}
 
-	} catch (SDOPropertyNotFoundException ex) {
+	} catch (commonj::sdo::SDOPropertyNotFoundException& ex) {
 		cout << "not created" << endl;
 
 	}
@@ -276,7 +277,7 @@
 		root->getDataFactory()->getType(DAS_NAMESPACE, "company").getProperty("department");
 		cout << "OK" << endl;
 
-	} catch (SDOPropertyNotFoundException ex) {
+	} catch (commonj::sdo::SDOPropertyNotFoundException& ex) {
 		cout << "not created" << endl;
 	}
 
@@ -300,7 +301,7 @@
 		root->getDataFactory()->getType(DAS_NAMESPACE, "department").getProperty("employee");
 		cout << "not ignored" << endl;
 
-	} catch (SDOPropertyNotFoundException ex) {
+	} catch (commonj::sdo::SDOPropertyNotFoundException& ex) {
 		cout << "OK" << endl;
 	}
 

Modified: incubator/tuscany/cpp/das/samples/SimpleRead/VSExpress/SimpleRead.suo
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/SimpleRead/VSExpress/SimpleRead.suo?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/tuscany/cpp/das/samples/SimpleRead/rsc/SimpleRead.fdb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/SimpleRead/rsc/SimpleRead.fdb?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
Binary files - no diff available.

Modified: incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp?rev=573001&r1=573000&r2=573001&view=diff
==============================================================================
--- incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp (original)
+++ incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp Wed Sep  5 10:14:08 2007
@@ -23,7 +23,7 @@
 // including DAS headers
 #include <apache/das/rdb/Connection.h>
 #include <apache/das/rdb/DASImpl.h>
-#include <apache/das/rdb/SqlException.h>
+#include <apache/das/rdb/SQLException.h>
 #include <apache/das/CommandPtr.h>
 
 // including SDO header
@@ -58,7 +58,7 @@
 			);
 
 		// Create a DAS instance providing a connection using a factory 
-		DASImpl* das = (DASImpl*) DASImpl::getFACTORY()->createDAS(connection);
+		DASImpl* das = (DASImpl*) DASImpl::getFACTORY().createDAS(connection);
 
 		// Create a DAS command from a sql string
 		CommandPtr command = das->createCommand("SELECT * FROM animals;");
@@ -67,19 +67,19 @@
 		DataObjectPtr root = command->executeQuery();
 
 		// Gets the cart list
-		DataObjectList& cartList = root->getList("ANIMALS");
+		DataObjectList& cartList = root->getList("animals");
 		
 		// for each cart on the list is printed the its id and name
 		for (int i = 0 ; i < cartList.size() ; i++) {
 			// Gets the cart id
-			long id = cartList[i]->getInteger("ID");
+			long id = cartList[i]->getInteger("id");
 
 			// Gets the the name string length and allocate enough space for it
-			unsigned int stringLength = cartList[i]->getLength("NAME");
+			unsigned int stringLength = cartList[i]->getLength("name");
 			wchar_t* buffer = new wchar_t[stringLength];
 
 			// Gets the cart name
-			cartList[i]->getString("NAME", buffer, stringLength);
+			cartList[i]->getString("name", buffer, stringLength);
 			wstring name = wstring(buffer, stringLength);
 
 			// Print the cart data
@@ -91,7 +91,7 @@
 
 		system("PAUSE");
 
-	} catch (SqlException& ex) {
+	} catch (SQLException& ex) {
 		cout << "couldn't connect to the data source!" << endl;
 		system("PAUSE");
 		return;



---------------------------------------------------------------------
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