cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r123800 - in cocoon/trunk/src: core/java/org/apache/cocoon/core/container java/org/apache/cocoon test/org/apache/cocoon
Date Fri, 31 Dec 2004 15:18:41 GMT
Author: cziegeler
Date: Fri Dec 31 07:18:39 2004
New Revision: 123800

URL: http://svn.apache.org/viewcvs?view=rev&rev=123800
Log:
Rename method
Modified:
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
   cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
   cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
   cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
   cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java?view=diff&rev=123800&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java&r1=123799&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java&r2=123800
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/AbstractServiceManager.java
Fri Dec 31 07:18:39 2004
@@ -121,9 +121,9 @@
             if( this.getLogger().isDebugEnabled() ) {
                 this.getLogger().debug( "Adding component (" + role + " = " + className +
")" );
             }
-
+            // FIXME - use different classloader
             final Class clazz = this.getClass().getClassLoader().loadClass( className );
-            this.addComponent( role, clazz, configuration );
+            this.doAddComponent( role, clazz, configuration );
         } catch( final ClassNotFoundException cnfe ) {
             final String message = "Could not get class (" + className + ") for role "
                                  + role + " at " + configuration.getLocation();
@@ -151,7 +151,7 @@
         }        
     }
     
-    protected abstract void addComponent(String role, Class clazz, Configuration config)
+    protected abstract void doAddComponent(String role, Class clazz, Configuration config)
     throws ServiceException;
     
     

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java?view=diff&rev=123800&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r1=123799&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java&r2=123800
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/CocoonServiceManager.java
Fri Dec 31 07:18:39 2004
@@ -146,6 +146,7 @@
                     }
 
                     try {
+                        // FIXME use different class loader
                         final Class componentClass = this.getClass().getClassLoader().loadClass(
info.getServiceClassName() );
 
                         final Configuration configuration = new DefaultConfiguration( "",
"-" );
@@ -590,7 +591,7 @@
      * @param component the class of this component.
      * @param configuration the configuration for this component.
      */
-    public void addComponent( final String role,
+    public void doAddComponent( final String role,
                               final Class component,
                               final Configuration configuration )
     throws ServiceException {

Modified: cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java?view=diff&rev=123800&p1=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r1=123799&p2=cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java&r2=123800
==============================================================================
--- cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
(original)
+++ cocoon/trunk/src/core/java/org/apache/cocoon/core/container/StandaloneServiceSelector.java
Fri Dec 31 07:18:39 2004
@@ -333,7 +333,7 @@
      * @param component the class of this component.
      * @param configuration the configuration for this component.
      */
-    public void addComponent( final String key,
+    public void doAddComponent( final String key,
                               final Class component,
                               final Configuration configuration )
     throws ServiceException {

Modified: cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java?view=diff&rev=123800&p1=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r1=123799&p2=cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java&r2=123800
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java	(original)
+++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java	Fri Dec 31 07:18:39 2004
@@ -221,7 +221,7 @@
         startupManager.setLoggerManager(this.loggerManager);
 
         try {
-            startupManager.addComponent(SAXParser.ROLE,
+            startupManager.doAddComponent(SAXParser.ROLE,
                                         ClassUtils.loadClass(parser),
                                         new DefaultConfiguration("", "empty"));
         } catch (Exception e) {

Modified: cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java?view=diff&rev=123800&p1=cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java&r1=123799&p2=cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java&r2=123800
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/CocoonTestCase.java	Fri Dec 31 07:18:39 2004
@@ -50,12 +50,12 @@
             factory.setAttribute("class", URLSourceFactory.class.getName());
             factory.setAttribute("name", "*");
             df.addChild(factory);
-            manager.addComponent("org.apache.excalibur.source.SourceFactorySelector", 
+            manager.doAddComponent("org.apache.excalibur.source.SourceFactorySelector", 
                                  CocoonServiceSelector.class, 
                                  df);
         }
         if ( this.addSourceResolver() ) {
-            manager.addComponent(SourceResolver.ROLE, 
+            manager.doAddComponent(SourceResolver.ROLE, 
                     SourceResolverImpl.class, 
                     new DefaultConfiguration("", "-"));
         }

Modified: cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java
Url: http://svn.apache.org/viewcvs/cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java?view=diff&rev=123800&p1=cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java&r1=123799&p2=cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java&r2=123800
==============================================================================
--- cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java	(original)
+++ cocoon/trunk/src/test/org/apache/cocoon/SitemapComponentTestCase.java	Fri Dec 31 07:18:39
2004
@@ -144,7 +144,7 @@
             factory.setAttribute("class", componentClassName);
             factory.setAttribute("name", key);
             df.addChild(factory);
-            manager.addComponent(typeClassName + "Selector", 
+            manager.doAddComponent(typeClassName + "Selector", 
                                  CocoonServiceSelector.class, 
                                  df);
         }

Mime
View raw message