Changeset 119

Show
Ignore:
Timestamp:
01/19/07 08:23:20 (2 years ago)
Author:
mikey
Message:

use current star version of XJConf
(loading from star files has to be implemented in net.stubbles.stubClassLoader)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/config/php/config.php

    r51 r119  
    11<?php 
     2/** 
     3 * use this class to configure your site 
     4 */ 
    25class stubConfig 
    36{ 
    47    /** 
    5      * path to xjconf: default is a pear install in an include path 
     8     * this method should return the path to you lib directory 
     9     *  
     10     * By default its /path/to/stubbles/lib. 
     11     * 
     12     * @return  string 
    613     */ 
    7     const PATH_TO_XJCONF = 'XJConf'; 
    8    # const PATH_TO_XJCONF = '../../XJConfForPHP/trunk/XJConf'; 
     14    public static function getLibPath() 
     15    { 
     16        return realpath(dirname(__FILE__) . '/../../lib'); 
     17    } 
    918} 
    1019?> 
  • trunk/docroot/index.php

    r101 r119  
    11<?php 
    22require '../config/php/config.php'; 
     3#require '../lib/starReader.php'; 
    34require '../src/main/php/net/stubbles/stubClassLoader.php'; 
     5stubClassLoader::load('net.stubbles.star.StarLoader', 'net.stubbles.star.StarClassRegistry'); 
     6stream_wrapper_register('star', 'StarLoader'); 
    47stubClassLoader::load('net.stubbles.websites.PageFactory', 
    58                      'net.stubbles.helper.stubRegistryFactory', 
  • trunk/src/main/php/net/stubbles/helper/stubXJConfLoader.php

    r65 r119  
    55 * @author  Frank Kleine <mikey@stubbles.net> 
    66 */ 
    7 require_once stubConfig::PATH_TO_XJCONF . '/XJConfLoader.php'
     7require StarClassRegistry::getUriForClass('net.xjconf.XJConfLoader')
    88XJConfLoader::load('XJConfClassLoader'); 
    99/** 
  • trunk/src/test/run.php

    r109 r119  
    1313require TEST_SRC_PATH . '/../main/php/org/simpletest/reporter.php'; 
    1414require TEST_SRC_PATH . '/../main/php/net/stubbles/stubClassLoader.php'; 
     15stubClassLoader::load('net.stubbles.star.StarLoader', 'net.stubbles.star.StarClassRegistry'); 
     16stream_wrapper_register('star', 'StarLoader'); 
     17StarClassRegistry::addLibPath(stubConfig::getLibPath()); 
    1518/** 
    1619 * Test runner for stubbles. 
     
    3033        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/helper/HelperTestSuite.php'); 
    3134        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/reflection/ReflectionTestSuite.php'); 
     35        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/websites/variantmanager/VariantManagerTestSuite.php'); 
    3236        $testSuite->addTestFile(TEST_SRC_PATH . '/php/net/stubbles/xml/XMLTestSuite.php'); 
    3337        if (PHP_SAPI == 'cli') {