Changeset 1392

Show
Ignore:
Timestamp:
03/03/08 13:32:20 (6 months ago)
Author:
mikey
Message:

implemented enhancement #125 part 3: reworked resource handling, updated example

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/examples/config/xml/interceptors-xml.xml

    r1391 r1392  
    44    xmlns="http://stubbles.net/ipo/interceptors"> 
    55  <preInterceptors> 
    6     <preInterceptor type="net::stubbles::websites::xml::stubShowLastXMLInterceptor" /> 
    7     <preInterceptor type="net::stubbles::ioc::stubIOCPreInterceptor" /> 
    8     <preInterceptor type="net::stubbles::websites::variantmanager::stubVariantsPreInterceptor" /> 
     6    <preInterceptor type="net::stubbles::websites::xml::stubShowLastXMLInterceptor"/> 
     7    <preInterceptor type="net::stubbles::ioc::stubIOCPreInterceptor"/> 
     8    <preInterceptor type="org::stubbles::examples::ioc::MyIOCPreInterceptor"/> 
     9    <preInterceptor type="net::stubbles::websites::variantmanager::stubVariantsPreInterceptor"/> 
    910  </preInterceptors> 
    1011  <postInterceptors> 
    11     <postInterceptor type="net::stubbles::websites::xml::stubShowLastXMLInterceptor" /> 
    12     <postInterceptor type="net::stubbles::websites::xml::stubXMLPostInterceptor" /> 
     12    <postInterceptor type="net::stubbles::websites::xml::stubShowLastXMLInterceptor"/> 
     13    <postInterceptor type="net::stubbles::websites::xml::stubXMLPostInterceptor"/> 
    1314  </postInterceptors> 
    1415</xj:configuration> 

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

    r1232 r1392  
    99    </properties> 
    1010    <resources> 
    11       <resource name="counter">org::stubbles::examples::resources::MyResource</resource> 
     11      <resource name="counter">MyResource</resource> 
    1212    </resources> 
    13     <xmlElement type="org::stubbles::examples::pageelements::TestXMLPageElement" name="Test" /> 
     13    <xmlElement type="org::stubbles::examples::pageelements::TestXMLPageElement" name="Test"/> 
    1414 
    1515    <xmlElementCachingDecorator lifetime="60"> 
    16       <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="cached" /> 
     16      <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="cached"/> 
    1717    </xmlElementCachingDecorator> 
    18     <xmlElement type="org::stubbles::examples::pageelements::CurrentTimeXMLPageElement" name="uncached" /> 
    19     <xmlElement type="org::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/src/main/php/net/stubbles/websites/xml/stubXMLProcessor.php

    r1360 r1392  
    6767        foreach ($elements as $name => $element) { 
    6868            $prefixRequest->setPrefix($name); 
    69             if ($injector != null) { 
     69            if (null !== $injector) { 
    7070                $injector->handleInjections($element); 
    7171            } 
    …… 
    9191 
    9292        // write resources 
    93         $resourceManager = stubRegistry::get('net.stubbles.ipo.session.resourcemanager.stubSessionResourceManager'); 
    94         if ($resourceManager !== null) { 
     93        if (null !== $injector) { 
    9594            $xmlStreamWriter->writeStartElement('resources'); 
    9695            foreach ($page->getResources() as $name => $interface) { 
    97                 $resource = $resourceManager->getResource($interface); 
     96                $resource = $injector->getInstance($interface); 
    9897                $xmlSerializer->serialize($resource, $xmlStreamWriter, array(stubXMLSerializer::OPT_ROOT_TAG => $name)); 
    9998            } 
    100              
    101             $xmlStreamWriter->writeEndElement(); 
    102         } 
    103  
     99        } 
     100         
     101        $xmlStreamWriter->writeEndElement(); 
    104102        $this->response->setXMLStreamWriter($xmlStreamWriter); 
    105103    }