You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by ro...@apache.org on 2005/05/29 23:53:32 UTC

svn commit: r178991 - in /incubator/ibatis/trunk/cs/tutorial: Model/ Model/Resources/ Model/bin/Debug/ Tests/ Tests/Resources/ Tests/bin/Debug/ WebView/ WebView/Resources/

Author: roberto
Date: Sun May 29 14:53:30 2005
New Revision: 178991

URL: http://svn.apache.org/viewcvs?rev=178991&view=rev
Log:
~Updated C# DataMapper tutorial for new config changes...need to figure out issue with sqlmap.config schema validation!

Added:
    incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/properties.config
    incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/properties.config
    incubator/ibatis/trunk/cs/tutorial/WebView/properties.config
Removed:
    incubator/ibatis/trunk/cs/tutorial/Model/Resources/properties.xml
    incubator/ibatis/trunk/cs/tutorial/Tests/Resources/properties.xml
    incubator/ibatis/trunk/cs/tutorial/Tests/Resources/providers.config
    incubator/ibatis/trunk/cs/tutorial/WebView/Resources/properties.xml
Modified:
    incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj
    incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj.user
    incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/sqlmap.config
    incubator/ibatis/trunk/cs/tutorial/Tests/Tests.csproj
    incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/sqlmap.config
    incubator/ibatis/trunk/cs/tutorial/WebView/WebView.csproj
    incubator/ibatis/trunk/cs/tutorial/WebView/sqlmap.config

Modified: incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj (original)
+++ incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj Sun May 29 14:53:30 2005
@@ -82,13 +82,12 @@
                 <Reference
                     Name = "nunit.framework"
                     AssemblyName = "nunit.framework"
-                    HintPath = "..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.framework.dll"
-                    AssemblyFolderKey = "hklm\dn\nunit.framework"
+                    HintPath = "bin\Debug\nunit.framework.dll"
                 />
                 <Reference
                     Name = "IBatisNet.DataMapper"
                     AssemblyName = "IBatisNet.DataMapper"
-                    HintPath = "..\..\mapper\IBatisNet.DataMapper\bin\Debug\IBatisNet.DataMapper.dll"
+                    HintPath = "bin\Debug\IBatisNet.DataMapper.dll"
                 />
             </References>
         </Build>
@@ -120,6 +119,10 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "bin\Debug\properties.config"
+                    BuildAction = "None"
+                />
+                <File
                     RelPath = "bin\Debug\providers.config"
                     BuildAction = "None"
                 />
@@ -129,10 +132,6 @@
                 />
                 <File
                     RelPath = "Resources\PersonHelper.xml"
-                    BuildAction = "Content"
-                />
-                <File
-                    RelPath = "Resources\properties.xml"
                     BuildAction = "Content"
                 />
             </Include>

Modified: incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj.user
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj.user?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj.user (original)
+++ incubator/ibatis/trunk/cs/tutorial/Model/Model.csproj.user Sun May 29 14:53:30 2005
@@ -1,7 +1,7 @@
 <VisualStudioProject>
     <CSHARP LastOpenVersion = "7.10.3077" >
         <Build>
-            <Settings ReferencePath = "C:\projects\Apache\ibatisnet\Source1\IBatisNet.DataMapper\bin\Debug\;C:\projects\SourceForge\ibatisnet1\Source1\IBatisNet.DataMapper\bin\Debug\;C:\projects\SourceForge\ibatisnet\Source1\IBatisNet.DataMapper\bin\Debug\;C:\iBatisNet\iBatisNet.DataMapper\bin\Debug\" >
+            <Settings ReferencePath = "C:\projects\ibatis\asf\trunk\cs\tutorial\Model\bin\Debug\;C:\projects\Apache\ibatisnet\Source1\IBatisNet.DataMapper\bin\Debug\;C:\projects\SourceForge\ibatisnet1\Source1\IBatisNet.DataMapper\bin\Debug\;C:\projects\SourceForge\ibatisnet\Source1\IBatisNet.DataMapper\bin\Debug\;C:\iBatisNet\iBatisNet.DataMapper\bin\Debug\;C:\projects\ibatis\asf\trunk\cs\mapper\IBatisNet.DataMapper\bin\Debug\" >
                 <Config
                     Name = "Debug"
                     EnableASPDebugging = "false"

