moved id generators

lib/Doctrine/ClassMetadata.php

@@ -792,13 +792,13 @@ class Doctrine_ClassMetadata implements Doctrine_Configurable, Serializable
     protected function _createIdGenerator()
     {
         if ($this->_generatorType == self::GENERATOR_TYPE_IDENTITY) {
-            $this->_idGenerator = new Doctrine_Id_IdentityGenerator($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_IdentityGenerator($this->_em);
         } else if ($this->_generatorType == self::GENERATOR_TYPE_SEQUENCE) {
-            $this->_idGenerator = new Doctrine_Id_SequenceGenerator($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_SequenceGenerator($this->_em);
         } else if ($this->_generatorType == self::GENERATOR_TYPE_TABLE) {
-            $this->_idGenerator = new Doctrine_Id_TableGenerator($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_TableGenerator($this->_em);
         } else {
-            $this->_idGenerator = new Doctrine_Id_Assigned($this->_em);
+            $this->_idGenerator = new Doctrine_ORM_Id_Assigned($this->_em);
         }
     }
     

lib/Doctrine/Connection/UnitOfWork.php

@@ -638,7 +638,7 @@ class Doctrine_Connection_UnitOfWork
                 break;
             case Doctrine_Entity::STATE_NEW:
                 $result = $class->getIdGenerator()->generate($entity);
-                if ($result == Doctrine_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
+                if ($result == Doctrine_ORM_Id_AbstractIdGenerator::POST_INSERT_INDICATOR) {
                     $insertNow[$entity->getOid()] = $entity;
                 } else {
                     $entity->_assignIdentifier($result);

lib/Doctrine/ORM/Id/AbstractIdGenerator.php

@@ -7,7 +7,7 @@
  *
  * @todo Rename to AbstractIdGenerator
  */
-abstract class Doctrine_Id_AbstractIdGenerator
+abstract class Doctrine_ORM_Id_AbstractIdGenerator
 {
     const POST_INSERT_INDICATOR = 'POST_INSERT_INDICATOR';
     

lib/Doctrine/ORM/Id/Assigned.php

@@ -5,7 +5,7 @@
  *
  * @since 2.0
  */
-class Doctrine_Id_Assigned extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_Assigned extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     /**
      * Enter description here...

lib/Doctrine/ORM/Id/IdentityGenerator.php

@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_Id_IdentityGenerator extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_IdentityGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     /**
      * Enter description here...

lib/Doctrine/ORM/Id/SequenceGenerator.php

@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_Id_SequenceGenerator extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_SequenceGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     private $_sequenceName;
     

lib/Doctrine/ORM/Id/SequenceIdentityGenerator.php

@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_Id_SequenceIdentityGenerator extends Doctrine_Id_IdentityGenerator
+class Doctrine_ORM_Id_SequenceIdentityGenerator extends Doctrine_ORM_Id_IdentityGenerator
 {
     private $_sequenceName;
     

lib/Doctrine/ORM/Id/TableGenerator.php

@@ -5,7 +5,7 @@
  *
  * @since 2.0
  */
-class Doctrine_Id_TableGenerator extends Doctrine_Id_AbstractIdGenerator
+class Doctrine_ORM_Id_TableGenerator extends Doctrine_ORM_Id_AbstractIdGenerator
 {
     
     public function generate(Doctrine_Entity $entity)

tests/lib/mocks/Doctrine_ClassMetadataMock.php

@@ -6,7 +6,7 @@ class Doctrine_ClassMetadataMock extends Doctrine_ClassMetadata
     
     /* Mock API */
     
-    public function setIdGenerator(Doctrine_Id_AbstractIdGenerator $g) {
+    public function setIdGenerator(Doctrine_ORM_Id_AbstractIdGenerator $g) {
         $this->_idGenerator = $g;
     }
     

tests/lib/mocks/Doctrine_SequenceMock.php

@@ -1,6 +1,6 @@
 <?php
 
-class Doctrine_SequenceMock extends Doctrine_Id_SequenceGenerator
+class Doctrine_SequenceMock extends Doctrine_ORM_Id_SequenceGenerator
 {
     private $_sequenceNumber = 0;