You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/01/22 22:43:13 UTC

svn commit: r371396 - in /cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container: CoreServiceManager.java RoleManagerOwner.java

Author: danielf
Date: Sun Jan 22 13:43:09 2006
New Revision: 371396

URL: http://svn.apache.org/viewcvs?rev=371396&view=rev
Log:
Need to get a parent role manager also from service managers that doesn't extend CoreServiceManager.

Added:
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java   (with props)
Modified:
    cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/CoreServiceManager.java

Modified: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/CoreServiceManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/CoreServiceManager.java?rev=371396&r1=371395&r2=371396&view=diff
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/CoreServiceManager.java (original)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/CoreServiceManager.java Sun Jan 22 13:43:09 2006
@@ -69,7 +69,7 @@
  */
 public class CoreServiceManager
         extends AbstractLogEnabled
-        implements Contextualizable, ThreadSafe, Disposable, Initializable, ServiceManager, Configurable {
+        implements Contextualizable, ThreadSafe, Disposable, Initializable, ServiceManager, Configurable, RoleManagerOwner {
 
     /** The attribute containing the JMX domain name */
     public static final String JMX_DOMAIN_ATTR_NAME = "jmx-domain";
@@ -145,9 +145,12 @@
         if ( parent instanceof ComponentManager ) {
             coreServicemanager = ((ComponentManager)parent).getServiceManager();
         }
-        // get role manager and logger manager
+        // get role manager
+        if ( coreServicemanager instanceof RoleManagerOwner ) {
+            parentRoleManager = ((RoleManagerOwner)coreServicemanager).getRoleManager();
+        }
+        // get logger manager
         if ( coreServicemanager instanceof CoreServiceManager ) {
-            parentRoleManager = ((CoreServiceManager)coreServicemanager).roleManager;
             this.loggerManager = ((CoreServiceManager)coreServicemanager).loggerManager;
         }
 
@@ -632,6 +635,13 @@
         }
 
         this.componentHandlers.put(newRole, new AliasComponentHandler(this.getLogger(), handler));
+    }
+
+    /* 
+     * Get the role manager
+     */
+    public RoleManager getRoleManager() {
+        return this.roleManager;
     }
 
     /**

Added: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java?rev=371396&view=auto
==============================================================================
--- cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java (added)
+++ cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java Sun Jan 22 13:43:09 2006
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2002-2005 The Apache Software Foundation
+ * Licensed  under the  Apache License,  Version 2.0  (the "License");
+ * you may not use  this file  except in  compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed  under the  License is distributed on an "AS IS" BASIS,
+ * WITHOUT  WARRANTIES OR CONDITIONS  OF ANY KIND, either  express  or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.core.container;
+
+/**
+ * Used for marking that a container has a role manager and for making it
+ * available from parent to child manager
+ *
+ * @version $Id$
+ */
+public interface RoleManagerOwner {
+    /**
+     * Get the role manager of the container
+     * @return a role manager
+     */
+    RoleManager getRoleManager();
+}

Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/trunk/cocoon-core/src/main/java/org/apache/cocoon/core/container/RoleManagerOwner.java
------------------------------------------------------------------------------
    svn:keywords = Id