update ref from vcap/bin/services to vcap-services/foo/bin

Change-Id: Icfccb7efc571e240401864eb595867ae12d6995a

jobs/atmos_gateway/templates/atmos_gateway_ctl

@@ -24,7 +24,7 @@ case $1 in
     /var/vcap/packages/syslog_aggregator/setup_syslog_forwarder.sh $JOB_DIR/config
     <% end %>
 
-    exec /var/vcap/packages/atmos_gateway/bin/services/atmos_gateway \
+    exec /var/vcap/packages/atmos_gateway/services/atmos/bin/atmos_gateway \
          -c $JOB_DIR/config/atmos_gateway.yml \
          >>$LOG_DIR/atmos_gateway.stdout.log \
          2>>$LOG_DIR/atmos_gateway.stderr.log

jobs/backup_manager/templates/backup_manager_ctl.erb

@@ -41,7 +41,7 @@ case $1 in
     check_mount "$MT_OPTS" "$MT_EXPORT" "$MOUNT_POINT"
     <% end %>
 
-    exec /var/vcap/packages/backup_manager/bin/services/backup_manager \
+    exec /var/vcap/packages/backup_manager/services/tools/backup/manager/bin/backup_manager \
          -c $JOB_DIR/config/backup_manager.yml \
          >>$LOG_DIR/backup_manager.stdout.log \
          2>>$LOG_DIR/backup_manager.stderr.log

jobs/backup_manager/templates/snapshot_manager_ctl.erb

@@ -40,7 +40,7 @@ case $1 in
     check_mount "$MT_OPTS" "$MT_EXPORT" "$MOUNT_POINT"
     <% end %>
 
-    exec /var/vcap/packages/backup_manager/bin/services/snapshot_manager \
+    exec /var/vcap/packages/backup_manager/services/tools/backup/manager/bin/snapshot_manager \
          -c $JOB_DIR/config/snapshot_manager.yml \
          >>$LOG_DIR/snapshot_manager.stdout.log \
          2>>$LOG_DIR/snapshot_manager.stderr.log

jobs/filesystem_gateway/templates/filesystem_gateway_ctl

@@ -28,7 +28,7 @@ case $1 in
     /var/vcap/packages/syslog_aggregator/setup_syslog_forwarder.sh $JOB_DIR/config
     <% end %>
 
-    exec /var/vcap/packages/filesystem_gateway/bin/services/filesystem_gateway \
+    exec /var/vcap/packages/filesystem_gateway/services/filesystem/bin/filesystem_gateway \
          -c $JOB_DIR/config/filesystem_gateway.yml \
          >>$LOG_DIR/filesystem_gateway.stdout.log \
          2>>$LOG_DIR/filesystem_gateway.stderr.log

jobs/mongodb_gateway/templates/mongodb_gateway_ctl

@@ -39,7 +39,7 @@ case $1 in
     check_mount "$MT_OPTS" "$MT_EXPORT" "$SNAPSHOT_DIR"
     <% end %>
 
-    exec /var/vcap/packages/mongodb_gateway/bin/services/mongodb_gateway \
+    exec /var/vcap/packages/mongodb_gateway/services/mongodb/bin/mongodb_gateway \
          -c $JOB_DIR/config/mongodb_gateway.yml \
          >>$LOG_DIR/mongodb_gateway.stdout.log \
          2>>$LOG_DIR/mongodb_gateway.stderr.log

jobs/mongodb_node/templates/mongodb_node_ctl

@@ -46,7 +46,7 @@ case $1 in
 
     (crontab -l | sed /mongodb_logrotate/d; cat /var/vcap/jobs/mongodb_node/config/mongodb_logrotate.cron) | sed /^$/d | crontab
 
-    exec /var/vcap/packages/mongodb_node/bin/services/mongodb_node \
+    exec /var/vcap/packages/mongodb_node/services/mongodb/bin/mongodb_node \
          -c $JOB_DIR/config/mongodb_node.yml \
          >>$LOG_DIR/mongodb_node.stdout.log \
          2>>$LOG_DIR/mongodb_node.stderr.log

jobs/mongodb_node/templates/mongodb_worker_ctl

@@ -20,7 +20,7 @@ case $1 in
     export CLOUD_FOUNDRY_CONFIG_PATH=$JOB_DIR/config/
     export PIDFILE=$PIDFILE
 
