[REVIEW] Rename Apachemq adapter to Activemq (per Daniel Lo)

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@17239 44c647ce-9c0f-0410-b52a-842ac1e357ba

library/Zend/Queue/Adapter/Apachemq.php → library/Zend/Queue/Adapter/Activemq.php

@@ -44,7 +44,7 @@ require_once 'Zend/Queue/Stomp/Frame.php';
  * @copyright  Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
-class Zend_Queue_Adapter_Apachemq extends Zend_Queue_Adapter_AdapterAbstract
+class Zend_Queue_Adapter_Activemq extends Zend_Queue_Adapter_AdapterAbstract
 {
     const DEFAULT_SCHEME = 'tcp';
     const DEFAULT_HOST   = '127.0.0.1';

tests/TestConfiguration.php.dist

@@ -498,10 +498,10 @@ define('TESTS_ZEND_MAIL_SMTP_AUTH', false);
  *
  * Selectively define the below in order to run tests for them.
  */
-define('TESTS_ZEND_QUEUE_APACHEMQ_HOST', false);
-define('TESTS_ZEND_QUEUE_APACHEMQ_PORT', false);
+define('TESTS_ZEND_QUEUE_ACTIVEMQ_SCHEME', false);
+define('TESTS_ZEND_QUEUE_ACTIVEMQ_HOST', false);
+define('TESTS_ZEND_QUEUE_ACTIVEMQ_PORT', false);
 define('TESTS_ZEND_QUEUE_DB', false);
-define('TESTS_ZEND_QUEUE_MEMCACHEQ_SCHEME', false);
 define('TESTS_ZEND_QUEUE_MEMCACHEQ_HOST', false);
 define('TESTS_ZEND_QUEUE_MEMCACHEQ_PORT', false);
 define('TESTS_ZEND_QUEUE_PLATFORMJQ_HOST', false);

tests/Zend/Queue/Adapter/ApachemqTest.php → tests/Zend/Queue/Adapter/ActivemqTest.php

@@ -34,7 +34,7 @@ require_once 'PHPUnit/Framework/TestCase.php';
 /** TestHelp.php */
 require_once dirname(__FILE__) . '/../../../TestHelper.php';
 
-class Zend_Queue_Adapter_ApachemqTest extends Zend_Queue_Adapter_AdapterTest
+class Zend_Queue_Adapter_ActivemqTest extends Zend_Queue_Adapter_AdapterTest
 {
     /**
      * getAdapterName() is an method to help make AdapterTest work with any
@@ -46,18 +46,21 @@ class Zend_Queue_Adapter_ApachemqTest extends Zend_Queue_Adapter_AdapterTest
      */
     public function getAdapterName()
     {
-        return 'Apachemq';
+        return 'Activemq';
     }
 
     public function getTestConfig()
     {
         $driverOptions = array();
-        if (defined('TESTS_ZEND_QUEUE_APACHEMQ_HOST')) {
+        if (defined('TESTS_ZEND_QUEUE_ACTIVEMQ_HOST')) {
             $driverOptions['host'] = TESTS_ZEND_QUEUE_APACHEMQ_HOST;
         }
-        if (defined('TESTS_ZEND_QUEUE_APACHEMQ_PORT')) {
+        if (defined('TESTS_ZEND_QUEUE_ACTIVEMQ_PORT')) {
             $driverOptions['port'] = TESTS_ZEND_QUEUE_APACHEMQ_PORT;
         }
+        if (defined('TESTS_ZEND_QUEUE_ACTIVEMQ_SCHEME')) {
+            $driverOptions['scheme'] = TESTS_ZEND_QUEUE_APACHEMQ_SCHEME;
+        }
         return array('driverOptions' => $driverOptions);
     }
 
@@ -72,11 +75,11 @@ class Zend_Queue_Adapter_ApachemqTest extends Zend_Queue_Adapter_AdapterTest
     public function testConst()
     {
         /**
-         * @see Zend_Queue_Adapter_Stomp
+         * @see Zend_Queue_Adapter_Activemq
          */
-        require_once 'Zend/Queue/Adapter/Apachemq.php';
-        $this->assertTrue(is_string(Zend_Queue_Adapter_Apachemq::DEFAULT_SCHEME));
-        $this->assertTrue(is_string(Zend_Queue_Adapter_Apachemq::DEFAULT_HOST));
-        $this->assertTrue(is_integer(Zend_Queue_Adapter_Apachemq::DEFAULT_PORT));
+        require_once 'Zend/Queue/Adapter/Activemq.php';
+        $this->assertTrue(is_string(Zend_Queue_Adapter_Activemq::DEFAULT_SCHEME));
+        $this->assertTrue(is_string(Zend_Queue_Adapter_Activemq::DEFAULT_HOST));
+        $this->assertTrue(is_integer(Zend_Queue_Adapter_Activemq::DEFAULT_PORT));
     }
 }

tests/Zend/Queue/Adapter/AdapterTest.php

@@ -480,7 +480,7 @@ abstract class Zend_Queue_Adapter_AdapterTest extends PHPUnit_Framework_TestCase
 
         // no more messages, should return false
         // stomp and amazon always return true.
-        $falsePositive = array('Apachemq', 'Amazon');
+        $falsePositive = array('Activemq', 'Amazon');
         if (! in_array($this->getAdapterName(), $falsePositive)) {
             $this->assertFalse($adapter->deleteMessage($message));
         }
@@ -697,7 +697,7 @@ abstract class Zend_Queue_Adapter_AdapterTest extends PHPUnit_Framework_TestCase
         }
         $adapter = $queue->getAdapter();
 
-        $not_supported = array('Apachemq');
+        $not_supported = array('Activemq');
         if ((! $queue->isSupported('deleteMessage')) || in_array($this->getAdapterName(), $not_supported)) {
             $queue->deleteQueue();
             $this->markTestSkipped($this->getAdapterName() . ' does not support visibility of messages');

tests/Zend/Queue/AllTests.php

@@ -48,7 +48,7 @@ require_once 'Zend/Queue/Stomp/FrameTest.php';
 require_once 'Zend/Queue/Stomp/ClientTest.php';
 
 // Message Queues dependent on Stomp
-require_once 'Zend/Queue/Adapter/ApachemqTest.php';
+require_once 'Zend/Queue/Adapter/ActivemqTest.php';
 
 /**
  * @category   Zend
@@ -93,7 +93,7 @@ class Zend_Queue_AllTests
         $suite->addTestSuite('Zend_Queue_Stomp_ClientTest');
 
         // Message Queues dependent on Stomp
-        $suite->addTestSuite('Zend_Queue_Adapter_ApachemqTest');
+        $suite->addTestSuite('Zend_Queue_Adapter_ActivemqTest');
 
         return $suite;
     }

tests/Zend/Queue/FactoryTest.php

@@ -33,7 +33,7 @@ require_once 'Zend/Queue/Exception.php';
 require_once 'Zend/Queue/Adapter/Array.php';
 require_once 'Zend/Queue/Adapter/Db.php';
 require_once 'Zend/Queue/Adapter/Memcacheq.php';
-require_once 'Zend/Queue/Adapter/Apachemq.php';
+require_once 'Zend/Queue/Adapter/Activemq.php';
 
 require_once dirname(__FILE__) . '/../../TestHelper.php';
 
@@ -89,22 +89,22 @@ class Zend_Queue_FactoryTest extends PHPUnit_Framework_TestCase
         $this->assertTrue($adapter instanceof Zend_Queue);
     }
 
-    public function testApachemq()
+    public function testActivemq()
     {
-        if ( TESTS_ZEND_QUEUE_APACHEMQ_SCHEME === false ||
-             TESTS_ZEND_QUEUE_APACHEMQ_HOST === false ||
-             TESTS_ZEND_QUEUE_APACHEMQ_PORT === false ) {
-            $this->markTestSkipped('ApacheMQ setup required');
+        if ( TESTS_ZEND_QUEUE_ACTIVEMQ_SCHEME === false ||
+             TESTS_ZEND_QUEUE_ACTIVEMQ_HOST === false ||
+             TESTS_ZEND_QUEUE_ACTIVEMQ_PORT === false ) {
+            $this->markTestSkipped('ActiveMQ setup required');
         }
 
         $config = array('name'          => 'queue1',
-                        'driverOptions' => array('host'     => TESTS_ZEND_QUEUE_APACHEMQ_HOST,
-                                                 'port'     => TESTS_ZEND_QUEUE_APACHEMQ_PORT,
-                                                 'scheme'   => TESTS_ZEND_QUEUE_APACHEMQ_SCHEME,
+                        'driverOptions' => array('host'     => TESTS_ZEND_QUEUE_ACTIVEMQ_HOST,
+                                                 'port'     => TESTS_ZEND_QUEUE_ACTIVEMQ_PORT,
+                                                 'scheme'   => TESTS_ZEND_QUEUE_ACTIVEMQ_SCHEME,
                                                  'username' => '',
                                                  'password' => ''));
 
-        $adapter = new Zend_Queue('Apachemq', $config);
+        $adapter = new Zend_Queue('Activemq', $config);
 
         $this->assertTrue($adapter instanceof Zend_Queue);
     }