You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ad...@apache.org on 2007/06/25 08:30:15 UTC

svn commit: r550379 - in /incubator/tuscany/cpp/das: ./ VSExpress/tuscany_das/ runtime/test/resource/ runtime/test/rsc/ runtime/test/src/ samples/SimpleRead/ samples/SimpleRead/VSExpress/ samples/SimpleRead/rsc/ samples/SimpleRead/src/

Author: adrianocrestani
Date: Sun Jun 24 23:30:14 2007
New Revision: 550379

URL: http://svn.apache.org/viewvc?view=rev&rev=550379
Log:
- Moving test cases data source from mysql to firebird

Added:
    incubator/tuscany/cpp/das/runtime/test/rsc/
      - copied from r542742, incubator/tuscany/cpp/das/runtime/test/resource/
    incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb   (with props)
Removed:
    incubator/tuscany/cpp/das/runtime/test/resource/
Modified:
    incubator/tuscany/cpp/das/GettingStarted.html
    incubator/tuscany/cpp/das/VSExpress/tuscany_das/tuscany_das.suo
    incubator/tuscany/cpp/das/runtime/test/src/main.cpp
    incubator/tuscany/cpp/das/samples/SimpleRead/Readme.html
    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/GettingStarted.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/GettingStarted.html?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
--- incubator/tuscany/cpp/das/GettingStarted.html (original)
+++ incubator/tuscany/cpp/das/GettingStarted.html Sun Jun 24 23:30:14 2007
@@ -6,7 +6,7 @@
 	<META NAME="GENERATOR" CONTENT="BrOffice.org 2.0  (Win32)">
 	<META NAME="CREATED" CONTENT="20070623;19202290">
 	<META NAME="CHANGEDBY" CONTENT="a a">
-	<META NAME="CHANGED" CONTENT="20070624;2200915">
+	<META NAME="CHANGED" CONTENT="20070625;1050490">
 	<!-- 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
@@ -44,104 +44,178 @@
 		Getting Started - DAS C++</FONT></H1>
 		<P LANG="pt-BR">This document describes what is needed to install
 		Tuscany DAS for C++. If you haven't already done so, the first step
-		is to download the DAS C++  from its repository:
+		is to download the DAS C++ from its repository:
 		<A HREF="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/" TARGET="_blank">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/</A>.
 				</P>
 		<H2 LANG="pt-BR">Contents</H2>
 		<OL>
 			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm"><A HREF="#requirements">System
-			Requirements</A>
+			Requirements</A> 
 			</P>
 			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm"><A HREF="#Installing">Installing
 			Tuscany DAS C++ on Windows.</A></P>
 			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm"><A HREF="#samples">Samples</A>
 						</P>
-			<LI><P LANG="pt-BR"><A HREF="#help">Getting Help</A>
+			<LI><P LANG="pt-BR"><A HREF="#help">Getting Help</A> 
 			</P>
 		</OL>
 		<H2 LANG="pt-BR"><A NAME="requirements"></A>System Requirements</H2>
 		<P LANG="pt-BR">In order to use Tuscany DAS there are some minimum
 		requirements:</P>
-		<TABLE WIDTH=896 BORDER=1 CELLPADDING=2 CELLSPACING=0 >
+		<TABLE WIDTH=896 BORDER=1 CELLPADDING=2 CELLSPACING=0>
 			<COL WIDTH=150>
-			<COL WIDTH=739>
+			<COL WIDTH=736>
 			<TR>
 				<TD WIDTH=150>
 					<P LANG="pt-BR"><B>Software</B></P>
 				</TD>
-				<TD WIDTH=739>
+				<TD WIDTH=736>
 					<P LANG="pt-BR"><B>Download Link</B></P>
 				</TD>
 			</TR>
 			<TR>
 				<TD WIDTH=150>
-					<P LANG="pt-BR">Operating systems:
+					<P LANG="pt-BR">Operating systems: 
 					</P>
 					<UL>
-						<LI><P LANG="pt-BR">Windows XP SP2
+						<LI><P LANG="pt-BR">Windows XP SP2 
 						</P>
 					</UL>
 				</TD>