-    exec /var/vcap/packages/mongodb_node/bin/services/mongodb_worker \
+    exec /var/vcap/packages/mongodb_node/services/mongodb/bin/mongodb_worker \
          >>$LOG_DIR/mongodb_worker_$INDEX.stdout.log \
          2>>$LOG_DIR/mongodb_worker_$INDEX.stderr.log
 

jobs/mysql_gateway/templates/mysql_gateway_ctl

@@ -39,7 +39,7 @@ case $1 in
     check_mount "$MT_OPTS" "$MT_EXPORT" "$SNAPSHOT_DIR"
     <% end %>
 
-    exec /var/vcap/packages/mysql_gateway/bin/services/mysql_gateway \
+    exec /var/vcap/packages/mysql_gateway/services/mysql/bin/mysql_gateway \
          -c $JOB_DIR/config/mysql_gateway.yml \
          >>$LOG_DIR/mysql_gateway.stdout.log \
          2>>$LOG_DIR/mysql_gateway.stderr.log

jobs/mysql_node/templates/mysql_node_ctl

@@ -47,7 +47,7 @@ case $1 in
     chmod +x $JOB_DIR/config/mysql_backup
     $JOB_DIR/config/mysql_backup start
 
-    exec /var/vcap/packages/mysql_node/bin/services/mysql_node \
+    exec /var/vcap/packages/mysql_node/services/mysql/bin/mysql_node \
          -c $JOB_DIR/config/mysql_node.yml \
          >>$LOG_DIR/mysql_node.stdout.log \
          2>>$LOG_DIR/mysql_node.stderr.log

jobs/mysql_node/templates/mysql_worker_ctl

@@ -20,7 +20,7 @@ case $1 in
     export CLOUD_FOUNDRY_CONFIG_PATH=$JOB_DIR/config/
     export PIDFILE=$PIDFILE
 
-    exec /var/vcap/packages/mysql_node/bin/services/mysql_worker \
+    exec /var/vcap/packages/mysql_node/services/mysql/bin/mysql_worker \
          >>$LOG_DIR/mysql_worker_$INDEX.stdout.log \
          2>>$LOG_DIR/mysql_worker_$INDEX.stderr.log
 

jobs/postgresql_gateway/templates/postgresql_gateway_ctl

@@ -51,7 +51,7 @@ case $1 in
     <% end %>
 
 
-    exec /var/vcap/packages/postgresql_gateway/bin/services/postgresql_gateway \
+    exec /var/vcap/packages/postgresql_gateway/services/postgresql/bin/postgresql_gateway \
          -c $JOB_DIR/config/postgresql_gateway.yml \
          >>$LOG_DIR/postgresql_gateway.stdout.log \
          2>>$LOG_DIR/postgresql_gateway.stderr.log

jobs/postgresql_node/templates/postgresql_node_ctl

@@ -55,7 +55,7 @@ case $1 in
     chmod +x $JOB_DIR/config/postgresql_backup
     $JOB_DIR/config/postgresql_backup start
 
-    exec /var/vcap/packages/postgresql_node/bin/services/postgresql_node \
+    exec /var/vcap/packages/postgresql_node/services/postgresql/bin/postgresql_node \
          -c $JOB_DIR/config/postgresql_node.yml \
          >>$LOG_DIR/postgresql_node.stdout.log \
          2>>$LOG_DIR/postgresql_node.stderr.log

jobs/postgresql_node/templates/postgresql_worker_ctl

@@ -20,7 +20,7 @@ case $1 in
     export CLOUD_FOUNDRY_CONFIG_PATH=$JOB_DIR/config/
     export PIDFILE=$PIDFILE
 
-    exec /var/vcap/packages/postgresql_node/bin/services/postgresql_worker \
+    exec /var/vcap/packages/postgresql_node/services/postgresql/bin/postgresql_worker \
          >>$LOG_DIR/postgresql_worker_$INDEX.stdout.log \
          2>>$LOG_DIR/postgresql_worker_$INDEX.stderr.log
     ;;

jobs/rabbit_gateway/templates/rabbit_gateway_ctl

@@ -23,7 +23,7 @@ case $1 in
     <% end %>
 
     echo $$ > $PIDFILE
