[fdo-commits] r2482 - in trunk/Providers/SHP: Docs/XmlSchema Managed/Project Managed/Src/OSGeo/FDO/Providers/SHP/Override Managed/UnitTest Src/Message Src/Overrides Src/Provider Src/UnitTest

svn_fdo at osgeo.org svn_fdo at osgeo.org
Fri Feb 9 19:33:26 EST 2007


Author: gregboone
Date: 2007-02-09 19:33:26 -0500 (Fri, 09 Feb 2007)
New Revision: 2482

Modified:
   trunk/Providers/SHP/Docs/XmlSchema/ShpConfigExample.xml
   trunk/Providers/SHP/Managed/Project/MgShapeOverrides.vcproj
   trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyInfo.cpp
   trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyVersion.cpp
   trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/MgShapeOverrides.rc
   trunk/Providers/SHP/Managed/UnitTest/ShpOverridesConfig.xml
   trunk/Providers/SHP/Managed/UnitTest/ShpSchemaConfig.xml
   trunk/Providers/SHP/Managed/UnitTest/providers.xml
   trunk/Providers/SHP/Src/Message/ShpMessage.vcproj
   trunk/Providers/SHP/Src/Message/ShpMessageStatic.rc
   trunk/Providers/SHP/Src/Overrides/FdoShpOverrides.rc
   trunk/Providers/SHP/Src/Overrides/ShpOverrides.vcproj
   trunk/Providers/SHP/Src/Provider/ShpProvider.h
   trunk/Providers/SHP/Src/Provider/ShpProvider.rc
   trunk/Providers/SHP/Src/Provider/ShpProvider.vcproj
   trunk/Providers/SHP/Src/UnitTest/ComparisonTests.cpp
   trunk/Providers/SHP/Src/UnitTest/ShpOverridesConfig.xml
   trunk/Providers/SHP/Src/UnitTest/ShpSchemaConfig.xml
   trunk/Providers/SHP/Src/UnitTest/ShpTests.cpp
   trunk/Providers/SHP/Src/UnitTest/providers.xml
Log:
Update version information to reference 3.3.0.0

Modified: trunk/Providers/SHP/Docs/XmlSchema/ShpConfigExample.xml
===================================================================
--- trunk/Providers/SHP/Docs/XmlSchema/ShpConfigExample.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Docs/XmlSchema/ShpConfigExample.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -77,7 +77,7 @@
 	</xs:schema>
 
 	<!-- Schema Overrides for Hydrographic Feature Schema -->
-	<SchemaMapping provider="OSGeo.SHP.3.2" name="Hydrographic" xmlns="http://fdoshp.osgeo.org/schemas">
+	<SchemaMapping provider="OSGeo.SHP.3.3" name="Hydrographic" xmlns="http://fdoshp.osgeo.org/schemas">
 		<!-- Schema Overrides for Sounding Feature Class -->
 		<complexType name="SoundingType" shapeFile="d:/hydrographic/soundings.shp">
 		    <!-- Schema Overrides for Sounding Feature Class Properties-->

Modified: trunk/Providers/SHP/Managed/Project/MgShapeOverrides.vcproj
===================================================================
--- trunk/Providers/SHP/Managed/Project/MgShapeOverrides.vcproj	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/Project/MgShapeOverrides.vcproj	2007-02-10 00:33:26 UTC (rev 2482)
@@ -96,7 +96,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning OSGeo.FDO.Providers.SHP.Overrides.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;$(FDO)\Managed\Fdo.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\OSGeo.FDO.Providers.SHP.Overrides.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;$(FDO)\Managed\Fdo.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\OSGeo.FDO.Providers.SHP.Overrides.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -178,7 +178,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning OSGeo.FDO.Providers.SHP.Overrides.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;$(FDO)\Managed\Fdo.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\OSGeo.FDO.Providers.SHP.Overrides.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;$(FDO)\Managed\Fdo.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\OSGeo.FDO.Providers.SHP.Overrides.dll"
 			/>
 		</Configuration>
 	</Configurations>

Modified: trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyInfo.cpp
===================================================================
--- trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyInfo.cpp	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyInfo.cpp	2007-02-10 00:33:26 UTC (rev 2482)
@@ -17,7 +17,7 @@
 [assembly:AssemblyConfigurationAttribute("")];
 [assembly:AssemblyCompanyAttribute("Open Source Geospatial Foundation")]; 
 [assembly:AssemblyProductAttribute("Feature Data Objects")];
-[assembly:AssemblyCopyrightAttribute("Copyright (C) 2006")]; 
+[assembly:AssemblyCopyrightAttribute("Copyright (C) 2007")]; 
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 

