Remove Export Services for Geneva Release

.gitignore

@@ -75,8 +75,6 @@ docker-core-config-seed/
 docker-core-consul/
 docker-edgex-mongo/
 docker-edgex-volume/
-export-client/
-export-distro/
 export-domain/
 export-test/
 support-domain/

MODULES

@@ -16,5 +16,5 @@
 #
 # Author: chencho
 
-export MODULES=(core-data-client core-domain core-exception core-test export-distro export-domain export-test support-domain support-logging-client export-client support-notifications-client core-data core-metadata-client support-scheduler)
+export MODULES=(core-data-client core-domain core-exception core-test export-domain export-test support-domain support-logging-client support-notifications-client core-data core-metadata-client support-scheduler)
 

README.md

@@ -29,8 +29,8 @@ This script will:
 
 **prepare-environment.sh**, this script will clone the set of modules you need. You can pass a list of valid modules.
 
->MODULES: core-data-client core-domain core-exception core-test export-distro
->export-domain export-test support-domain support-logging-client export-client
+>MODULES: core-data-client core-domain core-exception core-test 
+>export-domain export-test support-domain support-logging-client 
 >support-notifications-client core-data core-metadata-client
 
 **Note**, if you run the script without parameters, you can manually choose which modules you want to be installed.

clean_mongo.js

@@ -46,5 +46,3 @@ db.auth('notifications','password');
 db.notification.remove({});
 db.subscription.remove({});
 db.transmission.remove({});
-db=db.getSiblingDB('exportclient')
-db.exportConfiguration.remove({});

create-containers.sh

@@ -19,8 +19,8 @@
 set -e
 
 DOCKERS=( docker-edgex-volume docker-core-consul core-config-seed docker-edgex-mongo support-logging \
-    support-notifications core-metadata core-data core-command support-scheduler export-client \
-    export-distro support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp)
+    support-notifications core-metadata core-data core-command support-scheduler \
+    support-rulesengine device-virtual device-bacnet device-bluetooth device-modbus device-mqtt device-snmp)
 
 DOCKERFILE=$1
 

init_mongo.js