-    exec /var/vcap/packages/rabbit_gateway/bin/services/rabbitmq_gateway \
+    exec /var/vcap/packages/rabbit_gateway/services/rabbit/bin/rabbit_gateway \
         -c $JOB_DIR/config/rabbit_gateway.yml \
         >>$LOG_DIR/rabbit_gateway.stdout.log \
         2>>$LOG_DIR/rabbit_gateway.stderr.log

jobs/rabbit_node/templates/rabbit_node_ctl

@@ -35,7 +35,7 @@ case $1 in
     (crontab -l | sed /rabbit_logrotate/d; cat /var/vcap/jobs/rabbit_node/config/rabbit_logrotate.cron) | sed /^$/d | crontab
 
     echo $$ > $PIDFILE
-    exec /var/vcap/packages/rabbit_node/bin/services/rabbitmq_node \
+    exec /var/vcap/packages/rabbit_node/services/rabbit/bin/rabbit_node \
         -c $JOB_DIR/config/rabbit_node.yml \
         >>$LOG_DIR/rabbit_node.stdout.log \
         2>>$LOG_DIR/rabbit_node.stderr.log

jobs/redis_gateway/templates/redis_gateway_ctl

@@ -39,7 +39,7 @@ case $1 in
     check_mount "$MT_OPTS" "$MT_EXPORT" "$SNAPSHOT_DIR"
     <% end %>
 
-    exec /var/vcap/packages/redis_gateway/bin/services/redis_gateway \
+    exec /var/vcap/packages/redis_gateway/services/redis/bin/redis_gateway \
          -c $JOB_DIR/config/redis_gateway.yml \
          >>$LOG_DIR/redis_gateway.stdout.log \
          2>>$LOG_DIR/redis_gateway.stderr.log

jobs/redis_node/templates/redis_node_ctl

@@ -45,7 +45,7 @@ case $1 in
 
     (crontab -l | sed /redis_logrotate/d; cat /var/vcap/jobs/redis_node/config/redis_logrotate.cron) | sed /^$/d | crontab
 
-    exec /var/vcap/packages/redis_node/bin/services/redis_node \
+    exec /var/vcap/packages/redis_node/services/redis/bin/redis_node \
          -c $JOB_DIR/config/redis_node.yml \
          >>$LOG_DIR/redis_node.stdout.log \
          2>>$LOG_DIR/redis_node.stderr.log

jobs/redis_node/templates/redis_worker_ctl

@@ -20,7 +20,7 @@ case $1 in
     export CLOUD_FOUNDRY_CONFIG_PATH=$JOB_DIR/config/
     export PIDFILE=$PIDFILE
 
-    exec /var/vcap/packages/redis_node/bin/services/redis_worker \
+    exec /var/vcap/packages/redis_node/services/redis/bin/redis_worker \
          >>$LOG_DIR/redis_worker_$INDEX.stdout.log \
          2>>$LOG_DIR/redis_worker_$INDEX.stderr.log
 

jobs/serialization_data_server/templates/serialization_data_server_ctl

@@ -39,7 +39,7 @@ case $1 in
     check_mount "$MT_OPTS" "$MT_EXPORT" "$SNAPSHOT_DIR"
     mkdir -p $SERIAL_TMP_DIR
 
-    exec /var/vcap/packages/serialization_data_server/bin/services/serialization_data_server \
+    exec /var/vcap/packages/serialization_data_server/services/serialization_data_server/bin/serialization_data_server \
          -c /var/vcap/jobs/serialization_data_server/config/serialization_data_server.yml \
          >>$LOG_DIR/serialization_data_server.stdout.log \
          2>>$LOG_DIR/serialization_data_server.stderr.log

jobs/service_broker/templates/service_broker_ctl

@@ -25,7 +25,7 @@ case $1 in
 
     echo $$ > $PIDFILE
 
-    exec /var/vcap/packages/service_broker/bin/services/service_broker \
+    exec /var/vcap/packages/service_broker/services/service_broker/bin/service_broker \
          -c $JOB_DIR/config/service_broker.yml \
          -p $JOB_DIR/config/pre_defined_services.yml \
          >>$LOG_DIR/service_broker.stdout.log \

packages/atmos_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/atmos
-
-cp -a core/bin .
-
-rm -rf core

packages/atmos_gateway/spec

