Kaynağa Gözat

HPCC-18122 Remove ESP service ECLDirect

Signed-off-by: wangkx <kevin.wang@lexisnexis.com>
wangkx 7 yıl önce
ebeveyn
işleme
a123d2f1f9

+ 0 - 36
configuration/xsds_xmls/experimental.xml

@@ -195,10 +195,6 @@
                           path="OthersWorkunitsAccess"
                           resource="OthersWorkunitsAccess"
                           service="ws_workunits"/>
-     <AuthenticateFeature description="Access to ECL direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
      <ProcessFilters>
       <Platform name="Windows">
        <ProcessFilter name="any">
@@ -301,29 +297,6 @@
                           service="ws_ecl"/>
     </Properties>
    </BuildSet>
-   <BuildSet deployable="no"
-             installSet="deploy_map.xml"
-             name="ecldirect"
-             path="componentfiles/ecldirect"
-             processName="EspService"
-             schema="esp_service_ecldirect.xsd">
-    <Properties bindingType="EclDirectSoapBinding"
-                defaultPort="8008"
-                defaultResourcesBasedn="ou=EclDirectAccess,ou=EspServices,ou=ecl"
-                defaultSecurePort="18008"
-                plugin="ecldirect"
-                type="ecldirect">
-     <Authenticate access="Read"
-                   description="Root access to ECL Direct service"
-                   path="/"
-                   required="Read"
-                   resource="EclDirectAccess"/>
-     <AuthenticateFeature description="Access to ECL Direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
-    </Properties>
-   </BuildSet>
   </Build>
  </Programs>
  <Software>
@@ -579,11 +552,6 @@
                          path="OthersWorkunitsAccess"
                          resource="OthersWorkunitsAccess"
                          service="ws_workunits"/>
-    <AuthenticateFeature authenticate="Yes"
-                         description="Access to ECL direct service"
-                         path="EclDirectAccess"
-                         resource="EclDirectAccess"
-                         service="ecldirect"/>
    </EspBinding>
    <EspBinding defaultForPort="true"
                defaultServiceVersion=""
@@ -744,10 +712,6 @@
                          path="OthersWorkunitsAccess"
                          resource="OthersWorkunitsAccess"
                          service="ws_workunits"/>
-    <AuthenticateFeature description="Access to ECL direct service"
-                         path="EclDirectAccess"
-                         resource="EclDirectAccess"
-                         service="ecldirect"/>
     <ProcessFilters>
      <Platform name="Windows">
       <ProcessFilter name="any">

+ 0 - 91
esp/scm/ecldirect.ecm

@@ -1,91 +0,0 @@
-/*##############################################################################
-
-    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-############################################################################## */
-
-ESPStruct [nil_remove] ECLDirectException
-{
-    string Source;
-    string Severity;
-    int Code;
-    string Message;
-    string FileName;
-    int LineNo;
-    int Column;
-    int Activity;
-    [min_version("1.01")] string Scope;
-    [min_version("1.01")] int Priority;
-};
-
-ESPrequest RunEclRequest
-{
-    string userName;
-    string cluster;
-    boolean limitResults;
-    string eclText;
-    string snapshot;
-};
-
-
-ESPresponse [http_encode(0)] RunEclResponse
-{
-    EspResultSet results;
-};
-
-ESPenum RunEclExFormat : string
-{
-    None("None"),
-    Table("Table"),
-    Xml("Xml"),
-    ExtendedXml("ExtendedXml")
-};
-
-ESPrequest [nil_remove] RunEclExRequest
-{
-    [rows(28), cols(80)] string eclText;
-    string UserName;
-    string cluster;
-    string snapshot;
-    boolean includeResults;
-    boolean includeGraphs;
-    ESPenum RunEclExFormat format;
-    int wait(-1);
-    int resultLimit(0);
-};
-
-
-ESPresponse [nil_remove] RunEclExResponse
-{
-    string wuid;
-    ESParray<ESPstruct ECLDirectException> Errors;
-    string results;
-    string graphsXGMML;
-};
-
-
-ESPservice [
-    auth_feature("DEFERRED"),
-    version("1.01"), default_client_version("1.01")
-    ] EclDirect
-{
-    ESPmethod RunEcl(RunEclRequest, RunEclResponse);
-    ESPmethod RunEclEx(RunEclExRequest, RunEclExResponse);
-};
-
-
-
-SCMexportdef(EclDirect);
-
-SCMapi(EclDirect) IClientEclDirect *createEclDirectClient();

+ 0 - 1
esp/scm/espscm.cmake