-				<TD WIDTH=739></TD>
+				<TD WIDTH=736></TD>
 			</TR>
 			<TR>
 				<TD WIDTH=150>
 					<P LANG="pt-BR">Tuscany SDO C++ (from the trunk)</P>
 				</TD>
-				<TD WIDTH=739>
+				<TD WIDTH=736>
 					<P LANG="pt-BR">To compile and install Tuscany SDO C++ follow
 					the instructions on
 					<A HREF="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/GettingStarted.html">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/GettingStarted.html</A><FONT COLOR="#000000">
-					page. But instead of download the source from Tuscany downloads page, download the SDO C++ source from the trunk: <A HREF="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/" TARGET="_blank">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/</A></FONT></P>
+					page. But instead of download the source from Tuscany downloads
+					page, download the SDO C++ source from the trunk:
+					<A HREF="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/" TARGET="_blank">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/sdo/</A></FONT></P>
+				</TD>
+			</TR>
+			<TR>
+				<TD WIDTH=150>
+					<P LANG="pt-BR">libxml2 version 2.6.20 
+					</P>
+				</TD>
+				<TD WIDTH=736>
+					<P LANG="pt-BR" STYLE="margin-bottom: 0cm">You need to download
+					and install libxml2, iconv and zlib from
+					<A HREF="http://www.zlatkovic.com/libxml.en.html">http://www.zlatkovic.com/libxml.en.html</A>.
+					Please
+					read the installation notes for libxml2 particularly regarding
+					it's pre-req's iconv and zlib on Windows.
+					</P>
+				</TD>
+			</TR>
+			<TR>
+				<TD WIDTH=150>
+					<P LANG="pt-BR">iconv latest version</P>
+				</TD>
+				<TD WIDTH=736>
+					<P LANG="pt-BR">You can find iconv for windows here:
+					<a href="http://sourceforge.net/project/downloading.php?groupname=gnuwin32&amp;filename=libiconv-1.9.2-1-lib.zip">http://sourceforge.net/project/downloading.php?groupname=gnuwin32&amp;filename=libiconv-1.9.2-1-lib.zip</a>&amp;use_mirror=ufpr</P>
 				</TD>
 			</TR>
 		</TABLE>
-		<H2 LANG="pt-BR"><A NAME="Installing"></A>Installing Tuscany DAS
-		C++ on Windows</H2>
+		<H2 LANG="pt-BR"><A NAME="Installing"></A>Installing and Compiling
+		Tuscany DAS C++ on Windows</H2>
 		<OL>
 			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">Download the
 			contents under
 			<A HREF="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/</A><FONT COLOR="#000000">
 			into folder &lt;tuscany_das_cpp&gt;.</FONT></P>
+			<P LANG="pt-BR" STYLE="margin-bottom: 0cm"></P>
 			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">The following
-			environment variables are required:
+			environment variables are required: 
 			</P>
 			<UL>
 				<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">TUSCANY_SDOCPP=&lt;path
-				to tuscany sdo for c++ folder&gt;
+				to tuscany sdo for c++ folder&gt; 
+				</P>
+				<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">LIBXML2_HOME=&lt;path
+				to libxml2 folder&gt; 
 				</P>
 			</UL>
+		</OL>
+		<UL>
+			<LI><P LANG="pt-BR">ICONV_HOME=&lt;path to iconv folder&gt;</P>
+		</UL>
+		<OL START=3>
 			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">Build the source
 			using Visual Studio Express solution under folder
