cziegeler    2004/05/25 00:28:26

  Modified:    src/java/org/apache/cocoon Processor.java Cocoon.java
                        ProcessorWrapper.java cocoon.roles
               src/blocks/profiler/java/org/apache/cocoon/components/profiler
                        ProfilingNonCachingProcessingPipeline.java
                        ProfilingCachingProcessingPipeline.java
               src/blocks/cron/java/org/apache/cocoon/components/cron
                        QuartzJobExecutor.java TestCronJob.java
               src/java/org/apache/cocoon/environment/commandline
                        AbstractCommandLineEnvironment.java
               src/blocks/forms/java/org/apache/cocoon/forms/binding
                        JavaScriptJXPathBinding.java
               src/java/org/apache/cocoon/environment
                        ForwardRedirector.java Environment.java
                        AbstractEnvironment.java Redirector.java
               src/java/org/apache/cocoon/components/source/impl
                        SitemapSource.java SitemapSourceFactory.java
               src/java/org/apache/cocoon/components ContextHelper.java
               src/java/org/apache/cocoon/components/treeprocessor/sitemap
                        ComponentsSelector.java MountNodeBuilder.java
                        SitemapLanguage.java MountNode.java
               src/java/org/apache/cocoon/environment/wrapper
                        EnvironmentWrapper.java
                        MutableEnvironmentFacade.java
               src/java/org/apache/cocoon/components/pipeline
                        AbstractProcessingPipeline.java
                        ProcessingPipeline.java
               src/test/org/apache/cocoon/environment/mock
                        MockEnvironment.java
               src/blocks/linotype/java/org/apache/cocoon/components
                        SourceRepository.java
               src/java/org/apache/cocoon/environment/http
                        HttpEnvironment.java
               src/java/org/apache/cocoon/components/treeprocessor
                        InvokeContext.java TreeProcessor.java
               src/documentation/xdocs/plan updating.xml
               src/java/org/apache/cocoon/bean CocoonWrapper.java
               src/test/org/apache/cocoon/transformation
                        CIncludeTransformerTestCase.java
                        XIncludeTransformerTestCase.java
                        I18NTransformerTestCase.java
               src/blocks/woody/java/org/apache/cocoon/woody/event/impl
                        JavaScriptWidgetListener.java
               src/blocks/portal/java/org/apache/cocoon/environment/portlet
                        PortletEnvironment.java
               src/blocks/woody/java/org/apache/cocoon/woody/binding
                        JavaScriptJXPathBinding.java
               src/java/org/apache/cocoon/components/source SourceUtil.java
               src/blocks/cron/java/org/apache/cocoon/environment/background
                        BackgroundEnvironment.java
               src/java/org/apache/cocoon/servlet CocoonServlet.java
               .        status.xml
  Added:       src/java/org/apache/cocoon/components/container
                        ComponentLocatorImpl.java
                        DefaultSitemapConfigurationHolder.java
                        CocoonComponentManager.java ComponentContext.java
                        ComponentManagerWrapper.java
               src/java/org/apache/cocoon/components/source/impl
                        SitemapSourceInfo.java
               src/java/org/apache/cocoon/environment/internal
                        EnvironmentInfo.java EnvironmentStack.java
                        EnvironmentHelper.java
               src/java/org/apache/cocoon/components/source
                        CocoonSourceResolver.java
  Removed:     src/java/org/apache/cocoon/sitemap SitemapRedirector.java
                        XSLTFactoryLoader.java
               src/java/org/apache/cocoon/components
                        GlobalRequestLifecycleComponent.java
                        DefaultSitemapConfigurationHolder.java
                        CocoonComponentManager.java
                        RequestLifecycleComponent.java
                        EnvironmentStack.java ComponentLocatorImpl.java
                        ComponentContext.java
               
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components
                        AbstractSessionComponent.java
  Log:
   Remove deprecated class AbstractSessionComponent from session block.
   Redesign the internal environment handling (request processing) and moved
   private classes into own packages.
   Remove deprecated RequestLifecycleComponent and 
GlobalRequestLifecycleComponent.
  This is a port of the changes done in the cocoon-2.2 repository. It is not 
finished/tested yet,
  so some things might not work at the moment
  
  Revision  Changes    Path
  1.8       +49 -4     cocoon-2.1/src/java/org/apache/cocoon/Processor.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/Processor.java.diff?r1=1.7&r2=1.8
  
  
  1.25      +45 -19    cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/Cocoon.java.diff?r1=1.24&r2=1.25
  
  
  1.6       +31 -19    
cocoon-2.1/src/java/org/apache/cocoon/ProcessorWrapper.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/ProcessorWrapper.java.diff?r1=1.5&r2=1.6
  
  
  1.16      +1 -1      cocoon-2.1/src/java/org/apache/cocoon/cocoon.roles
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/cocoon.roles.diff?r1=1.15&r2=1.16
  
  
  1.8       +4 -4      
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingNonCachingProcessingPipeline.java.diff?r1=1.7&r2=1.8
  
  
  1.8       +4 -4      
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilingCachingProcessingPipeline.java.diff?r1=1.7&r2=1.8
  
  
  1.8       +6 -11     
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/QuartzJobExecutor.java.diff?r1=1.7&r2=1.8
  
  
  1.8       +2 -2      
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/TestCronJob.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/components/cron/TestCronJob.java.diff?r1=1.7&r2=1.8
  
  
  1.7       +57 -61    
cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/commandline/AbstractCommandLineEnvironment.java.diff?r1=1.6&r2=1.7
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentLocatorImpl.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentLocatorImpl.java?rev=1.1
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/container/DefaultSitemapConfigurationHolder.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/DefaultSitemapConfigurationHolder.java?rev=1.1
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/container/CocoonComponentManager.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/CocoonComponentManager.java?rev=1.1
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentContext.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentContext.java?rev=1.1
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentManagerWrapper.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/ComponentManagerWrapper.java?rev=1.1
  
  
  1.6       +4 -4      
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java.diff?r1=1.5&r2=1.6
  
  
  1.14      +56 -13    
cocoon-2.1/src/java/org/apache/cocoon/environment/ForwardRedirector.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/ForwardRedirector.java.diff?r1=1.13&r2=1.14
  
  
  1.9       +6 -22     
cocoon-2.1/src/java/org/apache/cocoon/environment/Environment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Environment.java.diff?r1=1.8&r2=1.9
  
  
  1.22      +48 -285   
cocoon-2.1/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/AbstractEnvironment.java.diff?r1=1.21&r2=1.22
  
  
  1.4       +2 -2      
cocoon-2.1/src/java/org/apache/cocoon/environment/Redirector.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/Redirector.java.diff?r1=1.3&r2=1.4
  
  
  1.19      +67 -139   
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java.diff?r1=1.18&r2=1.19
  
  
  1.4       +18 -14    
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSourceFactory.java.diff?r1=1.3&r2=1.4
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSourceInfo.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSourceInfo.java?rev=1.1
  
  
  1.7       +4 -1      
cocoon-2.1/src/java/org/apache/cocoon/components/ContextHelper.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/ContextHelper.java.diff?r1=1.6&r2=1.7
  
  
  1.10      +2 -2      
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ComponentsSelector.java.diff?r1=1.9&r2=1.10
  
  
  1.3       +3 -3      
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNodeBuilder.java.diff?r1=1.2&r2=1.3
  
  
  1.11      +2 -2      
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java.diff?r1=1.10&r2=1.11
  
  
  1.13      +22 -42    
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MountNode.java.diff?r1=1.12&r2=1.13
  
  
  1.17      +35 -203   
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java.diff?r1=1.16&r2=1.17
  
  
  1.10      +11 -81    
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java.diff?r1=1.9&r2=1.10
  
  
  1.23      +13 -21    
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java.diff?r1=1.22&r2=1.23
  
  
  1.5       +1 -9      
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/ProcessingPipeline.java.diff?r1=1.4&r2=1.5
  
  
  1.9       +4 -58     
cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockEnvironment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockEnvironment.java.diff?r1=1.8&r2=1.9
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentInfo.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentInfo.java?rev=1.1
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentStack.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentStack.java?rev=1.1
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java?rev=1.1
  
  
  1.5       +7 -6      
cocoon-2.1/src/blocks/linotype/java/org/apache/cocoon/components/SourceRepository.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/linotype/java/org/apache/cocoon/components/SourceRepository.java.diff?r1=1.4&r2=1.5
  
  
  1.16      +15 -60    
cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/environment/http/HttpEnvironment.java.diff?r1=1.15&r2=1.16
  
  
  1.6       +67 -33    
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/InvokeContext.java.diff?r1=1.5&r2=1.6
  
  
  1.27      +108 -56   
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java.diff?r1=1.26&r2=1.27
  
  
  1.12      +15 -0     cocoon-2.1/src/documentation/xdocs/plan/updating.xml
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/documentation/xdocs/plan/updating.xml.diff?r1=1.11&r2=1.12
  
  
  1.13      +3 -1      
cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonWrapper.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/bean/CocoonWrapper.java.diff?r1=1.12&r2=1.13
  
  
  1.3       +12 -17    
cocoon-2.1/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/test/org/apache/cocoon/transformation/CIncludeTransformerTestCase.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +9 -12     
cocoon-2.1/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/test/org/apache/cocoon/transformation/XIncludeTransformerTestCase.java.diff?r1=1.2&r2=1.3
  
  
  1.3       +9 -12     
cocoon-2.1/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/test/org/apache/cocoon/transformation/I18NTransformerTestCase.java.diff?r1=1.2&r2=1.3
  
  
  1.10      +3 -3      
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaScriptWidgetListener.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/event/impl/JavaScriptWidgetListener.java.diff?r1=1.9&r2=1.10
  
  
  1.4       +5 -51     
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java.diff?r1=1.3&r2=1.4
  
  
  1.14      +4 -4      
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JavaScriptJXPathBinding.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/binding/JavaScriptJXPathBinding.java.diff?r1=1.13&r2=1.14
  
  
  1.18      +13 -13    
cocoon-2.1/src/java/org/apache/cocoon/components/source/SourceUtil.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/SourceUtil.java.diff?r1=1.17&r2=1.18
  
  
  1.1                  
cocoon-2.1/src/java/org/apache/cocoon/components/source/CocoonSourceResolver.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/CocoonSourceResolver.java?rev=1.1
  
  
  1.5       +22 -12    
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java.diff?r1=1.4&r2=1.5
  
  
  1.29      +4 -2      
cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java
  
  
http://cvs.apache.org/viewcvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/CocoonServlet.java.diff?r1=1.28&r2=1.29
  
  
  1.338     +11 -1     cocoon-2.1/status.xml
  
  http://cvs.apache.org/viewcvs/cocoon-2.1/status.xml.diff?r1=1.337&r2=1.338
  
  

Reply via email to