Changeset 1210

Show
Ignore:
Timestamp:
01/11/08 09:22:24 (7 months ago)
Author:
mikey
Message:

implemented refactoring #120: move net::stubbles::star to org::stubbles::star

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/star/build.php

    r122 r1210  
    22$saveDir = getcwd(); 
    33chdir(dirname(__FILE__) . '/../../'); 
    4 require 'src/main/php/net/stubbles/star/StarException.php'; 
    5 require 'src/main/php/net/stubbles/star/StarFile.php'; 
    6 require 'src/main/php/net/stubbles/star/StarWriter.php'; 
    7 require 'src/main/php/net/stubbles/star/StarArchive.php'; 
    8 require 'src/main/php/net/stubbles/star/StarConsole.php'; 
     4require 'src/main/php/org/stubbles/star/StarException.php'; 
     5require 'src/main/php/org/stubbles/star/StarFile.php'; 
     6require 'src/main/php/org/stubbles/star/StarWriter.php'; 
     7require 'src/main/php/org/stubbles/star/StarArchive.php'; 
     8require 'src/main/php/org/stubbles/star/StarConsole.php'; 
    99StarConsole::main(); 
    1010chdir($saveDir); 

  • trunk/build/star/build.xml

    r1128 r1210  
    11<?xml version="1.0"?> 
    2 <project name="star" basedir="." default="main"> 
    3   <property name="build.base.dir" value="${project.basedir}/build" /> 
    4   <property name="pkg.dir" value="${project.basedir}/../../src/main/php/net/stubbles/star" /> 
     2<project name="star" default="main"> 
     3  <property name="build.base.dir" value="${stubbles.base.dir}/build/star/build" override="true"/> 
     4  <property name="pkg.dir" value="${stubbles.base.dir}/src/main/php/org/stubbles/star" /> 
    55  <property name="pkg.name" value="star-${version}"/> 
    66  <property name="build.src.dir" value="${build.base.dir}/${pkg.name}"/> 
    7   <taskDef name="mySimpletest" classname="MySimpleTestTask" classpath="${project.basedir}/../../src/test" /> 
     7  <taskDef name="mySimpletest" classname="MySimpleTestTask" classpath="${stubbles.base.dir}/src/test" /> 
    88 
    99  <target name="main" if="version" depends="test,build"/> 
    …… 
    4040    <echo>| Creating star files       |</echo> 
    4141    <echo>-----------------------------</echo> 
    42  
    43     <echo message="Base directory  : ${project.basedir}"/> 
    44     <echo message="Source directory: ${build.src.dir}"/> 
    45  
    46     <exec command="php &quot;${project.basedir}/build.php&quot; -i &quot;${project.basedir}/compile-writer-archive.ini&quot; -t &quot;${build.src.dir}/starWriter.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
    47     <exec command="php &quot;${project.basedir}/build.php&quot; -i &quot;${project.basedir}/compile-writer-cli.ini&quot; -t &quot;${build.src.dir}/starWriter-cli.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
    48     <exec command="php &quot;${project.basedir}/build.php&quot; -i &quot;${project.basedir}/compile-reader.ini&quot; -t &quot;${build.src.dir}/starReader.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
     42    <exec command="php &quot;${stubbles.base.dir}/build/star/build.php&quot; -i &quot;${stubbles.base.dir}/build/star/compile-writer-archive.ini&quot; -t &quot;${build.src.dir}/starWriter.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
     43    <exec command="php &quot;${stubbles.base.dir}/build/star/build.php&quot; -i &quot;${stubbles.base.dir}/build/star/compile-writer-cli.ini&quot; -t &quot;${build.src.dir}/starWriter-cli.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
     44    <exec command="php &quot;${stubbles.base.dir}/build/star/build.php&quot; -i &quot;${stubbles.base.dir}/build/star/compile-reader.ini&quot; -t &quot;${build.src.dir}/starReader.php&quot; -r &quot;${pkg.dir}&quot;" passthru="true" /> 
    4945  </target> 
    5046 
    …… 
    5349    <echo>| Creating TAR packages     |</echo> 
    5450    <echo>-----------------------------</echo> 
    55  
    5651    <property name="tgzfile" value="${build.base.dir}/${pkg.name}.tgz"/> 
    5752    <delete file="${tgzfile}"/> 
    …… 
    6257    </tar> 
    6358  </target> 
     59 
    6460  <target name="test" description="run test suite"> 
    65     <mySimpletest testfile="&quot;${project.basedir}/../../src/test/php/net/stubbles/star/run.php&quot;" exit="true" /> 
     61    <mySimpletest testfile="&quot;${stubbles.base.dir}/src/test/php/org/stubbles/star/run.php&quot;" exit="true" /> 
    6662  </target> 
    6763</project> 

  • trunk/build/star/compile-reader.ini

    r235 r1210  
    33 
    44[INCLUDES] 
    5 net.stubbles.star.StarClassRegistry="src/main/php/net/stubbles/star/StarClassRegistry.php" 
     5org::stubbles::star::StarClassRegistry="src/main/php/org/stubbles/star/StarClassRegistry.php" 
    66 
    77[PREFACE] 
    …… 
    1010[META-INF] 
    1111title = "Stubbles Archive Reader" 
    12 package = "net.stubbles.star" 
    13 version = "0.5.0" 
     12package = "org::stubbles::star" 
     13version = "0.6.0" 
    1414author = "Stubbles Development Team <http://stubbles.net> 
    15 copyright = "© 2007 Stubbles Development Team" 
     15copyright = "© 2007-2008 Stubbles Development Team" 

  • trunk/build/star/compile-writer-archive.ini

    r235 r1210  
    33 
    44[INCLUDES] 
    5 net.stubbles.star.StarFile="src/main/php/net/stubbles/star/StarFile.php" 
    6 net.stubbles.star.StarWriter="src/main/php/net/stubbles/star/StarWriter.php" 
    7 net.stubbles.star.StarArchive="src/main/php/net/stubbles/star/StarArchive.php" 
    8 net.stubbles.star.StarClassRegistry="src/main/php/net/stubbles/star/StarClassRegistry.php" 
    9 net.stubbles.star.StarConsole="src/main/php/net/stubbles/star/StarConsole.php" 
     5org::stubbles::star::StarFile="src/main/php/org/stubbles/star/StarFile.php" 
     6org::stubbles::star::StarWriter="src/main/php/org/stubbles/star/StarWriter.php" 
     7org::stubbles::star::StarArchive="src/main/php/org/stubbles/star/StarArchive.php" 
     8org::stubbles::star::StarClassRegistry="src/main/php/org/stubbles/star/StarClassRegistry.php" 
     9org::stubbles::star::StarConsole="src/main/php/org/stubbles/star/StarConsole.php" 
    1010 
    1111[PREFACE] 
    …… 
    1414[META-INF] 
    1515title = "Stubbles Archive Writer" 
    16 package = "net.stubbles.star" 
    17 version = "0.5.0" 
     16package = "org::stubbles::star" 
     17version = "0.6.0" 
    1818author = "Stubbles Development Team <http://stubbles.net> 
    19 copyright = "© 2007 Stubbles Development Team" 
     19copyright = "© 2007-2008 Stubbles Development Team" 

  • trunk/build/star/compile-writer-cli.ini

    r235 r1210  
    33 
    44[INCLUDES] 
    5 net.stubbles.star.StarFile="src/main/php/net/stubbles/star/StarFile.php" 
    6 net.stubbles.star.StarWriter="src/main/php/net/stubbles/star/StarWriter.php" 
    7 net.stubbles.star.StarArchive="src/main/php/net/stubbles/star/StarArchive.php" 
    8 net.stubbles.star.StarClassRegistry="src/main/php/net/stubbles/star/StarClassRegistry.php" 
    9 net.stubbles.star.StarConsole="src/main/php/net/stubbles/star/StarConsole.php" 
     5org::stubbles::star::StarFile="src/main/php/org/stubbles/star/StarFile.php" 
     6org::stubbles::star::StarWriter="src/main/php/org/stubbles/star/StarWriter.php" 
     7org::stubbles::star::StarArchive="src/main/php/org/stubbles/star/StarArchive.php" 
     8org::stubbles::star::StarClassRegistry="src/main/php/org/stubbles/star/StarClassRegistry.php" 
     9org::stubbles::star::StarConsole="src/main/php/org/stubbles/star/StarConsole.php" 
    1010 
    1111[PREFACE] 
    …… 
    1515[META-INF] 
    1616title = "Stubbles Archive CLI Writer" 
    17 package = "net.stubbles.star" 
    18 version = "0.5.0" 
     17package = "org::stubbles::star" 
     18version = "0.6.0" 
    1919author = "Stubbles Development Team <http://stubbles.net> 
    20 copyright = "© 2007 Stubbles Development Team" 
     20copyright = "© 2007-2008 Stubbles Development Team" 

  • trunk/build/star/preface-reader.php

    r115 r1210  
    11<?php 
    2 require 'star://' . __FILE__ . '?net.stubbles.star.StarClassRegistry'; 
     2require 'star://' . __FILE__ . '?org::stubbles::star::StarClassRegistry'; 
    33?> 

  • trunk/build/star/preface-writer.php

    r218 r1210  
    11<?php 
    2 require 'star://' . __FILE__ . '?net.stubbles.star.StarFile'; 
    3 require 'star://' . __FILE__ . '?net.stubbles.star.StarWriter'; 
    4 require 'star://' . __FILE__ . '?net.stubbles.star.StarArchive'; 
    5 require 'star://' . __FILE__ . '?net.stubbles.star.StarClassRegistry'; 
    6 require 'star://' . __FILE__ . '?net.stubbles.star.StarConsole'; 
     2require 'star://' . __FILE__ . '?org::stubbles::star::StarFile'; 
     3require 'star://' . __FILE__ . '?org::stubbles::star::StarWriter'; 
     4require 'star://' . __FILE__ . '?org::stubbles::star::StarArchive'; 
     5require 'star://' . __FILE__ . '?org::stubbles::star::StarClassRegistry'; 
     6require 'star://' . __FILE__ . '?org::stubbles::star::StarConsole'; 
    77?> 

  • trunk/src/main/php/org/stubbles/star/LICENSE

    r218 r1210  
    1 Copyright (c) 2007, stubbles Development Team 
     1Copyright (c) 2007-2008, stubbles Development Team 
    22All rights reserved. 
    33 
    …… 
    4141This is the licence's text: 
    4242---------------------------------------------------------------------- 
    43 Copyright (c) 2001-2007, XP-Framework Team 
     43Copyright (c) 2001-2008, XP-Framework Team 
    4444All rights reserved. 
    4545 

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

    r984 r1210  
    154154        if (count(self::$libPathes) == 0) { 
    155155            if (substr(__FILE__, 0, 7) === 'star://') { 
    156                 $path = str_replace('star://', '', str_replace('?net.stubbles.star.StarClassRegistry', '', __FILE__)); 
     156                $path = str_replace('star://', '', str_replace('?org::stubbles::star::StarClassRegistry', '', __FILE__)); 
    157157                self::$libPathes[dirname($path)] = true; 
    158158            } else { 

  • trunk/src/test/php/org/stubbles/star/StarFileTestCase.php

    r237 r1210  
    11<?php 
    22/** 
    3  * Tests for net.stubbles.star.StarFile 
     3 * Tests for org::stubbles::star::StarFile. 
    44 * 
    55 * @author      Frank Kleine <mikey@stubbles.net> 
    …… 
    77 * @subpackage  star_test 
    88 */ 
    9 stubClassLoader::load('net.stubbles.star.StarFile'); 
     9stubClassLoader::load('org::stubbles::star::StarFile'); 
    1010/** 
    11  * Tests for net.stubbles.star.StarFile 
     11 * Tests for norg::stubbles::star::StarFile. 
    1212 * 
    1313 * @package     stubbles 

  • trunk/src/test/php/org/stubbles/star/run.php

    r162 r1210  
    11<?php 
    22/** 
    3  * Test runner for net.stubbles.star. 
     3 * Test runner for org::stubbles::star. 
    44 * 
    55 * @author      Frank Kleine <<mikey@stubbles.net>> 
    …… 
    88 */ 
    99define('TEST_SRC_PATH', dirname(__FILE__)); 
    10 require TEST_SRC_PATH . '/../../../../../../config/php/config.php'; 
    11 require TEST_SRC_PATH . '/../../../../../main/php/org/simpletest/unit_tester.php'; 
    12 require TEST_SRC_PATH . '/../../../../../main/php/org/simpletest/mock_objects.php'; 
    13 require TEST_SRC_PATH . '/../../../../../main/php/org/simpletest/reporter.php'; 
    14 require TEST_SRC_PATH . '/../../../../../main/php/net/stubbles/stubClassLoader.php'; 
     10require_once TEST_SRC_PATH . '/../../../../../../config/php/config.php'; 
     11require_once TEST_SRC_PATH . '/../../../../../main/php/org/simpletest/unit_tester.php'; 
     12require_once TEST_SRC_PATH . '/../../../../../main/php/org/simpletest/mock_objects.php'; 
     13require_once TEST_SRC_PATH . '/../../../../../main/php/org/simpletest/reporter.php'; 
     14require_once TEST_SRC_PATH . '/../../../../../main/php/net/stubbles/stubClassLoader.php'; 
    1515/** 
    16  * Test runner for net.stubbles.star. 
     16 * Test runner for org::stubbles::star. 
    1717 * 
    1818 * @package     stubbles