added cassandra.local and hbase.local, created bin directory and move…

…d gremlin bin and shell scripts into it.
notsureofagoodname · Jun 13, 2012 · c2e1a66 · c2e1a66
1 parent f5afcc3
commit c2e1a66
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 10 deletions.
diff --git a/bin/cassandra.local b/bin/cassandra.local
@@ -0,0 +1,2 @@
+storage.backend=cassandra
+storage.hostname=127.0.0.1
diff --git a/gremlin.bat → bin/gremlin.bat b/gremlin.bat → bin/gremlin.bat
@@ -1,7 +1,7 @@
 :: Windows launcher script for Gremlin
 @echo off
 
-cd %CD%\target\
+cd %CD%\..\target\
 
 set TARGET=
 

diff --git a/bin/gremlin.sh b/bin/gremlin.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+`dirname $0`/../target/titan-*-standalone/bin/gremlin.sh $@
diff --git a/bin/hbase.local b/bin/hbase.local
@@ -0,0 +1,2 @@
+storage.backend=hbase
+storage.hostname=127.0.0.1
diff --git a/gremlin.sh b/gremlin.sh
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
@@ -7,8 +7,14 @@
         <fileSet>
             <fileMode>0775</fileMode>
             <includes>
-                <include>gremlin.sh</include>
-                <include>gremlin.bat</include>
+                <include>bin/gremlin.sh</include>
+                <include>bin/gremlin.bat</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <includes>
+                <include>bin/cassandra.local</include>
+                <include>bin/hbase.local</include>
             </includes>
         </fileSet>
         <fileSet>

diff --git a/src/main/bin/README.txt b/src/main/bin/README.txt
@@ -27,8 +27,8 @@ titan$ ./gremlin.sh
          \,,,/
          (o o)
 -----oOOo-(_)-oOOo-----
-gremlin> g = TitanFactory.open('tmp/titan-local');
-==>standardtitangraph[local]
+gremlin> g = TitanFactory.open('/tmp/titan-local');
+==>titangraph[local:/tmp/titan-local]
 
 
 2. Running Titan/Cassandra via Gremlin
@@ -43,8 +43,9 @@ gremlin> conf = new BaseConfiguration();
 gremlin> conf.setProperty("storage.backend","cassandra");
 gremlin> conf.setProperty("storage.hostname","127.0.0.1");
 gremlin> g = TitanFactory.open(conf);
-==>standardtitangraph[cassandra]
+==>titangraph[cassandra:127.0.0.1]
 
+It is possible to use TitanFactory.open('bin/cassandra.local') to reduce verbosity of opening a local instance.
 
 3. Running Titan/HBase via Gremlin
 
@@ -58,7 +59,9 @@ gremlin> conf = new BaseConfiguration();
 gremlin> conf.setProperty("storage.backend","hbase");
 gremlin> conf.setProperty("storage.hostname","127.0.0.1");
 gremlin> g = TitanFactory.open(conf);
-==>standardtitangraph[hbase]
+==>titangraph[hbase:127.0.0.1]
+
+It is possible to use TitanFactory.open('bin/hbase.local') to reduce verbosity of opening a local instance.
 
 ----------------------------------------------------------
 

diff --git a/src/main/bin/cassandra.local b/src/main/bin/cassandra.local
@@ -0,0 +1,2 @@
+storage.backend=cassandra
+storage.hostname=127.0.0.1
diff --git a/src/main/bin/hbase.local b/src/main/bin/hbase.local
@@ -0,0 +1,2 @@
+storage.backend=hbase
+storage.hostname=127.0.0.1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		storage.backend=cassandra
		storage.hostname=127.0.0.1
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		`dirname $0`/../target/titan-*-standalone/bin/gremlin.sh $@
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		storage.backend=hbase
		storage.hostname=127.0.0.1