-			&lt;tuscany_das_cpp&gt;/VSExpress/das_runtime/.</P>
-			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">Run the testcases:
+			&lt;tuscany_das_cpp&gt;/VSExpress/tuscany_das/.</P>
+			<P LANG="pt-BR" STYLE="margin-bottom: 0cm"></P>
+			<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">Set environment
+			variable TUSCANY_DASCPP=&lt;tuscany_das_cpp&gt;/deploy/</P>
+		</OL>
+		<P LANG="pt-BR" STYLE="margin-bottom: 0cm"><h2>Test Cases</h2></P>
+
+		<P LANG="pt-BR" STYLE="margin-bottom: 0cm; font-weight: medium"><h3>Setup</h3></P>
+		<UL>
+			<LI><P LANG="pt-BR"><SPAN STYLE="text-decoration: none">Download
+			the latest stable version of Firebird ODBC Driver. You can find it
+			here: <A HREF="http://www.firebirdsql.org/index.php?op=files&amp;id=odbc">http://www.firebirdsql.org/index.php?op=files&amp;id=odbc</A>.</SPAN></P>
+			<LI><P LANG="pt-BR"><SPAN STYLE="text-decoration: none">Install
+			Firebird ODBC Driver on your OS. ODBC Help may also be found at
+			<A HREF="http://www.firebirdsql.org/index.php?op=files&amp;id=odbc">http://www.firebirdsql.org/index.php?op=files&amp;id=odbc</A>.</SPAN></P>
+		</UL>
+		<P LANG="pt-BR" STYLE="margin-bottom: 0cm; font-weight: medium; text-decoration: none">
+		<h3>Running</h3></P>
+	<OL START=3>
+			<P LANG="pt-BR" STYLE="margin-bottom: 0cm">To run test cases you
+			just need to execute the file: 
 			</P>
 			<UL>
-				<LI><P LANG="pt-BR" STYLE="margin-bottom: 0cm">&lt;tuscany_das_cpp&gt;/VSExpress/das_runtime/das_test/Debug/das_test.exe
+				<P LANG="pt-BR" STYLE="margin-bottom: 0cm">&lt;tuscany_das_cpp&gt;/VSExpress/tuscany_das/das_test/Debug/das_test.exe
 								</P>
+				<P LANG="pt-BR" STYLE="margin-bottom: 0cm"></P>
 			</UL>
 			<P LANG="pt-BR">The output of all tests must show &ldquo;OK&rdquo;.</P>
 		</OL>
+		<P LANG="pt-BR"><B>Requirements:</B></P>
+		<UL>
+			<LI><P LANG="pt-BR">Firebird must be running as Superserver and
+			accepting connection from localhost.</P>
+			<LI><P LANG="pt-BR">The test cases access data sources located
+			under &lt;tuscany_das_cpp&gt;/runtime/test/rsc/ folder. To access
+			these data sources is used the user &ldquo;SYSDA&rdquo; and
+			password &ldquo;masterkey&rdquo;. You can modify it to meet your
+			Firebird user and password access on
+			&lt;tuscany_das_cpp&gt;/runtime/test/src/main.cpp getConnection()
+			function:</P>
+			
+		</UL>
+		<P LANG="pt-BR" STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2>...<br>
+		string
+		user = <FONT COLOR="#800000">&quot;SYSDBA&quot;</FONT><FONT COLOR="#000000">;</FONT><br>
+		<FONT COLOR="#000000">string
+		password = <FONT COLOR="#800000">&quot;masterkey&quot;</FONT><FONT COLOR="#000000">;</FONT><br>
+		<FONT COLOR="#000000">...</FONT></FONT></P><br>
 		<H2 LANG="pt-BR"><A NAME="samples"></A>Samples</H2>
-		<TABLE CELLPADDING=2 CELLSPACING=2 border=1>
+		<TABLE BORDER=1 CELLPADDING=2 CELLSPACING=2>
 			<TR>
 				<TD>
 					<P LANG="pt-BR">SimpleRead</P>
 				</TD>
 				<TD>
 					<P LANG="pt-BR">This sample shows how to load data from a RDB
-					source, using RDB DAS, into a SDO graph and then retrieve data from
-					it.
+					source, using RDB DAS, into a SDO graph and then retrieve data
+					from it. 
 					</P>
 				</TD>
 			</TR>
 		</TABLE>
 		<H2 LANG="pt-BR"><A NAME="help"></A>Getting Help</H2>
-		<P LANG="pt-BR">Any problem with this release can be reported to
+		<P LANG="pt-BR"><font size=3>Any problem with this release can be reported to
 		the Tuscany <A HREF="http://cwiki.apache.org/TUSCANY/mailing-lists.html" TARGET="_blank">mailing
 		lists</A> or create a JIRA issue
 		at&nbsp;<A HREF="http://issues.apache.org/jira/browse/Tuscany" TARGET="_blank">http://issues.apache.org/jira/browse/Tuscany</A>.</P>
