Fixing embedded mode

Author: dantleech

behat.yml

@@ -3,6 +3,14 @@ default:
         standalone:
             contexts:
                 - PHPCR\Shell\Test\StandaloneContext
+            paths:
+                - features/all
+                - features/standalone
+                - features/shell
         embedded:
+            filter:
+                tag: "~@standalone"
             contexts:
                 - PHPCR\Shell\Test\EmbeddedContext
+            paths:
+                - features/all

features/phpcr_access_control_privilege_list.feature renamed to features/all/phpcr_access_control_privilege_list.feature

@@ -3,17 +3,15 @@ Feature: Unregister a node type
     As a user that is logged into the shell
     I need to be able to do that
 
+    # This is not currently implemented by Jackrabbit
+
     Background:
         Given that I am logged in as "testuser"
 
     Scenario: Unregister a node type
         Given the "example.cnd" node type is loaded
         And I execute the "node-type:unregister ns:NodeType" command
         Then the command should fail
-        And I should see the following:
-        """
-        NodeType not found
-        """
 
     Scenario: Attempt to unregister a non-registered node type
         Given the "example.cnd" node type is loaded

features/phpcr_file_import.feature renamed to features/all/phpcr_file_import.feature

@@ -18,7 +18,6 @@ Feature: Command aliases
 
         Examples:
             | command | 
-            | use default |
             | select * from [nt:unstructured] |
             | cd cms |
             | rm cms |

features/phpcr_lock_info.feature renamed to features/all/phpcr_lock_info.feature

@@ -1,3 +1,4 @@
+@standlone
 Feature: Login to the session
     In order to reconnect as a different user from a session
     As a user logged into the shell

features/phpcr_lock_lock.feature renamed to features/all/phpcr_lock_lock.feature

@@ -97,6 +97,7 @@ public function init()
         }
 
         $this->registerPhpcrCommands();
+        $this->registerPhpcrStandaloneCommands();
         $this->registerShellCommands();
 
         $event = new ApplicationInitEvent($this);
@@ -117,8 +118,6 @@ protected function registerPhpcrCommands()
         $this->add(new CommandPhpcr\SessionImpersonateCommand());
         $this->add(new CommandPhpcr\SessionImportXMLCommand());
         $this->add(new CommandPhpcr\SessionInfoCommand());
-        $this->add(new CommandPhpcr\SessionLoginCommand());
-        $this->add(new CommandPhpcr\SessionLogoutCommand());
         $this->add(new CommandPhpcr\SessionNamespaceListCommand());
         $this->add(new CommandPhpcr\SessionNamespaceSetCommand());
         $this->add(new CommandPhpcr\NodePropertyRemoveCommand());
@@ -134,16 +133,12 @@ protected function registerPhpcrCommands()
         $this->add(new CommandPhpcr\RetentionHoldRemoveCommand());
         $this->add(new CommandPhpcr\RetentionPolicyGetCommand());
         $this->add(new CommandPhpcr\RetentionPolicyRemoveCommand());
-        $this->add(new CommandPhpcr\WorkspaceCreateCommand());
-        $this->add(new CommandPhpcr\WorkspaceDeleteCommand());
-        $this->add(new CommandPhpcr\WorkspaceListCommand());
         $this->add(new CommandPhpcr\NodeCloneCommand());
         $this->add(new CommandPhpcr\NodeCopyCommand());
         $this->add(new CommandPhpcr\NodeEditCommand());
         $this->add(new CommandPhpcr\WorkspaceNamespaceListCommand());
         $this->add(new CommandPhpcr\WorkspaceNamespaceRegisterCommand());
         $this->add(new CommandPhpcr\WorkspaceNamespaceUnregisterCommand());
-        $this->add(new CommandPhpcr\WorkspaceUseCommand());
         $this->add(new CommandPhpcr\NodeTypeShowCommand());
         $this->add(new CommandPhpcr\NodeTypeEditCommand());
         $this->add(new CommandPhpcr\NodeTypeUnregisterCommand());
@@ -184,6 +179,16 @@ protected function registerPhpcrCommands()
         $this->add(new CommandPhpcr\LockUnlockCommand());
     }
 
+    protected function registerPhpcrStandaloneCommands()
+    {
+        $this->add(new CommandPhpcr\SessionLoginCommand());
+        $this->add(new CommandPhpcr\SessionLogoutCommand());
+        $this->add(new CommandPhpcr\WorkspaceUseCommand());
+        $this->add(new CommandPhpcr\WorkspaceCreateCommand());
+        $this->add(new CommandPhpcr\WorkspaceDeleteCommand());
+        $this->add(new CommandPhpcr\WorkspaceListCommand());
+    }
+
     protected function registerShellCommands()
     {
         // add shell-specific commands