Online report : http://cocoon.zones.apache.org:12000/continuum/servlet/continuum/target/ProjectBuild.vm/view/ProjectBuild/id/52/buildId/1208 Build statistics: State: Ok Previous Build: No previous build. Started at: Sun, 24 Dec 2006 11:27:10 +0000 Finished at: Sun, 24 Dec 2006 11:27:15 +0000 Total time: 5s Build Trigger: Forced Exit code: 0 Building machine hostname: cocoon.zones.apache.org Operating system : SunOS(unknown) Java version : 1.4.2_06(Sun Microsystems Inc.)
Changes cziegeler Move deployment util to configuration module /cocoon/trunk/core/cocoon-configuration/cocoon-configuration-impl/src/main/java/org/apache/cocoon/configuration/impl/DeploymentUtil.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java:489702) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml cziegeler Make impl compilable /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl/DefaultEntityResolver.java cziegeler Move AbstractLogEnabled to util package Add new xml package /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/AbstractLogEnabled.java /cocoon/trunk/core/cocoon-util/pom.xml /cocoon/trunk/core/cocoon-util/src/main/java/org/apache/cocoon/util/AbstractLogEnabled.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/util/AbstractLogEnabled.java:489702) /cocoon/trunk/core/cocoon-xml /cocoon/trunk/core/cocoon-xml/cocoon-xml-api /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/pom.xml /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/xml /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/xml/DOMParser.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/DOMParser.java:489702) /cocoon/trunk/core/cocoon-xml/cocoon-xml-api/src/main/java/org/apache/cocoon/core/xml/SAXParser.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/SAXParser.java:489702) /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/pom.xml /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml /cocoon/trunk/core/cocoon-xml/cocoon-xml-impl/src/main/java/org/apache/cocoon/core/xml/impl (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/xml/impl:489702) /cocoon/trunk/core/cocoon-xml/pom.xml cziegeler Correct javadocs /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java vgritsenko javadoc errors /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java cziegeler Code cleanup /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/acting/CopySourceAction.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/sax/AbstractXMLByteStreamInterpreter.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/ReadNode.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/environment/http/HttpRequest.java cziegeler Use configured temporary directory for deployment /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java danielf Now the block context source works and Cocoon can be used from an unpacked war. * Fixed some bugs in the BlockContextSource and BlockContextSourceFactory. * Unpack the blocks in the webapp temp dir instead of inside the webapp. This should make it possible to run Cocoon from an unpacked war file. * Add configurations for BlockContextSourceFactory and for XPathTraverableGenerator and TraversableGenerator (used for traversing directories in the blockcontext). * Use the blockcontext: protocol in the blocks part of the cocoon-webapp sitemap.xmap /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java /cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-sitemapcomponents.xconf /cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/cocoon/avalon/cocoon-core-source-factories.xconf /cocoon/trunk/core/cocoon-webapp/src/main/webapp/blocks/sitemap.xmap giacomo get the running mode determination fixed /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/Settings.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/RunningModeHelper.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java danielf A block context source where the uris has the form blockcontext:/blockname/path. The block names are resolved to the paths to the COB-INF directories. Block name - path associations are made available from the DeployerUtil. The code is not tested yet. /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSource.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/source/impl/BlockContextSourceFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java lgawron do not load files from context://WEB-INF/cocoon/{spring|avalon|properties} If you do not like your configuration files placed in jars plase use any classpath location eg. WEB-INF/classes/META-INF/cocoon/{spring|avalon|properties} this means cocoon stops giving any special meaning to context://WEB-INF/cocoon/ directory. /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/cocoon.xconf cziegeler Minor changes /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/Constants.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java lgawron restructurization /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/avalon (from /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf:470836) /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/resources/COB-INF/config/xconf /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java lgawron proregisterPropertyPlaceholderConfigurer -> registerPropertyOverrideConfigurer reference current property/spring context locations /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java lgawron path tweaks /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java cziegeler Start support for reading configuration files directly from within the jars /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java cziegeler Continue deployment impl (not tested yet!) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java cziegeler Prototyp runtime deployment /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/deployment/DeploymentUtil.java cziegeler Refactoring and support modes for CocoonPropertyOverrideConfigurer /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonPropertyOverrideConfigurer.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ResourceUtils.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java cziegeler Remove unused stuff and make add possibility to specify running mode in spring application context (instead of using a system property) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/ContextHelper.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/LifecycleHelper.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd crossley Update to new Apache License header. /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/fam/SitemapMonitorImpl.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/store/impl/StoreJanitorImpl.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/NodeBuilderSelector.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/xslt/TraxProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/PropertyProvider.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/PropertyHelper.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/WiringNotFoundException.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonRequestAttributes.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonWebApplicationContext.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SitemapElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/TestBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationReader.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/SitemapHelper.java /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/util/PropertyHelperTestCase.java cziegeler Reduce defaut logging output of bootstrap Fix bug if root sitemap is not mounted in root directory /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingListener.java /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServlet.java /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/ShieldingServletFilter.java /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/classloader/AbstractClassLoaderFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/RequestUtil.java cziegeler Fix property handling Fix logging behaviour Clean up /cocoon/trunk/blocks/cocoon-hsqldb/cocoon-hsqldb-impl/src/main/resources/META-INF/properties/hsqldb.properties /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonContextFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonUtils.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ComponentContext.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ComponentContext.java:439550) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/ComponentContext.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/util/SimpleSourceResolver.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java cziegeler Simplify logging statements /cocoon/trunk/core/cocoon-bootstrap/src/main/java/org/apache/cocoon/bootstrap/servlet/BootstrapClassLoaderManager.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java cziegeler Create abstract base class /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AbstractSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonWebApplicationContext.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java cziegeler Fix attribute handling and read PropertyProvider support /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java cziegeler Allow own implementations for customizing settings Start new implementation for per sitemap factories /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SubSettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd cziegeler Finish first step of spring namespace handlers: cocoon can now simply be setup in any spring web application context. /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/AbstractPortalTestCase.java /cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/test/java/org/apache/cocoon/portal/event/impl/DefaultEventManagerTestCase.java /cocoon/trunk/blocks/cocoon-python/cocoon-python-impl/src/main/java/org/apache/cocoon/components/language/programming/python/PythonProgram.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/java/JavaProgram.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/components/language/programming/javascript/JavascriptProgram.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/xsp/handler/AbstractComponentHandler.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/xsp/handler/AbstractFactoryHandler.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/xsp/handler/ComponentFactory.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/xsp/handler/NonThreadSafePoolableComponentHandler.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/xsp/handler/SingleThreadedComponentHandler.java /cocoon/trunk/blocks/cocoon-xsp/cocoon-xsp-impl/src/main/java/org/apache/cocoon/xsp/handler/ThreadSafeComponentHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Constants.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/ProcessingUtil.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/Settings.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/SettingsDefaults.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/MutableSettings.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/configuration/impl/SettingsHelper.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonEnvironment.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceManager.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonBeanFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/CocoonNamespaceHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigReader.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigurationInfo.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonBeanPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonContextFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonElementParser.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonEnvironment.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonEnvironment.java:434410) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonNamespaceHandler.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceManager.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceManager.java:434510) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonServiceSelector.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/AvalonServiceSelector.java:434410) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ComponentInfo.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ComponentInfo.java:434410) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfo.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/ConfigurationInfo.java:434410) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigurationInfoFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/PoolableFactoryBean.java (from /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/PoolableFactoryBean.java:434410) /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSettings.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/generation/StatusGenerator.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServletListener.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/sitemap/SitemapServlet.java /cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.handlers /cocoon/trunk/core/cocoon-core/src/main/resources/META-INF/spring.schemas /cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon /cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/avalon/avalon.xsd /cocoon/trunk/core/cocoon-core/src/main/resources/org/apache/cocoon/core/container/spring/cocoon.xsd /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/CocoonTestCase.java /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapComponentTestCase.java /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/SitemapTestCase.java /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/TestPropertyProvider.java /cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java /cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/applicationContext.xml /cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/cocoon/properties/core.properties /cocoon/trunk/core/cocoon-webapp/src/main/webapp/WEB-INF/web.xml cziegeler We don't need settings for reading the config anymore /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonConfigurator.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java lgawron running mode name not constrained to prod, dev, test /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java cziegeler Add factory bean to create avalon context New implementation to read avalon style configuration files Update settings handling /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonContextFactoryBean.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/ConfigReader.java cziegeler Fix test application Context. New spring support: Settings is now created "the spring way" (through our property mechanism) and logger can be setup in application context as well /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/SettingsBeanFactoryPostProcessor.java /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon /cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/avalon/AvalonLoggerFactoryBean.java /cocoon/trunk/core/cocoon-webapp/src/main/webapp/samples/spring/conf/applicationContext.xml **************************************************************************** Output: **************************************************************************** [INFO] Scanning for projects... [INFO] ---------------------------------------------------------------------------- [INFO] Building Cocoon Core [modules] [INFO] task-segment: [clean, install] [INFO] ---------------------------------------------------------------------------- [INFO] [clean:clean] [INFO] [site:attach-descriptor] [INFO] [install:install] [INFO] Installing /home/maven/continuum-data/working-directory/52/pom.xml to /home/maven/.m2/repository/org/apache/cocoon/cocoon-core-modules/3-SNAPSHOT/cocoon-core-modules-3-SNAPSHOT.pom [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESSFUL [INFO] ------------------------------------------------------------------------ [INFO] Total time: 3 seconds [INFO] Finished at: Sun Dec 24 11:27:15 GMT 2006 [INFO] Final Memory: 6M/11M [INFO] ------------------------------------------------------------------------ ****************************************************************************