Changeset 1218

Show
Ignore:
Timestamp:
01/11/08 15:09:08 (9 months ago)
Author:
mikey
Message:

continued refactoring #119: fixed generation of star files: package separator in our star files is now ::

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/stubbles/build.xml

    r1157 r1218  
    165165         version="${version}" 
    166166         title="Stubbles" 
    167          package="net.stubbles" 
     167         package="net::stubbles" 
    168168         author="Stubbles Development Team <http://stubbles.net>" 
    169169         copyright="Stubbles Development Team" 
    170          preface="<?php require 'star://' . __FILE__ . '?net.stubbles.star.StarClassRegistry'; ?>${stubClassLoader}" 
     170         preface="<?php require 'star://' . __FILE__ . '?org::stubbles::star::StarClassRegistry'; ?>${stubClassLoader}" 
    171171         baseSrcPath="${stubbles.base.dir}/src/main"> 
    172172      <starDecorator starId="xsl/master.xsl" dir="." class="MasterXslStarFile" /> 
    …… 
    175175        <include name="**/*.xml" /> 
    176176        <include name="**/*.xsl" /> 
    177         <exclude name="**/star/StarArchive.php" /> 
    178         <include name="**/star/StarClassRegistry.php" /> 
    179         <exclude name="**/star/StarConsole.php" /> 
    180         <exclude name="**/star/StarException.php" /> 
    181         <exclude name="**/star/StarFile.php" /> 
    182         <exclude name="**/star/StarStreamWrapper.php" /> 
    183         <exclude name="**/star/StarWriter.php" /> 
    184177        <exclude name="**/remote/**" /> 
    185         <exclude name="**/org/**" /> 
     178        <exclude name="**/org/simpletest/**" /> 
     179        <exclude name="**/org/stubbles/codeSniffer/**" /> 
     180        <exclude name="**/org/stubbles/examples/**" /> 
     181        <exclude name="**/org/stubbles/phing/**" /> 
     182        <exclude name="**/org/stubbles/test/**" /> 
     183        <exclude name="**/org/stubbles/star/LICENSE" /> 
     184        <exclude name="**/org/stubbles/star/StarArchive.php" /> 
     185        <include name="**/org/stubbles/star/StarClassRegistry.php" /> 
     186        <exclude name="**/org/stubbles/star/StarConsole.php" /> 
     187        <exclude name="**/org/stubbles/star/StarException.php" /> 
     188        <exclude name="**/org/stubbles/star/StarFile.php" /> 
     189        <exclude name="**/org/stubbles/star/StarStreamWrapper.php" /> 
     190        <exclude name="**/org/stubbles/star/StarWriter.php" /> 
    186191        <exclude name="**/stubClassLoader.php" /> 
    187192        <exclude name="**/todo/**" /> 

  • trunk/src/main/php/org/stubbles/phing/tasks/stubStarWriterTask.php

    r1212 r1218  
    232232                        $srcDir = 'src' . DIRECTORY_SEPARATOR . 'main' . DIRECTORY_SEPARATOR . 'php' . DIRECTORY_SEPARATOR; 
    233233                        $pos    = strpos($fullFileName, $srcDir) + strlen($srcDir); 
    234                         $id     = str_replace(DIRECTORY_SEPARATOR, '.', str_replace('.php', '', substr($fullFileName, $pos))); 
     234                        $id     = str_replace(DIRECTORY_SEPARATOR, '::', str_replace('.php', '', substr($fullFileName, $pos))); 
    235235                    } else { 
    236236                        $srcDir = 'src' . DIRECTORY_SEPARATOR . 'main' . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR; 
    …… 
    269269        $starArchive->addMetaData('version', $this->version); 
    270270        $starArchive->addMetaData('author', $this->author); 
    271         $starArchive->addMetaData('copyright', '(c) ' . date('Y') . ' ' . $this->copyright); 
     271        $starArchive->addMetaData('copyright', '(c) 2007-' . date('Y') . ' ' . $this->copyright); 
    272272        $starArchive->create(); 
    273273    }