Merge pull request jackalope#22 from starkj/move_get_transaction_manager

getTransactionManager() moved to Workspace
videlalvaro · Jul 26, 2011 · c237d70 · c237d70
2 parents 7a3b3aa + d6545d5
commit c237d70
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 13 deletions.
diff --git a/api-test/suite b/api-test/suite
diff --git a/lib/phpcr b/lib/phpcr
diff --git a/src/Jackalope/Repository.php b/src/Jackalope/Repository.php
@@ -81,7 +81,7 @@ public function login(CredentialsInterface $credentials = null, $workspaceName =
         $session = $this->factory->get('Session', array($this, $workspaceName, $credentials, $this->transport));
         if ($this->transactions) {
             $utx = $this->factory->get('Transaction\\UserTransaction', array($this->transport, $session));
-            $session->setTransactionManager($utx);
+            $session->getWorkspace()->setTransactionManager($utx);
         }
 
         return $session;

diff --git a/src/Jackalope/Session.php b/src/Jackalope/Session.php
@@ -65,21 +65,12 @@ public function __construct($factory, Repository $repository, $workspaceName, \P
         $this->repository = $repository;
         $this->objectManager = $this->factory->get('ObjectManager', array($transport, $this));
         $this->workspace = $this->factory->get('Workspace', array($this, $this->objectManager, $workspaceName));
+        $this->utx = $this->workspace->getTransactionManager();
         $this->credentials = $credentials;
         $this->namespaceRegistry = $this->workspace->getNamespaceRegistry();
         self::registerSession($this);
     }
 
-    public function setTransactionManager(\PHPCR\Transaction\UserTransactionInterface $utx)
-    {
-        $this->utx = $utx;
-    }
-
-    public function getTransactionManager()
-    {
-        return $this->utx;
-    }
-
     /**
      * Returns the Repository object through which this session was acquired.
      *

diff --git a/src/Jackalope/Workspace.php b/src/Jackalope/Workspace.php
@@ -18,6 +18,7 @@ class Workspace implements \PHPCR\WorkspaceInterface
 
     protected $session;
     protected $nodeTypeManager;
+    protected $utx = null;
     protected $name;
     protected $namespaceRegistry;
 
@@ -225,6 +226,28 @@ public function getQueryManager()
         return $this->factory->get('Query\QueryManager', array($this->session->getObjectManager()));
     }
 
+    /**
+     * Sets the TransactionManager
+     *
+     * @param \PHPCR\Transaction\UserTransactionInterface $utx A UserTransaction object
+     */
+    public function setTransactionManager(\PHPCR\Transaction\UserTransactionInterface $utx)
+    {
+        $this->utx = $utx;
+    }
+
+    /**
+     * Returns the TransactionManager object
+     *
+     * @return \PHPCR\Transaction\UserTransactionInterface A UserTransaction object
+     * @api
+     */
+    public function getTransactionManager()
+    {
+        return $this->utx;
+    }
+
+
     /**
      * Returns the NamespaceRegistry object, which is used to access the mapping
      * between prefixes and namespaces.