[fdo-commits] r2481 - in trunk/Providers/SDF/Src: Message Provider UnitTest

svn_fdo at osgeo.org svn_fdo at osgeo.org
Fri Feb 9 19:31:51 EST 2007


Author: gregboone
Date: 2007-02-09 19:31:50 -0500 (Fri, 09 Feb 2007)
New Revision: 2481

Modified:
   trunk/Providers/SDF/Src/Message/SDFMessage.vcproj
   trunk/Providers/SDF/Src/Message/SDFMessageStatic.rc
   trunk/Providers/SDF/Src/Provider/SDF.rc
   trunk/Providers/SDF/Src/Provider/SDF.vcproj
   trunk/Providers/SDF/Src/Provider/SDFProvider.h
   trunk/Providers/SDF/Src/UnitTest/AssociationSchemaTest.cpp
   trunk/Providers/SDF/Src/UnitTest/ConnectionInfoTest.cpp
   trunk/Providers/SDF/Src/UnitTest/ExtendedSelectTest.cpp
   trunk/Providers/SDF/Src/UnitTest/FdoMultiThreadTest.cpp
   trunk/Providers/SDF/Src/UnitTest/MasterTest.cpp
   trunk/Providers/SDF/Src/UnitTest/SelectTest.cpp
   trunk/Providers/SDF/Src/UnitTest/UnitTestUtil.cpp
   trunk/Providers/SDF/Src/UnitTest/providers.xml
Log:
Update version information to reference 3.3.0.0

Modified: trunk/Providers/SDF/Src/Message/SDFMessage.vcproj
===================================================================
--- trunk/Providers/SDF/Src/Message/SDFMessage.vcproj	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/Message/SDFMessage.vcproj	2007-02-10 00:31:50 UTC (rev 2481)
@@ -98,7 +98,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Creating Library and Versioning SDFMessage.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFMessage.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFMessage.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -186,7 +186,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Creating Library and Versioning SDFMessage.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFMessage.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFMessage.dll"
 			/>
 		</Configuration>
 	</Configurations>

Modified: trunk/Providers/SDF/Src/Message/SDFMessageStatic.rc
===================================================================
--- trunk/Providers/SDF/Src/Message/SDFMessageStatic.rc	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/Message/SDFMessageStatic.rc	2007-02-10 00:31:50 UTC (rev 2481)
@@ -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", "SDF Provider Message Library"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.3.0.0"
             VALUE "InternalName", "SDFMessage"
-            VALUE "LegalCopyright", "Copyright © 2006"
+            VALUE "LegalCopyright", "Copyright © 2007"
             VALUE "OriginalFilename", "SDFMessage.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/SDF/Src/Provider/SDF.rc
===================================================================
--- trunk/Providers/SDF/Src/Provider/SDF.rc	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/Provider/SDF.rc	2007-02-10 00:31:50 UTC (rev 2481)
@@ -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 SDF"
             VALUE "CompanyName", "Open Source Geospatial Foundation"
             VALUE "FileDescription", "SDF FDO Provider Component"
-            VALUE "FileVersion", "3.2.0.0"
+            VALUE "FileVersion", "3.3.0.0"
             VALUE "InternalName", "SDFProvider"
-            VALUE "LegalCopyright", "Copyright © 2006"
+            VALUE "LegalCopyright", "Copyright © 2007"
             VALUE "OriginalFilename", "SDFProvider.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/SDF/Src/Provider/SDF.vcproj
===================================================================
--- trunk/Providers/SDF/Src/Provider/SDF.vcproj	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/Provider/SDF.vcproj	2007-02-10 00:31:50 UTC (rev 2481)
@@ -102,7 +102,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SDFProvider.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFProvider.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFProvider.dll"
 			/>
 		</Configuration>
 		<Configuration
@@ -198,7 +198,7 @@
 			<Tool
 				Name="VCPostBuildEventTool"
 				Description="Versioning SDFProvider.dll"
