Changeset 1156

Show
Ignore:
Timestamp:
12/15/07 19:31:21 (8 months ago)
Author:
mikey
Message:

moved example classes from net::stubbles::examples to org::stubbles::examples

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/stubbles/build.xml

    r1153 r1156  
    124124    <echo>| Copying examples          |</echo> 
    125125    <echo>-----------------------------</echo> 
    126     <mkdir dir="${build.src.dir}/src/main/php/net" /> 
    127     <mkdir dir="${build.src.dir}/src/main/php/net/stubbles" /> 
    128     <mkdir dir="${build.src.dir}/src/main/php/net/stubbles/examples" /> 
    129     <copy todir="${build.src.dir}/src/main/php/net/stubbles/examples"> 
    130       <fileset dir="${stubbles.base.dir}/src/main/php/net/stubbles/examples"> 
     126    <mkdir dir="${build.src.dir}/src/main/php/org" /> 
     127    <mkdir dir="${build.src.dir}/src/main/php/org/stubbles" /> 
     128    <mkdir dir="${build.src.dir}/src/main/php/org/stubbles/examples" /> 
     129    <copy todir="${build.src.dir}/src/main/php/org/stubbles/examples"> 
     130      <fileset dir="${stubbles.base.dir}/src/main/php/org/stubbles/examples"> 
    131131        <include name="**/*.php"/> 
    132132      </fileset> 
    …… 
    182182        <exclude name="**/star/StarStreamWrapper.php" /> 
    183183        <exclude name="**/star/StarWriter.php" /> 
    184         <exclude name="**/de/**" /> 
    185         <exclude name="**/examples/**" /> 
    186         <exclude name="**/info/**" /> 
    187184        <exclude name="**/org/**" /> 
    188185        <exclude name="**/stubClassLoader.php" /> 

  • trunk/config/xml/events.xml

    r1035 r1156  
    66  <dispatcher id="test"> 
    77    <register eventName="onLogin"> 
    8       <eventListener type="net.stubbles.examples.events.UserLoginLogging"/> 
     8      <eventListener type="org.stubbles.examples.events.UserLoginLogging"/> 
    99    </register> 
    1010    <registerLazy eventName="onLogin"> 
    11       <lazyEventListener class="net.stubbles.examples.events.BlackList"/> 
     11      <lazyEventListener class="org.stubbles.examples.events.BlackList"/> 
    1212    </registerLazy> 
    1313    <registerCallback eventName="onLoginSubmit"> 
    14       <callbackListener class="net.stubbles.examples.events.Auth" method="isValid" autoRemove="false"/> 
     14      <callbackListener class="org.stubbles.examples.events.Auth" method="isValid" autoRemove="false"/> 
    1515    </registerCallback> 
    1616  </dispatcher> 

  • trunk/config/xml/json-rpc-service.xml

    r1124 r1156  
    55  <service-url>${jsonrpc.service.url}</service-url> 
    66  <services> 
    7     <service name="MathService" className="net.stubbles.examples.service.MathService"/> 
    8     <service name="NameService" className="net.stubbles.examples.service.RememberNameService"/> 
     7    <service name="MathService" className="org.stubbles.examples.service.MathService"/> 
     8    <service name="NameService" className="org.stubbles.examples.service.RememberNameService"/> 
    99  </services> 
    1010</xj:configuration> 

  • trunk/config/xml/session-resources.xml

    r904 r1156  
    55    xmlns="http://stubbles.net/ipo/session-resources"> 
    66  <resources> 
    7     <resource class="net.stubbles.examples.resources.MyResourceImpl"> 
    8       <implements>net.stubbles.examples.resources.MyResource</implements> 
     7    <resource class="org.stubbles.examples.resources.MyResourceImpl"> 
     8      <implements>org.stubbles.examples.resources.MyResource</implements> 
    99    </resource> 
    1010  </resources> 

  • trunk/examples/config/xml/json-rpc-service.xml

    r1124 r1156  
    55  <service-url>http://localhost/?processor=jsonrpc</service-url> 
    66  <services> 
    7     <service name="MathService" className="net.stubbles.examples.service.MathService"/> 
    8     <service name="NameService" className="net.stubbles.examples.service.RememberNameService"/> 
     7    <service name="MathService" className="org.stubbles.examples.service.MathService"/> 
     8    <service name="NameService" className="org.stubbles.examples.service.RememberNameService"/> 
    99  </services> 
    1010</xj:configuration> 

  • trunk/examples/config/xml/session-resources.xml

    r904 r1156  
    55    xmlns="http://stubbles.net/ipo/session-resources"> 
    66  <resources> 
    7     <resource class="net.stubbles.examples.resources.MyResourceImpl"> 
    8       <implements>net.stubbles.examples.resources.MyResource</implements> 
     7    <resource class="org.stubbles.examples.resources.MyResourceImpl"> 
     8      <implements>org.stubbles.examples.resources.MyResource</implements> 
    99    </resource> 
    1010  </resources> 

  • trunk/examples/docroot/events/index.php

    r681 r1156  
    55require '../bootstrap-stubbles.php'; 
    66stubClassLoader::load('net.stubbles.events.events', 
    7                       'net.stubbles.examples.events.Auth', 
    8                       'net.stubbles.examples.events.BlackList', 
    9                       'net.stubbles.examples.events.UserLoginLogging' 
     7                      'org.stubbles.examples.events.Auth', 
     8                      'org.stubbles.examples.events.BlackList', 
     9                      'org.stubbles.examples.events.UserLoginLogging' 
    1010); 
    1111class Bootstrap 

  • trunk/examples/pages/conf/index.xml

    r927 r1156  
    99    </properties> 
    1010    <resources> 
    11       <resource name="counter">net.stubbles.examples.resources.MyResource</resource> 
     11      <resource name="counter">org.stubbles.examples.resources.MyResource</resource> 
    1212    </resources> 
    13     <xmlElement type="net.stubbles.examples.pageelements.TestXMLPageElement" name="Test" /> 
     13    <xmlElement type="org.stubbles.examples.pageelements.TestXMLPageElement" name="Test" /> 
    1414 
    1515    <xmlElementCachingDecorator lifetime="60"> 
    16       <xmlElement type="net.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="cached" /> 
     16      <xmlElement type="org.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="cached" /> 
    1717    </xmlElementCachingDecorator> 
    18     <xmlElement type="net.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" /> 
    19     <xmlElement type="net.stubbles.examples.pageelements.TestElementWithInjectedResource" name="counter" /> 
     18    <xmlElement type="org.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" /> 
     19    <xmlElement type="org.stubbles.examples.pageelements.TestElementWithInjectedResource" name="counter" /> 
    2020 
    2121    <xmlPassThru fileName="test.xml" name="passThru"> 

  • trunk/examples/pages/conf/shop.xml

    r1075 r1156  
    99    </properties> 
    1010 
    11     <xmlElement type="net.stubbles.examples.pageelements.TestShopPageElement" name="shopData"/> 
     11    <xmlElement type="org.stubbles.examples.pageelements.TestShopPageElement" name="shopData"/> 
    1212  </page> 
    1313</xj:configuration> 

  • trunk/pages/conf/form.xml

    r749 r1156  
    77      <property name="skin">default</property> 
    88    </properties> 
    9     <element type="net.stubbles.examples.pageelements.TestXMLPageElement" name="Test" /> 
     9    <element type="org.stubbles.examples.pageelements.TestXMLPageElement" name="Test" /> 
    1010  </page> 
    1111</xj:configuration> 

  • trunk/pages/conf/index.xml

    r749 r1156  
    77      <property name="skin">default</property> 
    88    </properties> 
    9     <xmlElement type="net.stubbles.examples.pageelements.TestXMLPageElement" name="Test" /> 
     9    <xmlElement type="org.stubbles.examples.pageelements.TestXMLPageElement" name="Test" /> 
    1010 
    1111    <xmlElementCachingDecorator lifetime="60"> 
    12       <xmlElement type="net.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="cached" /> 
     12      <xmlElement type="org.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="cached" /> 
    1313    </xmlElementCachingDecorator> 
    14     <xmlElement type="net.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" /> 
     14    <xmlElement type="org.stubbles.examples.pageelements.CurrentTimeXMLPageElement" name="uncached" /> 
    1515  </page> 
    1616</xj:configuration> 

  • trunk/src/main/php/org/stubbles/examples/pageelements/TestElementWithInjectedResource.php

    r1110 r1156  
    99stubClassLoader::load('net.stubbles.websites.stubAbstractPageElement', 
    1010                      'net.stubbles.websites.xml.stubXMLPageElement', 
    11                       'net.stubbles.examples.resources.MyResource' 
     11                      'org.stubbles.examples.resources.MyResource' 
    1212); 
    1313/** 

  • trunk/src/main/php/org/stubbles/examples/resources/MyResourceImpl.php

    r906 r1156  
    11<?php 
    2 stubClassLoader::load('net.stubbles.examples.resources.MyResource'); 
     2stubClassLoader::load('org.stubbles.examples.resources.MyResource'); 
    33 
    44class MyResourceImpl extends stubSerializableObject implements MyResource { 

  • trunk/src/test/php/net/stubbles/integration/EventsTestCase.php

    r1035 r1156  
    2929        $this->assertIsA($onLogin['UserLoginLogging'], 'UserLoginLogging'); 
    3030        $this->assertIsA($onLogin['stubLazyEventListener'], 'stubLazyEventListener'); 
    31         $this->assertEqual($onLogin['stubLazyEventListener']->getLazyClassName(), 'net.stubbles.examples.events.BlackList'); 
     31        $this->assertEqual($onLogin['stubLazyEventListener']->getLazyClassName(), 'org.stubbles.examples.events.BlackList'); 
    3232         
    3333        $onLoginSubmit  = $testDispatcher->getListenerForEvent('onLoginSubmit'); 
    3434        $this->assertIsA($onLoginSubmit['stubCallbackListener'], 'stubCallbackListener'); 
    35         $this->assertEqual($onLoginSubmit['stubCallbackListener']->getCallbackClassName(), 'net.stubbles.examples.events.Auth'); 
     35        $this->assertEqual($onLoginSubmit['stubCallbackListener']->getCallbackClassName(), 'org.stubbles.examples.events.Auth'); 
    3636        $this->assertEqual($onLoginSubmit['stubCallbackListener']->getCallbackMethodName(), 'isValid'); 
    3737        $this->assertFalse($onLoginSubmit['stubCallbackListener']->autoremove()); 

  • trunk/src/test/php/net/stubbles/integration/stubPageXJConfFactoryTestCase.php

    r749 r1156  
    2727        $this->assertIsA($elements['Test'], 'TestXMLPageElement'); 
    2828        $this->assertIsA($elements['cached'], 'stubXMLPageElementCachingDecorator'); 
    29         $this->assertEqual($elements['cached']->getRequiredClassNames(), array('net.stubbles.examples.pageelements.CurrentTimeXMLPageElement')); 
     29        $this->assertEqual($elements['cached']->getRequiredClassNames(), array('org.stubbles.examples.pageelements.CurrentTimeXMLPageElement')); 
    3030        $this->assertIsA($elements['uncached'], 'CurrentTimeXMLPageElement'); 
    3131    } 

  • trunk/src/test/php/net/stubbles/service/jsonrpc/util/stubJsonRpcProxyGeneratorTestCase.php

    r675 r1156  
    2323    { 
    2424        $generator = new stubJsonRpcProxyGenerator('http://localhost/'); 
    25         $code = $generator->generateJavascriptProxy('net.stubbles.examples.service.MathService', 'MathService'); 
     25        $code = $generator->generateJavascriptProxy('org.stubbles.examples.service.MathService', 'MathService'); 
    2626        $expected = "function MathService(clientObj) { 
    2727 this.dispatcher = new stubbles.json.rpc.Client(clientObj, 'http://localhost/');