cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
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 GMT
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("<bean");
-            this.appendAttribute(buffer, "id", Cocoon.class.getName());
-            this.appendAttribute(buffer, "class", Cocoon.class.getName());
-            this.appendAttribute(buffer, "singleton", "true");
-            buffer.append(">\n");
-            buffer.append("  <constructor-arg ref=\"");
-            buffer.append(Processor.ROLE);
-            buffer.append("\"/>\n");
-            buffer.append("  <constructor-arg ref=\"");
-            buffer.append(ServiceManager.class.getName());
-            buffer.append("\"/>\n");
-            buffer.append("  <constructor-arg ref=\"");
-            buffer.append(Context.class.getName());
-            buffer.append("\"/>\n");
-            buffer.append("  <constructor-arg ref=\"");
-            buffer.append(Logger.class.getName());
-            buffer.append("\"/>\n");
-            buffer.append("</bean>\n");
         }
         buffer.append("</beans>\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());
     }



Mime
View raw message