@@ -32,7 +32,6 @@ db.serviceMapping.insert( { serviceName: "command", serviceUrl: "http://localhos
 db.serviceMapping.insert( { serviceName: "rules", serviceUrl: "http://localhost:48084/" });
 db.serviceMapping.insert( { serviceName: "notifications", serviceUrl: "http://localhost:48060/" });
 db.serviceMapping.insert( { serviceName: "logging", serviceUrl: "http://localhost:48061/" });
-db.serviceMapping.insert( { serviceName: "exportclient", serviceUrl: "http://localhost:48071/" });
 
 db=db.getSiblingDB('admin')
 db.system.users.remove({});
@@ -126,12 +125,3 @@ db.createCollection("interval");
 db.createCollection("intervalAction");
 db.interval.createIndex({name: 1}, {unique: true});
 db.intervalAction.createIndex({name: 1}, {unique: true});
-
-db=db.getSiblingDB('exportclient')
-db.createUser({ user: "exportclient",
-  pwd: "password",
-  roles: [
-    { role: "readWrite", db: "exportclient" }
-  ]
-});
-db.createCollection("exportConfiguration");

project-metrics/fetch_repos.sh

@@ -23,14 +23,10 @@ docker-device-virtual
 docker-edgex-mongo
 docker-edgex-mongo-seed
 docker-edgex-volume
-docker-export-client
-docker-export-distro
 docker-support-logging
 docker-support-notifications
 docker-support-rulesengine
 docker-support-scheduler
-export-client
-export-distro
 export-domain
 export-test
 edgex-ui-go

releases/nightly-build/compose-files/docker-compose-nexus-no-secty.yml

@@ -227,48 +227,6 @@ services:
     depends_on:
       - app-service-rules
 
-  #  export-client:
-  #    image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master
-  #    ports:
-  #      - "48071:48071"
-  #    container_name: edgex-export-client
-  #    hostname: edgex-export-client
-  #    networks:
-  #      - edgex-network
-  #    environment:
-  #      <<: *common-variables
-  #    volumes:
-  #      - db-data:/data/db
-  #      - log-data:/edgex/logs
-  #      - consul-config:/consul/config
-  #      - consul-data:/consul/data
-  #    depends_on:
-  #      - data
-  #
-  #  export-distro:
-  #    image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master
-  #    ports:
-  #      - "48070:48070"
-  #      - "5566:5566"
-  #    container_name: edgex-export-distro
-  #    hostname: edgex-export-distro
-  #    networks:
-  #      - edgex-network
-  #    volumes:
-  #      - db-data:/data/db
-  #      - log-data:/edgex/logs
-  #      - consul-config:/consul/config
-  #      - consul-data:/consul/data
-  #    depends_on:
-  #      - export-client
-  #    environment:
-  #      <<: *common-variables
-  #      EXPORT_DISTRO_CLIENT_HOST: export-client
-  #      EXPORT_DISTRO_DATA_HOST: edgex-core-data
-  #      EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed
-  #      EXPORT_DISTRO_MQTTS_CERT_FILE: none
-  #      EXPORT_DISTRO_MQTTS_KEY_FILE: none
-
 #################################################################
 # Device Services
 #################################################################

releases/nightly-build/compose-files/docker-compose-nexus-redis-no-secty.yml

@@ -230,48 +230,6 @@ services:
     depends_on:
       - app-service-rules
 
-  #  export-client:
-  #    image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master
-  #    ports:
-  #      - "48071:48071"
-  #    container_name: edgex-export-client
-  #    hostname: edgex-export-client
-  #    networks:
-  #      - edgex-network
-  #    environment:
-  #      <<: *common-variables
-  #    volumes:
-  #      - db-data:/data/db
-  #      - log-data:/edgex/logs
-  #      - consul-config:/consul/config
-  #      - consul-data:/consul/data
-  #    depends_on:
-  #      - data
-  #
-  #  export-distro:
-  #    image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master
-  #    ports:
-  #      - "48070:48070"
-  #      - "5566:5566"
-  #    container_name: edgex-export-distro
-  #    hostname: edgex-export-distro
-  #    networks:
-  #      - edgex-network
-  #    volumes:
-  #      - db-data:/data/db
-  #      - log-data:/edgex/logs
-  #      - consul-config:/consul/config
-  #      - consul-data:/consul/data
-  #    depends_on:
-  #      - export-client
-  #    environment:
-  #      <<: *common-variables
-  #      EXPORT_DISTRO_CLIENT_HOST: export-client
-  #      EXPORT_DISTRO_DATA_HOST: edgex-core-data
-  #      EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed
-  #      EXPORT_DISTRO_MQTTS_CERT_FILE: none
-  #      EXPORT_DISTRO_MQTTS_KEY_FILE: none
-
 #################################################################
 # Device Services
 #################################################################

releases/nightly-build/compose-files/docker-compose-nexus.yml

@@ -405,50 +405,6 @@ services:
     depends_on:
       - app-service-rules
 
-  #  export-client:
-  #    image: nexus3.edgexfoundry.org:10004/docker-export-client-go:master
-  #    ports:
-  #      - "48071:48071"
-  #    container_name: edgex-export-client
-  #    hostname: edgex-export-client
-  #    networks:
-  #      - edgex-network
-  #    environment:
-  #      <<: *common-variables
-  #    volumes:
-  #      - db-data:/data/db
-  #      - log-data:/edgex/logs
-  #      - consul-config:/consul/config
-  #      - consul-data:/consul/data
-  #      - vault-config:/vault/config
-  #      - /tmp/edgex/secrets/ca/ca.pem:/tmp/edgex/secrets/ca/ca.pem:ro
-  #    depends_on:
-  #      - data
-  #
-  #  export-distro:
-  #    image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:master
-  #    ports:
-  #      - "48070:48070"
-  #      - "5566:5566"
-  #    container_name: edgex-export-distro
-  #    hostname: edgex-export-distro
-  #    networks:
-  #      - edgex-network
-  #    volumes:
-  #      - db-data:/data/db
-  #      - log-data:/edgex/logs
-  #      - consul-config:/consul/config
-  #      - consul-data:/consul/data
-  #    depends_on:
-  #      - export-client
-  #    environment:
-  #      <<: *common-variables
-  #      EXPORT_DISTRO_CLIENT_HOST: export-client
-  #      EXPORT_DISTRO_DATA_HOST: edgex-core-data
-  #      EXPORT_DISTRO_CONSUL_HOST: dgex-config-seed
-  #      EXPORT_DISTRO_MQTTS_CERT_FILE: none
-  #      EXPORT_DISTRO_MQTTS_KEY_FILE: none
-
 #################################################################
 # Device Services
 #################################################################

run-it.sh

@@ -68,10 +68,6 @@ run_service command 48082
 
 run_service scheduler 48085
 
-run_service export-client 48071
-
-run_service export-distro 48070
-
 run_service rulesengine 48075
 
 run_service device-virtual 49990