-				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.2.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFProvider.dll"
+				CommandLine="$(FDOTHIRDPARTY)\util\stampver\StampVer.exe -v&quot;..\..\SubDoc\Providers.version&quot; -f&quot;3.3.0.0%PROVIDERS_VERSION%&quot; $(OutDir)\SDFProvider.dll"
 			/>
 		</Configuration>
 		<Configuration

Modified: trunk/Providers/SDF/Src/Provider/SDFProvider.h
===================================================================
--- trunk/Providers/SDF/Src/Provider/SDFProvider.h	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/Provider/SDFProvider.h	2007-02-10 00:31:50 UTC (rev 2481)
@@ -16,11 +16,11 @@
 #ifndef STDPLUS_PROVIDER_H
 #define STDPLUS_PROVIDER_H
 
-#define SDF_PROVIDER_NAME					L"OSGeo.SDF.3.2"
+#define SDF_PROVIDER_NAME					L"OSGeo.SDF.3.3"
 #define SDF_PROVIDER_DEFAULT_DISPLAY_NAME	"OSGeo FDO Provider for SDF"
 #define SDF_PROVIDER_DEFAULT_DESCRIPTION	"Read/write access to Autodesk's spatial database format, a file-based personal geodatabase that supports multiple features/attributes, spatial indexing, and file-locking."
-#define SDF_PROVIDER_VERSION				L"3.2.0.0"
-#define SDF_FDO_VERSION						L"3.2.0.0"
+#define SDF_PROVIDER_VERSION				L"3.3.0.0"
+#define SDF_FDO_VERSION						L"3.3.0.0"
 
 #define	PROP_NAME_FILE		L"File"	  
 #define	PROP_NAME_RDONLY	L"ReadOnly"  

Modified: trunk/Providers/SDF/Src/UnitTest/AssociationSchemaTest.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/AssociationSchemaTest.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/AssociationSchemaTest.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -63,7 +63,7 @@
 #endif
 
     FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-    FdoIConnection *conn = manager->CreateConnection (L"OSGeo.SDF.3.2");