Added: incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/properties.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/properties.config?rev=178991&view=auto
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/properties.config (added)
+++ incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/properties.config Sun May 29 14:53:30 2005
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<settings>
+	<!--   User application and configured property settings go here.-->
+	<!--   Example: <add key="settingName" value="settingValue"/> -->
+	<add key="provider" value="OleDb1.1" />
+	<add key="connectionString" value="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=..\..\..\WebView\Resources\iBatisTutorial.mdb" />
+	<add key="root" value="../../" />
+</settings>

Modified: incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/sqlmap.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/sqlmap.config?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/sqlmap.config (original)
+++ incubator/ibatis/trunk/cs/tutorial/Model/bin/Debug/sqlmap.config Sun May 29 14:53:30 2005
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<sqlMapConfig
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<?xml version="1.0" encoding="utf-8"?>
+<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
 
-   <properties resource="../../Resources/properties.xml"/>
+    <properties resource="properties.config"/>
    
 	<settings>
 		<setting useStatementNamespaces="false"/>
@@ -16,9 +14,7 @@
 	</database>
 
 	<sqlMaps>
-		<sqlMap resource="../../Resources/PersonHelper.xml"/>
-		<!-- sqlMap url="C:/projects/SourceForge/ibatisnet1/Tutorial2/Model/Resources/PersonHelper.xml"/ -->
-		<!-- Rem : If used as embedded Resources, just specify the name of each sqlMap file -->	
+		<sqlMap resource="${root}Resources/PersonHelper.xml"/>
 	</sqlMaps>
-
+	
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/tutorial/Tests/Tests.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Tests/Tests.csproj?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Tests/Tests.csproj (original)
+++ incubator/ibatis/trunk/cs/tutorial/Tests/Tests.csproj Sun May 29 14:53:30 2005
@@ -71,15 +71,15 @@
                     AssemblyFolderKey = "hklm\dn\nunit.framework"
                 />
                 <Reference
-                    Name = "Model"
-                    Project = "{9024A1F6-D029-4CB0-99C1-6B50EC1BDFB3}"
-                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
-                />
-                <Reference
                     Name = "IBatisNet.DataMapper"
                     AssemblyName = "IBatisNet.DataMapper"
                     HintPath = "..\..\mapper\IBatisNet.DataMapper\bin\Debug\IBatisNet.DataMapper.dll"
                 />
+                <Reference
+                    Name = "iBatisTutorial.Model"
+                    AssemblyName = "iBatisTutorial.Model"
+                    HintPath = "..\Model\bin\Debug\iBatisTutorial.Model.dll"
+                />
             </References>
         </Build>
         <Files>
@@ -90,15 +90,19 @@
                     BuildAction = "Compile"
                 />
                 <File
-                    RelPath = "bin\Debug\sqlmap.config"
+                    RelPath = "bin\Debug\properties.config"
                     BuildAction = "None"
                 />
                 <File
-                    RelPath = "Resources\PersonHelper.xml"
-                    BuildAction = "Content"
+                    RelPath = "bin\Debug\providers.config"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "bin\Debug\sqlmap.config"
+                    BuildAction = "None"
                 />
                 <File
-                    RelPath = "Resources\properties.xml"
+                    RelPath = "Resources\PersonHelper.xml"
                     BuildAction = "Content"
                 />
             </Include>

Added: incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/properties.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/properties.config?rev=178991&view=auto
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/properties.config (added)
+++ incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/properties.config Sun May 29 14:53:30 2005
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<settings>
+	<!--   User application and configured property settings go here.-->
+	<!--   Example: <add key="settingName" value="settingValue"/> -->
+	<add key="provider" value="OleDb1.1" />
+	<add key="connectionString" value="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=..\..\..\WebView\Resources\iBatisTutorial.mdb" />
+	<add key="root" value="../../" />
+</settings>

