Merge pull request #163 from sherfert/1.2-default-protocol

Change the default protocol to neo4j://

Author: sherfert

cypher-shell/src/main/java/org/neo4j/shell/cli/CliArgHelper.java

@@ -128,7 +128,7 @@ private static ArgumentParser setupParser()
         ArgumentGroup connGroup = parser.addArgumentGroup("connection arguments");
         connGroup.addArgument("-a", "--address")
                 .help("address and port to connect to")
-                .setDefault("bolt://localhost:7687");
+                .setDefault("neo4j://localhost:7687");
         connGroup.addArgument("-u", "--username")
                 .setDefault("")
                 .help("username to connect as. Can also be specified using environment variable " + ConnectionConfig.USERNAME_ENV_VAR);

cypher-shell/src/test/java/org/neo4j/shell/cli/CliArgHelperTest.java

@@ -54,6 +54,13 @@ public void testWrap() {
         assertNull("invalid wrap",CliArgHelper.parse("--wrap foo".split(" ")));
     }
 
+    @Test
+    public void testDefaultScheme() {
+        CliArgs arguments = CliArgHelper.parse();
+        assertNotNull( arguments );
+        assertEquals( "neo4j://", arguments.getScheme() );
+    }
+
     @Test
     public void testDebugIsNotDefault() {
         assertFalse("Debug should not be the default mode",

tyrekicking.sh

@@ -14,7 +14,7 @@ function testscript {
   # first try with encryption off (4.X series), if that fails with encryption on (3.X series)
   if cypher-shell/cypher-shell -u neo4j -p neo --encryption false "RETURN 1;"; then
     echo "$1 Success!"
-  elif cypher-shell/cypher-shell -u neo4j -p neo --encryption true "RETURN 1;"; then
+  elif cypher-shell/cypher-shell -a "bolt://localhost:7687" -u neo4j -p neo --encryption true "RETURN 1;"; then
     echo "$1 Success!"
   else
     echo "$1 Failure!"