Squashed commit of the following:

commit 04b11c8c6dff36c00b1b7a51c6d8801fdda48c86
Merge: a104078 5ed899a
Author: Patrick Bozeman <pbozeman@vmware.com>
Date:   Tue Aug 2 12:00:23 2011 -0700

    Merge remote-tracking branch 'jexp/master'

    Conflicts:
    	.gitmodules
    	cloud_controller/config/cloud_controller.yml

    Change-Id: I69c7cafd87e52eab2e941d4a993f03b879f0d194

commit 5ed899a6bdf12d75139b540b161212592419de99
Author: Michael <github@jexp.de>
Date:   Tue Aug 2 14:40:28 2011 +0200

    update to neo4j 1.4.1

commit c5f4c1d37c99e93f6e5d601cb0d7359dd99356b6
Author: Michael <github@jexp.de>
Date:   Wed May 25 23:17:25 2011 +0200

    updated gitmodules to public http url

commit 10a5d3f374355f435bff325b7b1267424edbca75
Author: Michael <github@jexp.de>
Date:   Mon May 23 11:46:31 2011 +0200

    updated setup to extract neo4j startup script

commit 44a0a923f21f747519daf6bba50d54bff26ef70f
Author: Michael <github@jexp.de>
Date:   Fri May 6 02:44:39 2011 +0200

    updated vcap_setup to use neo4j-hosting-extension

commit a662ff04429813ec70901a2227b7d1113d2b8a78
Merge: f4f43f1 e984187
Author: Michael <github@jexp.de>
Date:   Tue May 3 14:09:49 2011 +0200

    merge vcap_setup

commit f4f43f1129ce76ea4ff9e5c009c7a52d3ea94c92
Author: Michael <github@jexp.de>
Date:   Tue May 3 14:05:34 2011 +0200

    neo4j services git repo for submodule

commit a732e0716060750de72869a140278398aaa80d3f
Author: Michael Hunger <github@jexp.de>
Date:   Tue May 3 14:03:14 2011 +0200

    xadded neo4j server provisioning

commit e9841870c9a9b4f2e06e2be246ad8eaa733d0b41
Author: Michael Hunger <github@jexp.de>
Date:   Thu Apr 21 12:45:25 2011 +0200

    added neo4j setup

commit ef3d720fe621e9764fa0a956586c22b95e5c5f2a
Author: Michael Hunger <github@jexp.de>
Date:   Thu Apr 21 10:59:52 2011 +0200

    added neo4j services

Change-Id: I6ca4cb1fb4e793c1eda9936787ce16d3837cf3ec
This commit is contained in:
Michael 2011-08-03 10:58:12 -07:00 коммит произвёл Patrick Bozeman
Родитель ed7aed484e
Коммит 6d3b5e1fb5
6 изменённых файлов: 38 добавлений и 3 удалений

4
bin/services/neo4j_gateway Executable file
Просмотреть файл

@ -0,0 +1,4 @@
#!/usr/bin/env ruby
# Copyright (c) 2009-2011 VMware, Inc.
exec(File.expand_path("../../../services/neo4j/bin/neo4j_gateway", __FILE__), *ARGV)

3
bin/services/neo4j_node Executable file
Просмотреть файл

@ -0,0 +1,3 @@
#!/usr/bin/env ruby
exec(File.expand_path("../../../services/neo4j/bin/neo4j_node", __FILE__), *ARGV)

Просмотреть файл

@ -15,7 +15,7 @@
# - redis
# - mysql
# - mongo
#
# - neo4j
require 'yaml'
require 'fileutils'
@ -301,6 +301,8 @@ module Run
puts
kill_service_instances('mongodb', /mongod/)
puts
kill_service_instances('neo4j', /neo4j/ )
puts
puts "Cleaning shared directories:"
dirs = %w[/var/vcap/services /var/vcap/shared /var/vcap/sys /var/vcap.local/* /tmp/vcap-run]
@ -382,7 +384,7 @@ module Run
end
def self.services
%w(redis mysql mongodb)
%w(redis mysql mongodb neo4j)
end
def self.alias_args(args)

Просмотреть файл

@ -105,6 +105,8 @@ builtin_services:
token: "0xdeadbeef"
rabbitmq:
token: "0xdeadbeef"
neo4j:
token: "0xdeadbeef"
# used for /info/runtimes endpoint (served unfiltered as JSON)
runtimes:

Просмотреть файл

@ -9,7 +9,7 @@ module CoreComponents
end
def components
%w[cloud_controller dea health_manager router services/redis services/mysql services/mongodb services/postgresql]
%w[cloud_controller dea health_manager router services/redis services/mysql services/mongodb services/postgresql services/neo4j]
end
def dirs

Просмотреть файл

@ -514,6 +514,30 @@ else
echo "MongoDB Server (version $MONGODB_VERSION) is current"
fi
NEO4J_VERSION=community-1.4.1
NEO4J_DIST_FILE=neo4j-community-1.4.1-unix.tar.gz
NEO4J_SERVICE_DIR=/var/vcap/services/neo4j
NEO4J_HOSTING_EXTENSION=authentication-extension-1.4.jar
if [[ -f "$NEO4J_SERVICE_DIR/$NEO4J_DIST_FILE" ]]; then
echo "Neo4j ($NEO4J_VERSION) is current"
else
read -p "Should I add Neo4j Server? [y/N] "
if [[ $REPLY =~ ^[yY]$ ]]; then
echo "Installing Neo4j Server (version $NEO4J_VERSION)"
pushd .
mkdir -p $NEO4J_SERVICE_DIR
cd $NEO4J_SERVICE_DIR
curl -O http://dist.neo4j.org/$NEO4J_DIST_FILE
rm neo4j-server.tgz
ln -s $NEO4J_DIST_FILE neo4j-server.tgz
curl -O http://dist.neo4j.org/$NEO4J_HOSTING_EXTENSION
rm neo4j-hosting-extension.jar
ln -s $NEO4J_HOSTING_EXTENSION neo4j-hosting-extension.jar
popd
fi
fi
echo -e "\n\nYou should be good to go!!\n\n"
ruby -v