Open Source Projects Europe

--- a/module/bundle/components/optFE/code/src/src/ModuleFE.coffee
+++ b/bundle/components/optFE/code/src/src/ModuleFE.coffee
@@ -79,36 +79,36 @@
   ###
     Start httpServer
   ###
-  #startHttpServer: () =>
-  #  @logger.info 'startHttpServer'
-  #  @httpServer = http.createServer()
-  #  @httpServer.on 'request', @onHttpRequest
-  #  @httpServer.on 'error', @onHttpError
-  #  @httpServer.listen @optServiceChannel
+#startHttpServer: () =>
+#  @logger.info 'startHttpServer'
+#  @httpServer = http.createServer()
+#  @httpServer.on 'request', @onHttpRequest
+#  @httpServer.on 'error', @onHttpError
+#  @httpServer.listen @optServiceChannel
 
   ###
     Receive and process new http requests
   ###
-  #onHttpRequest: (request, response) =>
-  #  pathname = url.parse(request.url).pathname
-  #  if (pathname is "/opc")
-  #    postData = ""
-  #
-  #    request.on "data", (chunk) =>
-  #      @logger.info "onHttpRequest onData"
-  #      postData = postData + chunk
-  #
-  #    request.on "end", () =>
-  #      message = JSON.parse postData
-  #      @logger.info "onHttpRequest onEnd. Data = #{message}"
-  #
-  #      @handleRequest(message, response)
-  #
-  #  else
-  #    msg =
-  #      success: false
-  #      message: "Invalid resource #{pathname}"
-  #    @sendResponse(response, msg, 400)
+#onHttpRequest: (request, response) =>
+#  pathname = url.parse(request.url).pathname
+#  if (pathname is "/opc")
+#    postData = ""
+#
+#    request.on "data", (chunk) =>
+#      @logger.info "onHttpRequest onData"
+#      postData = postData + chunk
+#
+#    request.on "end", () =>
+#      message = JSON.parse postData
+#      @logger.info "onHttpRequest onEnd. Data = #{message}"
+#
+#      @handleRequest(message, response)
+#
+#  else
+#    msg =
+#      success: false
+#      message: "Invalid resource #{pathname}"
+#    @sendResponse(response, msg, 400)
 
   handleRequest: (msg, res) =>
     @logger.info "handleRequest() OK"

--- a/module/bundle/deployment/Manifest.json
+++ b/bundle/deployment/Manifest.json
@@ -5,9 +5,6 @@
   "configuration": {
     "resources": {},
     "parameters": {
-      "dssql": {
-        "proxyTcpDssql": "{\"req_dssql2mdbw\":{\"port\":3306}}"
-      },
       "taskexecutor": {
         "proxyTcpMariaWrapper": "{\"maria_wrapper\":{\"port\":3306}}"
       },
@@ -15,10 +12,6 @@
         "proxyTcpMariadbwrapper": "{\"rep_mdbw2dssql\":{\"port\":3306}}",
         "filesToLoad": [
           "c2net_prepare.sql",
-          "01_C2_STables_Create_CamelCase.sql",
-          "02_C2_STables_Insert.sql",
-          "03_C2_PTable_Create.sql",
-          "04_C2_PTable_Insert.sql",
           "S_MRP_A_20161115121402.sql",
           "c2net_check.sql"
         ]
@@ -59,17 +52,6 @@
         "__resilience": 1
       }
     },