-		<P LANG="pt-BR">&nbsp;</P>
+		<P LANG="pt-BR">&nbsp;</P></font>
 		<TABLE CELLPADDING=2 CELLSPACING=2>
 			<TR>
 				<TD>

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?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
Binary files - no diff available.

Added: incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb?view=auto&rev=550379
==============================================================================
Binary file - no diff available.

Propchange: incubator/tuscany/cpp/das/runtime/test/rsc/TestCases.fdb
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
--- incubator/tuscany/cpp/das/runtime/test/src/main.cpp (original)
+++ incubator/tuscany/cpp/das/runtime/test/src/main.cpp Sun Jun 24 23:30:14 2007
@@ -33,15 +33,48 @@
 #include <commonj/sdo/DataObject.h>
 #include <libxml/xmlreader.h>
 
-#define TEST_RESOURCE_PATH "../../../runtime/test/resource/"
+#define TEST_RESOURCE_PATH "../../../runtime/test/rsc/"
 
 using namespace std;
 using namespace apache::das;
 using namespace apache::das::rdb;
 
 Connection* getConnection() {
-	return new Connection("testDSN", "root", "masterkey");
+	char* tuscanyDASCPPPath = getenv("TUSCANY_DASCPP");
+	
+	if (tuscanyDASCPPPath == 0) {
+		cout << "environment variable TUSCANY_DASCPP not set!" << endl;
+		system("PAUSE");
+		exit(1);
+
+	}
+
+	try {
+		// Connect to a database using a connect string
+		string user = "SYSDBA";
+		string password = "masterkey";
+		string dataSourcePath = (string) tuscanyDASCPPPath + "/../runtime/test/rsc/TestCases.fdb";
+
+		Connection connection((string)
+				"DRIVER=Firebird/InterBase(r) driver; " +
+				"UID=" + user + 
+				"; PWD=" + password + 
+				";DBNAME=localhost:" + dataSourcePath + ";"
+			);
+
+		return new Connection("testDSN", "root", "masterkey");
+
+	} catch (SqlException& ex) {
+		cout << "couldn't connect to the data source!" << endl;
+		system("PAUSE");
+		exit(1);
+
+	}
+
+	return 0;
+
 }
