Changeset 1675

Show
Ignore:
Timestamp:
07/06/08 17:06:53 (6 months ago)
Author:
mikey
Message:

RFC #0001: move net::stubbles::auth and net::stubbles::events to incubator

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • framework/trunk/build/stubbles/build.xml

    r1671 r1675  
    201201        <include name="**/net/stubbles/reflection/**/*.php"/> 
    202202        <include name="**/org/stubbles/star/StarClassRegistry.php"/> 
    203       </fileset> 
    204     </buildStar> 
    205     <buildStar buildPath="${build.src.dir}/lib/stubbles-auth-${version}.php" 
    206          version="${version}" 
    207          title="Stubbles Auth" 
    208          package="net::stubbles::auth" 
    209          author="Stubbles Development Team &lt;http://stubbles.net&gt;" 
    210          copyright="Stubbles Development Team" 
    211          baseSrcPath="${stubbles.base.dir}/src/main"> 
    212       <fileset dir="${stubbles.base.dir}/src/main"> 
    213         <include name="**/net/stubbles/auth/**/*.php"/> 
    214       </fileset> 
    215     </buildStar> 
    216     <buildStar buildPath="${build.src.dir}/lib/stubbles-events-${version}.php" 
    217          version="${version}" 
    218          title="Stubbles Events" 
    219          package="net::stubbles::events" 
    220          author="Stubbles Development Team &lt;http://stubbles.net&gt;" 
    221          copyright="Stubbles Development Team" 
    222          baseSrcPath="${stubbles.base.dir}/src/main"> 
    223       <fileset dir="${stubbles.base.dir}/src/main"> 
    224         <include name="**/net/stubbles/events/**/*.php"/> 
    225203      </fileset> 
    226204    </buildStar> 

  • framework/trunk/build/stubbles/initializers.ini

    r1538 r1675  
    11cache = "net::stubbles::util::cache::stubCacheXJConfInitializer" 
    22config = "net::stubbles::lang::initializer::stubRegistryXJConfInitializer" 
    3 events = "net::stubbles::events::stubEventsXJConfInitializer" 
    43interceptors = "net::stubbles::ipo::interceptors::stubInterceptorXJConfInitializer" 
    54logging = "net::stubbles::util::log::stubLoggerXJConfInitializer" 

  • framework/trunk/projects/examples/docroot/index.php

    r1299 r1675  
    100100        </ul> 
    101101      </li> 
    102       <li>Event handling<ul><li><a href="events/">Simple example</a></li><li><a href="events/queue.php">Queued events</a></li></ul></li> 
    103102      <li> 
    104103        JSON-RPC 

  • framework/trunk/src/main/php/net/stubbles/lang/initializer/stubGeneralInitializer.php

    r1538 r1675  
    2626    protected $features = array('logger' => true, 
    2727                                'rdbms'  => false, 
    28                                 'cache'  => false, 
    29                                 'events' => false 
     28                                'cache'  => false/*, 
     29                                'events' => false*/ 
    3030                          ); 
    3131    /** 
    …… 
    3636    protected $classes  = array('logger' => 'net::stubbles::util::log::stubLoggerXJConfInitializer', 
    3737                                'rdbms'  => 'net::stubbles::rdbms::stubDatabaseXJConfInitializer', 
    38                                 'cache'  => 'net::stubbles::util::cache::stubCacheXJConfInitializer', 
    39                                 'events' => 'net::stubbles::events::stubEventsXJConfInitializer' 
     38                                'cache'  => 'net::stubbles::util::cache::stubCacheXJConfInitializer'/*, 
     39                                'events' => 'net::stubbles::events::stubEventsXJConfInitializer'*/ 
    4040                          ); 
    4141 
    …… 
    7474        } 
    7575         
    76         if ($this->isEventHandlingEnabled() === true) { 
     76        /*if ($this->isEventHandlingEnabled() === true) { 
    7777            $this->getEventsInitializer()->init(); 
    78         } 
     78        }*/ 
    7979    } 
    8080 
    …… 
    179179    public function isEventHandlingEnabled() 
    180180    { 
    181         return $this->features['events']; 
     181        return false;#$this->features['events']; 
    182182    } 
    183183 
    …… 
    190190    public function getEventsInitializer() 
    191191    { 
    192         if (true === $this->features['events']) { 
     192        /*if (true === $this->features['events']) { 
    193193            stubClassLoader::load('net::stubbles::events::stubEventsInitializer'); 
    194194            $eventsInitializer = $this->getInitializer('events'); 
    …… 
    199199            return $eventsInitializer; 
    200200        } 
    201          
     201        */ 
    202202        return null; 
    203203    } 

  • framework/trunk/src/test/AllTests.php

    r1633 r1675  
    2323require_once 'PHPUnit/Util/Filter.php'; 
    2424require_once TEST_SRC_PATH . '/php/net/stubbles/stubTestSuite.php'; 
    25 require_once TEST_SRC_PATH . '/php/net/stubbles/auth/AuthTestSuite.php'; 
    2625require_once TEST_SRC_PATH . '/php/net/stubbles/console/ConsoleTestSuite.php'; 
    27 require_once TEST_SRC_PATH . '/php/net/stubbles/events/EventTestSuite.php'; 
    2826require_once TEST_SRC_PATH . '/php/net/stubbles/ioc/IOCTestSuite.php'; 
    2927require_once TEST_SRC_PATH . '/php/net/stubbles/ipo/IPOTestSuite.php'; 
    …… 
    6361        $suite = new self(); 
    6462        $suite->addTestSuite('stubTestSuite'); 
    65         $suite->addTestSuite('AuthTestSuite'); 
    6663        $suite->addTestSuite('ConsoleTestSuite'); 
    67         $suite->addTestSuite('EventTestSuite'); 
    6864        $suite->addTestSuite('IOCTestSuite'); 
    6965        $suite->addTestSuite('IPOTestSuite'); 

  • framework/trunk/src/test/IntegrationTests.php

    r1633 r1675  
    5555        $suite->addTestFile($dir . '/DatabaseTestCase.php'); 
    5656        $suite->addTestFile($dir . '/EncoderXJConfTestCase.php'); 
    57         $suite->addTestFile($dir . '/EventsTestCase.php'); 
    5857        $suite->addTestFile($dir . '/InterceptorTestCase.php'); 
    5958        $suite->addTestFile($dir . '/LoggerTestCase.php'); 

  • framework/trunk/src/test/php/net/stubbles/lang/initializer/stubGeneralInitializerTestCase.php

    r1538 r1675  
    141141    { 
    142142        $generalInitializer = new stubGeneralInitializer(array('events' => true)); 
    143         $this->assertTrue($generalInitializer->isEventHandlingEnabled()); 
     143        $this->assertFalse($generalInitializer->isEventHandlingEnabled()); 
     144        #$this->assertTrue($generalInitializer->isEventHandlingEnabled()); 
    144145        $initializer = $generalInitializer->getEventsInitializer(); 
    145         $this->assertType('stubEventsInitializer', $initializer); 
    146         $this->assertType('stubEventsXJConfInitializer', $initializer); 
     146        $this->assertNull($initializer); 
     147        /*$this->assertType('stubEventsInitializer', $initializer); 
     148        $this->assertType('stubEventsXJConfInitializer', $initializer);*/ 
    147149    } 
    148150 
    …… 
    153155     * @expectedException  stubRuntimeException 
    154156     */ 
    155     public function eventsEnabledWrongClass() 
     157    /*public function eventsEnabledWrongClass() 
    156158    { 
    157159        $generalInitializer = new stubGeneralInitializer(array('events' => true), array('events' => 'stdClass')); 
    158160        $this->assertTrue($generalInitializer->isEventHandlingEnabled()); 
    159161        $generalInitializer->getEventsInitializer(); 
    160     } 
     162    }*/ 
    161163 
    162164    /** 
    …… 
    222224        $mockDatabaseInitializer->expects($this->once())->method('init'); 
    223225        $generalInitializer->expects($this->once())->method('getDatabaseInitializer')->will($this->returnValue($mockDatabaseInitializer));; 
    224         $mockEventsInitializer = $this->getMock('stubInitializer'); 
    225         $mockEventsInitializer->expects($this->once())->method('init'); 
    226         $generalInitializer->expects($this->once())->method('getEventsInitializer')->will($this->returnValue($mockEventsInitializer));; 
     226        #$mockEventsInitializer = $this->getMock('stubInitializer'); 
     227        #$mockEventsInitializer->expects($this->once())->method('init'); 
     228        #$generalInitializer->expects($this->once())->method('getEventsInitializer')->will($this->returnValue($mockEventsInitializer));; 
    227229        $generalInitializer->init(); 
    228230    }