+    FdoIConnection *conn = manager->CreateConnection (L"OSGeo.SDF.3.3");
 	if( re_create )
 	{
 		size_t len = wcstombs(NULL, TEST_FILE, 0);

Modified: trunk/Providers/SDF/Src/UnitTest/ConnectionInfoTest.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/ConnectionInfoTest.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/ConnectionInfoTest.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -131,7 +131,7 @@
 
 	delete[] mbsPath;
     FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-    connection = manager->CreateConnection (L"OSGeo.SDF.3.2");
+    connection = manager->CreateConnection (L"OSGeo.SDF.3.3");
 
     FdoPtr<FdoICreateSDFFile> crsdf = (FdoICreateSDFFile*)(connection->CreateCommand(SdfCommandType_CreateSDFFile));
 

Modified: trunk/Providers/SDF/Src/UnitTest/ExtendedSelectTest.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/ExtendedSelectTest.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/ExtendedSelectTest.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -64,7 +64,7 @@
     {
         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");
         OpenConnection(connection,SDF_FILE);
 
         FdoPtr<SdfIExtendedSelect> select = (SdfIExtendedSelect*)connection->CreateCommand(SdfCommandType_ExtendedSelect); 
@@ -318,7 +318,7 @@
     {
         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");
         OpenConnection(connection,WORLD);
 
         WorldTest( connection );
@@ -336,7 +336,7 @@
     {
         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");
         OpenConnection(connection,WORLD_N1);
 
         WorldTest( connection );
@@ -354,7 +354,7 @@
     {
         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");
         OpenConnection(connection, WORLD_N2, true);
 
         WorldTest( connection );
@@ -372,7 +372,7 @@
     {
         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");
         OpenConnection(connection, WORLD_N2);
 
         CPPUNIT_ASSERT_MESSAGE ("open connection should fail", false);
@@ -393,7 +393,7 @@
     {
         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"Fi_le=\"../../TestData/C~`!@#$%^&()_-+=}{[];',re.sdf\"");
         connection->Open();
 
@@ -415,7 +415,7 @@
     {
         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");
 
         std::wstring connStr = std::wstring(L"File=\"") + std::wstring(WORLD_N3) + std::wstring(L"\";ReadOnly=FALSE");
         connection->SetConnectionString(connStr.c_str());
@@ -496,7 +496,7 @@
     {
         FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
 
-        FdoPtr<FdoIConnection> conn = manager->CreateConnection (L"OSGeo.SDF.3.2");
+        FdoPtr<FdoIConnection> conn = manager->CreateConnection (L"OSGeo.SDF.3.3");
 
         OpenConnection(conn, DEST_FILE);    
 
@@ -548,7 +548,7 @@
     {
         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");
         FdoPtr<FdoIConnectionInfo> pInfo = connection->GetConnectionInfo();
         FdoPtr<FdoIConnectionPropertyDictionary> pProps = pInfo->GetConnectionProperties();
         pProps->SetProperty(L"File", std::wstring(WORLD_N3).c_str());

Modified: trunk/Providers/SDF/Src/UnitTest/FdoMultiThreadTest.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/FdoMultiThreadTest.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/FdoMultiThreadTest.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -128,7 +128,7 @@
         for (int i = 0; i < NUMBER_OF_THREADS; i++)
 	    {
             info[i].connectionId = i;
-            info[i].mConn = manager->CreateConnection (L"OSGeo.SDF.3.2");
+            info[i].mConn = manager->CreateConnection (L"OSGeo.SDF.3.3");
 			OpenConnection(info[i].mConn,SDF_FILE);
 	    } 
     }

Modified: trunk/Providers/SDF/Src/UnitTest/MasterTest.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/MasterTest.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/MasterTest.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -83,7 +83,7 @@
 FdoIConnection* MasterTest::CreateConnection()
 {
     FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-    return (manager->CreateConnection (L"OSGeo.SDF.3.2"));
+    return (manager->CreateConnection (L"OSGeo.SDF.3.3"));
 }
 
 // This method is executed at the beginning of each test case.

Modified: trunk/Providers/SDF/Src/UnitTest/SelectTest.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/SelectTest.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/SelectTest.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -215,7 +215,7 @@
 
 	delete[] mbsPath;
     FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-    connection = manager->CreateConnection (L"OSGeo.SDF.3.2");
+    connection = manager->CreateConnection (L"OSGeo.SDF.3.3");
 
     FdoPtr<FdoICreateSDFFile> crsdf = (FdoICreateSDFFile*)(connection->CreateCommand(SdfCommandType_CreateSDFFile));
 

Modified: trunk/Providers/SDF/Src/UnitTest/UnitTestUtil.cpp
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/UnitTestUtil.cpp	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/UnitTestUtil.cpp	2007-02-10 00:31:50 UTC (rev 2481)
@@ -36,7 +36,7 @@
 #endif
 
     FdoPtr<IConnectionManager> manager = FdoFeatureAccessManager::GetConnectionManager ();
-    FdoIConnection *conn = manager->CreateConnection (L"OSGeo.SDF.3.2");
+    FdoIConnection *conn = manager->CreateConnection (L"OSGeo.SDF.3.3");
 	if( re_create )
 	{
 		size_t len = wcstombs(NULL, fileName, 0);

Modified: trunk/Providers/SDF/Src/UnitTest/providers.xml
===================================================================
--- trunk/Providers/SDF/Src/UnitTest/providers.xml	2007-02-10 00:30:28 UTC (rev 2480)
+++ trunk/Providers/SDF/Src/UnitTest/providers.xml	2007-02-10 00:31:50 UTC (rev 2481)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <FeatureProviderRegistry>
   <FeatureProvider>
-    <Name>OSGeo.SDF.3.2</Name>
+    <Name>OSGeo.SDF.3.3</Name>
     <DisplayName>OSGeo FDO Provider for SDF</DisplayName>
     <Description>FDO Provider for SDF</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>.\SDFProvider.dll</LibraryPath>
   </FeatureProvider>
 </FeatureProviderRegistry>



More information about the fdo-commits mailing list