Changeset 221

Show
Ignore:
Timestamp:
02/06/07 11:01:07 (2 years ago)
Author:
mikey
Message:

fixed path problems

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/starReader.php

    r218 r221  
    215215?><?php StarStreamWrapper::register(); ?><?php 
    216216require 'star://' . __FILE__ . '?net.stubbles.star.StarClassRegistry'; 
    217 ?><?php __halt_compiler();star1net.stubbles.star.StarClassRegistryStarClassRegistry.phpsrc/main/php/net/stubbles/star45656151<?php 
     217?><?php __halt_compiler();star1net.stubbles.star.StarClassRegistryStarClassRegistry.phpsrc/main/php/net/stubbles/star48356151<?php 
    218218/** 
    219219 * Class registry for mapping of classes to star files. 
    …… 
    323323         
    324324        if (count(self::$libPathes) == 0) { 
    325             self::$libPathes[realpath(getcwd() . '/../lib')] = true; 
     325            if (substr(__FILE__, 0, 7) == 'star://') { 
     326                $path = str_replace('star://', '', str_replace('?net.stubbles.star.StarClassRegistry', '', __FILE__)); 
     327                self::$libPathes[dirname($path)] = true; 
     328            } else { 
     329                self::$libPathes[realpath(getcwd() . '/../lib')] = true; 
     330            } 
    326331        } 
    327332         

  • trunk/src/main/php/net/stubbles/star/StarClassRegistry.php

    r218 r221  
    107107         
    108108        if (count(self::$libPathes) == 0) { 
    109             self::$libPathes[realpath(getcwd() . '/../lib')] = true; 
     109            if (substr(__FILE__, 0, 7) == 'star://') { 
     110                $path = str_replace('star://', '', str_replace('?net.stubbles.star.StarClassRegistry', '', __FILE__)); 
     111                self::$libPathes[dirname($path)] = true; 
     112            } else { 
     113                self::$libPathes[realpath(getcwd() . '/../lib')] = true; 
     114            } 
    110115        } 
    111116         

  • trunk/src/main/php/net/stubbles/stubClassLoader.php

    r165 r221  
    103103    public static function getSourcePath() 
    104104    { 
    105         return realpath(dirname(__FILE__) . '/../../'); 
     105        if (basename(__FILE__) != __CLASS__ . '.php') { 
     106            return realpath(dirname(__FILE__) . '/../src/main/php/'); 
     107        } else { 
     108            return realpath(dirname(__FILE__) . '/../../'); 
     109        } 
    106110    } 
    107111