@@ -26,7 +26,6 @@ set ( ESPSCM_GENERATED_DIR ${CMAKE_BINARY_DIR}/generated )
 set ( ESPSCM_SRCS
       common.ecm
       ecl.ecm
-      ecldirect.ecm
       ecllib.ecm
       esp.ecm
       ws_access.ecm

+ 0 - 1
esp/services/CMakeLists.txt

@@ -14,7 +14,6 @@
 #    limitations under the License.
 ################################################################################
 HPCC_ADD_SUBDIRECTORY (common)
-HPCC_ADD_SUBDIRECTORY (ecldirect "PLATFORM")
 IF (USE_OPENLDAP)
     HPCC_ADD_SUBDIRECTORY (ws_access "PLATFORM")
 ENDIF(USE_OPENLDAP)

+ 0 - 88
esp/services/ecldirect/CMakeLists.txt

@@ -1,88 +0,0 @@
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
-
-
-# Component: EclDirect 
-#####################################################
-# Description:
-# ------------
-#    Cmake Input File for EclDirect
-#####################################################
-
-project( EclDirect ) 
-
-include(${HPCC_SOURCE_DIR}/esp/scm/espscm.cmake)
-
-set (    SRCS 
-         ${ESPSCM_GENERATED_DIR}/ecldirect_esp.cpp 
-         EclDirectPlugin.cpp 
-         EclDirectService.cpp 
-    )
-
-include_directories ( 
-         ./../.. 
-         ./../../../system/mp 
-         ./../../../system/jlib 
-         ./../../services 
-         ./../../platform 
-         ./../../../system/xmllib 
-         ./../../../system/security/shared 
-         ./../../../system/security/securesocket 
-         ./../../../system/include 
-         ./../../../common/environment 
-         ./../../../common/workunit 
-         ./../../../common/wuwebview
-         ./../../clients 
-         ./../../../common/fileview2 
-         ./../../../dali/base 
-         ./../../bindings 
-         ./../../bindings/SOAP/xpp 
-    )
-
-ADD_DEFINITIONS( -D_USRDLL )
-
-HPCC_ADD_LIBRARY( EclDirect SHARED ${SRCS} )
-add_dependencies( EclDirect espscm )
-install ( TARGETS EclDirect RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime)
-target_link_libraries ( EclDirect  
-         jlib
-         xmllib 
-         esphttp 
-         mp 
-         hrpc 
-         remote 
-         dalibase 
-         environment 
-         dllserver 
-         nbcd 
-         eclrtl 
-         deftype 
-         workunit 
-         wuwebview
-         jhtree 
-         hql 
-         fileview2 
-    )
-
-IF (USE_OPENSSL)
-    target_link_libraries ( EclDirect
-    	securesocket
-    )
-ENDIF()
-IF (USE_OPENLDAP)
-  target_link_libraries ( EclDirect LdapSecurity )
-ENDIF(USE_OPENLDAP)
-

+ 0 - 55
esp/services/ecldirect/EclDirectPlugin.cpp

@@ -1,55 +0,0 @@
-/*##############################################################################
-
-    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-############################################################################## */
-
-#pragma warning (disable : 4786)
-
-#include "ecldirect_esp.ipp"
-#include "http/platform/httpprot.hpp"
-#include "EclDirectService.hpp"
-#include "espplugin.hpp"
-
-extern "C"
-{
-
-ESP_FACTORY IEspService * esp_service_factory(const char *name, const char* type, IPropertyTree *cfg, const char *process)
-{
-   if (strcmp(type, "EclDirect")==0)
-   {
-      CEclDirectEx* service = new CEclDirectEx();
-        service->init(cfg, process, name);
-      return service;
-   }
-
-   ERRLOG("Unknown service type %s", type);
-   return NULL;
-}
-
-ESP_FACTORY IEspRpcBinding * esp_binding_factory(const char *name, const char* type, IPropertyTree *cfg, const char *process)
-{
-   if (strcmp(type, "EclDirectSoapBinding")==0)
-        return new CEclDirectSoapBindingEx(cfg, name, process);
-
-   ERRLOG("Unknown binding type %s", type);
-   return NULL;
-}
-
-ESP_FACTORY IEspProtocol * esp_protocol_factory(const char *name, const char* type, IPropertyTree *cfg, const char *process)
-{
-    return http_protocol_factory(name, type, cfg, process);
-}
-
-};

+ 0 - 434
esp/services/ecldirect/EclDirectService.cpp

@@ -1,434 +0,0 @@
-/*##############################################################################
-
-    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-############################################################################## */
-
-#pragma warning (disable : 4786)
-
-#include "EclDirectService.hpp"
-
-#include "workunit.hpp"
-#include "fileview.hpp"
-#include "wuwebview.hpp"
-
-#define ECLDIRECT_ACCESS "EclDirectAccess"
-
-struct EclDirectWUExceptions
-{
-    EclDirectWUExceptions(IConstWorkUnit& cw);
-    operator IArrayOf<IEspECLDirectException>&() { return errors; }
-
-private:
-    IArrayOf<IEspECLDirectException> errors;
-};
-
-EclDirectWUExceptions::EclDirectWUExceptions(IConstWorkUnit& cw)
-{
-    Owned<IConstWUExceptionIterator> it = &cw.getExceptions();
-    ForEach(*it)
-    {
-        SCMStringBuffer s;
-        Owned<IEspECLDirectException> e= createECLDirectException();
-        IConstWUException &item = it->query();
-        e->setCode(item.getExceptionCode());
-        e->setSource(item.getExceptionSource(s).str());
-        e->setMessage(item.getExceptionMessage(s).str());
-        e->setFileName(item.getExceptionFileName(s).str());
-        e->setLineNo(item.getExceptionLineNo());
-        e->setColumn(item.getExceptionColumn());
-        e->setActivity(item.getActivityId());
-        if (item.getPriority())
-            e->setPriority(item.getPriority());
-        e->setScope(item.queryScope());
-
-        switch (it->query().getSeverity())
-        {
-            default:
-            case SeverityError:
-                e->setSeverity("Error");
-                break;
-            case SeverityWarning:
-                e->setSeverity("Warning");
-                break;
-            case SeverityInformation:
-                e->setSeverity("Info");
-                break;
-            case SeverityAlert:
-                e->setSeverity("Alert");
-                break;
-        }
-
-        errors.append(*e.getLink());
-    }
-}
-
-void CEclDirectEx::refreshValidClusters()
-{
-    validClusters.kill();
-    Owned<IStringIterator> it = getTargetClusters(NULL, NULL);
-    ForEach(*it)
-    {
-        SCMStringBuffer s;
-        IStringVal &val = it->str(s);
-        if (!validClusters.getValue(val.str()))
-            validClusters.setValue(val.str(), true);
-    }
-}
-
-bool CEclDirectEx::isValidCluster(const char *cluster)
-{
-    CriticalBlock block(crit);
-    if (validClusters.getValue(cluster))
-        return true;
-    if (validateTargetClusterName(cluster))
-    {
-        refreshValidClusters();
-        return true;
-    }
-    return false;
-}
-
-void CEclDirectEx::init(IPropertyTree *cfg, const char *process, const char *service)
-{
-    StringBuffer xpath;
-    xpath.appendf("Software/EspProcess[@name=\"%s\"]/EspService[@name=\"%s\"]", process, service);
-    Owned<IPropertyTree> srvcfg = cfg->getPropTree(xpath.str());
-
-    if (!srvcfg)
-    {
-        IERRLOG("EclDirect: Configuration Error: unable to load configuration");
-        throw MakeStringException(-1, "EclDirect: Configuration Error: unable to load configuration");
-    }
-
-    srvcfg->getProp("ClusterName", defaultCluster);
-
-    defaultWait = srvcfg->getPropInt("WuTimeout", 60000);
-    deleteWorkunits = cfg->getPropBool("DeleteWorkUnits", false);
-
-    refreshValidClusters();
-}
-
-CEclDirectSoapBindingEx::CEclDirectSoapBindingEx(IPropertyTree* cfg, const char *binding, const char *process):CEclDirectSoapBinding(cfg, binding, process)
-{
-    StringBuffer xpath;
-    xpath.appendf("Software/EspProcess[@name='%s']", process);
-    IPropertyTree *procTree = cfg->queryPropTree(xpath.str());
-    if (!procTree)
-        throw MakeStringException(-1, "EclDirect Configuration Error: unable to find process");
-
-    xpath.set("EspBinding[@name='").append(binding).append("']/@port");
-    int port = procTree->getPropInt(xpath.str());
-    if (port)
-    {
-        xpath.set("EspBinding[@type='ws_workunitsSoapBinding'][@port='").append(port).append("']");
-        redirect = procTree->hasProp(xpath.str());
-    }
-
-    SCMStringBuffer s;
-    Owned<IStringIterator> it = getTargetClusters(NULL, NULL);
-    ForEach(*it)
-        clusters.append(it->str(s).str());
-    supportRepository = false;
-}
-
-inline void deleteEclDirectWorkunit(IWorkUnitFactory *factory, const char *wuid)
-{
-    try
-    {
-        if (!factory->deleteWorkUnit(wuid))
-            throw MakeStringException(-1, "%s: Workunit cannot be deleted. Please check ESP log.", wuid);
-    }
-    catch (IException *e)
-    {
-        DBGLOG(e, "EclDirect Failed to delete workunit");
-    }
-    catch (...)
-    {
-    }
-}
-
-bool CEclDirectEx::onRunEcl(IEspContext &context, IEspRunEclRequest & req, IEspRunEclResponse & resp)
-{
-    if (!context.validateFeatureAccess(ECLDIRECT_ACCESS, SecAccess_Full, false))
-        throw MakeStringException(-1, "EclDirect access permission denied.");
-
-    StringBuffer user;
-    if (!context.getUserID(user).length())
-        user.append(req.getUserName());
-
-    Owned <IWorkUnitFactory> factory = getWorkUnitFactory(context.querySecManager(), context.queryUser());
-    Owned <IWorkUnit> workunit;
-    if (!user.length())
-        workunit.setown(factory->createWorkUnit("ECL-Direct", ""));
-    else
-    {
-        workunit.setown(factory->createWorkUnit("ECL-Direct", user.str()));
-        workunit->setUser(user.str());
-    }
-
-    Owned<IWUQuery> query = workunit->updateQuery();
-    query->setQueryText(req.getEclText());
-    query.clear();
-
-    const char* clustername = req.getCluster();
-    if (!clustername || !*clustername || strieq(clustername, "default"))
-        clustername = defaultCluster.str();
-
-    if (!clustername || !*clustername)
-        throw MakeStringException(-1, "No Cluster Specified");
-
-    if (!isValidCluster(clustername))
-        throw MakeStringException(-1, "Invalid TargetCluster %s Specified", clustername);
-
-    workunit->setClusterName(clustername);
-    if (req.getLimitResults())
-        workunit->setResultLimit(100);
-
-    const char* snapshot = req.getSnapshot();
-    if (snapshot && *snapshot)
-        workunit->setSnapshot(snapshot);
-
-    // Execute it
-    StringAttr wuid(workunit->queryWuid());  // NB queryWuid() not valid after workunit,clear()
-    
-    workunit->setAction(WUActionRun);
-    workunit->setState(WUStateSubmitted);
-    workunit.clear();
-
-    submitWorkUnit(wuid.str(), context.querySecManager(), context.queryUser());
-
-    if (waitForWorkUnitToComplete(wuid.str(), defaultWait))
-    {
-        Owned<IConstWorkUnit> cw = factory->openWorkUnit(wuid.str());
-
-        SCMStringBuffer resultXML;
-        getFullWorkUnitResultsXML(context.queryUserId(), context.queryPassword(), cw.get(), resultXML);
-        resp.setResults(resultXML.str());
-
-        cw.clear();
-
-        if (deleteWorkunits)
-            deleteEclDirectWorkunit(factory, wuid.str());
-    }
-    else
-    {
-        // Don't delete these ones...
-        DBGLOG("WorkUnit %s timed out", wuid.str());
-        
-        StringBuffer result;
-        result.appendf("<Exception><Source>ESP</Source><Message>Timed out waiting for job to complete: %s</Message></Exception>", wuid.str());
-        resp.setResults(result.str());
-    }
-
-    return true;
-}
-
-bool CEclDirectEx::onRunEclEx(IEspContext &context, IEspRunEclExRequest & req, IEspRunEclExResponse & resp)
-{
-    if (!context.validateFeatureAccess(ECLDIRECT_ACCESS, SecAccess_Full, false))
-        throw MakeStringException(-1, "EclDirect access permission denied.");
-
-    const char* eclText = req.getEclText();
-    if (!eclText || !*eclText)
-    {
-        resp.setResults("<Exception><Source>ESP</Source><Message>No Ecl Text provided</Message></Exception>");
-        return true;
-    }
-
-    StringBuffer user;
-    if (!context.getUserID(user).length())
-        user.append(req.getUserName());
-
-    Owned <IWorkUnitFactory> factory = getWorkUnitFactory(context.querySecManager(), context.queryUser());
-    Owned <IWorkUnit> workunit;
-    if (!user.length())
-        workunit.setown(factory->createWorkUnit("ECL-Direct", ""));
-    else
-    {
-        workunit.setown(factory->createWorkUnit("ECL-Direct", user.str()));
-        workunit->setUser(user.str());
-    }
-
-    Owned<IWUQuery> query = workunit->updateQuery();
-    query->setQueryText(eclText);
-    query.clear();
-
-    const char* cluster = req.getCluster();
-    if (!cluster || !*cluster || !stricmp(cluster, "default"))
-        cluster = defaultCluster.str();
-
-    if (!cluster || !*cluster)
-        throw MakeStringException(-1, "No Cluster Specified");
-
-    if (!isValidCluster(cluster))
-        throw MakeStringException(-1, "Invalid TargetCluster %s Specified", cluster);
-
-    workunit->setClusterName(cluster);
-
-    const char* snapshot = req.getSnapshot();
-    if (snapshot && *snapshot)
-        workunit->setSnapshot(snapshot);
-
-    if (req.getResultLimit())
-        workunit->setResultLimit(req.getResultLimit());
-
-    // Execute it
-    StringAttr wuid(workunit->queryWuid());  // NB queryWuid() not valid after workunit,clear()
-    workunit->setAction(WUActionRun);
-    workunit->setState(WUStateSubmitted);
-    workunit.clear();
-
-    resp.setWuid(wuid.str());
-
-    submitWorkUnit(wuid.str(), context.querySecManager(), context.queryUser());
-
-    if (!waitForWorkUnitToComplete(wuid.str(), (req.getWait_isNull()) ? defaultWait : req.getWait()))
-    {
-        StringBuffer result;
-        result.appendf("<Exception><Source>ESP</Source><Message>Timed out waiting for job to complete: %s</Message></Exception>", wuid.str());
-        resp.setResults(result.str());
-        return true;
-    }
-
-    if (!deleteWorkunits && context.queryRequestParameters()->hasProp("redirect"))
-    {
-        StringBuffer url("/WsWorkunits/WUInfo?Wuid=");
-        resp.setRedirectUrl(url.append(wuid).str());
-        return true;
-    }
-
-    Owned<IConstWorkUnit> cw = factory->openWorkUnit(wuid.str());
-    EclDirectWUExceptions errors(*cw);
-    resp.setErrors(errors);
-
-    if (req.getIncludeResults())
-    {
-        StringBuffer results;
-        CRunEclExFormat outputFormat = req.getFormat();
-        Owned<IWuWebView> web = createWuWebView(wuid.str(), NULL, NULL, getCFD(), true);
-        if (!web)
-            results.appendf("<Exception><Source>ESP</Source><Message>Failed loading result workunit %s</Message></Exception>", wuid.str());
-        else if (outputFormat == CRunEclExFormat_Table)
-        {
-            StringBuffer xsltfile(getCFD());
-            web->applyResultsXSLT(xsltfile.append("xslt/wsecl3_result.xslt").str(), results);
-        }
-        else
-        {
-            unsigned xmlflags = 0;
-            if (outputFormat != CRunEclExFormat_ExtendedXml)
-                xmlflags |= WWV_OMIT_SCHEMAS;
-            if (context.queryRequestParameters()->hasProp("display_xslt"))
-                xmlflags |= WWV_USE_DISPLAY_XSLT;
-            else
-                xmlflags |= WWV_OMIT_XML_DECLARATION;
-            web->expandResults(results, xmlflags);
-        }
-        resp.setResults(results.str());
-    }
-
-    if (req.getIncludeGraphs())
-    {
-        Owned<IConstWUGraphIterator> it = &cw->getGraphs(GraphTypeAny);
-        StringBuffer xgmml("<Graphs>");
-        SCMStringBuffer s;
-        ForEach(*it)
-            xgmml.append(it->query().getXGMML(s, true).str());
-        xgmml.append("</Graphs>");
-        resp.setGraphsXGMML(xgmml.str());
-    }
-
-    if (deleteWorkunits)
-        deleteEclDirectWorkunit(factory, wuid.str());
-
-    return true;
-}
-
-static void xsltTransform(const char* xml, const char* sheet, IProperties *params, StringBuffer& ret)
-{
-    if(!checkFileExists(sheet))
-        throw MakeStringException(-1, "Could not find stylesheet %s.",sheet);
-    Owned<IXslProcessor> proc = getXslProcessor();
-    Owned<IXslTransform> trans = proc->createXslTransform();
-    trans->setXmlSource(xml, strlen(xml));
-    trans->loadXslFromFile(sheet);
-    trans->copyParameters(params);
-    trans->transform(ret);
-}
-
-int CEclDirectSoapBindingEx::sendRunEclExForm(IEspContext &context, CHttpRequest* request, CHttpResponse* response)
-{
-    StringBuffer xml;
-    xml.append("<RunEclEx clientVersion='").append(context.getClientVersion()).append("'>");
-    appendXMLTag(xml, "UseEclRepository", (supportRepository) ? "Yes" : "No");
-    appendXMLTag(xml, "Redirect", (redirect) ? "Yes" : "No");
-    appendXMLTag(xml, "IncludeResults", (redirect) ? "No" : "Yes");
-    ForEachItemIn(i, clusters)
-        appendXMLTag(xml, "Cluster", clusters.item(i));
-    xml.append("</RunEclEx>");
-
-    StringBuffer xslt(getCFD());
-    xslt.append("./smc_xslt/run_ecl.xslt");
-
-    StringBuffer html;
-    xsltTransform(xml.str(), xslt.str(), NULL, html);
-    response->setContent(html.str());
-    response->setContentType(HTTP_TYPE_TEXT_HTML_UTF8);
-    response->send();
-
-    return 0;
-}
-
-inline const char *runEclExFormatMimeType(CRunEclExFormat format)
-{
-    if (format == CRunEclExFormat_Table)
-        return "text/html; charset=utf-8";
-    return "application/xml; charset=utf-8";
-}
-
-int CEclDirectSoapBindingEx::onGet(CHttpRequest* request, CHttpResponse* response)
-{
-    const char *path = request->queryPath();
-    if (strieq(path, "/EclDirect/RunEclEx/Form"))
-        return sendRunEclExForm(*request->queryContext(), request, response);
-
-    if(strieq(path, "/EclDirect/RunEclEx/DisplayResult"))
-    {
-        IEspContext& context = *request->queryContext();
-        request->queryParameters()->setProp("display_xslt", 1);
-
-        CRunEclExRequest reqObj(&context, "EclDirect", request->queryParameters(), request->queryAttachments());
-        CRunEclExResponse respObj("EclDirect");
-        theService->onRunEclEx(context, *QUERYINTERFACE(&reqObj, IEspRunEclExRequest), *QUERYINTERFACE(&respObj, IEspRunEclExResponse));
-
-        const char *result = respObj.getResults();
-        if (result && *result)
-        {
-            response->setContent(result);
-            response->setContentType(runEclExFormatMimeType(reqObj.getFormat()));
-        }
-        else
-        {
-            response->setContent("No result in Ecl execution.");
-            response->setContentType("text/html");
-        }
-
-        response->setStatus(HTTP_STATUS_OK);
-        response->send();
-        return 0;
-    }
-
-    return CEclDirectSoapBinding::onGet(request,response);
-}

+ 0 - 69
esp/services/ecldirect/EclDirectService.hpp

@@ -1,69 +0,0 @@
-/*##############################################################################
-
-    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-############################################################################## */
-
-#ifndef _EclDirectService_HPP__
-#define _EclDirectService_HPP__
-
-#include "ecldirect_esp.ipp"
-
-class CEclDirectEx : public CEclDirect
-{
-private:
-    StringBuffer defaultCluster;
-    int defaultWait;
-    bool deleteWorkunits;
-    BoolHash validClusters;
-    CriticalSection crit;
-
-public:
-   IMPLEMENT_IINTERFACE;
-
-    CEclDirectEx() : defaultWait(0){}
-
-    virtual void init(IPropertyTree *cfg, const char *process, const char *service);
-    void refreshValidClusters();
-    bool isValidCluster(const char *cluster);
-
-    bool onRunEcl(IEspContext &context, IEspRunEclRequest &req, IEspRunEclResponse &resp);
-    bool onRunEclEx(IEspContext &context, IEspRunEclExRequest &req, IEspRunEclExResponse &resp);
-};
-
-class CEclDirectSoapBindingEx : public CEclDirectSoapBinding
-{
-private:
-    CEclDirectEx *theService;
-
-    StringArray clusters;
-    bool supportRepository;
-    bool redirect;
-
-public:
-    CEclDirectSoapBindingEx(IPropertyTree* cfg, const char *bindname=NULL, const char *procname=NULL);
-
-    void addService(const char *name, const char *host, unsigned short port, IEspService &service)
-    {
-        theService = dynamic_cast<CEclDirectEx*>(&service);
-        CEspBinding::addService(name, host, port, service);
-    }
-
-    virtual void getNavigationData(IEspContext &context, IPropertyTree & data) {};
-
-    virtual int onGet(CHttpRequest* request, CHttpResponse* response);
-    int sendRunEclExForm(IEspContext &context, CHttpRequest* request, CHttpResponse* response);
-};
-
-#endif //_EclDirectService_HPP__

+ 0 - 26
esp/services/ecldirect/sourcedoc.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
--->
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd">
-<section>
-    <title>esp/services/ecldirect</title>
-
-    <para>
-        The esp/services/ecldirect directory contains the sources for the esp/services/ecldirect library.
-    </para>
-</section>

+ 0 - 1
initfiles/componentfiles/configxml/@temp/CMakeLists.txt

@@ -15,7 +15,6 @@
 ################################################################################
 
 FOREACH ( iFILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_ecldirect.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/esp_service.xsl
     ${CMAKE_CURRENT_SOURCE_DIR}/wsecl_onchange.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_wsecl.xsl

+ 1 - 31
initfiles/componentfiles/configxml/@temp/esp_service_WsSMC.xsl

@@ -85,10 +85,6 @@ This is required by its binding with ESP service '<xsl:value-of select="$espServ
             <xsl:with-param name="bindingNode" select="$bindingNode"/>
             <xsl:with-param name="authNode" select="$authNode"/>
         </xsl:apply-templates>
-        <xsl:apply-templates select="." mode="EclDirect">
-          <xsl:with-param name="bindingNode" select="$bindingNode"/>
-          <xsl:with-param name="authNode" select="$authNode"/>
-        </xsl:apply-templates>
         <xsl:apply-templates select="." mode="FileSpray_Serv">
             <xsl:with-param name="bindingNode" select="$bindingNode"/>
             <xsl:with-param name="authNode" select="$authNode"/>
@@ -358,33 +354,7 @@ This is required by its binding with ESP service '<xsl:value-of select="$espServ
         </EspBinding>
     </xsl:template>
 
-    <!-- EclDirect -->
-    <xsl:template match="EspService" mode="EclDirect">
-      <xsl:param name="authNode"/>
-      <xsl:param name="bindingNode"/>
-
-      <xsl:variable name="serviceType" select="'EclDirect'"/>
-      <xsl:variable name="bindType" select="'EclDirectSoapBinding'"/>
-      <xsl:variable name="servicePlugin">
-        <xsl:choose>
-          <xsl:when test="$isLinuxInstance">EclDirect</xsl:when>
-          <xsl:otherwise>EclDirect.dll</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="serviceName" select="concat('ecldirect', '_', @name, '_', $process)"/>
-      <xsl:variable name="bindName" select="concat('ecldirect', '_', $bindingNode/@name, '_', $process)"/>
-
-      <EspService name="{$serviceName}" type="{$serviceType}" plugin="{$servicePlugin}"/>
-      <EspBinding name="{$bindName}" service="{$serviceName}" protocol="{$bindingNode/@protocol}" type="{$bindType}" plugin="{$servicePlugin}" netAddress="0.0.0.0" port="{$bindingNode/@port}">
-        <xsl:call-template name="bindAuthentication">
-          <xsl:with-param name="bindingNode" select="$bindingNode"/>
-          <xsl:with-param name="authMethod" select="$authNode/@method"/>
-        </xsl:call-template>
-      </EspBinding>
-    </xsl:template>
-
-  <!-- WS-FILESPRAY -->
+    <!-- WS-FILESPRAY -->
     <xsl:template match="EspService" mode="FileSpray_Serv">
         <xsl:param name="bindingNode"/>
         <xsl:param name="authNode"/>

+ 0 - 134
initfiles/componentfiles/configxml/@temp/esp_service_ecldirect.xsl

@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
--->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xml:space="default">
-    <xsl:output method="xml" indent="yes" omit-xml-declaration="no" encoding="UTF-8"/>
-    <xsl:param name="process" select="'esp'"/>
-    <xsl:param name="instance" select="'s1'"/>
-    <xsl:param name="isLinuxInstance" select="0"/>
-    <xsl:param name="espServiceName" select="'ecldirect'"/>
-
-
-    <xsl:template match="text()"/>
-
-    <xsl:variable name="serviceModuleType" select="'ecldirect'"/>
-
-    <xsl:template match="/Environment">
-        <Environment>
-            <Software>
-                <EspProcess>
-                    <xsl:apply-templates select="/Environment/Software/EspProcess[@name=$process]"/>
-                </EspProcess>
-            </Software>
-        </Environment>
-    </xsl:template>
-
-    <xsl:template match="EspProcess">
-        <xsl:variable name="authNode" select="Authentication[1]"/>
-        <xsl:for-each select="EspBinding">
-            <xsl:variable name="serviceModuleName" select="@service"/>
-            <xsl:apply-templates select="/Environment/Software/EspService[@name=$espServiceName and @name=$serviceModuleName and Properties/@type=$serviceModuleType]">
-                <xsl:with-param name="bindingNode" select="."/>
-                <xsl:with-param name="authNode" select="$authNode"/>
-            </xsl:apply-templates>
-        </xsl:for-each>
-    </xsl:template>
-
-    <!--create one of these service specific templates  for each type of service to be created in the final configuration file-->
-    <xsl:template match="EspService">
-        <xsl:param name="authNode"/>
-        <xsl:param name="bindingNode"/>
-
-        <xsl:variable name="serviceType" select="'EclDirect'"/>
-        <xsl:variable name="bindType" select="'EclDirectSoapBinding'"/>
-        <xsl:variable name="servicePlugin">
-            <xsl:choose>
-                <xsl:when test="$isLinuxInstance">EclDirect</xsl:when>
-                <xsl:otherwise>EclDirect.dll</xsl:otherwise>
-            </xsl:choose>
-        </xsl:variable>
-
-        <xsl:variable name="serviceName" select="concat('ecldirect', '_', @name, '_', $process)"/>
-        <xsl:variable name="bindName" select="concat('ecldirect', '_', $bindingNode/@name, '_', $process)"/>
-
-        <EspService name="{$serviceName}" type="{$serviceType}" plugin="{$servicePlugin}">
-            <ClusterName><xsl:value-of select="@clusterName"/></ClusterName>
-        </EspService>
-
-        <EspBinding name="{$bindName}" service="{$serviceName}" protocol="{$bindingNode/@protocol}" type="{$bindType}" plugin="{$servicePlugin}" netAddress="0.0.0.0" port="{$bindingNode/@port}">
-            <xsl:call-template name="bindAuthentication">
-                <xsl:with-param name="bindingNode" select="$bindingNode"/>
-                <xsl:with-param name="authMethod" select="$authNode/@method"/>
-            </xsl:call-template>
-        </EspBinding>
-    </xsl:template>
-
-
-    <!-- UTILITY templates-->
-    <xsl:template name="bindAuthentication">
-   <xsl:param name="authMethod"/>
-   <xsl:param name="bindingNode"/>
-      <xsl:choose>
-         <xsl:when test="$authMethod='basic'">
-            <Authenticate type="Basic" method="UserDefined">
-               <xsl:for-each select="$bindingNode/Authenticate[string(@path) != '']">
-                  <Location path="{@path}"/>
-               </xsl:for-each>
-            </Authenticate>
-         </xsl:when>
-         <xsl:when test="$authMethod='local'">
-            <Authenticate method="Local">
-               <xsl:for-each select="$bindingNode/Authenticate[string(@path) != '']">
-                  <Location path="{@path}" resource="{@resource}" required="{@access}" description="{@description}"/>
-               </xsl:for-each>
-            </Authenticate>
-         </xsl:when>
-         <xsl:when test="$authMethod='ldap' or $authMethod='ldaps'">
-            <Authenticate method="LdapSecurity" config="ldapserver">
-            <xsl:copy-of select="$bindingNode/@resourcesBasedn"/> <!--if binding has an ldap resourcebasedn specified then copy it out -->
-
-            <xsl:for-each select="$bindingNode/Authenticate">
-               <Location path="{@path}" resource="{@resource}" access="{@access}"/>
-            </xsl:for-each>
-            
-            <xsl:for-each select="$bindingNode/AuthenticateFeature[@authenticate='Yes']">
-               <Feature name="{@name}" path="{@path}" resource="{@resource}" required="{@access}" description="{@description}"/>
-            </xsl:for-each>
-            </Authenticate>
-         </xsl:when>
-         <xsl:when test="$authMethod='secmgrPlugin'">
-            <Authenticate>
-            <xsl:attribute name="method">
-               <xsl:value-of select="$bindingNode/@type"/>
-            </xsl:attribute>
-            <xsl:copy-of select="$bindingNode/@resourcesBasedn"/>
-
-            <xsl:for-each select="$bindingNode/Authenticate">
-               <Location path="{@path}" resource="{@resource}" access="{@access}"/>
-            </xsl:for-each>
-
-            <xsl:for-each select="$bindingNode/AuthenticateFeature[@authenticate='Yes']">
-               <Feature name="{@name}" path="{@path}" resource="{@resource}" required="{@access}" description="{@description}"/>
-            </xsl:for-each>
-            </Authenticate>
-         </xsl:when>
-      </xsl:choose>
-    </xsl:template>
-
-</xsl:stylesheet>

+ 0 - 1
initfiles/componentfiles/configxml/CMakeLists.txt

@@ -53,7 +53,6 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/eclscheduler.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/environment.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_account.xsd
-    ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_ecldirect.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_wsecl.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/esp_service_wsecl2.xsd
     ${CMAKE_CURRENT_SOURCE_DIR}/GABConfig.xsd

+ 0 - 27
initfiles/componentfiles/configxml/buildsetCC.xml.in

@@ -191,10 +191,6 @@
                           path="OthersWorkunitsAccess"
                           resource="OthersWorkunitsAccess"
                           service="ws_workunits"/>
-     <AuthenticateFeature description="Access to ECL direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
     <AuthenticateFeature description="Access to ESDL configuration service"
                           path="ESDLConfigAccess"
                           resource="ESDLConfigAccess"
@@ -303,29 +299,6 @@
     </BuildSet>
    <BuildSet deployable="no"
              installSet="deploy_map.xml"
-             name="ecldirect"
-             path="componentfiles/ecldirect"
-             processName="EspService"
-             schema="esp_service_ecldirect.xsd">
-    <Properties bindingType="EclDirectSoapBinding"
-                defaultPort="8008"
-                defaultResourcesBasedn="ou=EclDirectAccess,ou=EspServices,ou=ecl"
-                defaultSecurePort="18008"
-                plugin="ecldirect"
-                type="ecldirect">
-     <Authenticate access="Read"
-                   description="Root access to ECL Direct service"
-                   path="/"
-                   required="Read"
-                   resource="EclDirectAccess"/>
-     <AuthenticateFeature description="Access to ECL Direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
-    </Properties>
-   </BuildSet>
-   <BuildSet deployable="no"
-             installSet="deploy_map.xml"
              name="DynamicESDL"
              path="componentfiles/esdlsvcengine"
              processName="EspService"

+ 0 - 3
initfiles/componentfiles/configxml/cgencomplist_linux.xml

@@ -71,9 +71,6 @@
     <File name="thor.xsl" method="xslt" destName="thor.xml"/>
     <File name="setvars_linux.xsl" method="xslt" destName="setvars"/>
   </Component>
-  <Component name="ecldirect" processName='EspService' schema='esp_service_ecldirect.xsd' deployable='no'>
-    <File name="@temp/esp_service_ecldirect.xsl" method="esp_service_module"/>
-  </Component>
   <Component name="esp_wubilling" processName='EspService' schema='wswubilling.xsd' deployable='no'>
     <File name="@temp/esp_service_wswubilling.xsl" method="esp_service_module"/>
   </Component>

+ 0 - 3
initfiles/componentfiles/configxml/cgencomplist_win.xml

@@ -74,9 +74,6 @@
     <File name="thor.xsl" method="xslt" destName="thor.xml"/>
     <File name="setvars.xsl" method="xslt" destName="setvars.bat"/>
   </Component>
-  <Component name="ecldirect" processName='EspService' schema='esp_service_ecldirect.xsd' deployable='no'>
-    <File name="@temp\esp_service_ecldirect.xsl" method="esp_service_module"/>
-  </Component>
   <Component name="esp_wubilling" processName='EspService' schema='wswubilling.xsd' deployable='no'>
     <File name="@temp\esp_service_wswubilling.xsl" method="esp_service_module"/>
   </Component>

+ 0 - 67
initfiles/componentfiles/configxml/esp_service_ecldirect.xsd

@@ -1,67 +0,0 @@
-<!--
-################################################################################
-#    HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems®.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License");
-#    you may not use this file except in compliance with the License.
-#    You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS,
-#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#    See the License for the specific language governing permissions and
-#    limitations under the License.
-################################################################################
--->
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v5 rel. 2 U (http://www.xmlspy.com) by Flavio Villanustre (Seisint, Inc.) -->
-<!--W3C Schema generated by XMLSPY v5 rel. 2 U (http://www.xmlspy.com)-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-    <xs:include schemaLocation="environment.xsd"/>
-    <xs:element name="EspService">
-        <xs:complexType>
-            <xs:attribute name="build" type="buildType" use="required">
-                <xs:annotation>
-                    <xs:appinfo>
-                        <tooltip>The build name to be deployed</tooltip>
-                        <viewType>hidden</viewType>
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="buildSet" type="buildSetType" use="required">
-                <xs:annotation>
-                    <xs:appinfo>
-                        <viewType>hidden</viewType>
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="name" type="xs:string" use="optional" default="ecldirect">
-                <xs:annotation>
-                    <xs:appinfo>
-                        <required>true</required>
-                        <tooltip>Name for this ESP service</tooltip>
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="description" type="xs:string" use="optional" default="ESP service for running raw ECL queries">
-                <xs:annotation>
-                    <xs:appinfo>
-                        <tooltip>Description for this process</tooltip>
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="clusterName" type="xs:string" use="required">
-                <xs:annotation>
-                    <xs:appinfo>
-                        <tooltip>Names the cluster that jobs will be submitted to</tooltip>
-                        <autogenforwizard>1</autogenforwizard>
-                        <autogendefaultvalue>$hthorcluster</autogendefaultvalue>            
-                    </xs:appinfo>
-                </xs:annotation>
-            </xs:attribute>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>

+ 0 - 36
initfiles/etc/DIR_NAME/environment.xml.in

@@ -399,11 +399,6 @@
                          resource="OthersWorkunitsAccess"
                          service="ws_workunits"/>
     <AuthenticateFeature authenticate="Yes"
-                         description="Access to ECL direct service"
-                         path="EclDirectAccess"
-                         resource="EclDirectAccess"
-                         service="ecldirect"/>
-    <AuthenticateFeature authenticate="Yes"
                          description="Access to ESDL configuration service"
                          path="ESDLConfigAccess"
                          resource="ESDLConfigAccess"
@@ -657,10 +652,6 @@
                          path="OthersWorkunitsAccess"
                          resource="OthersWorkunitsAccess"
                          service="ws_workunits"/>
-    <AuthenticateFeature description="Access to ECL direct service"
-                         path="EclDirectAccess"
-                         resource="EclDirectAccess"
-                         service="ecldirect"/>
     <AuthenticateFeature description="Access to ESDL configuration service"
                          path="ESDLConfigAccess"
                          resource="ESDLConfigAccess"
@@ -956,10 +947,6 @@
                           path="OthersWorkunitsAccess"
                           resource="OthersWorkunitsAccess"
                           service="ws_workunits"/>
-     <AuthenticateFeature description="Access to ECL direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
      <AuthenticateFeature description="Access to ESDL configuration service"
                           path="ESDLConfigAccess"
                           resource="ESDLConfigAccess"
@@ -1073,29 +1060,6 @@
    </BuildSet>
    <BuildSet deployable="no"
              installSet="deploy_map.xml"
-             name="ecldirect"
-             path="componentfiles/ecldirect"
-             processName="EspService"
-             schema="esp_service_ecldirect.xsd">
-    <Properties bindingType="EclDirectSoapBinding"
-                defaultPort="8008"
-                defaultResourcesBasedn="ou=EclDirectAccess,ou=EspServices,ou=ecl"
-                defaultSecurePort="18008"
-                plugin="ecldirect"
-                type="ecldirect">
-     <AuthenticateFeature description="Access to ECL Direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
-     <Authenticate access="Read"
-                   description="Root access to ECL Direct service"
-                   path="/"
-                   required="Read"
-                   resource="EclDirectAccess"/>
-    </Properties>
-   </BuildSet>
-   <BuildSet deployable="no"
-             installSet="deploy_map.xml"
              name="DynamicESDL"
              path="componentfiles/esdlsvcengine"
              processName="EspService"

+ 1 - 1
initfiles/etc/DIR_NAME/genenvrules.conf

@@ -1,7 +1,7 @@
 
 [Algorithm]
 max_comps_per_node=4
-do_not_generate=SiteCertificate,dfuplus,soapplus,eclplus,ldapServer,ws_account,eclserver,ecldirect,DynamicESDL,cassandraloggingagent,esploggingagent,loggingmanager,wslogging,daliplugin,backupnode
+do_not_generate=SiteCertificate,dfuplus,soapplus,eclplus,ldapServer,ws_account,eclserver,DynamicESDL,cassandraloggingagent,esploggingagent,loggingmanager,wslogging,daliplugin,backupnode
 avoid_combo=dali-eclagent,dali-sasha
 comps_on_all_nodes=dafilesrv,ftslave
 exclude_from_comps_on_all_nodes=ldapServer

+ 0 - 6
system/jlib/jptree-attrvalues.hpp

@@ -115,7 +115,6 @@
     "componentfiles/dfuserver",
     "componentfiles/DropZone",
     "componentfiles/eclagent",
-    "componentfiles/ecldirect",
     "componentfiles/eclminus",
     "componentfiles/eclplus",
     "componentfiles/esdlsvcengine",
@@ -212,9 +211,6 @@
     "EclCCServerProcess",
     "eclccserver.xsd",
     "ecl.common",
-    "ecldirect",
-    "EclDirectAccess",
-    "EclDirectSoapBinding",
     "eclminus",
     "eclplus",
     "EclPlusProcess",
@@ -241,7 +237,6 @@
     "ESPserver",
     "EspService",
     "ESPservice",
-    "esp_service_ecldirect.xsd",
     "esp_service_module",
     "ESP services for SMC",
     "esp_service_wsecl2.xsd",
@@ -469,7 +464,6 @@
     "OriginalTextFilesOsPath",
     "OrigName",
     "OthersWorkunitsAccess",
-    "ou=EclDirectAccess,ou=EspServices,ou=ecl",
     "ou=EspServices,ou=ecl",
     "ou=SMC,ou=EspServices,ou=ecl",
     "ou=workunits,ou=ecl",

+ 0 - 36
testing/regress/environment.xml.in

@@ -390,11 +390,6 @@
                          resource="OthersWorkunitsAccess"
                          service="ws_workunits"/>
     <AuthenticateFeature authenticate="Yes"
-                         description="Access to ECL direct service"
-                         path="EclDirectAccess"
-                         resource="EclDirectAccess"
-                         service="ecldirect"/>
-    <AuthenticateFeature authenticate="Yes"
                          description="Access to ESDL configuration service"
                          path="ESDLConfigAccess"
                          resource="ESDLConfigAccess"
@@ -625,10 +620,6 @@
                          path="OthersWorkunitsAccess"
                          resource="OthersWorkunitsAccess"
                          service="ws_workunits"/>
-    <AuthenticateFeature description="Access to ECL direct service"
-                         path="EclDirectAccess"
-                         resource="EclDirectAccess"
-                         service="ecldirect"/>
     <AuthenticateFeature description="Access to ESDL configuration service"
                          path="ESDLConfigAccess"
                          resource="ESDLConfigAccess"
@@ -920,10 +911,6 @@
                           path="OthersWorkunitsAccess"
                           resource="OthersWorkunitsAccess"
                           service="ws_workunits"/>
-     <AuthenticateFeature description="Access to ECL direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
      <AuthenticateFeature description="Access to ESDL configuration service"
                           path="ESDLConfigAccess"
                           resource="ESDLConfigAccess"
@@ -1037,29 +1024,6 @@
    </BuildSet>
    <BuildSet deployable="no"
              installSet="deploy_map.xml"
-             name="ecldirect"
-             path="componentfiles/ecldirect"
-             processName="EspService"
-             schema="esp_service_ecldirect.xsd">
-    <Properties bindingType="EclDirectSoapBinding"
-                defaultPort="8008"
-                defaultResourcesBasedn="ou=EclDirectAccess,ou=EspServices,ou=ecl"
-                defaultSecurePort="18008"
-                plugin="ecldirect"
-                type="ecldirect">
-     <AuthenticateFeature description="Access to ECL Direct service"
-                          path="EclDirectAccess"
-                          resource="EclDirectAccess"
-                          service="ecldirect"/>
-     <Authenticate access="Read"
-                   description="Root access to ECL Direct service"
-                   path="/"
-                   required="Read"
-                   resource="EclDirectAccess"/>
-    </Properties>
-   </BuildSet>
-   <BuildSet deployable="no"
-             installSet="deploy_map.xml"
              name="DynamicESDL"
              path="componentfiles/esdlsvcengine"
              processName="EspService"