Modified: trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyVersion.cpp
===================================================================
--- trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyVersion.cpp	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/AssemblyVersion.cpp	2007-02-10 00:33:26 UTC (rev 2482)
@@ -34,4 +34,4 @@
 // by using the '*' as shown below:
 //
 
-[assembly:AssemblyVersion("3.2.6256.0")];
+[assembly:AssemblyVersion("3.3.0.0")];

Modified: trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/MgShapeOverrides.rc
===================================================================
--- trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/MgShapeOverrides.rc	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/Src/OSGeo/FDO/Providers/SHP/Override/MgShapeOverrides.rc	2007-02-10 00:33:26 UTC (rev 2482)
@@ -53,8 +53,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,0,0
- PRODUCTVERSION 3,2,0,0
+ FILEVERSION 3,3,0,0
+ PRODUCTVERSION 3,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@
         BEGIN
             VALUE "CompanyName", "Open Source Geospatial Foundation"
             VALUE "FileDescription", "FDO Shape Managed Overrides API Component"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.3.0.0"
             VALUE "InternalName", "OSGeo.FDO.Providers.SHP.Overrides"
-            VALUE "LegalCopyright", "Copyright (C) 2006"
+            VALUE "LegalCopyright", "Copyright (C) 2007"
             VALUE "OriginalFilename", "OSGeo.FDO.Providers.SHP.Overrides.dll"
             VALUE "ProductName", "Feature Data Objects"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Providers/SHP/Managed/UnitTest/ShpOverridesConfig.xml
===================================================================
--- trunk/Providers/SHP/Managed/UnitTest/ShpOverridesConfig.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/UnitTest/ShpOverridesConfig.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<SchemaMapping provider="OSGeo.SHP.3.2" name="Hydrographic" xmlns="http://fdoshp.osgeo.org/schemas">
+<SchemaMapping provider="OSGeo.SHP.3.3" name="Hydrographic" xmlns="http://fdoshp.osgeo.org/schemas">
 	<complexType name="SoundingType" shapeFile="d:/hydrographic/soundings.shp">
 		<element name="SoundingDate">
 			<Column name="SNDG_DATE"/>

Modified: trunk/Providers/SHP/Managed/UnitTest/ShpSchemaConfig.xml
===================================================================
--- trunk/Providers/SHP/Managed/UnitTest/ShpSchemaConfig.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/UnitTest/ShpSchemaConfig.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -78,7 +78,7 @@
 	</xs:schema>
 
 	<!-- Schema Overrides for Hydrographic Feature Schema -->
-    <SchemaMapping provider="OSGeo.SHP.3.2" name="hydro" xmlns="http://fdoshp.osgeo.org/schemas">
+    <SchemaMapping provider="OSGeo.SHP.3.3" name="hydro" xmlns="http://fdoshp.osgeo.org/schemas">
 	    <complexType name="SoundingType" shapeFile="d:/hydrographic/soundings.shp">
 		    <element name="SoundingDate">
 			    <Column name="SNDG_DATE"/>

Modified: trunk/Providers/SHP/Managed/UnitTest/providers.xml
===================================================================
--- trunk/Providers/SHP/Managed/UnitTest/providers.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Managed/UnitTest/providers.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FeatureProviderRegistry>
   <FeatureProvider>
-    <Name>OSGeo.SHP.3.2</Name>
+    <Name>OSGeo.SHP.3.3</Name>
     <DisplayName>OSGeo FDO Provider for SHP</DisplayName>
     <Description>OSGeo FDO Provider for SHP</Description>
     <IsManaged>False</IsManaged>
-    <Version>3.2.0.0</Version>
-    <FeatureDataObjectsVersion>3.2.0.0</FeatureDataObjectsVersion>
+    <Version>3.3.0.0</Version>
+    <FeatureDataObjectsVersion>3.3.0.0</FeatureDataObjectsVersion>
     <LibraryPath>.\SHPProvider.dll</LibraryPath>
   </FeatureProvider>
 </FeatureProviderRegistry>

Modified: trunk/Providers/SHP/Src/Message/ShpMessage.vcproj
===================================================================
--- trunk/Providers/SHP/Src/Message/ShpMessage.vcproj	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Message/ShpMessage.vcproj	2007-02-10 00:33:26 UTC (rev 2482)
@@ -86,7 +86,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SHPMessage.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPMessage.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPMessage.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -160,7 +160,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SHPMessage.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPMessage.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPMessage.dll"
 			/>
 		</Configuration>
 	</Configurations>

