Return-Path: Delivered-To: apmail-cocoon-cvs-archive@www.apache.org Received: (qmail 63746 invoked from network); 2 Jul 2006 16:12:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Jul 2006 16:12:54 -0000 Received: (qmail 81782 invoked by uid 500); 2 Jul 2006 16:12:53 -0000 Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org Received: (qmail 81728 invoked by uid 500); 2 Jul 2006 16:12:53 -0000 Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@cocoon.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@cocoon.apache.org Received: (qmail 81713 invoked by uid 99); 2 Jul 2006 16:12:53 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2006 09:12:53 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Jul 2006 09:12:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 067D91A983A; Sun, 2 Jul 2006 09:12:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r418614 - in /cocoon/trunk: blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/ blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ blocks/cocoon-portal/cocoon-portal-imp... Date: Sun, 02 Jul 2006 16:12:30 -0000 To: cvs@cocoon.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060702161232.067D91A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: cziegeler Date: Sun Jul 2 09:12:28 2006 New Revision: 418614 URL: http://svn.apache.org/viewvc?rev=418614&view=rev Log: Delete obsolete classes and move cli and portlet env to own directories (these are not included in the build as they are not working anyway) Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/environment/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/environment/portlet/ - copied from r418563, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/portlet/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java - copied unchanged from r418563, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java - copied unchanged from r418563, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/portlet/PortletLogger.java - copied unchanged from r418563, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/PortletLogger.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java - copied unchanged from r418563, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-env/src/main/java/org/apache/cocoon/portlet/multipart/ - copied from r418563, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/multipart/ cocoon/trunk/core/cocoon-cli/ cocoon/trunk/core/cocoon-cli/src/ cocoon/trunk/core/cocoon-cli/src/main/ cocoon/trunk/core/cocoon-cli/src/main/java/ cocoon/trunk/core/cocoon-cli/src/main/java/org/ cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/ cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/ cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/bean/ cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/bean/BeanListener.java - copied unchanged from r418563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/BeanListener.java cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/bean/CocoonBean.java - copied unchanged from r418563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonBean.java cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java - copied unchanged from r418563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/bean/Target.java - copied unchanged from r418563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/Target.java cocoon/trunk/core/cocoon-cli/src/main/java/org/apache/cocoon/bean/helpers/ - copied from r418563, cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/helpers/ Removed: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/environment/portlet/ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/CocoonPortlet.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/ManagedCocoonPortlet.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/PortletLogger.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/SettingsHelper.java cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portlet/multipart/ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/Cocoon.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/CocoonAccess.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/BeanListener.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonBean.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/CocoonWrapper.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/Target.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/bean/helpers/ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/servlet/CocoonServlet.java Modified: 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/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/XmlConfigCreator.java cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java?rev=418614&r1=418613&r2=418614&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/CoreUtil.java Sun Jul 2 09:12:28 2006 @@ -612,7 +612,7 @@ env.settings = this.settings; ConfigurableBeanFactory rootContext = BeanFactoryUtil.createRootBeanFactory(env, this.environmentContext); ConfigurationInfo result = ConfigReader.readConfiguration(settings.getConfiguration(), env); - ConfigurableBeanFactory mainContext = BeanFactoryUtil.createBeanFactory(env, result, null, rootContext, true); + ConfigurableBeanFactory mainContext = BeanFactoryUtil.createBeanFactory(env, result, null, rootContext); this.settings.setCreationTime(System.currentTimeMillis()); return mainContext; Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java?rev=418614&r1=418613&r2=418614&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryFactoryImpl.java Sun Jul 2 09:12:28 2006 @@ -100,7 +100,7 @@ final ConfigurationInfo parentConfigInfo = (ConfigurationInfo) parentFactory .getBean(ConfigurationInfo.class.getName()); final ConfigurationInfo ci = ConfigReader.readConfiguration(config, parentConfigInfo, ae, resolver); - return BeanFactoryUtil.createBeanFactory(classLoader, ae, ci, resolver, parentFactory, false); + return BeanFactoryUtil.createBeanFactory(classLoader, ae, ci, resolver, parentFactory); } return parentFactory; } Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java?rev=418614&r1=418613&r2=418614&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/BeanFactoryUtil.java Sun Jul 2 09:12:28 2006 @@ -73,10 +73,9 @@ public static ConfigurableListableBeanFactory createBeanFactory(AvalonEnvironment env, ConfigurationInfo info, SourceResolver resolver, - BeanFactory parent, - boolean addCocoon) + BeanFactory parent) throws Exception { - return createBeanFactory(env, info, resolver, parent, addCocoon, true); + return createBeanFactory(env, info, resolver, parent, true); } /** @@ -92,10 +91,9 @@ AvalonEnvironment env, ConfigurationInfo info, SourceResolver resolver, - BeanFactory parent, - boolean addCocoon) + BeanFactory parent) throws Exception { - return createBeanFactory(classLoader, env, info, resolver, parent, addCocoon, true); + return createBeanFactory(classLoader, env, info, resolver, parent, true); } /** @@ -111,10 +109,9 @@ ConfigurationInfo info, SourceResolver resolver, BeanFactory parent, - boolean addCocoon, boolean preInstantiateSingletons) throws Exception { - return createBeanFactory(Thread.currentThread().getContextClassLoader(), env, info, resolver, parent, addCocoon, preInstantiateSingletons); + return createBeanFactory(Thread.currentThread().getContextClassLoader(), env, info, resolver, parent, preInstantiateSingletons); } /** @@ -131,7 +128,6 @@ ConfigurationInfo info, SourceResolver resolver, BeanFactory parent, - boolean addCocoon, boolean preInstantiateSingletons) throws Exception { final ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); @@ -139,7 +135,7 @@ if ( classLoader != null ) { Thread.currentThread().setContextClassLoader(classLoader); } - final String xmlConfig = (new XmlConfigCreator(env.logger)).createConfig(info, addCocoon); + final String xmlConfig = (new XmlConfigCreator(env.logger)).createConfig(info); Resource rsc = new ByteArrayResource(xmlConfig.getBytes("utf-8")); Logger logger = env.logger; if ( info.rootLogger != null ) { Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java?rev=418614&r1=418613&r2=418614&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/container/spring/XmlConfigCreator.java Sun Jul 2 09:12:28 2006 @@ -21,13 +21,9 @@ import java.util.Map; import org.apache.avalon.excalibur.pool.Poolable; -import org.apache.avalon.framework.context.Context; import org.apache.avalon.framework.logger.Logger; -import org.apache.avalon.framework.service.ServiceManager; import org.apache.avalon.framework.thread.ThreadSafe; -import org.apache.cocoon.Cocoon; import org.apache.cocoon.ProcessingUtil; -import org.apache.cocoon.Processor; import org.springframework.util.StringUtils; /** @@ -53,7 +49,7 @@ this.logger = log; } - public String createConfig(ConfigurationInfo info, boolean addCocoon) + public String createConfig(ConfigurationInfo info) throws Exception { final Map components = info.getComponents(); final List pooledRoles = new ArrayList(); @@ -177,27 +173,6 @@ this.appendAttribute(buffer, "alias", current.getAlias()); buffer.append("/>\n"); } - } - // add the Cocoon object to the root - if ( addCocoon ) { - buffer.append("\n"); - buffer.append(" \n"); - buffer.append(" \n"); - buffer.append(" \n"); - buffer.append(" \n"); - buffer.append("\n"); } buffer.append("\n"); Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java?rev=418614&r1=418613&r2=418614&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java (original) +++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/core/osgi/OSGiSpringECMFactory.java Sun Jul 2 09:12:28 2006 @@ -126,7 +126,7 @@ this.parentBeanfactory = BeanFactoryUtil.createRootBeanFactory(avalonEnvironment, osgiServletContext); ConfigurationInfo springBeanConfiguration = ConfigReader.readConfiguration(configFile, avalonEnvironment); this.beanFactory = BeanFactoryUtil.createBeanFactory(avalonEnvironment, springBeanConfiguration, - null, this.parentBeanfactory, false, false); + null, this.parentBeanfactory, false); this.beanFactory.addBeanPostProcessor(new ServiceRegistrationPostProcessor()); this.beanFactory.preInstantiateSingletons(); // What is this for? Modified: cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java?rev=418614&r1=418613&r2=418614&view=diff ============================================================================== --- cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java (original) +++ cocoon/trunk/core/cocoon-core/src/test/java/org/apache/cocoon/core/container/ContainerTestCase.java Sun Jul 2 09:12:28 2006 @@ -301,7 +301,7 @@ // read roles and components ConfigurationInfo rolesInfo = ConfigReader.readConfiguration(confRM, confCM, null, avalonEnv, null); this.addComponents( rolesInfo ); - this.beanFactory = BeanFactoryUtil.createBeanFactory(avalonEnv, rolesInfo, null, this.rootBeanFactory, false); + this.beanFactory = BeanFactoryUtil.createBeanFactory(avalonEnv, rolesInfo, null, this.rootBeanFactory); this.manager = (ServiceManager)this.beanFactory.getBean(ServiceManager.class.getName()); }