+
 
 void testPointers() {
 	cout << "-------------testPointers--------------" << endl;

Modified: incubator/tuscany/cpp/das/samples/SimpleRead/Readme.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/das/samples/SimpleRead/Readme.html?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
--- incubator/tuscany/cpp/das/samples/SimpleRead/Readme.html (original)
+++ incubator/tuscany/cpp/das/samples/SimpleRead/Readme.html Sun Jun 24 23:30:14 2007
@@ -1,25 +1,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
-<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
-	<STYLE>
-	<!--
-		TD P { color: #000000; font-family: "Verdana", "Helvetica", "Arial", sans-serif; font-size: 12pt }
-		H1 { color: #000000 }
-		P { color: #000000; font-family: "Verdana", "Helvetica", "Arial", sans-serif; font-size: 12pt }
-		H2 { background: #dddddd; border: 1px solid #999999; padding-top: 0.11cm; padding-bottom: 0.11cm; padding-left: 0.16cm; padding-right: 0.11cm; color: #990000 }
-		A:link { color: #3366aa; text-decoration: none }
-	-->
-	</STYLE>
-
 	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
 	<TITLE>Tuscany RDB DAS Sample</TITLE>
 	<META NAME="GENERATOR" CONTENT="BrOffice.org 2.0  (Win32)">
 	<META NAME="CREATED" CONTENT="20070623;3134782">
 	<META NAME="CHANGEDBY" CONTENT="a a">
-	<META NAME="CHANGED" CONTENT="20070624;4073367">
+	<META NAME="CHANGED" CONTENT="20070625;523460">
 	<META NAME="ProgId" CONTENT="Word.Document">
 	<META NAME="Originator" CONTENT="Microsoft Word 10">
+	<META HTTP-EQUIV="Content-Style-Type" CONTENT="text/css">
 	<!--[if gte mso 9]><xml>
  <o:DocumentProperties>
   <o:Author>IBM_USER</o:Author>
@@ -105,27 +95,24 @@
 -->
 	<STYLE>
 	<!--
-		TD P { color: #000000; font-family: "Verdana", "Helvetica", "Arial", sans-serif; font-size: 12pt }
 		H1 { color: #000000 }
 		P { color: #000000; font-family: "Verdana", "Helvetica", "Arial", sans-serif; font-size: 12pt }
 		H2 { background: #dddddd; border: 1px solid #999999; padding-top: 0.11cm; padding-bottom: 0.11cm; padding-left: 0.16cm; padding-right: 0.11cm; color: #990000 }
+		A:visited { color: #800080 }
 		A:link { color: #3366aa; text-decoration: none }
-
 	-->
 	</STYLE>
 </HEAD>
-<BODY LANG="en-US" TEXT="#000000" LINK="#0000ff" VLINK="#800080" DIR="LTR" STYLE="border: none; padding: 0cm">
+<BODY LANG="en-US" TEXT="#000000" LINK="#3366aa" VLINK="#800080" DIR="LTR" STYLE="border: none; padding: 0cm">
 <H1 LANG="pt-BR">Tuscany RDB DAS Sample (SimpleRead)&nbsp;</H1>
 <P LANG="pt-BR">This sample shows how to load data from a RDB source,
 using RDB DAS, into a SDO graph and then retrieve data from it.</P>
-<P LANG="pt-BR"><h2>Setup</h2></P>
+<H2 LANG="pt-BR">Setup</H2>
 <UL>
 	<LI><P LANG="pt-BR"><SPAN STYLE="text-decoration: none"><FONT COLOR="#000000">Follow
 	the
 	<A HREF="https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/GettingStarted.html">https://svn.apache.org/repos/asf/incubator/tuscany/cpp/das/GettingStarted.html</A>
 	document to download, compile and install Tuscany DAS for C++.</FONT></SPAN></P>
-	<LI><P LANG="pt-BR" STYLE="text-decoration: none">Set TUSCANY_DASCPP
-	environment variable as &lt;tuscany_das_cpp&gt/deploy/</P>
 	<LI><P LANG="pt-BR"><SPAN STYLE="text-decoration: none"><FONT COLOR="#000000">Download
 	latest stable version of Firebird Superserver. You can find it here:
 	<A HREF="http://www.firebirdsql.org/index.php?op=files&amp;id=engine_201">http://www.firebirdsql.org/index.php?op=files&amp;id=engine_201</A><A HREF="http://incubator.apache.org/tuscany/sdo-downloads.html">.</A></FONT></SPAN></P>
@@ -135,34 +122,30 @@
 	<LI><P LANG="pt-BR"><SPAN STYLE="text-decoration: none">Install
 	Firebird ODBC Driver on your OS. ODBC Help may also be found at
 	<A HREF="http://www.firebirdsql.org/index.php?op=files&amp;id=odbc">http://www.firebirdsql.org/index.php?op=files&amp;id=odbc</A>.</SPAN></P>
-	<LI><P LANG="pt-BR" STYLE="font-weight: medium; text-decoration: none">
-	<FONT SIZE=3>Run Firebird as Superserver. </FONT>
-	</P>
 </UL>
 <H2 LANG="pt-BR">Compiling the Sample</H2>
 <P LANG="pt-BR">Compile the sample source using Visual Studio Express
 solution under &lt;tuscany_das_cpp&gt;/samples/SimpleRead/VSExpress/.</P>
 <H2 LANG="pt-BR">Running the Sample</H2>
-<P LANG="pt-BR"><FONT >To run the
-sample execute the file
-&lt;tuscany_das_cpp&gt;/samples/SimpleRead/VSExpress/debug/SimpleRead.exe</FONT></P>
+<P LANG="pt-BR">To run the sample execute the file
+&lt;tuscany_das_cpp&gt;/samples/SimpleRead/VSExpress/debug/SimpleRead.exe</P>
 <P LANG="pt-BR"><B>Requirements</B>:</P>
 <UL>
 	<LI><P LANG="pt-BR">Firebird must be running as Superserver and
 	accepting connection from localhost.</P>
 	<LI><P LANG="pt-BR">The sample tries to access the data source using
-	user &ldquo;SYSDA&rdquo; and password &ldquo;masterkey&rdquo;.  You
-	can modify it to meet your firebird user and password access on
+	user &ldquo;SYSDA&rdquo; and password &ldquo;masterkey&rdquo;. You
+	can modify it to meet your Firebird user and password access on
 	sample main function:</P>
 </UL>
-<P LANG="pt-BR" STYLE="margin-left: 2cm; margin-bottom: 0cm"><SPAN LANG=""><FONT SIZE=2>...</FONT></SPAN></P>
-<P LANG="" STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2>string
-user = <FONT COLOR="#800000">&quot;SYSDBA&quot;</FONT><FONT COLOR="#000000">;</FONT></FONT></P>
-<P LANG="pt-BR" STYLE="margin-left: 2cm; margin-bottom: 0cm"><SPAN LANG=""><FONT SIZE=2><FONT COLOR="#000000">string
-password = </FONT><FONT COLOR="#800000">&quot;masterkey&quot;</FONT><FONT COLOR="#000000">;</FONT></FONT></SPAN></P>
-<P LANG="" STYLE="margin-left: 2.02cm; margin-bottom: 0cm"><FONT SIZE=2>...</FONT></P>
-
-<P LANG="pt-BR"><h2>Sample Architecture</h2></P>
+<P LANG="pt-BR" STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2>...<br>
+		string
+		user = <FONT COLOR="#800000">&quot;SYSDBA&quot;</FONT><FONT COLOR="#000000">;</FONT><br>
+		<FONT COLOR="#000000">string
+		password = <FONT COLOR="#800000">&quot;masterkey&quot;</FONT><FONT COLOR="#000000">;</FONT><br>
+		<FONT COLOR="#000000">...</FONT></FONT></P><br>
+		<TABLE BORDER=1 CELLPADDING=2 CELLSPACING=2>
+<H2 LANG="pt-BR"><font size=5><b>Sample Architecture</b></font></H2>
 <P LANG="pt-BR">The sample files are located under
 &lt;tuscany_das_cpp&gt;/samples/SimpleRead/.</P>
 <P LANG="pt-BR"><B>Contents</B>:</P>
@@ -177,19 +160,18 @@
 	created with the following sql:</P>
 </UL>
 <P LANG="pt-BR" STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2>CREATE
-TABLE animals ( </FONT>
-</P>
-<P LANG="pt-BR" STYLE="margin-left: 4cm; margin-bottom: 0cm"><FONT SIZE=2>	id
-INT NOT NULL, </FONT>
-</P>
-<P LANG="pt-BR" STYLE="margin-left: 4cm; margin-bottom: 0cm"><FONT SIZE=2>	name
-VARCHAR(20), </FONT>
-</P>
-<P LANG="pt-BR" STYLE="margin-left: 4cm; margin-bottom: 0cm"><FONT SIZE=2>	PRIMARY
-KEY (id) </FONT>
-</P>
-<P LANG="pt-BR" STYLE="margin-left: 2cm; margin-bottom: 0cm"><FONT SIZE=2>);
- </FONT>
-</P>
+TABLE animals ( </FONT><br>
 
+<FONT SIZE=2>id
+INT NOT NULL, </FONT><br>
+
+<FONT SIZE=2>name
+VARCHAR(20), </FONT><br>
+<FONT SIZE=2>PRIMARY
+KEY (id) </FONT><br>
+<FONT SIZE=2>);<br>
+<br>
+</FONT>
+</P>
+</BODY>
 </HTML>

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?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
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?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
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?view=diff&rev=550379&r1=550378&r2=550379
==============================================================================
--- incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp (original)
+++ incubator/tuscany/cpp/das/samples/SimpleRead/src/main.cpp Sun Jun 24 23:30:14 2007
@@ -50,10 +50,10 @@
 		string password = "masterkey";
 		string dataSourcePath = (string) tuscanyDASCPPPath + "/../samples/SimpleRead/rsc/SimpleRead.fdb";
 
-		Connection connection(
+		Connection connection((string) 
 				"DRIVER=Firebird/InterBase(r) driver; " +
 				"UID=" + user + 
-				"; PWD=" + masterkey + 
+				"; PWD=" + password + 
 				";DBNAME=localhost:" + dataSourcePath + ";"
 			);
 



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