Modified: incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/sqlmap.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/sqlmap.config?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/sqlmap.config (original)
+++ incubator/ibatis/trunk/cs/tutorial/Tests/bin/Debug/sqlmap.config Sun May 29 14:53:30 2005
@@ -3,17 +3,14 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
 
-   <properties resource="../../Resources/properties.xml"/>
+    <properties resource="properties.config"/>
 
 	<settings>
 		<setting useStatementNamespaces="false"/>
 		<setting cacheModelsEnabled="true"/>
 	</settings>
 
-	<!-- Experimental -->
-	<assembly>iBatisTutorial.Tests</assembly>
-	
-	<providers file="../../Resources/providers.config"/>
+	<providers resource="providers.config"/>
 
 	<database>	
 		<provider name="${provider}"/>
@@ -21,7 +18,7 @@
 	</database>
 
 	<sqlMaps>
-		<sqlMap resource="../../Resources/PersonHelper.xml" />
+		<sqlMap resource="${root}Resources/PersonHelper.xml" />
 	</sqlMaps>
 
 </sqlMapConfig>

Modified: incubator/ibatis/trunk/cs/tutorial/WebView/WebView.csproj
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/WebView/WebView.csproj?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/WebView/WebView.csproj (original)
+++ incubator/ibatis/trunk/cs/tutorial/WebView/WebView.csproj Sun May 29 14:53:30 2005
@@ -124,6 +124,10 @@
                     BuildAction = "EmbeddedResource"
                 />
                 <File
+                    RelPath = "properties.config"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "providers.config"
                     BuildAction = "None"
                 />
@@ -157,10 +161,6 @@
                 />
                 <File
                     RelPath = "Resources\PersonHelper.xml"
-                    BuildAction = "Content"
-                />
-                <File
-                    RelPath = "Resources\properties.xml"
                     BuildAction = "Content"
                 />
             </Include>

Added: incubator/ibatis/trunk/cs/tutorial/WebView/properties.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/WebView/properties.config?rev=178991&view=auto
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/WebView/properties.config (added)
+++ incubator/ibatis/trunk/cs/tutorial/WebView/properties.config Sun May 29 14:53:30 2005
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8" ?> 
+<settings>
+	<!--   User application and configured property settings go here.-->
+	<!--   Example: <add key="settingName" value="settingValue"/> -->
+	<add key="provider" value="OleDb1.1" />
+	<add 
+		key="connectionString" 
+		value="Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\projects\ibatis\asf\trunk\cs\tutorial\WebView\Resources\iBatisTutorial.mdb" />
+	<add key="root" value="./" />		
+</settings>

Modified: incubator/ibatis/trunk/cs/tutorial/WebView/sqlmap.config
URL: http://svn.apache.org/viewcvs/incubator/ibatis/trunk/cs/tutorial/WebView/sqlmap.config?rev=178991&r1=178990&r2=178991&view=diff
==============================================================================
--- incubator/ibatis/trunk/cs/tutorial/WebView/sqlmap.config (original)
+++ incubator/ibatis/trunk/cs/tutorial/WebView/sqlmap.config Sun May 29 14:53:30 2005
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<sqlMapConfig
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
+<sqlMapConfig xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="SqlMapConfig.xsd">
 
-   <properties resource="./Resources/properties.xml"/>
+    <properties resource="properties.config"/>
    
 	<settings>
 		<setting useStatementNamespaces="false"/>
@@ -16,8 +14,7 @@
 	</database>
 
 	<sqlMaps>
-		<sqlMap resource="./Resources/PersonHelper.xml"/>
-		<!-- Rem : If used as embedded Resources, just specify the name of each sqlMap file -->	
+		<sqlMap resource="${root}Resources/PersonHelper.xml"/>
 	</sqlMaps>
 
 </sqlMapConfig>