@@ -4,6 +4,5 @@ dependencies:
 - ruby
 - sqlite
 files:
-- core/bin/services/atmos_gateway
 - services/atmos/**/*
 - pkg_utils/*

packages/backup_manager/pre_packaging

@@ -3,8 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/tools/backup/manager
-
-cp -a core/bin .
-
-rm -rf core
-

packages/backup_manager/spec

@@ -6,7 +6,5 @@ dependencies:
 files:
 - services/tools/backup/**/*
 - services/tools/restore/**/*
-- core/bin/services/backup_manager
-- core/bin/services/snapshot_manager
 - pkg_utils/*
 

packages/filesystem_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/filesystem
-
-cp -a core/bin .
-
-rm -rf core

packages/filesystem_gateway/spec

@@ -4,6 +4,5 @@ dependencies:
 - ruby
 - sqlite
 files:
-- core/bin/services/filesystem_gateway
 - services/filesystem/**/*
 - pkg_utils/*

packages/mongodb_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/mongodb
-
-cp -a core/bin .
-
-rm -rf core

packages/mongodb_gateway/spec

@@ -4,6 +4,5 @@ dependencies:
 - ruby
 - sqlite
 files:
-- core/bin/services/mongodb_gateway
 - services/mongodb/**/*
 - pkg_utils/*

packages/mongodb_node/pre_packaging

@@ -3,8 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/mongodb
-
-cp -a core/bin .
-
-rm -rf core
-

packages/mongodb_node/spec

@@ -4,7 +4,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/mongodb_node
-- core/bin/services/mongodb_worker
 - services/mongodb/**/*
 - pkg_utils/*

packages/mysql_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/mysql
-
-cp -a core/bin .
-
-rm -rf core

packages/mysql_gateway/spec

@@ -5,6 +5,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/mysql_gateway
 - services/mysql/**/*
 - pkg_utils/*

packages/mysql_node/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/mysql
-
-cp -a core/bin .
-
-rm -rf core

packages/mysql_node/spec

@@ -5,7 +5,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/mysql_node
-- core/bin/services/mysql_worker
 - services/mysql/**/*
 - pkg_utils/*

packages/postgresql_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/postgresql
-
-cp -a core/bin .
-
-rm -rf core

packages/postgresql_gateway/spec

@@ -5,6 +5,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/postgresql_gateway
 - services/postgresql/**/*
 - pkg_utils/*

packages/postgresql_node/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/postgresql
-
-cp -a core/bin .
-
-rm -rf core

packages/postgresql_node/spec

@@ -5,7 +5,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/postgresql_node
-- core/bin/services/postgresql_worker
 - services/postgresql/**/*
 - pkg_utils/*

packages/rabbit_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/rabbit
-
-cp -a core/bin .
-
-rm -rf core

packages/rabbit_gateway/spec

@@ -4,6 +4,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/rabbitmq_gateway
 - services/rabbit/**/*
 - pkg_utils/*

packages/rabbit_node/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/rabbit
-
-cp -a core/bin .
-
-rm -rf core

packages/rabbit_node/spec

@@ -4,6 +4,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/rabbitmq_node
 - services/rabbit/**/*
 - pkg_utils/*

packages/redis_gateway/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/redis
-
-cp -a core/bin .
-
-rm -rf core

packages/redis_gateway/spec

@@ -4,6 +4,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/redis_gateway
 - services/redis/**/*
 - pkg_utils/*

packages/redis_node/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/redis
-
-cp -a core/bin .
-
-rm -rf core

packages/redis_node/spec

@@ -4,7 +4,5 @@ dependencies:
 - sqlite
 - ruby
 files:
-- core/bin/services/redis_node
-- core/bin/services/redis_worker
 - services/redis/**/*
 - pkg_utils/*

packages/serialization_data_server/pre_packaging

@@ -3,7 +3,3 @@ set -e
 
 cd ${BUILD_DIR}
 pkg_utils/vendor.sh services/serialization_data_server
-
-cp -a core/bin .
-
-rm -rf core

packages/serialization_data_server/spec

@@ -3,6 +3,5 @@ name: serialization_data_server
 dependencies:
 - ruby
 files:
-- core/bin/services/serialization_data_server
 - services/serialization_data_server/**/*
 - pkg_utils/*