cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r179038 - in /cocoon/trunk/src/java/org/apache/cocoon: Cocoon.java core/container/ComponentLocatorWrapper.java core/container/CoreServiceManager.java
Date Mon, 30 May 2005 08:19:26 GMT
Author: cziegeler
Date: Mon May 30 01:19:24 2005
New Revision: 179038

URL: http://svn.apache.org/viewcvs?rev=179038&view=rev
Log:
Javadoc fixes
Release core

Modified:
    cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java
    cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentLocatorWrapper.java
    cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java

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?rev=179038&r1=179037&r2=179038&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/Cocoon.java Mon May 30 01:19:24 2005
@@ -121,10 +121,8 @@
 
     /**
      * Creates a new <code>Cocoon</code> instance.
-     *
-     * @exception ConfigurationException if an error occurs
      */
-    public Cocoon() throws ConfigurationException {
+    public Cocoon() {
         // Set the system properties needed by Xalan2.
         setSystemProperties();
 
@@ -133,6 +131,9 @@
         instance = this;
     }
 
+    /**
+     * @see org.apache.avalon.framework.logger.LogEnabled#enableLogging(org.apache.avalon.framework.logger.Logger)
+     */
     public void enableLogging(Logger logger) {
         this.rootLogger = logger;
         super.enableLogging(logger.getChildLogger("cocoon"));
@@ -342,7 +343,7 @@
         }
     }
 
-    /* (non-Javadoc)
+    /**
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
@@ -359,7 +360,11 @@
             ContainerUtil.dispose(this.serviceManager);
             this.serviceManager = null;
         }
-
+        if ( this.parentServiceManager != null ) {
+            this.parentServiceManager.release(this.core);
+            this.core = null;
+            this.parentServiceManager = null;
+        }
         this.context = null;
         this.disposed = true;
     }

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentLocatorWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentLocatorWrapper.java?rev=179038&r1=179037&r2=179038&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentLocatorWrapper.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/ComponentLocatorWrapper.java Mon
May 30 01:19:24 2005
@@ -35,10 +35,16 @@
         this.manager = m;
     }
 
+    /**
+     * @see org.apache.cocoon.sitemap.ComponentLocator#hasComponent(java.lang.String)
+     */
     public boolean hasComponent(String key) {
         return this.manager.hasService(key);
     }
 
+    /**
+     * @see org.apache.cocoon.sitemap.ComponentLocator#getComponent(java.lang.String)
+     */
     public Object getComponent(String key) 
     throws ProcessingException {
         try {
@@ -48,6 +54,9 @@
         }
     }
 
+    /**
+     * @see org.apache.cocoon.sitemap.ComponentLocator#release(java.lang.Object)
+     */
     public void release(Object component) {
         this.manager.release(component);
     }

Modified: cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java?rev=179038&r1=179037&r2=179038&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/core/container/CoreServiceManager.java Mon May
30 01:19:24 2005
@@ -111,7 +111,7 @@
     /** The classloader to get classes from */
     protected ClassLoader classloader;
 
-    /** The resolver used to resolve includes. It is lazily loaded in {@link #getSourceResolver()}.
*/
+    /** The resolver used to resolve includes. It is lazily loaded in {@link #setupSourceResolver()}.
*/
     private SourceResolver cachedSourceResolver;
 
     /** Create the ServiceManager with a parent ServiceManager */
@@ -595,10 +595,10 @@
      * Obtain a new ComponentHandler for the specified component. 
      * 
      * @param role the component's role.
-     * @param componentClass Class of the component for which the handle is
+     * @param className Class of the component for which the handle is
      *                       being requested.
      * @param configuration The configuration for this component.
-     * @param serviceManager The service manager which will be managing the Component.
+     * @param baseInfo The information for managing the component, like service manager etc.
      *
      * @throws Exception If there were any problems obtaining a ComponentHandler
      */
@@ -818,7 +818,7 @@
     }
 
     /** 
-     * Check if a component can be overriden. Only {@link DefaultSelector} or its subclasses
can be
+     * Check if a component can be overriden. Only {@link DefaultServiceSelector} or its
subclasses can be
      * overriden, as they directly feed this manager with their component definitions and
are empty
      * shells delegating to this manager afterwards.
      */



Mime
View raw message