Modified: trunk/Providers/SHP/Src/Message/ShpMessageStatic.rc
===================================================================
--- trunk/Providers/SHP/Src/Message/ShpMessageStatic.rc	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Message/ShpMessageStatic.rc	2007-02-10 00:33:26 UTC (rev 2482)
@@ -83,8 +83,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,0,0
- PRODUCTVERSION 3,2,0,0
+ FILEVERSION 3,3,0,0
+ PRODUCTVERSION 3,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -102,12 +102,12 @@
             VALUE "Comments", "Resource Only Dynamic Link Library"
             VALUE "CompanyName", "Open Source Geospatial Foundation"
             VALUE "FileDescription", "FDO Provider for Shp Message Library"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.3.0.0"
             VALUE "InternalName", "ShpMessage"
-            VALUE "LegalCopyright", "Copyright © 2006"
+            VALUE "LegalCopyright", "Copyright © 2007"
             VALUE "OriginalFilename", "ShpMessage.dll"
             VALUE "ProductName", "Feature Data Objects"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Providers/SHP/Src/Overrides/FdoShpOverrides.rc
===================================================================
--- trunk/Providers/SHP/Src/Overrides/FdoShpOverrides.rc	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Overrides/FdoShpOverrides.rc	2007-02-10 00:33:26 UTC (rev 2482)
@@ -53,8 +53,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,0,0
- PRODUCTVERSION 3,2,0,0
+ FILEVERSION 3,3,0,0
+ PRODUCTVERSION 3,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -71,12 +71,12 @@
         BEGIN
             VALUE "Comments", "FDO Shape File Overrides API"
             VALUE "FileDescription", "FDO API for Shp Overrides"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.3.0.0"
             VALUE "InternalName", "SHPOverrides"
-            VALUE "LegalCopyright", "Copyright © 2006"
+            VALUE "LegalCopyright", "Copyright © 2007"
             VALUE "OriginalFilename", "ShpOverrides.dll"
             VALUE "ProductName", "Feature Data Objects"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Providers/SHP/Src/Overrides/ShpOverrides.vcproj
===================================================================
--- trunk/Providers/SHP/Src/Overrides/ShpOverrides.vcproj	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Overrides/ShpOverrides.vcproj	2007-02-10 00:33:26 UTC (rev 2482)
@@ -99,7 +99,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SHPOverrides.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPOverrides.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPOverrides.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -191,7 +191,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SHPOverrides.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPOverrides.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPOverrides.dll"
 			/>
 		</Configuration>
 	</Configurations>

Modified: trunk/Providers/SHP/Src/Provider/ShpProvider.h
===================================================================
--- trunk/Providers/SHP/Src/Provider/ShpProvider.h	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Provider/ShpProvider.h	2007-02-10 00:33:26 UTC (rev 2482)
@@ -21,11 +21,11 @@
 #define SHPPROVIDER_H
 
 // General descriptive items of Shp Provier:
-#define SHP_PROVIDER_NAME					L"OSGeo.SHP.3.2"
+#define SHP_PROVIDER_NAME					L"OSGeo.SHP.3.3"
 #define SHP_PROVIDER_DEFAULT_DISPLAY_NAME	"OSGeo FDO Provider for SHP"
 #define SHP_PROVIDER_DEFAULT_DESCRIPTION	"Read/write access to spatial and attribute data in an ESRI SHP file."
-#define SHP_PROVIDER_VERSION				L"3.2.0.0"
-#define SHP_FDO_VERSION						L"3.2.0.0"
+#define SHP_PROVIDER_VERSION				L"3.3.0.0"
+#define SHP_FDO_VERSION						L"3.3.0.0"
 
 // Shp Provier identifier names
 #define SHP_PROVIDER_AUTHOR L"OSGeo"

Modified: trunk/Providers/SHP/Src/Provider/ShpProvider.rc
===================================================================
--- trunk/Providers/SHP/Src/Provider/ShpProvider.rc	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Provider/ShpProvider.rc	2007-02-10 00:33:26 UTC (rev 2482)
@@ -83,8 +83,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,2,0,0
- PRODUCTVERSION 3,2,0,0
+ FILEVERSION 3,3,0,0
+ PRODUCTVERSION 3,3,0,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -102,12 +102,12 @@
             VALUE "Comments", "FDO Provider for Shp"
             VALUE "CompanyName", "Open Source Geospatial Foundation"
             VALUE "FileDescription", "FDO Provider for Shp Component"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.3.0.0"
             VALUE "InternalName", "ShpProvider"
-            VALUE "LegalCopyright", "Copyright © 2006"
+            VALUE "LegalCopyright", "Copyright © 2007"
             VALUE "OriginalFilename", "ShpProvider.dll"
             VALUE "ProductName", "Feature Data Objects"
-            VALUE "ProductVersion", "3.2.0.0"
+            VALUE "ProductVersion", "3.3.0.0"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/Providers/SHP/Src/Provider/ShpProvider.vcproj
===================================================================
--- trunk/Providers/SHP/Src/Provider/ShpProvider.vcproj	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/Provider/ShpProvider.vcproj	2007-02-10 00:33:26 UTC (rev 2482)
@@ -95,7 +95,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SHPProvider.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPProvider.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPProvider.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -174,7 +174,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SHPProvider.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPProvider.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SHPProvider.dll"
 			/>
 		</Configuration>
 	</Configurations>

