[mapguide-commits] r7671 - branches/2.4/MgDev/Web/src/HttpHandler
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Mon Jul 8 02:42:35 PDT 2013
Author: jng
Date: 2013-07-08 02:42:34 -0700 (Mon, 08 Jul 2013)
New Revision: 7671
Removed:
branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.cpp
branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.h
Modified:
branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj
branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj.filters
branches/2.4/MgDev/Web/src/HttpHandler/HttpHandlerBuild.cpp
branches/2.4/MgDev/Web/src/HttpHandler/HttpRequest.cpp
branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.cpp
branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.h
branches/2.4/MgDev/Web/src/HttpHandler/Makefile.am
Log:
#2309: Implement RFC 136 - Remove EXECUTESQLQUERY from the mapagent
Deleted: branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.cpp
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.cpp 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.cpp 2013-07-08 09:42:34 UTC (rev 7671)
@@ -1,74 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#include "HttpHandler.h"
-#include "HttpExecuteSqlQuery.h"
-
-HTTP_IMPLEMENT_CREATE_OBJECT(MgHttpExecuteSqlQuery)
-
-/// <summary>
-/// Initializes the common parameters and parameters specific to this request.
-/// </summary>
-/// <param name="name">Input
-/// MgHttpRequest
-/// This contains all the parameters of the request.
-/// </param>
-/// <returns>
-/// nothing
-/// </returns>
-MgHttpExecuteSqlQuery::MgHttpExecuteSqlQuery(MgHttpRequest *hRequest)
-{
- InitializeCommonParameters(hRequest);
-
- Ptr<MgHttpRequestParam> params = hRequest->GetRequestParam();
-
- m_resId = params->GetParameterValue(MgHttpResourceStrings::reqFeatResourceId);
- m_sqlStatement = params->GetParameterValue(MgHttpResourceStrings::reqFeatSql);
-}
-
-/// <summary>
-/// Executes the specific request.
-/// </summary>
-/// <returns>
-/// MgHttpResponse
-/// This contains the response (including MgHttpResult and StatusCode) from the server.
-/// </returns>
-void MgHttpExecuteSqlQuery::Execute(MgHttpResponse& hResponse)
-{
- Ptr<MgHttpResult> hResult = hResponse.GetResult();
-
- MG_HTTP_HANDLER_TRY()
-
- // Check common parameters
- ValidateCommonParameters();
-
- Ptr<MgResourceIdentifier> resId = new MgResourceIdentifier(m_resId);
-
- // Create Proxy Feature Service instance
- Ptr<MgFeatureService> service = (MgFeatureService*)(CreateService(MgServiceType::FeatureService));
-
- // call the C++ API
- Ptr<MgSqlDataReader> sqlReader = service->ExecuteSqlQuery(resId, m_sqlStatement);
- Ptr<MgByteReader> byteReader = sqlReader->ToXml();
-
- //Convert to alternate response format, if necessary
- ProcessFormatConversion(byteReader);
-
- hResult->SetResultObject(byteReader, byteReader->GetMimeType());
-
- MG_HTTP_HANDLER_CATCH_AND_THROW_EX(L"MgHttpExecuteSqlQuery.Execute")
-}
Deleted: branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.h
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.h 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpExecuteSqlQuery.h 2013-07-08 09:42:34 UTC (rev 7671)
@@ -1,51 +0,0 @@
-//
-// Copyright (C) 2004-2011 by Autodesk, Inc.
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of version 2.1 of the GNU Lesser
-// General Public License as published by the Free Software Foundation.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-//
-
-#ifndef _FS_EXECUTE_SQL_QUERY_H
-#define _FS_EXECUTE_SQL_QUERY_H
-
-class MgHttpExecuteSqlQuery : public MgHttpRequestResponseHandler
-{
-HTTP_DECLARE_CREATE_OBJECT()
-
-public:
- /// <summary>
- /// Initializes the common parameters of the request.
- /// </summary>
- /// <param name="name">Input
- /// MgHttpRequest
- /// This contains all the parameters of the request.
- /// </param>
- /// <returns>
- /// nothing
- /// </returns>
- MgHttpExecuteSqlQuery(MgHttpRequest *hRequest);
-
- /// <summary>
- /// Executes the specific request.
- /// </summary>
- /// <param name="hResponse">Input
- /// This contains the response (including MgHttpResult and StatusCode) from the server.
- /// </param>
- void Execute(MgHttpResponse& hResponse);
-
-private:
- STRING m_resId;
- STRING m_sqlStatement;
-};
-
-#endif // _FS_EXECUTE_SQL_QUERY_H
Modified: branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj 2013-07-08 09:42:34 UTC (rev 7671)
@@ -348,12 +348,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
- <ClCompile Include="HttpExecuteSqlQuery.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
- </ClCompile>
<ClCompile Include="HttpGetCapabilities.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -957,7 +951,6 @@
<ClInclude Include="HttpUpdateRepository.h" />
<ClInclude Include="HttpDescribeSchema.h" />
<ClInclude Include="HttpEnumerateDataStores.h" />
- <ClInclude Include="HttpExecuteSqlQuery.h" />
<ClInclude Include="HttpGetCapabilities.h" />
<ClInclude Include="HttpGetClassDefinition.h" />
<ClInclude Include="HttpGetClasses.h" />
Modified: branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj.filters
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj.filters 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj.filters 2013-07-08 09:42:34 UTC (rev 7671)
@@ -117,9 +117,6 @@
<ClCompile Include="HttpEnumerateDataStores.cpp">
<Filter>Feature Service</Filter>
</ClCompile>
- <ClCompile Include="HttpExecuteSqlQuery.cpp">
- <Filter>Feature Service</Filter>
- </ClCompile>
<ClCompile Include="HttpGetCapabilities.cpp">
<Filter>Feature Service</Filter>
</ClCompile>
@@ -462,9 +459,6 @@
<ClInclude Include="HttpEnumerateDataStores.h">
<Filter>Feature Service</Filter>
</ClInclude>
- <ClInclude Include="HttpExecuteSqlQuery.h">
- <Filter>Feature Service</Filter>
- </ClInclude>
<ClInclude Include="HttpGetCapabilities.h">
<Filter>Feature Service</Filter>
</ClInclude>
Modified: branches/2.4/MgDev/Web/src/HttpHandler/HttpHandlerBuild.cpp
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpHandlerBuild.cpp 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpHandlerBuild.cpp 2013-07-08 09:42:34 UTC (rev 7671)
@@ -53,7 +53,6 @@
#include "HttpEnumerateApplicationTemplates.cpp"
#include "HttpEnumerateApplicationWidgets.cpp"
#include "HttpEnumerateApplicationContainers.cpp"
-#include "HttpExecuteSqlQuery.cpp"
#include "HttpGetCapabilities.cpp"
#include "HttpGetConnectionPropertyValues.cpp"
#include "HttpGetDefaultTileSizeX.cpp"
Modified: branches/2.4/MgDev/Web/src/HttpHandler/HttpRequest.cpp
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpRequest.cpp 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpRequest.cpp 2013-07-08 09:42:34 UTC (rev 7671)
@@ -62,7 +62,6 @@
#include "HttpDescribeSchema.h"
#include "HttpSelectFeatures.h"
#include "HttpSelectFeaturesSpatially.h"
-#include "HttpExecuteSqlQuery.h"
#include "HttpGetSpatialContexts.h"
#include "HttpGetLongTransactions.h"
#include "HttpEnumerateDataStores.h"
@@ -377,7 +376,6 @@
httpClassCreators[MgHttpResourceStrings::opDescribeSchema] = MgHttpDescribeSchema::CreateObject;
httpClassCreators[MgHttpResourceStrings::opSelectFeatures] = MgHttpSelectFeatures::CreateObject;
httpClassCreators[MgHttpResourceStrings::opSelectFeaturesSpatially] = MgHttpSelectFeaturesSpatially::CreateObject;
- httpClassCreators[MgHttpResourceStrings::opExecuteSqlQuery] = MgHttpExecuteSqlQuery::CreateObject;
httpClassCreators[MgHttpResourceStrings::opGetSpatialContexts] = MgHttpGetSpatialContexts::CreateObject;
httpClassCreators[MgHttpResourceStrings::opGetLongTransactions] = MgHttpGetLongTransactions::CreateObject;
httpClassCreators[MgHttpResourceStrings::opEnumerateUsers] = MgHttpEnumerateUsers::CreateObject;
Modified: branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.cpp
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.cpp 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.cpp 2013-07-08 09:42:34 UTC (rev 7671)
@@ -147,7 +147,6 @@
const STRING MgHttpResourceStrings::reqFeatSpatialOp = L"SPATIALOP";
const STRING MgHttpResourceStrings::reqFeatGeometry = L"GEOMETRY";
const STRING MgHttpResourceStrings::reqFeatProperties = L"PROPERTIES";
-const STRING MgHttpResourceStrings::reqFeatSql = L"SQL";
const STRING MgHttpResourceStrings::reqFeatActiveOnly = L"ACTIVEONLY";
const STRING MgHttpResourceStrings::reqFeatComputedProperties = L"COMPUTED_PROPERTIES";
const STRING MgHttpResourceStrings::reqFeatComputedAliases = L"COMPUTED_ALIASES";
@@ -161,7 +160,6 @@
const STRING MgHttpResourceStrings::opSelectFeatures = L"SELECTFEATURES";
// const STRING MgHttpResourceStrings::opSelectFeaturesSpatially = L"SELECTFEATURESSPATIALLY";
const STRING MgHttpResourceStrings::opSelectFeaturesSpatially = L"SELECTAGGREGATES";
-const STRING MgHttpResourceStrings::opExecuteSqlQuery = L"EXECUTESQLQUERY";
const STRING MgHttpResourceStrings::opGetSpatialContexts = L"GETSPATIALCONTEXTS";
const STRING MgHttpResourceStrings::opGetLongTransactions = L"GETLONGTRANSACTIONS";
const STRING MgHttpResourceStrings::opEnumerateDataStores = L"ENUMERATEDATASTORES";
Modified: branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.h
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.h 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/HttpResourceStrings.h 2013-07-08 09:42:34 UTC (rev 7671)
@@ -122,7 +122,6 @@
static const STRING reqFeatGeomProperty;
static const STRING reqFeatSpatialOp;
static const STRING reqFeatGeometry;
- static const STRING reqFeatSql;
static const STRING reqFeatActiveOnly;
static const STRING reqFeatComputedProperties;
static const STRING reqFeatComputedAliases;
@@ -268,7 +267,6 @@
static const STRING opDescribeSchema;
static const STRING opSelectFeatures;
static const STRING opSelectFeaturesSpatially;
- static const STRING opExecuteSqlQuery;
static const STRING opGetSpatialContexts;
static const STRING opGetLongTransactions;
static const STRING opEnumerateDataStores;
Modified: branches/2.4/MgDev/Web/src/HttpHandler/Makefile.am
===================================================================
--- branches/2.4/MgDev/Web/src/HttpHandler/Makefile.am 2013-07-08 09:39:41 UTC (rev 7670)
+++ branches/2.4/MgDev/Web/src/HttpHandler/Makefile.am 2013-07-08 09:42:34 UTC (rev 7671)
@@ -52,7 +52,6 @@
HttpEnumerateApplicationContainers.cpp \
HttpEnumerateApplicationWidgets.cpp \
HttpEnumerateApplicationTemplates.cpp \
- HttpExecuteSqlQuery.cpp \
HttpGetCapabilities.cpp \
HttpGetClassDefinition.cpp \
HttpGetClasses.cpp \
@@ -176,7 +175,6 @@
HttpEnumerateApplicationContainers.h \
HttpEnumerateApplicationWidgets.h \
HttpEnumerateApplicationTemplates.h \
- HttpExecuteSqlQuery.h \
HttpGetCapabilities.h \
HttpGetClassDefinition.h \
HttpGetClasses.h \
More information about the mapguide-commits
mailing list