-    "dssql": {
-      "resources": {
-        "__instances": 1,
-        "__cpu": 1,
-        "__memory": 1,
-        "__ioperf": 1,
-        "__iopsintensive": false,
-        "__bandwidth": 1,
-        "__resilience": 1
-      }
-    },
     "mariadbwrapper": {
       "resources": {
         "__instances": 1,

--- a/module/bundle/service/Manifest.json
+++ b/bundle/service/Manifest.json
@@ -4,10 +4,6 @@
   "configuration": {
     "resources": [],
     "parameters": [
-      {
-        "name": "dssql",
-        "type": "eslap://eslap.cloud/parameter/json/1_0_0"
-      },
       {
         "name": "mariadbwrapper",
         "type": "eslap://eslap.cloud/parameter/json/1_0_0"
@@ -27,19 +23,13 @@
     },
     {
       "name": "jobs",
-      "component": "eslap://iti/components/jobs/0_0_1",
+      "component": "eslap://iti/components/jobs/0_0_2",
       "resources": {},
       "parameters": {}
     },
     {
       "name": "taskexecutor",
-      "component": "eslap://iti/components/taskexecutor/0_0_1",
-      "resources": {},
-      "parameters": {}
-    },
-    {
-      "name": "dssql",
-      "component": "eslap://iti/components/dssql/0_0_1",
+      "component": "eslap://iti/components/taskexecutor/0_0_2",
       "resources": {},
       "parameters": {}
     },
@@ -128,10 +118,6 @@
       "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
       "depended": [
         {
-          "role": "dssql",
-          "endpoint": "req_dssql2mdbw"
-        },
-        {
           "role": "taskexecutor",
           "endpoint": "maria_wrapper"
         }
@@ -140,21 +126,6 @@
         {
           "role": "mariadbwrapper",
           "endpoint": "rep_mdbw2dssql"
-        }
-      ]
-    },
-    {
-      "type": "eslap://eslap.cloud/connector/loadbalancer/1_0_0",
-      "depended": [
-        {
-          "role": "taskexecutor",
-          "endpoint": "maria_sql"
-        }
-      ],
-      "provided": [
-        {
-          "role": "dssql",
-          "endpoint": "rep_dssql_sql"
         }
       ]
     },

--- a/module/scripts/build_service.sh
+++ b/scripts/build_service.sh
@@ -1,12 +1,11 @@
 #!/usr/bin/env bash
 
-echo 'Building Service '
+echo 'Building Bundle '
 
 echo $PWD
 cd ..
 cd bundle
 BUNDLE_HOME=$PWD
-cd ..
 cd ..
 cd ..
 PROJECT_HOME=$PWD
@@ -22,10 +21,10 @@
 echo 'MARIADB_HOME:' ${MARIADB_HOME}
 echo 'OPT_FE_HOME:' ${OPT_FE_HOME}
 
-JOBS_GEN=true
+JOBS_GEN=false
 TASK_GEN=true
-MARIADB_GEN=true
-OPT_FE_GEN=true
+MARIADB_GEN=false
+OPT_FE_GEN=false
 ZIP_GEN=true
 
 if $JOBS_GEN
@@ -151,13 +150,20 @@
     echo 'job src folder...'
     cp -fr ${MARIADB_HOME}/code/src/src  ${BUNDLE_HOME}/components/mariadbw/code/src/.
 
+    echo 'copying SQL script to src...'
+
+    cp ${TASK_HOME}/code/src/julia/algorithms/AH_MCU_S_MRP_1/C2_without_STables/S_MRP_A_20161115121402.sql ${MARIADB_HOME}/code/src/src
+    #    cp ${TASK_HOME}/code/src/julia/algorithms/AH_MCU_S_MRP_1/C2_without_STables/01_C2_STables_Create_CamelCase.sql ${MARIADB_HOME}/code/src/src
+    #    cp ${TASK_HOME}/code/src/julia/algorithms/AH_MCU_S_MRP_1/C2_without_STables/02_C2_STables_Insert.sql ${MARIADB_HOME}/code/src/src
+    #    cp ${TASK_HOME}/code/src/julia/algorithms/AH_MCU_S_MRP_1/C2_without_STables/03_C2_PTable_Create.sql ${MARIADB_HOME}/code/src/src
+    #    cp ${TASK_HOME}/code/src/julia/algorithms/AH_MCU_S_MRP_1/C2_without_STables/04_C2_PTable_Insert.sql ${MARIADB_HOME}/code/src/src
     echo 'compiling...'
+
+
+    echo 'done!'
     cd ${BUNDLE_HOME}/components/mariadbw/code/src/
-#    docker run -it --dns=192.168.0.11 --entrypoint=bash -v $(pwd):/tmp/component eslap.cloud/runtime/mariadb:1_0_0
+    rm -rf ./node_modules
     docker run --rm --dns=192.168.0.11  --entrypoint=bash -v $(pwd):/tmp/component eslap.cloud/runtime/mariadb:1_0_0 -c 'cd /tmp/component && npm install'
-    echo 'compilation done!'
-
-#    docker run --rm --dns=192.168.0.11 -v $(pwd):/tmp/component eslap.cloud/runtime/mariadb:1_0_0 -c 'cd /tmp/component && npm install'
     echo 'compilation done!'
 
     echo 'MariaDB Wrapper Component DONE!'
@@ -180,13 +186,12 @@
 if $ZIP_GEN
 then
     cd ${BUNDLE_HOME}
-    chown -R dmachancoses:dmachancoses .*
-    rm module_bundle.zip
+#    chown -R ${USER}:${USER} .*
+    rm service_bundle.zip
     cd ${BUNDLE_HOME}
     echo 'Building bundle...'
     echo 'zipping..'
-    zip -qr module_bundle ./components ./service/Manifest.json ./deployment/Manifest.json
+    zip -qr service_bundle ./components ./service/Manifest.json ./deployment/Manifest.json
     echo 'zipping DONE!'
-    mv module_bundle.zip ${BUNDLE_HOME}
     ls -l ${BUNDLE_HOME}/*.zip
 fi