Modified: trunk/Providers/SHP/Src/UnitTest/ComparisonTests.cpp
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/ComparisonTests.cpp	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/UnitTest/ComparisonTests.cpp	2007-02-10 00:33:26 UTC (rev 2482)
@@ -64,7 +64,7 @@
         {
             // sdf
             FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-            FdoPtr<FdoIConnection> connection = manager->CreateConnection (L"OSGeo.SDF.3.2");
+            FdoPtr<FdoIConnection> connection = manager->CreateConnection (L"OSGeo.SDF.3.3");
             connection->SetConnectionString (L"File=" LOCATION CLASS1);
             CPPUNIT_ASSERT_MESSAGE ("connection state not open", FdoConnectionState_Open == connection->Open ());
             start = clock ();
@@ -120,7 +120,7 @@
         {
             // sdf
             FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-            FdoPtr<FdoIConnection> connection = manager->CreateConnection (L"OSGeo.SDF.3.2");
+            FdoPtr<FdoIConnection> connection = manager->CreateConnection (L"OSGeo.SDF.3.3");
             connection->SetConnectionString (L"File=" LOCATION CLASS2);
             CPPUNIT_ASSERT_MESSAGE ("connection state not open", FdoConnectionState_Open == connection->Open ());
             start = clock ();

Modified: trunk/Providers/SHP/Src/UnitTest/ShpOverridesConfig.xml
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/ShpOverridesConfig.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/UnitTest/ShpOverridesConfig.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<SchemaMapping provider="OSGeo.SHP.3.2" name="Hydrographic" xmlns="http://fdoshp.osgeo.org/schemas">
+<SchemaMapping provider="OSGeo.SHP.3.3" name="Hydrographic" xmlns="http://fdoshp.osgeo.org/schemas">
 	<complexType name="SoundingType" shapeFile="d:/hydrographic/soundings.shp">
 		<element name="SoundingDate">
 			<Column name="SNDG_DATE"/>

Modified: trunk/Providers/SHP/Src/UnitTest/ShpSchemaConfig.xml
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/ShpSchemaConfig.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/UnitTest/ShpSchemaConfig.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -78,7 +78,7 @@
 	</xs:schema>
 
 	<!-- Schema Overrides for Hydrographic Feature Schema -->
-    <SchemaMapping provider="OSGeo.SHP.3.2" name="hydro" xmlns="http://fdoshp.osgeo.org/schemas">
+    <SchemaMapping provider="OSGeo.SHP.3.3" name="hydro" xmlns="http://fdoshp.osgeo.org/schemas">
 	    <complexType name="SoundingType" shapeFile="d:/hydrographic/soundings.shp">
 		    <element name="SoundingDate">
 			    <Column name="SNDG_DATE"/>

Modified: trunk/Providers/SHP/Src/UnitTest/ShpTests.cpp
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/ShpTests.cpp	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/UnitTest/ShpTests.cpp	2007-02-10 00:33:26 UTC (rev 2482)
@@ -37,7 +37,7 @@
 FdoIConnection* ShpTests::GetConnection ()
 {
     FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-    return (manager->CreateConnection (L"OSGeo.SHP.3.2"));
+    return (manager->CreateConnection (L"OSGeo.SHP.3.3"));
 }
 
 void ShpTests::fail (FdoException* ge)

Modified: trunk/Providers/SHP/Src/UnitTest/providers.xml
===================================================================
--- trunk/Providers/SHP/Src/UnitTest/providers.xml	2007-02-10 00:31:50 UTC (rev 2481)
+++ trunk/Providers/SHP/Src/UnitTest/providers.xml	2007-02-10 00:33:26 UTC (rev 2482)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FeatureProviderRegistry>
   <FeatureProvider>
-    <Name>OSGeo.SHP.3.2</Name>
+    <Name>OSGeo.SHP.3.3</Name>
     <DisplayName>OSGeo FDO Provider for SHP</DisplayName>
     <Description>OSGeo FDO Provider for SHP</Description>
     <IsManaged>False</IsManaged>
-    <Version>3.2.0.0</Version>
-    <FeatureDataObjectsVersion>3.2.0.0</FeatureDataObjectsVersion>
+    <Version>3.3.0.0</Version>
+    <FeatureDataObjectsVersion>3.3.0.0</FeatureDataObjectsVersion>
     <LibraryPath>.\ShpProvider.dll</LibraryPath>
   </FeatureProvider>
 </FeatureProviderRegistry>



More information about the fdo-commits mailing list